generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index eccdd8e..8f2b860 100644 (file)
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -773,7 +773,7 @@ extern "C"
   /* This one gets called by kcminit
 
    */
-  KDE_EXPORT void kcminit_access()
+  Q_DECL_EXPORT void kcminit_access()
   {
     KConfig config("kaccessrc", KConfig::NoGlobals);
     KToolInvocation::startServiceByDesktopName("kaccess");

diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index efb1d6b..dc32d45 100644 (file)
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -41,7 +41,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void kcminit_mouse()
+  Q_DECL_EXPORT void kcminit_mouse()
   {
       KConfig *config = new KConfig("kcminputrc", KConfig::NoGlobals );
     MouseSettings settings;

diff --git a/kcontrol/keyboard/keyboard_daemon.h b/kcontrol/keyboard/keyboard_daemon.h
index 5b77866..b4ab4e9 100644 (file)
--- a/kcontrol/keyboard/keyboard_daemon.h
+++ b/kcontrol/keyboard/keyboard_daemon.h
@@ -21,6 +21,7 @@
 #define KEYBOARD_DAEMON_H_
 
 #include <kdedmodule.h>
+#include <kdemacros.h>
 #include <QtCore/QStringList>
 
 #include "layout_memory.h"

diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/kfontinst/lib/Misc.h
index be69af9..516ad92 100644 (file)
--- a/kcontrol/kfontinst/lib/Misc.h
+++ b/kcontrol/kfontinst/lib/Misc.h
@@ -32,6 +32,7 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QFile>
 #include <KUrl>
+#include <kdemacros.h>
 #include "KfiConstants.h"
 
 class QTextStream;

diff --git a/khotkeys/libkhotkeysprivate/actions/actions.h b/khotkeys/libkhotkeysprivate/actions/actions.h
index 6d4ed09..6105785 100644 (file)
--- a/khotkeys/libkhotkeysprivate/actions/actions.h
+++ b/khotkeys/libkhotkeysprivate/actions/actions.h
@@ -16,6 +16,7 @@
 #include <QtCore/QTimer>
 
 #include <kservice.h>
+#include <kdemacros.h>
 
 class KConfig;
 

diff --git a/khotkeys/libkhotkeysprivate/khotkeysglobal.h b/khotkeys/libkhotkeysprivate/khotkeysglobal.h
index ce039bd..e766b88 100644 (file)
--- a/khotkeys/libkhotkeysprivate/khotkeysglobal.h
+++ b/khotkeys/libkhotkeysprivate/khotkeysglobal.h
@@ -15,6 +15,7 @@
 #define KHOTKEYS_CONFIG_FILE "khotkeysrc"
 
 #include <klocale.h>
+#include <kdemacros.h>
 
 #include <QtCore/QPointer>
 

diff --git a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h
index 0783e65..e8cee29 100644 (file)
--- a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h
+++ b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h
@@ -21,6 +21,7 @@
 #include <QtCore/QString>
 
 #include "KConfigGroup"
+#include <kdemacros.h>
 
 #include <QtGui/qwindowdefs.h>
 

diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp
index d7396d8..b01d55d 100644 (file)
--- a/kioslave/about/kio_about.cpp
+++ b/kioslave/about/kio_about.cpp
@@ -21,6 +21,7 @@
 #include "kio_about.h"
 
 #include <kcomponentdata.h>
+#include <kdemacros.h>
 
 using namespace KIO;
 

diff --git a/kioslave/applications/kio_applications.cpp b/kioslave/applications/kio_applications.cpp
index 02958bb..e528a36 100644 (file)
--- a/kioslave/applications/kio_applications.cpp
+++ b/kioslave/applications/kio_applications.cpp
@@ -17,15 +17,16 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/slavebase.h>
-#include <kcomponentdata.h>
-#include <kdebug.h>
-#include <klocale.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
+#include <kio/slavebase.h>
+#include <kcomponentdata.h>
+#include <kdebug.h>
+#include <klocale.h>
+#include <kdemacros.h>
 
 class ApplicationsProtocol : public KIO::SlaveBase
 {

diff --git a/kioslave/archive/kio_archive.cpp b/kioslave/archive/kio_archive.cpp
index 5a6b7d0..931fe2f 100644 (file)
--- a/kioslave/archive/kio_archive.cpp
+++ b/kioslave/archive/kio_archive.cpp
@@ -42,9 +42,7 @@
 
 using namespace KIO;
 
-extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
-
-int kdemain( int argc, char **argv )
+extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
 {
   KComponentData componentData( "kio_archive" );
 

diff --git a/kioslave/bookmarks/kio_bookmarks.cpp b/kioslave/bookmarks/kio_bookmarks.cpp
index fd4a78a..b650dba 100644 (file)
--- a/kioslave/bookmarks/kio_bookmarks.cpp
+++ b/kioslave/bookmarks/kio_bookmarks.cpp
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
-
+#include <kdemacros.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kcomponentdata.h>

diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 9f4b4db..056bf64 100644 (file)
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -30,6 +30,7 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
+#include <kdemacros.h>
 
 #include <QFile>
 

diff --git a/kioslave/desktop/kio_desktop.cpp b/kioslave/desktop/kio_desktop.cpp
index 13a45a2..4e1a9f1 100644 (file)
--- a/kioslave/desktop/kio_desktop.cpp
+++ b/kioslave/desktop/kio_desktop.cpp
@@ -26,6 +26,7 @@
 #include <KGlobalSettings>
 #include <KStandardDirs>
 #include <kdeversion.h>
+#include <kdemacros.h>
 
 #include <kio/udsentry.h>
 

diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc
index 6b30758..7a72b6c 100644 (file)
--- a/kioslave/filter/filter.cc
+++ b/kioslave/filter/filter.cc
@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kmimetype.h>
 #include <kfilterbase.h>
 #include <kurl.h>
+#include <kdemacros.h>
 
 extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 

diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp
index 81e8faf..6001dab 100644 (file)
--- a/kioslave/finger/kio_finger.cpp
+++ b/kioslave/finger/kio_finger.cpp
@@ -32,7 +32,8 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <KProcess>
+#include <kprocess.h>
+#include <kdemacros.h>
 
 
 using namespace KIO;

diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index e5a6f0d..d613336 100644 (file)
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -79,6 +79,7 @@
 #include <errno.h>
 #include <sys/resource.h>
 #include <kdefakes.h>
+#include <kdemacros.h>
 
 #include "fishcode.h"
 

diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp
index df25243..feee912 100644 (file)
--- a/kioslave/floppy/kio_floppy.cpp
+++ b/kioslave/floppy/kio_floppy.cpp
@@ -44,6 +44,7 @@
 #include <kdebug.h>
 #include <kio/global.h>
 #include <klocale.h>
+#include <kdemacros.h>
 
 using namespace KIO;
 

diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc
index 471e0c1..b021781 100644 (file)
--- a/kioslave/info/info.cc
+++ b/kioslave/info/info.cc
@@ -13,6 +13,7 @@
 #include <kiconloader.h>
 #include <kcomponentdata.h>
 #include <klocale.h>
+#include <kdemacros.h>
 
 using namespace KIO;
 

diff --git a/kioslave/man/man.cc b/kioslave/man/man.cc
index 6916e3d..692d101 100644 (file)
--- a/kioslave/man/man.cc
+++ b/kioslave/man/man.cc
@@ -13,6 +13,7 @@
 #include <kiconloader.h>
 #include <kcomponentdata.h>
 #include <klocale.h>
+#include <kdemacros.h>
 
 using namespace KIO;
 

diff --git a/kioslave/mtp/kio_mtp.cpp b/kioslave/mtp/kio_mtp.cpp
index 83b3cb5..4cf491d 100644 (file)
--- a/kioslave/mtp/kio_mtp.cpp
+++ b/kioslave/mtp/kio_mtp.cpp
@@ -22,6 +22,7 @@
 
 #include <KComponentData>
 #include <KTemporaryFile>
+#include <kdemacros.h>
 #include <QFileInfo>
 #include <QDateTime>
 #include <QCoreApplication>

diff --git a/kioslave/network/ioslave/main.cpp b/kioslave/network/ioslave/main.cpp
index 95fc3fa..f357e41 100644 (file)
--- a/kioslave/network/ioslave/main.cpp
+++ b/kioslave/network/ioslave/main.cpp
@@ -24,6 +24,7 @@
 
 // KDE
 #include <KComponentData>
+#include <kdemacros.h>
 // Qt
 #include <QtCore/QCoreApplication>
 

diff --git a/kioslave/recentdocuments/recentdocuments.cpp b/kioslave/recentdocuments/recentdocuments.cpp
index 252cb7c..742328a 100644 (file)
--- a/kioslave/recentdocuments/recentdocuments.cpp
+++ b/kioslave/recentdocuments/recentdocuments.cpp
@@ -10,6 +10,7 @@
 #include <KStandardDirs>
 #include <KIO/Job>
 #include <KIO/NetAccess>
+#include <kdemacros.h>
 
 #include <stdio.h>
 

diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp
index d48713b..47bb250 100644 (file)
--- a/kioslave/remote/kio_remote.cpp
+++ b/kioslave/remote/kio_remote.cpp
@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-
+#include <kdemacros.h>
 
 extern "C" {
        int KDE_EXPORT kdemain( int argc, char **argv )

diff --git a/kioslave/settings/kio_settings.cpp b/kioslave/settings/kio_settings.cpp
index 6f6fbb0..a497cdb 100644 (file)
--- a/kioslave/settings/kio_settings.cpp
+++ b/kioslave/settings/kio_settings.cpp
@@ -18,16 +18,19 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kservicetypetrader.h>
-#include <kio/slavebase.h>
-#include <kcomponentdata.h>
-#include <kdebug.h>
-#include <klocale.h>
+
 #include <sys/stat.h>
 #include <time.h>
+
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
+#include <kservicetypetrader.h>
+#include <kio/slavebase.h>
+#include <kcomponentdata.h>
+#include <kdebug.h>
+#include <klocale.h>
+#include <kdemacros.h>
 
 class SettingsProtocol : public KIO::SlaveBase
 {

diff --git a/kioslave/smb/kio_smb.cpp b/kioslave/smb/kio_smb.cpp
index 2c2523a..4586c71 100644 (file)
--- a/kioslave/smb/kio_smb.cpp
+++ b/kioslave/smb/kio_smb.cpp
@@ -31,6 +31,7 @@
 #include "kio_smb.h"
 #include "kio_smb_internal.h"
 #include <kcomponentdata.h>
+#include <kdemacros.h>
 #include <QCoreApplication>
 
 //===========================================================================

diff --git a/kioslave/thumbnail/epubthumbnail.cpp b/kioslave/thumbnail/epubthumbnail.cpp
index 46f9ea1..321e0e8 100644 (file)
--- a/kioslave/thumbnail/epubthumbnail.cpp
+++ b/kioslave/thumbnail/epubthumbnail.cpp
@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <QtGui/QImage>
 #include <QtCore/QDebug>
+#include <kdemacros.h>
 
 extern "C"
 {
@@ -88,4 +89,4 @@ bool EPUBCreator::create(const QString &path, int width, int height, QImage &img
 ThumbCreator::Flags EPUBCreator::flags() const
 {
     return None;
-}
\ No newline at end of file
+}

diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp
index 3a50632..56d2a2d 100644 (file)
--- a/kioslave/thumbnail/textcreator.cpp
+++ b/kioslave/thumbnail/textcreator.cpp
@@ -30,6 +30,7 @@
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
+#include <kdemacros.h>
 
 extern "C"
 {

diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index e1d7df0..4506bd1 100644 (file)
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -56,6 +56,7 @@
 #include <kfilemetainfo.h>
 #include <klocale.h>
 #include <kde_file.h>
+#include <kdemacros.h>
 
 #include <config-runtime.h> // For HAVE_NICE
 #include <kio/thumbcreator.h>

diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index 3368827..fdefafd 100644 (file)
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -27,6 +27,7 @@
 #include <kde_file.h>
 #include <kcomponentdata.h>
 #include <kmimetype.h>
+#include <kdemacros.h>
 
 #include <QCoreApplication>
 #include <QDataStream>

diff --git a/ktouchpadenabler/ktouchpadenabler_daemon.h b/ktouchpadenabler/ktouchpadenabler_daemon.h
index 8143189..78bd8d4 100644 (file)
--- a/ktouchpadenabler/ktouchpadenabler_daemon.h
+++ b/ktouchpadenabler/ktouchpadenabler_daemon.h
@@ -21,6 +21,7 @@
 #define KTOUCHPADENABLER_DAEMON_H
 
 #include <kdedmodule.h>
+#include <kdemacros.h>
 
 class TouchpadEnablerDaemonPrivate;
 

diff --git a/kwin/clients/oxygen/demo/CMakeLists.txt b/kwin/clients/oxygen/demo/CMakeLists.txt
index da56c5d..23af174 100644 (file)
--- a/kwin/clients/oxygen/demo/CMakeLists.txt
+++ b/kwin/clients/oxygen/demo/CMakeLists.txt
@@ -1,18 +1,19 @@
-include_directories(${CMAKE_SOURCE_DIR}/libs/oxygen)
-include_directories( ${KDE4_KDEUI_INCLUDES} )
+include_directories(
+    ${CMAKE_SOURCE_DIR}/libs/oxygen
+    ${KDE4_KDEUI_INCLUDES}
+)
 
 
 ########### next target ###############
-set( oxygen_shadow_demo_SOURCES
+set(oxygen_shadow_demo_SOURCES
     oxygenshadowdemodialog.cpp
     oxygenshadowdemowidget.cpp
     main.cpp
-    oxygenshadowdemo.ui
 )
 
-add_executable( oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES} )
+add_executable(oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES})
 
-target_link_libraries( oxygen-shadow-demo
+target_link_libraries(oxygen-shadow-demo
     ${KDE4_KDEUI_LIBS}
     ${X11_X11_LIB}
     ${X11_Xrender_LIB}
@@ -21,4 +22,4 @@ target_link_libraries( oxygen-shadow-demo
 )
 
 ########### install files ###############
-install (TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS})

diff --git a/libs/kephal/service/kephalservice.cpp b/libs/kephal/service/kephalservice.cpp
index be66a2b..ee7b778 100644 (file)
--- a/libs/kephal/service/kephalservice.cpp
+++ b/libs/kephal/service/kephalservice.cpp
@@ -85,12 +85,12 @@ void KephalService::init()
 
     m_outputs = 0;
 #ifdef HAS_RANDR_1_2
-    RandRDisplay * display;
+    RandRDisplay *display = 0;
     if (! m_noXRandR) {
         display = new RandRDisplay();
     }
 
-    if ((! m_noXRandR) && display->isValid()) {
+    if ((! m_noXRandR) && display && display->isValid()) {
         m_outputs = new XRandROutputs(this, display);
         if (m_outputs->outputs().size() <= 1) {
             delete m_outputs;

diff --git a/libs/ksysguard/lsofui/lsof.h b/libs/ksysguard/lsofui/lsof.h
index 1b7bb3a..72cef9b 100644 (file)
--- a/libs/ksysguard/lsofui/lsof.h
+++ b/libs/ksysguard/lsofui/lsof.h
@@ -26,6 +26,7 @@
 #include <QtCore/QProcess>
 #include <QtGui/QTreeWidget>
 #include <kapplication.h>
+#include <kdemacros.h>
 
 struct KLsofWidgetPrivate;
 

diff --git a/libs/ksysguard/signalplotter/kgraphicssignalplotter.h b/libs/ksysguard/signalplotter/kgraphicssignalplotter.h
index cabf4c1..c289619 100644 (file)
--- a/libs/ksysguard/signalplotter/kgraphicssignalplotter.h
+++ b/libs/ksysguard/signalplotter/kgraphicssignalplotter.h
@@ -29,6 +29,7 @@
 #include <QtGui/QGraphicsWidget>
 #include <klocalizedstring.h>
 #include <kcomponentdata.h>
+#include <kdemacros.h>
 
 class QPaintEvent;
 class QResizeEvent;

diff --git a/libs/ksysguard/signalplotter/ksignalplotter.h b/libs/ksysguard/signalplotter/ksignalplotter.h
index bea638c..830e659 100644 (file)
--- a/libs/ksysguard/signalplotter/ksignalplotter.h
+++ b/libs/ksysguard/signalplotter/ksignalplotter.h
@@ -29,6 +29,7 @@
 #include <QtGui/QWidget>
 #include <klocalizedstring.h>
 #include <kcomponentdata.h>
+#include <kdemacros.h>
 
 class QPaintEvent;
 class QResizeEvent;

diff --git a/plasma/shells/plasma-desktop/plasmaapp.h b/plasma/shells/plasma-desktop/plasmaapp.h
index 15ed69a..4d2235b 100644 (file)
--- a/plasma/shells/plasma-desktop/plasmaapp.h
+++ b/plasma/shells/plasma-desktop/plasmaapp.h
@@ -28,6 +28,12 @@
 #include <Plasma/Plasma>
 #include <plasma/packagemetadata.h>
 
+#ifdef Q_WS_X11
+// for Atom
+#include <X11/Xlib.h>
+#include <fixx11h.h>
+#endif
+
 class QSignalMapper;
 
 namespace Plasma

diff --git a/powerdevil/PowerDevilSettings.kcfg b/powerdevil/PowerDevilSettings.kcfg
index cd103c6..686993c 100644 (file)
--- a/powerdevil/PowerDevilSettings.kcfg
+++ b/powerdevil/PowerDevilSettings.kcfg
@@ -6,6 +6,8 @@
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="powerdevilrc"/>
 
+  <include>"kdemacros.h"</include>
+
   <!--The following group is retained just for compatibility and upgrades.-->
   <group name="Profiles">
     <entry name="ACProfile" type="String">

diff --git a/powerdevil/daemon/powerdevilactionpool.h b/powerdevil/daemon/powerdevilactionpool.h
index ca436ff..fe5b881 100644 (file)
--- a/powerdevil/daemon/powerdevilactionpool.h
+++ b/powerdevil/daemon/powerdevilactionpool.h
@@ -25,6 +25,7 @@
 #include <QtCore/QStringList>
 
 #include <kglobal.h>
+#include <kdemacros.h>
 
 class KConfigGroup;
 namespace PowerDevil