diff options
author | hjk <hjk@theqtcompany.com> | 2016-03-18 07:55:01 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-03-30 15:20:19 +0000 |
commit | 39a38d5679084b515276285c044d8a27e671adb1 (patch) | |
tree | 8f72b00aa4a7db53eb8e193119033edf1ae9b0e4 /src/libs/sqlite | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) | |
download | qt-creator-39a38d5679084b515276285c044d8a27e671adb1.tar.gz |
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/libs/sqlite')
23 files changed, 23 insertions, 94 deletions
diff --git a/src/libs/sqlite/columndefinition.h b/src/libs/sqlite/columndefinition.h index cf1715a33f..91f64cb24c 100644 --- a/src/libs/sqlite/columndefinition.h +++ b/src/libs/sqlite/columndefinition.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLUMNDEFINITION_H -#define COLUMNDEFINITION_H +#pragma once #include "sqliteglobal.h" #include "utf8string.h" @@ -51,5 +50,3 @@ private: }; } - -#endif // COLUMNDEFINITION_H diff --git a/src/libs/sqlite/createtablecommand.h b/src/libs/sqlite/createtablecommand.h index 70b2146394..b4387e7ab7 100644 --- a/src/libs/sqlite/createtablecommand.h +++ b/src/libs/sqlite/createtablecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_CREATETABLECOMMAND_H -#define INTERNAL_CREATETABLECOMMAND_H +#pragma once #include "columndefinition.h" #include "utf8string.h" @@ -48,5 +47,3 @@ public: } // namespace Internal Q_DECLARE_METATYPE(Internal::CreateTableCommand) - -#endif // INTERNAL_CREATETABLECOMMAND_H diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.h b/src/libs/sqlite/createtablesqlstatementbuilder.h index 25caf3ccda..3445d4946f 100644 --- a/src/libs/sqlite/createtablesqlstatementbuilder.h +++ b/src/libs/sqlite/createtablesqlstatementbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATETABLESQLSTATEMENTBUILDER_H -#define CREATETABLESQLSTATEMENTBUILDER_H +#pragma once #include "columndefinition.h" #include "sqlstatementbuilder.h" @@ -62,5 +61,3 @@ private: }; } - -#endif // CREATETABLESQLSTATEMENTBUILDER_H diff --git a/src/libs/sqlite/sqlitecolumn.h b/src/libs/sqlite/sqlitecolumn.h index c16ec3f212..136691e36d 100644 --- a/src/libs/sqlite/sqlitecolumn.h +++ b/src/libs/sqlite/sqlitecolumn.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITECOLUMN_H -#define SQLITECOLUMN_H +#pragma once #include "columndefinition.h" #include "utf8string.h" @@ -55,5 +54,3 @@ private: ColumnType type_; bool isPrimaryKey_; }; - -#endif // SQLITECOLUMN_H diff --git a/src/libs/sqlite/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h index ec77d78f84..91454329ee 100644 --- a/src/libs/sqlite/sqlitedatabase.h +++ b/src/libs/sqlite/sqlitedatabase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASE_H -#define SQLITEDATABASE_H +#pragma once #include "sqlitedatabaseconnectionproxy.h" #include "sqliteglobal.h" @@ -78,5 +77,3 @@ private: QString databaseFilePath_; JournalMode journalMode_; }; - -#endif // SQLITEDATABASE_H diff --git a/src/libs/sqlite/sqlitedatabasebackend.h b/src/libs/sqlite/sqlitedatabasebackend.h index 674e0324d7..7d86519922 100644 --- a/src/libs/sqlite/sqlitedatabasebackend.h +++ b/src/libs/sqlite/sqlitedatabasebackend.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASEBACKEND_H -#define SQLITEDATABASEBACKEND_H +#pragma once #include "sqliteglobal.h" @@ -107,5 +106,3 @@ private: TextEncoding cachedTextEncoding; }; - -#endif // SQLITEDATABASEBACKEND_H diff --git a/src/libs/sqlite/sqlitedatabaseconnection.h b/src/libs/sqlite/sqlitedatabaseconnection.h index 154cf250d9..bbf813ffe6 100644 --- a/src/libs/sqlite/sqlitedatabaseconnection.h +++ b/src/libs/sqlite/sqlitedatabaseconnection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASECONNECTIONCONTROLLER_H -#define SQLITEDATABASECONNECTIONCONTROLLER_H +#pragma once #include "sqlitedatabasebackend.h" @@ -56,5 +55,3 @@ signals: private: SqliteDatabaseBackend databaseBackend; }; - -#endif // SQLITEDATABASECONNECTIONCONTROLLER_H diff --git a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h index 2e3f1e7e96..ddc25f18b9 100644 --- a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h +++ b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASECONNECTION_H -#define SQLITEDATABASECONNECTION_H +#pragma once #include <sqliteglobal.h> @@ -62,5 +61,3 @@ private: QPointer<SqliteWorkerThread> databaseConnectionThread; bool databaseConnectionIsOpen; }; - -#endif // SQLITEDATABASECONNECTION_H diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h index 54d9084584..b778d39b58 100644 --- a/src/libs/sqlite/sqliteexception.h +++ b/src/libs/sqlite/sqliteexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEEXCEPTION_H -#define SQLITEEXCEPTION_H +#pragma once #include "sqliteglobal.h" @@ -41,5 +40,3 @@ private: const char *whatErrorHasHappen; QByteArray sqliteErrorMessage_; }; - -#endif // SQLITEEXCEPTION_H diff --git a/src/libs/sqlite/sqliteglobal.h b/src/libs/sqlite/sqliteglobal.h index 5d75871b86..9349230fab 100644 --- a/src/libs/sqlite/sqliteglobal.h +++ b/src/libs/sqlite/sqliteglobal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEGLOBAL_H -#define SQLITEGLOBAL_H +#pragma once #include <QtGlobal> @@ -86,6 +85,3 @@ class Utf8StringVector; typedef QMap<Utf8String, QVariant> RowDictionary; typedef QVector<RowDictionary> RowDictionaries; - - -#endif // SQLITEGLOBAL_H diff --git a/src/libs/sqlite/sqlitereadstatement.h b/src/libs/sqlite/sqlitereadstatement.h index 932c36af31..4f27c8657b 100644 --- a/src/libs/sqlite/sqlitereadstatement.h +++ b/src/libs/sqlite/sqlitereadstatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEREADSTATEMENT_H -#define SQLITEREADSTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -50,5 +49,3 @@ public: protected: void checkIsReadOnlyStatement(); }; - -#endif // SQLITEREADSTATEMENT_H diff --git a/src/libs/sqlite/sqlitereadwritestatement.h b/src/libs/sqlite/sqlitereadwritestatement.h index 1b7e4e8431..cb3c0707d4 100644 --- a/src/libs/sqlite/sqlitereadwritestatement.h +++ b/src/libs/sqlite/sqlitereadwritestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEREADWRITESTATEMENT_H -#define SQLITEREADWRITESTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -49,5 +48,3 @@ public: using SqliteStatement::toValue; using SqliteStatement::execute; }; - -#endif // SQLITEREADWRITESTATEMENT_H diff --git a/src/libs/sqlite/sqlitestatement.h b/src/libs/sqlite/sqlitestatement.h index 76762ef284..4cdf5ac262 100644 --- a/src/libs/sqlite/sqlitestatement.h +++ b/src/libs/sqlite/sqlitestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITESTATEMENT_H -#define SQLITESTATEMENT_H +#pragma once #include "sqliteglobal.h" @@ -127,5 +126,3 @@ private: int columnCount_; mutable bool isReadyToFetchValues; }; - -#endif // SQLITESTATEMENT_H diff --git a/src/libs/sqlite/sqlitetable.h b/src/libs/sqlite/sqlitetable.h index c945b96781..16a0661909 100644 --- a/src/libs/sqlite/sqlitetable.h +++ b/src/libs/sqlite/sqlitetable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITETABLE_H -#define SQLITETABLE_H +#pragma once #include "sqliteglobal.h" #include "tablewriteworkerproxy.h" @@ -75,5 +74,3 @@ private: SqliteDatabase *sqliteDatabase; bool withoutRowId; }; - -#endif // SQLITETABLE_H diff --git a/src/libs/sqlite/sqlitetransaction.h b/src/libs/sqlite/sqlitetransaction.h index 90f83360ea..3ff6c8c739 100644 --- a/src/libs/sqlite/sqlitetransaction.h +++ b/src/libs/sqlite/sqlitetransaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITETRANSACTION_H -#define SQLITETRANSACTION_H +#pragma once #include "sqliteglobal.h" @@ -60,6 +59,3 @@ public: SqliteExclusiveTransaction(); }; - - -#endif // SQLITETRANSACTION_H diff --git a/src/libs/sqlite/sqliteworkerthread.h b/src/libs/sqlite/sqliteworkerthread.h index 9f0d640483..b76852434a 100644 --- a/src/libs/sqlite/sqliteworkerthread.h +++ b/src/libs/sqlite/sqliteworkerthread.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEWORKERTHREAD_H -#define SQLITEWORKERTHREAD_H +#pragma once #include <QMutex> #include <QPointer> @@ -48,5 +47,3 @@ private: mutable QWaitCondition connectionChanged; QPointer<SqliteDatabaseConnection> connection; }; - -#endif // SQLITEWORKERTHREAD_H diff --git a/src/libs/sqlite/sqlitewritestatement.h b/src/libs/sqlite/sqlitewritestatement.h index cf623afb76..abfb27d741 100644 --- a/src/libs/sqlite/sqlitewritestatement.h +++ b/src/libs/sqlite/sqlitewritestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEWRITESTATEMENT_H -#define SQLITEWRITESTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -47,5 +46,3 @@ public: protected: void checkIsWritableStatement(); }; - -#endif // SQLITEWRITESTATEMENT_H diff --git a/src/libs/sqlite/sqlstatementbuilder.h b/src/libs/sqlite/sqlstatementbuilder.h index 674089d19b..6bc092900e 100644 --- a/src/libs/sqlite/sqlstatementbuilder.h +++ b/src/libs/sqlite/sqlstatementbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLSTATEMENTBUILDER_H -#define SQLSTATEMENTBUILDER_H +#pragma once #include "utf8string.h" @@ -77,5 +76,3 @@ private: mutable Utf8String sqlStatement_; mutable std::vector<BindingPair> bindings; }; - -#endif // SQLSTATEMENTBUILDER_H diff --git a/src/libs/sqlite/sqlstatementbuilderexception.h b/src/libs/sqlite/sqlstatementbuilderexception.h index 104e12d3e5..17e215ad4f 100644 --- a/src/libs/sqlite/sqlstatementbuilderexception.h +++ b/src/libs/sqlite/sqlstatementbuilderexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLSTATEMENTBUILDEREXCEPTION_H -#define SQLSTATEMENTBUILDEREXCEPTION_H +#pragma once #include "sqliteexception.h" @@ -33,5 +32,3 @@ class SQLITE_EXPORT SqlStatementBuilderException : public SqliteException public: SqlStatementBuilderException(const char *whatErrorHasHappen, const char *errorMessage = 0); }; - -#endif // SQLSTATEMENTBUILDEREXCEPTION_H diff --git a/src/libs/sqlite/tablewriteworker.h b/src/libs/sqlite/tablewriteworker.h index 26f541a987..8ae95c44c3 100644 --- a/src/libs/sqlite/tablewriteworker.h +++ b/src/libs/sqlite/tablewriteworker.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_TABLEWRITEWORKER_H -#define INTERNAL_TABLEWRITEWORKER_H +#pragma once #include "createtablecommand.h" @@ -47,5 +46,3 @@ signals: }; } // namespace Internal - -#endif // INTERNAL_TABLEWRITEWORKER_H diff --git a/src/libs/sqlite/tablewriteworkerproxy.h b/src/libs/sqlite/tablewriteworkerproxy.h index cff996b70e..0bf481e69d 100644 --- a/src/libs/sqlite/tablewriteworkerproxy.h +++ b/src/libs/sqlite/tablewriteworkerproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_TABLEWRITEWORKERPROXY_H -#define INTERNAL_TABLEWRITEWORKERPROXY_H +#pragma once #include "createtablecommand.h" @@ -62,5 +61,3 @@ private: }; } // namespace Internal - -#endif // INTERNAL_TABLEWRITEWORKERPROXY_H diff --git a/src/libs/sqlite/utf8string.h b/src/libs/sqlite/utf8string.h index 15129c255c..26bf354e24 100644 --- a/src/libs/sqlite/utf8string.h +++ b/src/libs/sqlite/utf8string.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTF8STRING_H -#define UTF8STRING_H +#pragma once #include "sqliteglobal.h" @@ -127,5 +126,3 @@ SQLITE_EXPORT uint qHash(const Utf8String &utf8String); #define Utf8StringLiteral(str) Utf8String::fromByteArray(QByteArrayLiteral(str)) Q_DECLARE_METATYPE(Utf8String) - -#endif // UTF8STRING_H diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/sqlite/utf8stringvector.h index d68f68b811..7d77e283d0 100644 --- a/src/libs/sqlite/utf8stringvector.h +++ b/src/libs/sqlite/utf8stringvector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTF8STRINGVECTOR_H -#define UTF8STRINGVECTOR_H +#pragma once #include "sqliteglobal.h" #include "utf8string.h" @@ -69,5 +68,3 @@ SQLITE_EXPORT QDebug operator<<(QDebug debug, const Utf8StringVector &textVector SQLITE_EXPORT void PrintTo(const Utf8StringVector &textVector, ::std::ostream* os); Q_DECLARE_METATYPE(Utf8StringVector) - -#endif // UTF8STRINGVECTOR_H |