From 260c6f3dd87d3e91bcd96fcc5fe7eccb23086f4e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 28 Apr 2016 22:27:02 +0000 Subject: [PATCH] generic: misc cleanups Signed-off-by: Ivailo Monev --- kcontrol/access/kcmaccess.cpp | 2 +- kcontrol/input/main.cpp | 2 +- kcontrol/keyboard/keyboard_daemon.h | 1 + kcontrol/kfontinst/lib/Misc.h | 1 + khotkeys/libkhotkeysprivate/actions/actions.h | 1 + khotkeys/libkhotkeysprivate/khotkeysglobal.h | 1 + .../windows_helper/window_selection_interface.h | 1 + kioslave/about/kio_about.cpp | 1 + kioslave/applications/kio_applications.cpp | 9 +++++---- kioslave/archive/kio_archive.cpp | 4 +--- kioslave/bookmarks/kio_bookmarks.cpp | 2 +- kioslave/cgi/cgi.cpp | 1 + kioslave/desktop/kio_desktop.cpp | 1 + kioslave/filter/filter.cc | 1 + kioslave/finger/kio_finger.cpp | 3 ++- kioslave/fish/fish.cpp | 1 + kioslave/floppy/kio_floppy.cpp | 1 + kioslave/info/info.cc | 1 + kioslave/man/man.cc | 1 + kioslave/mtp/kio_mtp.cpp | 1 + kioslave/network/ioslave/main.cpp | 1 + kioslave/recentdocuments/recentdocuments.cpp | 1 + kioslave/remote/kio_remote.cpp | 2 +- kioslave/settings/kio_settings.cpp | 13 ++++++++----- kioslave/smb/kio_smb.cpp | 1 + kioslave/thumbnail/epubthumbnail.cpp | 3 ++- kioslave/thumbnail/textcreator.cpp | 1 + kioslave/thumbnail/thumbnail.cpp | 1 + kioslave/trash/kio_trash.cpp | 1 + ktouchpadenabler/ktouchpadenabler_daemon.h | 1 + kwin/clients/oxygen/demo/CMakeLists.txt | 15 ++++++++------- libs/kephal/service/kephalservice.cpp | 4 ++-- libs/ksysguard/lsofui/lsof.h | 1 + libs/ksysguard/signalplotter/kgraphicssignalplotter.h | 1 + libs/ksysguard/signalplotter/ksignalplotter.h | 1 + plasma/shells/plasma-desktop/plasmaapp.h | 6 ++++++ powerdevil/PowerDevilSettings.kcfg | 2 ++ powerdevil/daemon/powerdevilactionpool.h | 1 + 38 files changed, 65 insertions(+), 27 deletions(-) diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index eccdd8ee..8f2b8609 100644 --- 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 efb1d6b0..dc32d459 100644 --- 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 5b778663..b4ab4e94 100644 --- a/kcontrol/keyboard/keyboard_daemon.h +++ b/kcontrol/keyboard/keyboard_daemon.h @@ -21,6 +21,7 @@ #define KEYBOARD_DAEMON_H_ #include +#include #include #include "layout_memory.h" diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/kfontinst/lib/Misc.h index be69af98..516ad929 100644 --- a/kcontrol/kfontinst/lib/Misc.h +++ b/kcontrol/kfontinst/lib/Misc.h @@ -32,6 +32,7 @@ #include #include #include +#include #include "KfiConstants.h" class QTextStream; diff --git a/khotkeys/libkhotkeysprivate/actions/actions.h b/khotkeys/libkhotkeysprivate/actions/actions.h index 6d4ed09f..61057857 100644 --- a/khotkeys/libkhotkeysprivate/actions/actions.h +++ b/khotkeys/libkhotkeysprivate/actions/actions.h @@ -16,6 +16,7 @@ #include #include +#include class KConfig; diff --git a/khotkeys/libkhotkeysprivate/khotkeysglobal.h b/khotkeys/libkhotkeysprivate/khotkeysglobal.h index ce039bd4..e766b881 100644 --- a/khotkeys/libkhotkeysprivate/khotkeysglobal.h +++ b/khotkeys/libkhotkeysprivate/khotkeysglobal.h @@ -15,6 +15,7 @@ #define KHOTKEYS_CONFIG_FILE "khotkeysrc" #include +#include #include diff --git a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h index 0783e65d..e8cee29b 100644 --- a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h +++ b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_interface.h @@ -21,6 +21,7 @@ #include #include "KConfigGroup" +#include #include diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp index d7396d86..b01d55d7 100644 --- a/kioslave/about/kio_about.cpp +++ b/kioslave/about/kio_about.cpp @@ -21,6 +21,7 @@ #include "kio_about.h" #include +#include using namespace KIO; diff --git a/kioslave/applications/kio_applications.cpp b/kioslave/applications/kio_applications.cpp index 02958bb9..e528a361 100644 --- a/kioslave/applications/kio_applications.cpp +++ b/kioslave/applications/kio_applications.cpp @@ -17,15 +17,16 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include class ApplicationsProtocol : public KIO::SlaveBase { diff --git a/kioslave/archive/kio_archive.cpp b/kioslave/archive/kio_archive.cpp index 5a6b7d03..931fe2fb 100644 --- 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 fd4a78a4..b650dba6 100644 --- a/kioslave/bookmarks/kio_bookmarks.cpp +++ b/kioslave/bookmarks/kio_bookmarks.cpp @@ -29,7 +29,7 @@ #include #include #include - +#include #include #include #include diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 9f4b4dbe..056bf640 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include diff --git a/kioslave/desktop/kio_desktop.cpp b/kioslave/desktop/kio_desktop.cpp index 13a45a26..4e1a9f10 100644 --- a/kioslave/desktop/kio_desktop.cpp +++ b/kioslave/desktop/kio_desktop.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 6b307583..7a72b6cc 100644 --- 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 #include #include +#include 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 81e8faf5..6001dab7 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -32,7 +32,8 @@ #include #include #include -#include +#include +#include using namespace KIO; diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index e5a6f0d0..d6133368 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -79,6 +79,7 @@ #include #include #include +#include #include "fishcode.h" diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp index df252432..feee9125 100644 --- a/kioslave/floppy/kio_floppy.cpp +++ b/kioslave/floppy/kio_floppy.cpp @@ -44,6 +44,7 @@ #include #include #include +#include using namespace KIO; diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index 471e0c10..b0217815 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -13,6 +13,7 @@ #include #include #include +#include using namespace KIO; diff --git a/kioslave/man/man.cc b/kioslave/man/man.cc index 6916e3da..692d101f 100644 --- a/kioslave/man/man.cc +++ b/kioslave/man/man.cc @@ -13,6 +13,7 @@ #include #include #include +#include using namespace KIO; diff --git a/kioslave/mtp/kio_mtp.cpp b/kioslave/mtp/kio_mtp.cpp index 83b3cb50..4cf491d7 100644 --- a/kioslave/mtp/kio_mtp.cpp +++ b/kioslave/mtp/kio_mtp.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/kioslave/network/ioslave/main.cpp b/kioslave/network/ioslave/main.cpp index 95fc3fab..f357e41d 100644 --- a/kioslave/network/ioslave/main.cpp +++ b/kioslave/network/ioslave/main.cpp @@ -24,6 +24,7 @@ // KDE #include +#include // Qt #include diff --git a/kioslave/recentdocuments/recentdocuments.cpp b/kioslave/recentdocuments/recentdocuments.cpp index 252cb7ca..742328ad 100644 --- a/kioslave/recentdocuments/recentdocuments.cpp +++ b/kioslave/recentdocuments/recentdocuments.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index d48713b0..47bb250f 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -26,7 +26,7 @@ #include #include #include - +#include 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 6f6fbb00..a497cdbd 100644 --- a/kioslave/settings/kio_settings.cpp +++ b/kioslave/settings/kio_settings.cpp @@ -18,16 +18,19 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include + #include #include + #include #include #include +#include +#include +#include +#include +#include +#include class SettingsProtocol : public KIO::SlaveBase { diff --git a/kioslave/smb/kio_smb.cpp b/kioslave/smb/kio_smb.cpp index 2c2523a7..4586c715 100644 --- 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 +#include #include //=========================================================================== diff --git a/kioslave/thumbnail/epubthumbnail.cpp b/kioslave/thumbnail/epubthumbnail.cpp index 46f9ea10..321e0e8c 100644 --- a/kioslave/thumbnail/epubthumbnail.cpp +++ b/kioslave/thumbnail/epubthumbnail.cpp @@ -21,6 +21,7 @@ along with this program. If not, see . #include #include +#include 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 3a50632f..56d2a2d6 100644 --- a/kioslave/thumbnail/textcreator.cpp +++ b/kioslave/thumbnail/textcreator.cpp @@ -30,6 +30,7 @@ #include #include #include +#include extern "C" { diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index e1d7df0a..4506bd18 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -56,6 +56,7 @@ #include #include #include +#include #include // For HAVE_NICE #include diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 3368827f..fdefafd8 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/ktouchpadenabler/ktouchpadenabler_daemon.h b/ktouchpadenabler/ktouchpadenabler_daemon.h index 8143189d..78bd8d49 100644 --- a/ktouchpadenabler/ktouchpadenabler_daemon.h +++ b/ktouchpadenabler/ktouchpadenabler_daemon.h @@ -21,6 +21,7 @@ #define KTOUCHPADENABLER_DAEMON_H #include +#include class TouchpadEnablerDaemonPrivate; diff --git a/kwin/clients/oxygen/demo/CMakeLists.txt b/kwin/clients/oxygen/demo/CMakeLists.txt index da56c5da..23af1740 100644 --- 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 be66a2bc..ee7b778f 100644 --- 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 1b7bb3aa..72cef9b8 100644 --- a/libs/ksysguard/lsofui/lsof.h +++ b/libs/ksysguard/lsofui/lsof.h @@ -26,6 +26,7 @@ #include #include #include +#include struct KLsofWidgetPrivate; diff --git a/libs/ksysguard/signalplotter/kgraphicssignalplotter.h b/libs/ksysguard/signalplotter/kgraphicssignalplotter.h index cabf4c1f..c289619c 100644 --- a/libs/ksysguard/signalplotter/kgraphicssignalplotter.h +++ b/libs/ksysguard/signalplotter/kgraphicssignalplotter.h @@ -29,6 +29,7 @@ #include #include #include +#include class QPaintEvent; class QResizeEvent; diff --git a/libs/ksysguard/signalplotter/ksignalplotter.h b/libs/ksysguard/signalplotter/ksignalplotter.h index bea638c0..830e659b 100644 --- a/libs/ksysguard/signalplotter/ksignalplotter.h +++ b/libs/ksysguard/signalplotter/ksignalplotter.h @@ -29,6 +29,7 @@ #include #include #include +#include class QPaintEvent; class QResizeEvent; diff --git a/plasma/shells/plasma-desktop/plasmaapp.h b/plasma/shells/plasma-desktop/plasmaapp.h index 15ed69a1..4d2235b0 100644 --- a/plasma/shells/plasma-desktop/plasmaapp.h +++ b/plasma/shells/plasma-desktop/plasmaapp.h @@ -28,6 +28,12 @@ #include #include +#ifdef Q_WS_X11 +// for Atom +#include +#include +#endif + class QSignalMapper; namespace Plasma diff --git a/powerdevil/PowerDevilSettings.kcfg b/powerdevil/PowerDevilSettings.kcfg index cd103c6d..686993cf 100644 --- a/powerdevil/PowerDevilSettings.kcfg +++ b/powerdevil/PowerDevilSettings.kcfg @@ -6,6 +6,8 @@ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > + "kdemacros.h" + diff --git a/powerdevil/daemon/powerdevilactionpool.h b/powerdevil/daemon/powerdevilactionpool.h index ca436ffc..fe5b8816 100644 --- a/powerdevil/daemon/powerdevilactionpool.h +++ b/powerdevil/daemon/powerdevilactionpool.h @@ -25,6 +25,7 @@ #include #include +#include class KConfigGroup; namespace PowerDevil -- 2.11.0