From 654ab19f9e345a0252040c24bf546984dae676fd Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 5 Sep 2015 07:27:57 +0000 Subject: [PATCH] fix rekonq --- rekonq/scripts/cppcheck.sh | 4 +- rekonq/src/CMakeLists.txt | 51 ++------------------- rekonq/src/adblock/adblockmanager.cpp | 2 + rekonq/src/adblock/adblocksettingwidget.cpp | 1 + rekonq/src/main.cpp | 2 +- rekonq/src/sessionmanager.cpp | 1 + rekonq/src/sessionwidget.cpp | 1 + rekonq/src/settings/appearancewidget.cpp | 2 +- rekonq/src/settings/generalwidget.cpp | 2 +- rekonq/src/settings/privacywidget.cpp | 1 + rekonq/src/settings/webkitwidget.cpp | 2 + rekonq/src/sync/syncassistant.cpp | 2 + rekonq/src/sync/synccheckwidget.cpp | 1 + rekonq/src/sync/syncoperasettingswidget.cpp | 4 +- rekonq/src/urlbar/sslwidget.cpp | 2 + rekonq/src/useragent/useragentwidget.cpp | 2 +- rekonq/src/webtab/webpluginfactory.cpp | 1 + 17 files changed, 26 insertions(+), 55 deletions(-) diff --git a/rekonq/scripts/cppcheck.sh b/rekonq/scripts/cppcheck.sh index be081040..a883a1d6 100644 --- a/rekonq/scripts/cppcheck.sh +++ b/rekonq/scripts/cppcheck.sh @@ -25,9 +25,7 @@ PWD=$(pwd) -cd $PWD -cd .. -cd src +cd $PWD/../src echo "cppcheck(ing)..." cppcheck \ diff --git a/rekonq/src/CMakeLists.txt b/rekonq/src/CMakeLists.txt index 28f3dfc3..6fdbd292 100644 --- a/rekonq/src/CMakeLists.txt +++ b/rekonq/src/CMakeLists.txt @@ -5,7 +5,6 @@ ADD_SUBDIRECTORY( data ) ### ------- SETTING REKONQ FILES.. add_definitions(-DQT_STATICPLUGIN) -QT4_WRAP_CPP(wk_HEADERS_MOC qwebkitplatformplugin.h) # src files set(rekonq_KDEINIT_SRCS @@ -119,7 +118,6 @@ set(rekonq_KDEINIT_SRCS webwindow/webwindow.cpp #---------------------------------------- kspellplugin.cpp - ${wk_HEADERS_MOC} ) @@ -143,38 +141,6 @@ IF(HAVE_QCA2 AND HAVE_QTOAUTH) ) ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH) -# ui files -KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS - # ---------------------------------------- - adblock/blocked_elements.ui - adblock/settings_adblock.ui - #---------------------------------------- - settings/settings_general.ui - settings/settings_tabs.ui - settings/settings_appearance.ui - settings/settings_webkit.ui - settings/settings_advanced.ui - settings/settings_privacy.ui - settings/password_exceptions.ui - # ---------------------------------------- - sync/sync_check.ui - sync/sync_data.ui - sync/sync_ftp_settings.ui - sync/sync_google_settings.ui - sync/sync_opera_settings.ui - sync/sync_ssh_settings.ui - sync/sync_host_type.ui - # ---------------------------------------- - useragent/useragentsettings.ui - # ---------------------------------------- - webtab/sslinfo.ui - # ---------------------------------------- - cleardata.ui - session.ui - webappcreation.ui - ) - - ### ------------- INCLUDING DIRECTORIES... INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} @@ -218,12 +184,6 @@ ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH) ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} ) - -### -------------- ADDING APPLICATION ICON... - -KDE4_ADD_APP_ICON( rekonq_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-rekonq.png ) - - ### -------------- ADDING APPLICATION KCFG FILES... KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc ) @@ -231,17 +191,17 @@ KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc ) ### --------------- ADDING EXECUTABLE... -KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp ) +ADD_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp ) ### --------------- TARGETTING LINK LIBRARIES... -TARGET_LINK_LIBRARIES ( kdeinit_rekonq +TARGET_LINK_LIBRARIES ( rekonq ${QT_LIBRARIES} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBS} - ${KDE4_KUTILS_LIBS} + ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} @@ -250,7 +210,7 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq # Nepomuk optional target link libraries IF(SOPRANO_FOUND AND NepomukCore_FOUND) - TARGET_LINK_LIBRARIES( kdeinit_rekonq + TARGET_LINK_LIBRARIES( rekonq ${NEPOMUK_CORE_LIBRARY} ${SOPRANO_LIBRARIES} ) @@ -258,7 +218,7 @@ ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND) # Opera sync optional link libraries IF(HAVE_QCA2 AND HAVE_QTOAUTH) - TARGET_LINK_LIBRARIES( kdeinit_rekonq + TARGET_LINK_LIBRARIES( rekonq ${QCA2_LIBRARY} ${QTOAUTH_LIBRARY} ) @@ -268,7 +228,6 @@ ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH) ### ------------ INSTALL FILES... INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) -INSTALL( TARGETS kdeinit_rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) # kwebapp script install (provided for retro-compatibility...) #FILE( COPY data/kwebapp DESTINATION ${BIN_INSTALL_DIR} diff --git a/rekonq/src/adblock/adblockmanager.cpp b/rekonq/src/adblock/adblockmanager.cpp index 0c7586b7..368edd64 100644 --- a/rekonq/src/adblock/adblockmanager.cpp +++ b/rekonq/src/adblock/adblockmanager.cpp @@ -39,6 +39,8 @@ // KDE Includes #include #include +#include +#include // Qt Includes #include diff --git a/rekonq/src/adblock/adblocksettingwidget.cpp b/rekonq/src/adblock/adblocksettingwidget.cpp index a86f211b..24618c5c 100644 --- a/rekonq/src/adblock/adblocksettingwidget.cpp +++ b/rekonq/src/adblock/adblocksettingwidget.cpp @@ -35,6 +35,7 @@ #include #include #include +#include // Qt Includes #include diff --git a/rekonq/src/main.cpp b/rekonq/src/main.cpp index 430e322b..0c616c4e 100644 --- a/rekonq/src/main.cpp +++ b/rekonq/src/main.cpp @@ -48,7 +48,7 @@ static const char description[] = I18N_NOOP("A lightweight Web Browser for KDE based on WebKit"); -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +int main(int argc, char **argv) { KAboutData about("rekonq", 0, diff --git a/rekonq/src/sessionmanager.cpp b/rekonq/src/sessionmanager.cpp index 6c55c3e4..93b1de91 100644 --- a/rekonq/src/sessionmanager.cpp +++ b/rekonq/src/sessionmanager.cpp @@ -46,6 +46,7 @@ #include #include #include +#include // Qt Includes #include diff --git a/rekonq/src/sessionwidget.cpp b/rekonq/src/sessionwidget.cpp index 4382ce01..e84e56c0 100644 --- a/rekonq/src/sessionwidget.cpp +++ b/rekonq/src/sessionwidget.cpp @@ -38,6 +38,7 @@ // KDE Includes #include +#include // Qt Includes #include diff --git a/rekonq/src/settings/appearancewidget.cpp b/rekonq/src/settings/appearancewidget.cpp index 19096cf6..d287afc0 100644 --- a/rekonq/src/settings/appearancewidget.cpp +++ b/rekonq/src/settings/appearancewidget.cpp @@ -34,7 +34,7 @@ // KDE Includes #include #include - +#include int zoomFactorList[13] = {5, 6, 7, 8, 9, 10, 11, 13, 15, 20, 25, 30}; diff --git a/rekonq/src/settings/generalwidget.cpp b/rekonq/src/settings/generalwidget.cpp index 9c7d44ee..2f05e5bc 100644 --- a/rekonq/src/settings/generalwidget.cpp +++ b/rekonq/src/settings/generalwidget.cpp @@ -39,7 +39,7 @@ //KDE Includes #include #include - +#include GeneralWidget::GeneralWidget(QWidget *parent) : QWidget(parent) diff --git a/rekonq/src/settings/privacywidget.cpp b/rekonq/src/settings/privacywidget.cpp index 9c3a270a..a93955c6 100644 --- a/rekonq/src/settings/privacywidget.cpp +++ b/rekonq/src/settings/privacywidget.cpp @@ -37,6 +37,7 @@ // KDE Includes #include #include +#include // Qt Includes #include diff --git a/rekonq/src/settings/webkitwidget.cpp b/rekonq/src/settings/webkitwidget.cpp index aef8eba8..b9d7b697 100644 --- a/rekonq/src/settings/webkitwidget.cpp +++ b/rekonq/src/settings/webkitwidget.cpp @@ -28,6 +28,8 @@ #include "webkitwidget.h" #include "moc_webkitwidget.cpp" +// KDE Includes +#include WebKitWidget::WebKitWidget(QWidget *parent) : QWidget(parent) diff --git a/rekonq/src/sync/syncassistant.cpp b/rekonq/src/sync/syncassistant.cpp index c91c234e..80011ea5 100644 --- a/rekonq/src/sync/syncassistant.cpp +++ b/rekonq/src/sync/syncassistant.cpp @@ -38,6 +38,8 @@ #include "syncoperasettingswidget.h" #include "syncsshsettingswidget.h" +// KDE Includes +#include SyncAssistant::SyncAssistant(QWidget *parent) : QWizard(parent) diff --git a/rekonq/src/sync/synccheckwidget.cpp b/rekonq/src/sync/synccheckwidget.cpp index 98126e38..a0fd3713 100644 --- a/rekonq/src/sync/synccheckwidget.cpp +++ b/rekonq/src/sync/synccheckwidget.cpp @@ -38,6 +38,7 @@ // KDE Includes #include #include +#include // Qt Includes #include diff --git a/rekonq/src/sync/syncoperasettingswidget.cpp b/rekonq/src/sync/syncoperasettingswidget.cpp index fece9649..08f6059d 100644 --- a/rekonq/src/sync/syncoperasettingswidget.cpp +++ b/rekonq/src/sync/syncoperasettingswidget.cpp @@ -39,8 +39,8 @@ // Local Includes #include "syncassistant.h" - - +// KDE Includes +#include SyncOperaSettingsWidget::SyncOperaSettingsWidget(QWidget *parent) : QWizardPage(parent) diff --git a/rekonq/src/urlbar/sslwidget.cpp b/rekonq/src/urlbar/sslwidget.cpp index f0d3c08f..21a1958b 100644 --- a/rekonq/src/urlbar/sslwidget.cpp +++ b/rekonq/src/urlbar/sslwidget.cpp @@ -41,6 +41,8 @@ #include #include +// KDE Includes +#include const int c_dim = 16; diff --git a/rekonq/src/useragent/useragentwidget.cpp b/rekonq/src/useragent/useragentwidget.cpp index 9155c34a..2905477f 100644 --- a/rekonq/src/useragent/useragentwidget.cpp +++ b/rekonq/src/useragent/useragentwidget.cpp @@ -30,7 +30,7 @@ // KDE Includes #include - +#include UserAgentWidget::UserAgentWidget(QWidget *parent) : QWidget(parent) diff --git a/rekonq/src/webtab/webpluginfactory.cpp b/rekonq/src/webtab/webpluginfactory.cpp index e29e6079..7cd8051e 100644 --- a/rekonq/src/webtab/webpluginfactory.cpp +++ b/rekonq/src/webtab/webpluginfactory.cpp @@ -27,6 +27,7 @@ // Self Includes #include "webpluginfactory.h" +#include "moc_qwebkitplatformplugin.cxx" #include "moc_webpluginfactory.cpp" // Auto Includes