summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog/QCMake.h
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/QtDialog/QCMake.h
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/QtDialog/QCMake.h')
-rw-r--r--Source/QtDialog/QCMake.h33
1 files changed, 20 insertions, 13 deletions
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index 5cae06d..a818c6b 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -16,8 +16,8 @@
#include "cmake.h"
#ifdef _MSC_VER
-#pragma warning ( disable : 4127 )
-#pragma warning ( disable : 4512 )
+#pragma warning(disable : 4127)
+#pragma warning(disable : 4512)
#endif
#include <vector>
@@ -34,7 +34,13 @@
/// Value is of type String or Bool
struct QCMakeProperty
{
- enum PropertyType { BOOL, PATH, FILEPATH, STRING };
+ enum PropertyType
+ {
+ BOOL,
+ PATH,
+ FILEPATH,
+ STRING
+ };
QString Key;
QVariant Value;
QStringList Strings;
@@ -42,13 +48,13 @@ struct QCMakeProperty
PropertyType Type;
bool Advanced;
bool operator==(const QCMakeProperty& other) const
- {
+ {
return this->Key == other.Key;
- }
+ }
bool operator<(const QCMakeProperty& other) const
- {
+ {
return this->Key < other.Key;
- }
+ }
};
// list of properties
@@ -65,7 +71,7 @@ class QCMake : public QObject
{
Q_OBJECT
public:
- QCMake(QObject* p=0);
+ QCMake(QObject* p = 0);
~QCMake();
public slots:
/// load the cache file in a directory
@@ -84,7 +90,8 @@ public slots:
void generate();
/// set the property values
void setProperties(const QCMakePropertyList&);
- /// interrupt the configure or generate process (if connecting, make a direct connection)
+ /// interrupt the configure or generate process (if connecting, make a direct
+ /// connection)
void interrupt();
/// delete the cache in binary directory
void deleteCache();
@@ -128,7 +135,8 @@ public:
bool getDebugOutput() const;
signals:
- /// signal when properties change (during read from disk or configure process)
+ /// signal when properties change (during read from disk or configure
+ /// process)
void propertiesChanged(const QCMakePropertyList& vars);
/// signal when the generator changes
void generatorChanged(const QString& gen);
@@ -157,8 +165,8 @@ protected:
static bool interruptCallback(void*);
static void progressCallback(const char* msg, float percent, void* cd);
- static void messageCallback(const char* msg, const char* title,
- bool&, void* cd);
+ static void messageCallback(const char* msg, const char* title, bool&,
+ void* cd);
static void stdoutCallback(const char* msg, size_t len, void* cd);
static void stderrCallback(const char* msg, size_t len, void* cd);
bool WarnUninitializedMode;
@@ -174,4 +182,3 @@ protected:
};
#endif // QCMake_h
-