diff options
Diffstat (limited to 'Source/QtDialog')
-rw-r--r-- | Source/QtDialog/AddCacheEntry.cxx | 3 | ||||
-rw-r--r-- | Source/QtDialog/AddCacheEntry.h | 5 | ||||
-rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 15 | ||||
-rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 27 | ||||
-rw-r--r-- | Source/QtDialog/CMakeSetupDialog.h | 5 | ||||
-rw-r--r-- | Source/QtDialog/Compilers.h | 1 | ||||
-rw-r--r-- | Source/QtDialog/FirstConfigure.cxx | 5 | ||||
-rw-r--r-- | Source/QtDialog/FirstConfigure.h | 2 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.cxx | 4 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.h | 13 | ||||
-rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 8 | ||||
-rw-r--r-- | Source/QtDialog/QCMakeCacheView.h | 5 | ||||
-rw-r--r-- | Source/QtDialog/QCMakeWidgets.cxx | 4 | ||||
-rw-r--r-- | Source/QtDialog/QCMakeWidgets.h | 3 | ||||
-rw-r--r-- | Source/QtDialog/RegexExplorer.h | 4 | ||||
-rw-r--r-- | Source/QtDialog/WarningMessagesDialog.h | 2 |
16 files changed, 59 insertions, 47 deletions
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx index 3881045..efb2b65 100644 --- a/Source/QtDialog/AddCacheEntry.cxx +++ b/Source/QtDialog/AddCacheEntry.cxx @@ -11,8 +11,9 @@ ============================================================================*/ #include "AddCacheEntry.h" -#include <QMetaProperty> + #include <QCompleter> +#include <QMetaProperty> static const int NumTypes = 4; static const int DefaultTypeIndex = 0; diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index 38c3a74..7c08af6 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -13,11 +13,12 @@ #ifndef AddCacheEntry_h #define AddCacheEntry_h -#include <QWidget> +#include "QCMake.h" + #include <QCheckBox> #include <QStringList> +#include <QWidget> -#include "QCMake.h" #include "ui_AddCacheEntry.h" class AddCacheEntry : public QWidget, public Ui::AddCacheEntry diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index cff4f6f..b44219f 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -10,19 +10,20 @@ See the License for more information. ============================================================================*/ #include "QCMake.h" // include to disable MS warnings + +#include "CMakeSetupDialog.h" +#include "cmAlgorithms.h" +#include "cmDocumentation.h" +#include "cmVersion.h" +#include "cmake.h" #include <QApplication> #include <QDir> -#include <QTranslator> #include <QLocale> #include <QTextCodec> -#include "CMakeSetupDialog.h" -#include "cmDocumentation.h" -#include "cmake.h" -#include "cmVersion.h" -#include "cmAlgorithms.h" +#include <QTranslator> #include <cmsys/CommandLineArguments.hxx> -#include <cmsys/SystemTools.hxx> #include <cmsys/Encoding.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 2fc4faf..945739d 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -11,28 +11,29 @@ ============================================================================*/ #include "CMakeSetupDialog.h" -#include <QFileDialog> -#include <QProgressBar> -#include <QMessageBox> -#include <QStatusBar> -#include <QToolButton> -#include <QDialogButtonBox> + #include <QCloseEvent> #include <QCoreApplication> -#include <QSettings> +#include <QDialogButtonBox> +#include <QDragEnterEvent> +#include <QFileDialog> +#include <QInputDialog> +#include <QKeySequence> #include <QMenu> #include <QMenuBar> -#include <QDragEnterEvent> +#include <QMessageBox> #include <QMimeData> -#include <QUrl> +#include <QProgressBar> +#include <QSettings> #include <QShortcut> -#include <QKeySequence> -#include <QInputDialog> +#include <QStatusBar> +#include <QToolButton> +#include <QUrl> -#include "QCMake.h" -#include "QCMakeCacheView.h" #include "AddCacheEntry.h" #include "FirstConfigure.h" +#include "QCMake.h" +#include "QCMakeCacheView.h" #include "RegexExplorer.h" #include "WarningMessagesDialog.h" #include "cmSystemTools.h" diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 4b53b1c..f9624d1 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -14,10 +14,11 @@ #define CMakeSetupDialog_h #include "QCMake.h" + +#include "ui_CMakeSetupDialog.h" +#include <QEventLoop> #include <QMainWindow> #include <QThread> -#include <QEventLoop> -#include "ui_CMakeSetupDialog.h" class QCMakeThread; class CMakeCacheModel; diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h index 3f7b834..ee89886 100644 --- a/Source/QtDialog/Compilers.h +++ b/Source/QtDialog/Compilers.h @@ -4,6 +4,7 @@ #define COMPILERS_HPP #include <QWidget> + #include <ui_Compilers.h> class Compilers : public QWidget, public Ui::Compilers diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index 61aad72..5c0af2b 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -1,10 +1,11 @@ #include "FirstConfigure.h" + #include "Compilers.h" -#include <QSettings> -#include <QRadioButton> #include <QComboBox> +#include <QRadioButton> +#include <QSettings> #include <QVBoxLayout> diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h index 09952b6..3c574d4 100644 --- a/Source/QtDialog/FirstConfigure.h +++ b/Source/QtDialog/FirstConfigure.h @@ -4,7 +4,9 @@ #include <QWizard> #include <QWizardPage> + #include "cmake.h" + #include "ui_Compilers.h" #include "ui_CrossCompiler.h" diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index dd7c138..28be341 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -12,12 +12,12 @@ #include "QCMake.h" -#include <QDir> #include <QCoreApplication> +#include <QDir> +#include "cmExternalMakefileProjectGenerator.h" #include "cmState.h" #include "cmSystemTools.h" -#include "cmExternalMakefileProjectGenerator.h" #ifdef Q_OS_WIN #include "qt_windows.h" // For SetErrorMode diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 8942e7c..5cae06d 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -12,6 +12,9 @@ #ifndef QCMake_h #define QCMake_h + +#include "cmake.h" + #ifdef _MSC_VER #pragma warning ( disable : 4127 ) #pragma warning ( disable : 4512 ) @@ -19,15 +22,13 @@ #include <vector> +#include <QAtomicInt> +#include <QList> +#include <QMetaType> #include <QObject> #include <QString> -#include <QVariant> -#include <QList> #include <QStringList> -#include <QMetaType> -#include <QAtomicInt> - -#include "cmake.h" +#include <QVariant> /// struct to represent cmake properties in Qt /// Value is of type String or Bool diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index bae6a30..f64a78a 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -12,14 +12,14 @@ #include "QCMakeCacheView.h" +#include <QApplication> +#include <QEvent> #include <QHBoxLayout> #include <QHeaderView> -#include <QEvent> -#include <QStyle> #include <QKeyEvent> -#include <QSortFilterProxyModel> #include <QMetaProperty> -#include <QApplication> +#include <QSortFilterProxyModel> +#include <QStyle> #include "QCMakeWidgets.h" diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index 41f0bd8..5631b86 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -14,10 +14,11 @@ #define QCMakeCacheView_h #include "QCMake.h" -#include <QTreeView> + +#include <QItemDelegate> #include <QSet> #include <QStandardItemModel> -#include <QItemDelegate> +#include <QTreeView> class QSortFilterProxyModel; class QCMakeCacheModel; diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx index 41f98b5..7803ef3 100644 --- a/Source/QtDialog/QCMakeWidgets.cxx +++ b/Source/QtDialog/QCMakeWidgets.cxx @@ -13,10 +13,10 @@ #include "QCMakeWidgets.h" #include <QDirModel> -#include <QFileInfo> #include <QFileDialog> -#include <QToolButton> +#include <QFileInfo> #include <QResizeEvent> +#include <QToolButton> QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var) : QLineEdit(p), Variable(var) diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h index 8f58df2..759b635 100644 --- a/Source/QtDialog/QCMakeWidgets.h +++ b/Source/QtDialog/QCMakeWidgets.h @@ -13,9 +13,10 @@ #ifndef QCMakeWidgets_h #define QCMakeWidgets_h -#include <QLineEdit> #include <QComboBox> #include <QCompleter> +#include <QLineEdit> + class QToolButton; // common widgets for Qt based CMake diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h index 2ac9c3e..3ac8a24 100644 --- a/Source/QtDialog/RegexExplorer.h +++ b/Source/QtDialog/RegexExplorer.h @@ -13,9 +13,9 @@ #ifndef RegexExplorer_h #define RegexExplorer_h -#include <string> -#include <cmsys/RegularExpression.hxx> #include <QDialog> +#include <cmsys/RegularExpression.hxx> +#include <string> #include "ui_RegexExplorer.h" diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h index 6c274a7..4bb739c 100644 --- a/Source/QtDialog/WarningMessagesDialog.h +++ b/Source/QtDialog/WarningMessagesDialog.h @@ -16,8 +16,8 @@ #include <QDialog> #include <QWidget> -#include "ui_WarningMessagesDialog.h" #include "QCMake.h" +#include "ui_WarningMessagesDialog.h" /** * Dialog window for setting the warning message related options. |