ensured stage dirs are created before written to; fixed moc problem with gui file browser

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1902 5a81b35b-ba03-0410-adc8-b2c5c5119f08

CMakeLists.txt

@@ -121,6 +121,8 @@ else()
   set(LIB_STAGE_PATH "${STAGE_DIR}/lib")
 endif()
 
+file(MAKE_DIRECTORY $STAGE_DIR $EXECUTABLE_OUTPUT_PATH $HEADER_STAGE_PATH LIB_STAGE_PATH)
+
 if (WIN32)
    # add_definitions(-DBOOST_TEST_INCLUDED)
    

modules/gui/src/file_browser.cc

@@ -76,13 +76,13 @@ FileBrowser::FileBrowser(QWidget* parent):
   this->Init(path);
 }
 
-FileBrowser::FileBrowser(QString& path, QWidget* parent):
+FileBrowser::FileBrowser(const QString& path, QWidget* parent):
  Widget(NULL, parent)
 {
   this->Init(path);
 }
 
-void FileBrowser::Init(QString& path)
+void FileBrowser::Init(const QString& path)
 {
   model_=new QDirModel;
   model_->setSorting(QDir::Name|QDir::DirsFirst|QDir::IgnoreCase);
@@ -153,7 +153,7 @@ void FileBrowser::ChangeToParentDirectory(int index){
   view_->viewport()->update();
 }
 
-void FileBrowser::UpdateMenu(const QString path){
+void FileBrowser::UpdateMenu(const QString& path){
   menu_->clear();
   QDir directory = QDir(path);
   AddItem(directory);
@@ -182,7 +182,7 @@ void FileBrowser::Split(){
   panels->MoveNextTo(qobject_cast<Widget*>(this), new_file_browser);
 }
 
-void FileBrowser::AddItem(const QDir directory, QString mypath){
+void FileBrowser::AddItem(const QDir& directory, const QString& mypath){
   QVariant variant = QVariant(directory.path());
   QIcon icon = model_->fileIcon(model_->index(variant.toString()));
   if (mypath!=""){

modules/gui/src/file_browser.hh

@@ -37,7 +37,7 @@ class FileBrowser : public Widget {
   Q_OBJECT
 public:
   FileBrowser(QWidget* parent=NULL);
-  FileBrowser(QString& path, QWidget* parent=NULL);
+  FileBrowser(const QString& path, QWidget* parent=NULL);
   
   virtual ActionList GetActions();
   virtual bool Save(const QString& prefix);
@@ -47,14 +47,14 @@ protected:
   virtual void keyPressEvent(QKeyEvent* event);
 
 private slots:
-  void Init(QString& path);
+  void Init(const QString& path);
   void DoubleClicked(const QModelIndex& index);
   void ChangeToParentDirectory(int index);
   void Split();
 private:
   void LoadObject(const QModelIndex& index);
-  void UpdateMenu(const QString path);
-  void AddItem(const QDir directory, QString mypath="");
+  void UpdateMenu(const QString& path);
+  void AddItem(const QDir& directory, const QString& mypath="");
   QComboBox* menu_;
   QDirModel* model_;
   QListView* view_;