fix Linux compilation

- fix cases in include - fix slots declaration
OpenModelica · Feb 14, 2017 · c0242d9 · c0242d9
1 parent dc933bb
commit c0242d9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/OMEdit/OMEditGUI/Git/CleanDialog.cpp b/OMEdit/OMEditGUI/Git/CleanDialog.cpp
@@ -3,7 +3,7 @@
 #include "MainWindow.h"
 #include "Modeling/ModelWidgetContainer.h"
 #include "Git/GitCommands.h"
-#include "util/Helper.h"
+#include "Util/Helper.h"
 #include "QFrame"
 #include "QDialogButtonBox"
 #include "QStyle"
@@ -51,8 +51,8 @@ CleanDialog::CleanDialog(QWidget *pParent)
   mpButtonBox->addButton(mpCleanRepositoryButton, QDialogButtonBox::ActionRole);
   mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
   //
-  connect(mpSelectAllCheckBox, &QAbstractButton::clicked, this, selectAllItems);
-  connect(mpCleanFilesTreeView, &QAbstractItemView::clicked, this, updateSelectAllCheckBox);
+  connect(mpSelectAllCheckBox, &QAbstractButton::clicked, this, &CleanDialog::selectAllItems);
+  connect(mpCleanFilesTreeView, &QAbstractItemView::clicked, this, &CleanDialog::updateSelectAllCheckBox);
   // set the layout
   QGridLayout *pMainLayout = new QGridLayout;
   pMainLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
@@ -123,7 +123,7 @@ void CleanDialog::selectAllItems(bool checked)
   }
 }
 
-void CleanDialog::updateSelectAllCheckBox()
+void CleanDialog::updateSelectAllCheckBox(void)
 {
   bool checked = true;
   if (const int rowCount = mpCleanFilesModel->rowCount()) {

diff --git a/OMEdit/OMEditGUI/Git/CleanDialog.h b/OMEdit/OMEditGUI/Git/CleanDialog.h
@@ -22,8 +22,6 @@ class CleanDialog : public QDialog
   QTreeView * mpCleanFilesTreeView;
   QString *mpworkingDirectory;
   void getUntrackedFiles();
-  void selectAllItems(bool checked);
-  void updateSelectAllCheckBox();
   QStringList checkedFiles() const;
   void addFile(const QString &workingDirectory, QString fileName, bool checked);
   QCheckBox *mpSelectAllCheckBox;
@@ -37,6 +35,9 @@ class CleanDialog : public QDialog
 //  void workingDirectoryChanged(const QString &workingDirectory);
 //  void browseWorkingDirectory();
 //  void commitTextChanged(const QString &commit);
+public slots:
+  void selectAllItems(bool checked);
+  void updateSelectAllCheckBox(void);
 };
 
 #endif // CLEANDIALOG_H
diff --git a/OMEdit/OMEditGUI/Git/CommitChangesDialog.cpp b/OMEdit/OMEditGUI/Git/CommitChangesDialog.cpp
@@ -3,7 +3,7 @@
 #include "Modeling/ModelWidgetContainer.h"
 #include "Modeling/MessagesWidget.h"
 #include "Git/GitCommands.h"
-#include "util/Helper.h"
+#include "Util/Helper.h"
 #include "QFrame"
 #include "QGridLayout"
 #include "QGroupBox"

diff --git a/OMEdit/OMEditGUI/Git/GitCommands.cpp b/OMEdit/OMEditGUI/Git/GitCommands.cpp
@@ -2,7 +2,7 @@
 #include "MainWindow.h"
 #include "Modeling/MessagesWidget.h"
 #include "Modeling/ModelWidgetContainer.h"
-#include "util/Helper.h"
+#include "Util/Helper.h"
 #include "QFileInfo"
 #include "QDir"
 #include "QMessageBox"

diff --git a/OMEdit/OMEditGUI/Git/RevertCommitsDialog.cpp b/OMEdit/OMEditGUI/Git/RevertCommitsDialog.cpp
@@ -2,8 +2,8 @@
 #include "MainWindow.h"
 #include "Modeling/ModelWidgetContainer.h"
 #include "Git/GitCommands.h"
-#include "util/Helper.h"
-#include "util/StringHandler.h"
+#include "Util/Helper.h"
+#include "Util/StringHandler.h"
 #include "QPushButton"
 #include "QDialogButtonBox"
 #include "QLineEdit"

diff --git a/OMEdit/OMEditGUI/Traceability/TraceabilityPushDialog.cpp b/OMEdit/OMEditGUI/Traceability/TraceabilityPushDialog.cpp
@@ -1,6 +1,6 @@
 #include "TraceabilityPushDialog.h"
 #include "MainWindow.h"
-#include "util/Helper.h"
+#include "Util/Helper.h"
 #include "Modeling/MessagesWidget.h"
 #include "Options/OptionsDialog.h"
 #include "Modeling/ModelWidgetContainer.h"

diff --git a/OMEdit/OMEditGUI/Traceability/TraceabilityQueryDialog.cpp b/OMEdit/OMEditGUI/Traceability/TraceabilityQueryDialog.cpp
@@ -1,6 +1,6 @@
 #include "TraceabilityQueryDialog.h"
 #include "MainWindow.h"
-#include "util/Helper.h"
+#include "Util/Helper.h"
 #include "Modeling/ModelWidgetContainer.h"
 #include "Options/OptionsDialog.h"
 #include "Git/GitCommands.h"