diff options
38 files changed, 102 insertions, 102 deletions
diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.cpp b/autotests/kconfig_compiler/kconfigcompiler_test.cpp index 752af57f..24854612 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test.cpp @@ -14,11 +14,11 @@ ************************************************************************* */ -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QProcess> -#include <QtCore/QString> -#include <QtTest/QtTest> +#include <QDir> +#include <QFile> +#include <QProcess> +#include <QString> +#include <QtTest> #include <qstandardpaths.h> #include "kconfigcompiler_test.h" diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.h b/autotests/kconfig_compiler/kconfigcompiler_test.h index 3777eaa7..d7de5474 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test.h +++ b/autotests/kconfig_compiler/kconfigcompiler_test.h @@ -17,8 +17,8 @@ #ifndef KCONFIGCOMPILER_TEST_H #define KCONFIGCOMPILER_TEST_H -#include <QtCore/QFile> -#include <QtCore/QObject> +#include <QFile> +#include <QObject> class QString; diff --git a/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp b/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp index 2a26c155..c9943727 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp @@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "signals_test_no_singleton.h" #include "signals_test_singleton_dpointer.h" #include "signals_test_no_singleton_dpointer.h" -#include <QtTest/QtTestGui> -#include <QtTest/QSignalSpy> -#include <QtCore/QSharedPointer> -#include <QtCore/QtGlobal> -#include <QtCore/QDebug> +#include <QtTestGui> +#include <QSignalSpy> +#include <QSharedPointer> +#include <QtGlobal> +#include <QDebug> #include <QTemporaryFile> #include <QFileInfo> #include <functional> diff --git a/autotests/kconfig_compiler/test9main.cpp b/autotests/kconfig_compiler/test9main.cpp index 8ec98adb..56e2c38b 100644 --- a/autotests/kconfig_compiler/test9main.cpp +++ b/autotests/kconfig_compiler/test9main.cpp @@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test9.h" -#include <QtCore/QDir> +#include <QDir> #include <QGuiApplication> #include <QDebug> diff --git a/autotests/kconfigguitest.cpp b/autotests/kconfigguitest.cpp index 657c3e16..25fd210c 100644 --- a/autotests/kconfigguitest.cpp +++ b/autotests/kconfigguitest.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtTest/QtTestGui> +#include <QtTestGui> #include "kconfigguitest.h" #include <kconfig.h> diff --git a/autotests/kconfigguitest.h b/autotests/kconfigguitest.h index 142f85fb..b842d13b 100644 --- a/autotests/kconfigguitest.h +++ b/autotests/kconfigguitest.h @@ -19,7 +19,7 @@ #ifndef KCONFIGTEST_H #define KCONFIGTEST_H -#include <QtCore/QObject> +#include <QObject> class KConfigTest : public QObject { diff --git a/autotests/kconfigloadertest.h b/autotests/kconfigloadertest.h index b7e7edf6..2eed4fc0 100644 --- a/autotests/kconfigloadertest.h +++ b/autotests/kconfigloadertest.h @@ -20,7 +20,7 @@ #ifndef KCONFIGLOADERTEST_H #define KCONFIGLOADERTEST_H -#include <QtTest/QtTest> +#include <QtTest> class KConfigLoader; diff --git a/autotests/kconfignokdehometest.cpp b/autotests/kconfignokdehometest.cpp index d9712ee1..9080c174 100644 --- a/autotests/kconfignokdehometest.cpp +++ b/autotests/kconfignokdehometest.cpp @@ -19,7 +19,7 @@ #include <QObject> -#include <QtTest/QtTest> +#include <QtTest> #include <QStandardPaths> #include <ksharedconfig.h> diff --git a/autotests/kconfigskeletontest.cpp b/autotests/kconfigskeletontest.cpp index c17aef4a..3e37f6c5 100644 --- a/autotests/kconfigskeletontest.cpp +++ b/autotests/kconfigskeletontest.cpp @@ -21,7 +21,7 @@ #include <kconfig.h> #include <QFont> -#include <QtTest/QtTestGui> +#include <QtTestGui> QTEST_MAIN(KConfigSkeletonTest) diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index 3e0578f0..bb3245f2 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -23,7 +23,7 @@ #include "kconfigtest.h" #include "helper.h" -#include <QtTest/QtTest> +#include <QtTest> #include <qtemporarydir.h> #include <QStandardPaths> #include <kdesktopfile.h> diff --git a/autotests/kconfigtest.h b/autotests/kconfigtest.h index 8cd5cdb2..367e85de 100644 --- a/autotests/kconfigtest.h +++ b/autotests/kconfigtest.h @@ -19,7 +19,7 @@ #ifndef KCONFIGTEST_H #define KCONFIGTEST_H -#include <QtCore/QObject> +#include <QObject> class KConfigTest : public QObject { diff --git a/autotests/kdesktopfiletest.h b/autotests/kdesktopfiletest.h index f63edd0d..12385f4e 100644 --- a/autotests/kdesktopfiletest.h +++ b/autotests/kdesktopfiletest.h @@ -19,7 +19,7 @@ #ifndef KDESKTOPFILETEST_H #define KDESKTOPFILETEST_H -#include <QtCore/QObject> +#include <QObject> class KDesktopFileTest : public QObject { diff --git a/autotests/kentrymaptest.h b/autotests/kentrymaptest.h index b36ca763..b0e7d7d3 100644 --- a/autotests/kentrymaptest.h +++ b/autotests/kentrymaptest.h @@ -20,7 +20,7 @@ #ifndef KENTRYMAPTEST_H #define KENTRYMAPTEST_H -#include <QtCore/QObject> +#include <QObject> #include "kconfigdata.h" class KEntryMapTest : public QObject diff --git a/autotests/ksharedconfig_in_global_object.cpp b/autotests/ksharedconfig_in_global_object.cpp index 7a4f66bf..ff7f581e 100644 --- a/autotests/ksharedconfig_in_global_object.cpp +++ b/autotests/ksharedconfig_in_global_object.cpp @@ -17,8 +17,8 @@ */ -#include <QtCore/QCoreApplication> -#include <QtCore/QtGlobal> +#include <QCoreApplication> +#include <QtGlobal> #include <QTimer> #include <ksharedconfig.h> #include <kconfiggroup.h> diff --git a/autotests/kstandardshortcuttest.cpp b/autotests/kstandardshortcuttest.cpp index a5bbacde..da1e2d2b 100644 --- a/autotests/kstandardshortcuttest.cpp +++ b/autotests/kstandardshortcuttest.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <QtTest/QtTest> +#include <QtTest> #include "kstandardshortcuttest.h" QTEST_MAIN(KStandardShortcutTest) // GUI needed by KAccel diff --git a/autotests/kstandardshortcuttest.h b/autotests/kstandardshortcuttest.h index 3e52c795..77dd3443 100644 --- a/autotests/kstandardshortcuttest.h +++ b/autotests/kstandardshortcuttest.h @@ -20,7 +20,7 @@ #ifndef KSTDACCELTEST_H #define KSTDACCELTEST_H -#include <QtCore/QObject> +#include <QObject> class KStandardShortcutTest : public QObject { diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp index 33530611..c4f5212c 100644 --- a/autotests/test_kconf_update.cpp +++ b/autotests/test_kconf_update.cpp @@ -24,7 +24,7 @@ #include <QFile> #include <QDir> #include <QSharedPointer> -#include <QtCore/QProcess> +#include <QProcess> #include <qtemporaryfile.h> #include <qstandardpaths.h> #include "config-kconf.h" diff --git a/src/core/conversioncheck.h b/src/core/conversioncheck.h index 55bd8826..4ba0c111 100644 --- a/src/core/conversioncheck.h +++ b/src/core/conversioncheck.h @@ -21,12 +21,12 @@ #ifndef CONVERSION_CHECK_H #define CONVERSION_CHECK_H -#include <QtCore/QString> -#include <QtCore/QDate> -#include <QtCore/QPoint> -#include <QtCore/QSize> -#include <QtCore/QRect> -#include <QtCore/QVariant> +#include <QString> +#include <QDate> +#include <QPoint> +#include <QSize> +#include <QRect> +#include <QVariant> class QColor; class QFont; diff --git a/src/core/kauthorized.cpp b/src/core/kauthorized.cpp index 9c8b1175..b6054d76 100644 --- a/src/core/kauthorized.cpp +++ b/src/core/kauthorized.cpp @@ -20,8 +20,8 @@ #include "kauthorized.h" -#include <QtCore/QDir> -#include <QtCore/QRegExp> +#include <QDir> +#include <QRegExp> #include <QList> #include <QUrl> diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index c8eb90af..6b498746 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -49,10 +49,10 @@ static inline int pclose(FILE *stream) #include <qfile.h> #include <qlocale.h> #include <qdir.h> -#include <QtCore/QProcess> -#include <QtCore/QSet> -#include <QtCore/QBasicMutex> -#include <QtCore/QMutexLocker> +#include <QProcess> +#include <QSet> +#include <QBasicMutex> +#include <QMutexLocker> bool KConfigPrivate::mappingsRegistered = false; diff --git a/src/core/kconfig.h b/src/core/kconfig.h index ab148b3e..9601a1e9 100644 --- a/src/core/kconfig.h +++ b/src/core/kconfig.h @@ -28,10 +28,10 @@ #include <kconfigcore_export.h> -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QString> +#include <QVariant> +#include <QByteArray> +#include <QList> #include <qstandardpaths.h> class KConfigGroup; diff --git a/src/core/kconfig_p.h b/src/core/kconfig_p.h index 080adadb..dfb3875a 100644 --- a/src/core/kconfig_p.h +++ b/src/core/kconfig_p.h @@ -28,10 +28,10 @@ #include "kconfigbackend_p.h" #include "kconfiggroup.h" -#include <QtCore/QStringList> -#include <QtCore/QStack> -#include <QtCore/QFile> -#include <QtCore/QDir> +#include <QStringList> +#include <QStack> +#include <QFile> +#include <QDir> class KConfigPrivate { diff --git a/src/core/kconfigbackend.cpp b/src/core/kconfigbackend.cpp index 0c18f2c8..5d274583 100644 --- a/src/core/kconfigbackend.cpp +++ b/src/core/kconfigbackend.cpp @@ -22,12 +22,12 @@ #include "kconfigbackend_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/QDebug> +#include <QDateTime> +#include <QStringList> +#include <QDir> +#include <QFileInfo> +#include <QHash> +#include <QDebug> #include "kconfig.h" #include "kconfigini_p.h" diff --git a/src/core/kconfigbackend_p.h b/src/core/kconfigbackend_p.h index d2e3de4e..31e728bf 100644 --- a/src/core/kconfigbackend_p.h +++ b/src/core/kconfigbackend_p.h @@ -23,8 +23,8 @@ #ifndef KCONFIGBACKEND_H #define KCONFIGBACKEND_H -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> #include <QExplicitlySharedDataPointer> #include <kconfigcore_export.h> diff --git a/src/core/kconfigbase.cpp b/src/core/kconfigbase.cpp index 8cda588f..d22cc20a 100644 --- a/src/core/kconfigbase.cpp +++ b/src/core/kconfigbase.cpp @@ -24,7 +24,7 @@ #include "kconfiggroup.h" -#include <QtCore/QString> +#include <QString> bool KConfigBase::hasGroup(const QString &group) const { diff --git a/src/core/kconfigbase.h b/src/core/kconfigbase.h index 998c3570..b7403de1 100644 --- a/src/core/kconfigbase.h +++ b/src/core/kconfigbase.h @@ -26,7 +26,7 @@ #include <kconfigcore_export.h> -#include <QtCore/QtGlobal> +#include <QtGlobal> class QStringList; class KConfigGroup; diff --git a/src/core/kconfigbase_p.h b/src/core/kconfigbase_p.h index c1066267..fe1c193e 100644 --- a/src/core/kconfigbase_p.h +++ b/src/core/kconfigbase_p.h @@ -22,7 +22,7 @@ #ifndef KCONFIGBASE_P_H #define KCONFIGBASE_P_H -#include <QtCore/QSharedData> +#include <QSharedData> class KConfigBasePrivate : public QSharedData { diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h index e33cfd27..f84e51e3 100644 --- a/src/core/kconfigdata.h +++ b/src/core/kconfigdata.h @@ -23,10 +23,10 @@ #ifndef KCONFIGDATA_H #define KCONFIGDATA_H -#include <QtCore/QByteArray> -#include <QtCore/QString> -#include <QtCore/QMap> -#include <QtCore/QDebug> +#include <QByteArray> +#include <QString> +#include <QMap> +#include <QDebug> /** * map/dict/list config node entry. diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index c81fcbef..88bc6402 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -28,15 +28,15 @@ #include "ksharedconfig.h" #include "kconfigdata.h" -#include <QtCore/QDate> -#include <QtCore/QSharedData> -#include <QtCore/QFile> -#include <QtCore/QPoint> -#include <QtCore/QRect> -#include <QtCore/QString> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QUrl> +#include <QDate> +#include <QSharedData> +#include <QFile> +#include <QPoint> +#include <QRect> +#include <QString> +#include <QTextStream> +#include <QDir> +#include <QUrl> #include <stdlib.h> @@ -388,7 +388,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &val } #ifdef Q_OS_WIN -# include <QtCore/QDir> +# include <QDir> #endif static bool cleanHomeDirPath(QString &path, const QString &homeDir) diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h index ed350566..5b8c4075 100644 --- a/src/core/kconfiggroup.h +++ b/src/core/kconfiggroup.h @@ -28,9 +28,9 @@ #include <kconfigcore_export.h> -#include <QtCore/QExplicitlySharedDataPointer> -#include <QtCore/QVariant> -#include <QtCore/QStringList> +#include <QExplicitlySharedDataPointer> +#include <QVariant> +#include <QStringList> class KConfig; class KConfigGroupPrivate; diff --git a/src/core/kconfiggroup_p.h b/src/core/kconfiggroup_p.h index edc59cc8..8e33ce05 100644 --- a/src/core/kconfiggroup_p.h +++ b/src/core/kconfiggroup_p.h @@ -21,7 +21,7 @@ #ifndef KCONFIGGROUP_P_H #define KCONFIGGROUP_P_H -#include <QtCore/QVariant> +#include <QVariant> #include "kconfiggroup.h" class KConfigGroup; diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h index 729f5acf..fa1d8827 100644 --- a/src/core/kcoreconfigskeleton.h +++ b/src/core/kcoreconfigskeleton.h @@ -28,12 +28,12 @@ #include <ksharedconfig.h> #include <kconfiggroup.h> -#include <QtCore/QDate> -#include <QtCore/QHash> -#include <QtCore/QRect> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtCore/QUrl> +#include <QDate> +#include <QHash> +#include <QRect> +#include <QStringList> +#include <QVariant> +#include <QUrl> class KCoreConfigSkeletonPrivate; class KConfigSkeletonItemPrivate; diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp index b0b6a878..96d7b118 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp @@ -25,8 +25,8 @@ #include <unistd.h> #endif -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDir> +#include <QFileInfo> #include <QUrl> #include <qstandardpaths.h> diff --git a/src/core/kemailsettings.h b/src/core/kemailsettings.h index 505b0b6d..4d2f0d50 100644 --- a/src/core/kemailsettings.h +++ b/src/core/kemailsettings.h @@ -28,8 +28,8 @@ #ifndef _KEMAILSETTINGS_H #define _KEMAILSETTINGS_H -#include <QtCore/QCoreApplication> // Q_DECLARE_TR_FUNCTIONS -#include <QtCore/QStringList> +#include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS +#include <QStringList> #include <kconfigcore_export.h> diff --git a/src/gui/kconfiggroupgui.cpp b/src/gui/kconfiggroupgui.cpp index c399a65b..8031458e 100644 --- a/src/gui/kconfiggroupgui.cpp +++ b/src/gui/kconfiggroupgui.cpp @@ -20,7 +20,7 @@ #include <kconfiggroup.h> -#include <QtCore/QMutableStringListIterator> +#include <QMutableStringListIterator> #include <QColor> #include <QDebug> #include <QFont> diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h index 0b3b6589..aabe6b3c 100644 --- a/src/gui/kstandardshortcut.h +++ b/src/gui/kstandardshortcut.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDSHORTCUT_H #define KSTANDARDSHORTCUT_H -#include <QtCore/QString> +#include <QString> #include <QKeySequence> #include <kconfiggui_export.h> diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp index ab7d9469..928f3a0b 100644 --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -20,14 +20,14 @@ #include <config-kconf.h> // CMAKE_INSTALL_PREFIX -#include <QtCore/QDate> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> +#include <QDate> +#include <QFile> +#include <QTextStream> +#include <QTextCodec> #include <QUrl> #include <QTemporaryFile> #include <QCoreApplication> -#include <QtCore/QDir> +#include <QDir> #include <QProcess> #include <QDebug> diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp index 8346de2b..95d23dd4 100644 --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -26,14 +26,14 @@ // Compiling this file with this flag is just crazy #undef QT_NO_CAST_FROM_ASCII -#include <QtCore/QCoreApplication> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtXml/QDomAttr> -#include <QtCore/QRegExp> -#include <QtCore/QStringList> +#include <QCoreApplication> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QTextStream> +#include <QDomAttr> +#include <QRegExp> +#include <QStringList> #include <qcommandlineparser.h> #include <qcommandlineoption.h> @@ -2244,7 +2244,7 @@ int main(int argc, char **argv) // Header required by singleton implementation if (cfg.singleton) { - cpp << "#include <qglobal.h>" << endl << "#include <QtCore/QFile>" << endl << endl; + cpp << "#include <qglobal.h>" << endl << "#include <QFile>" << endl << endl; } if (cfg.singleton && cfgFileNameArg) { cpp << "#include <QDebug>" << endl << endl; |