[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: kstandarddirs.h does not need to depend on kglobal.h
From: Albert Astals Cid <tsdgeos () terra ! es>
Date: 2012-12-28 14:44:52
Message-ID: 20121228144452.99F55A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 42f3688d4eaf1027067fc4b0aca285c4f8d2b88e by Albert Astals Cid.
Committed on 28/12/2012 at 15:43.
Pushed by aacid into branch 'frameworks'.
kstandarddirs.h does not need to depend on kglobal.h
David, this probably breaks the qt5 build since plasma is not build in the qt4 part, \
can you have a look?
CCMAIL: dfaure@kde.org
M +1 -0 kde3support/kparts/dockmainwindow3.cpp
M +1 -0 kdecore/kernel/kstandarddirs.cpp
M +1 -1 kdecore/kernel/kstandarddirs.h
M +1 -0 kdecore/tests/kconfignokdehometest.cpp
M +1 -0 kdoctools/xslt_help.cpp
M +1 -0 kdoctools/xslt_kde.cpp
M +1 -0 kfile/knewfilemenu.cpp
M +1 -0 kio/kssl/ksslcertificate.cpp
M +1 -0 kio/kssl/ksslkeygen.cpp
M +1 -0 knewstuff/knewstuff3/core/installation.cpp
M +1 -0 knotify/config/knotifyconfigactionswidget.cpp
M +1 -0 knotify/tests/knotifytestwindow.cpp
M +1 -0 kross/ui/plugin.cpp
M +1 -0 kutils/kpluginselector.cpp
M +1 -0 kutils/ksettings/dialog.cpp
M +1 -0 staging/kemoticons/src/core/kemoticons.cpp
M +1 -0 staging/kemoticons/src/providers/adium/adium_emoticons.cpp
M +1 -0 staging/kemoticons/src/providers/kde/kde_emoticons.cpp
M +1 -0 staging/kemoticons/src/providers/pidgin/pidgin_emoticons.cpp
M +1 -0 staging/kemoticons/src/providers/xmpp/xmpp_emoticons.cpp
http://commits.kde.org/kdelibs/42f3688d4eaf1027067fc4b0aca285c4f8d2b88e
diff --git a/kde3support/kparts/dockmainwindow3.cpp \
b/kde3support/kparts/dockmainwindow3.cpp index ae7dcd3..300f192 100644
--- a/kde3support/kparts/dockmainwindow3.cpp
+++ b/kde3support/kparts/dockmainwindow3.cpp
@@ -26,6 +26,7 @@
#include <kparts/plugin.h>
#include <kcomponentdata.h>
#include <khelpmenu.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <QApplication>
#include <QStatusBar>
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
index d09651d..2b26b79 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -28,6 +28,7 @@
#include "kconfig.h"
#include "kconfiggroup.h"
#include "kdebug.h"
+#include "kglobal.h"
#include "kshell.h"
#include "kuser.h"
#include "kde_file.h"
diff --git a/kdecore/kernel/kstandarddirs.h b/kdecore/kernel/kstandarddirs.h
index df6b8c3..37b16d9 100644
--- a/kdecore/kernel/kstandarddirs.h
+++ b/kdecore/kernel/kstandarddirs.h
@@ -23,8 +23,8 @@
#ifndef KSTANDARDDIRS_H
#define KSTANDARDDIRS_H
+#include <kdecore_export.h>
#include <QtCore/QStringList>
-#include <kglobal.h>
#include <QtCore/QMap>
class KConfig;
diff --git a/kdecore/tests/kconfignokdehometest.cpp \
b/kdecore/tests/kconfignokdehometest.cpp index 125236a..33f76a8 100644
--- a/kdecore/tests/kconfignokdehometest.cpp
+++ b/kdecore/tests/kconfignokdehometest.cpp
@@ -28,6 +28,7 @@
#include <kconfig.h>
#include <kconfiggroup.h>
+#include <kglobal.h>
class KConfigNoKdeHomeTest : public QObject
{
diff --git a/kdoctools/xslt_help.cpp b/kdoctools/xslt_help.cpp
index 3603769..aabceff 100644
--- a/kdoctools/xslt_help.cpp
+++ b/kdoctools/xslt_help.cpp
@@ -9,6 +9,7 @@
#include <libxml/parserInternals.h>
#include <libxml/catalog.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <QtCore/QDate>
#include <QtCore/QDir>
diff --git a/kdoctools/xslt_kde.cpp b/kdoctools/xslt_kde.cpp
index 0fcceef..92bb499 100644
--- a/kdoctools/xslt_kde.cpp
+++ b/kdoctools/xslt_kde.cpp
@@ -13,6 +13,7 @@
#include <QtCore/QDir>
#include <QtCore/QRegExp>
#include <kcomponentdata.h>
+#include <kglobal.h>
#include <klocalizedstring.h>
#include <assert.h>
#include <kfilterbase.h>
diff --git a/kfile/knewfilemenu.cpp b/kfile/knewfilemenu.cpp
index 3912e39..32d697e 100644
--- a/kfile/knewfilemenu.cpp
+++ b/kfile/knewfilemenu.cpp
@@ -33,6 +33,7 @@
#include <kcomponentdata.h>
#include <kdialog.h>
#include <kiconloader.h>
+#include <kglobal.h>
#include <klocalizedstring.h>
#include <klineedit.h>
#include <kmessagebox.h>
diff --git a/kio/kssl/ksslcertificate.cpp b/kio/kssl/ksslcertificate.cpp
index 5bcde03..ef77f49 100644
--- a/kio/kssl/ksslcertificate.cpp
+++ b/kio/kssl/ksslcertificate.cpp
@@ -32,6 +32,7 @@
#include "ksslcertchain.h"
#include "ksslutils.h"
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <kde_file.h>
#include <klocalizedstring.h>
diff --git a/kio/kssl/ksslkeygen.cpp b/kio/kssl/ksslkeygen.cpp
index 0fb2602..5d37ba4 100644
--- a/kio/kssl/ksslkeygen.cpp
+++ b/kio/kssl/ksslkeygen.cpp
@@ -24,6 +24,7 @@
#include "ui_keygenwizard.h"
#include <kdebug.h>
+#include <kglobal.h>
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <kopenssl.h>
diff --git a/knewstuff/knewstuff3/core/installation.cpp \
b/knewstuff/knewstuff3/core/installation.cpp index 2ba619e..dee58cb 100644
--- a/knewstuff/knewstuff3/core/installation.cpp
+++ b/knewstuff/knewstuff3/core/installation.cpp
@@ -22,6 +22,7 @@
#include <QDir>
#include <QFile>
+#include "kglobal.h"
#include "kstandarddirs.h"
#include "qmimedatabase.h"
#include "karchive.h"
diff --git a/knotify/config/knotifyconfigactionswidget.cpp \
b/knotify/config/knotifyconfigactionswidget.cpp index 8f08d49..2060cda 100644
--- a/knotify/config/knotifyconfigactionswidget.cpp
+++ b/knotify/config/knotifyconfigactionswidget.cpp
@@ -18,6 +18,7 @@
#include "knotifyconfigactionswidget.h"
#include "knotifyconfigelement.h"
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/knotify/tests/knotifytestwindow.cpp \
b/knotify/tests/knotifytestwindow.cpp index 1a1fd0a..54f844b 100644
--- a/knotify/tests/knotifytestwindow.cpp
+++ b/knotify/tests/knotifytestwindow.cpp
@@ -12,6 +12,7 @@
#include <kactioncollection.h>
#include <kxmlguifactory.h>
#include <kdialog.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <QStatusBar>
diff --git a/kross/ui/plugin.cpp b/kross/ui/plugin.cpp
index f3920b4..bebd4e4 100644
--- a/kross/ui/plugin.cpp
+++ b/kross/ui/plugin.cpp
@@ -21,6 +21,7 @@
#include <kaction.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <krun.h>
#include <kxmlguifactory.h>
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 8ef7c15..4c5baab 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -38,6 +38,7 @@
#include <kcmoduleproxy.h>
#include <kmessagebox.h>
#include <kiconloader.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <klocalizedstring.h>
#include <kcategorydrawer.h>
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index f472b98..78435dd 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -28,6 +28,7 @@
#include <kdebug.h>
#include <kservicetypetrader.h>
#include <kconfig.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <kcomponentdata.h>
#include <kiconloader.h>
diff --git a/staging/kemoticons/src/core/kemoticons.cpp \
b/staging/kemoticons/src/core/kemoticons.cpp index 0d95380..f9ab9a7 100644
--- a/staging/kemoticons/src/core/kemoticons.cpp
+++ b/staging/kemoticons/src/core/kemoticons.cpp
@@ -31,6 +31,7 @@
#include <kzip.h>
#include <qmimedatabase.h>
#include <kdirwatch.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
class KEmoticonsPrivate
diff --git a/staging/kemoticons/src/providers/adium/adium_emoticons.cpp \
b/staging/kemoticons/src/providers/adium/adium_emoticons.cpp index bfbe5a1..bc10932 \
100644
--- a/staging/kemoticons/src/providers/adium/adium_emoticons.cpp
+++ b/staging/kemoticons/src/providers/adium/adium_emoticons.cpp
@@ -24,6 +24,7 @@
#include <kpluginfactory.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
K_PLUGIN_FACTORY(AdiumEmoticonsFactory, registerPlugin<AdiumEmoticons>();)
diff --git a/staging/kemoticons/src/providers/kde/kde_emoticons.cpp \
b/staging/kemoticons/src/providers/kde/kde_emoticons.cpp index ad833d8..fcce583 \
100644
--- a/staging/kemoticons/src/providers/kde/kde_emoticons.cpp
+++ b/staging/kemoticons/src/providers/kde/kde_emoticons.cpp
@@ -25,6 +25,7 @@
#include <kpluginfactory.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
K_PLUGIN_FACTORY(KdeEmoticonsFactory, registerPlugin<KdeEmoticons>();)
diff --git a/staging/kemoticons/src/providers/pidgin/pidgin_emoticons.cpp \
b/staging/kemoticons/src/providers/pidgin/pidgin_emoticons.cpp index 84c3cc6..e45c09a \
100644
--- a/staging/kemoticons/src/providers/pidgin/pidgin_emoticons.cpp
+++ b/staging/kemoticons/src/providers/pidgin/pidgin_emoticons.cpp
@@ -23,6 +23,7 @@
#include <kpluginfactory.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
K_PLUGIN_FACTORY(PidginEmoticonsFactory, registerPlugin<PidginEmoticons>();)
diff --git a/staging/kemoticons/src/providers/xmpp/xmpp_emoticons.cpp \
b/staging/kemoticons/src/providers/xmpp/xmpp_emoticons.cpp index 7488283..d22d5e4 \
100644
--- a/staging/kemoticons/src/providers/xmpp/xmpp_emoticons.cpp
+++ b/staging/kemoticons/src/providers/xmpp/xmpp_emoticons.cpp
@@ -24,6 +24,7 @@
#include <kpluginfactory.h>
#include <kdebug.h>
+#include <kglobal.h>
#include <kstandarddirs.h>
#include <qmimedatabase.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic