Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix rekonq

Browse source
This commit is contained in:
Ivailo Monev 2015-09-05 07:27:57 +00:00
parent bdb842db63
commit 654ab19f9e
17 changed files with 26 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rekonq/scripts/cppcheck.sh
View file

@ -25,9 +25,7 @@
PWD=$(pwd)
cd $PWD
cd ..
cd src
cd $PWD/../src
echo "cppcheck(ing)..."
cppcheck \

51
rekonq/src/CMakeLists.txt
View file

@ -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}

2
rekonq/src/adblock/adblockmanager.cpp
View file

@ -39,6 +39,8 @@
// KDE Includes
#include <KIO/FileCopyJob>
#include <KStandardDirs>
#include <KDialog>
#include <KLocale>
// Qt Includes
#include <QUrl>

1
rekonq/src/adblock/adblocksettingwidget.cpp
View file

@ -35,6 +35,7 @@
#include <KSharedConfig>
#include <KStandardDirs>
#include <KIcon>
#include <KLocale>
// Qt Includes
#include <QString>

2
rekonq/src/main.cpp
View file

@ -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,

1
rekonq/src/sessionmanager.cpp
View file

@ -46,6 +46,7 @@
#include <KPushButton>
#include <KStandardDirs>
#include <KUrl>
#include <KLocale>
// Qt Includes
#include <QFile>

1
rekonq/src/sessionwidget.cpp
View file

@ -38,6 +38,7 @@
// KDE Includes
#include <KIcon>
#include <KLocale>
// Qt Includes
#include <QListWidgetItem>

2
rekonq/src/settings/appearancewidget.cpp
View file

@ -34,7 +34,7 @@
// KDE Includes
#include <KGlobal>
#include <KCharsets>
#include <KLocale>
int zoomFactorList[13] = {5, 6, 7, 8, 9, 10, 11, 13, 15, 20, 25, 30};

2
rekonq/src/settings/generalwidget.cpp
View file

@ -39,7 +39,7 @@
//KDE Includes
#include <kstandarddirs.h>
#include <KUrlRequester>
#include <KLocale>
GeneralWidget::GeneralWidget(QWidget *parent)
: QWidget(parent)

1
rekonq/src/settings/privacywidget.cpp
View file

@ -37,6 +37,7 @@
// KDE Includes
#include <KDialog>
#include <KPushButton>
#include <KLocale>
// Qt Includes
#include <QProcess>

2
rekonq/src/settings/webkitwidget.cpp
View file

@ -28,6 +28,8 @@
#include "webkitwidget.h"
#include "moc_webkitwidget.cpp"
// KDE Includes
#include <KLocale>
WebKitWidget::WebKitWidget(QWidget *parent)
: QWidget(parent)

2
rekonq/src/sync/syncassistant.cpp
View file

@ -38,6 +38,8 @@
#include "syncoperasettingswidget.h"
#include "syncsshsettingswidget.h"
// KDE Includes
#include <KLocale>
SyncAssistant::SyncAssistant(QWidget *parent)
: QWizard(parent)

1
rekonq/src/sync/synccheckwidget.cpp
View file

@ -38,6 +38,7 @@
// KDE Includes
#include <KStandardDirs>
#include <KIcon>
#include <KLocale>
// Qt Includes
#include <QMovie>

4
rekonq/src/sync/syncoperasettingswidget.cpp
View file

@ -39,8 +39,8 @@
// Local Includes
#include "syncassistant.h"
// KDE Includes
#include <KLocale>
SyncOperaSettingsWidget::SyncOperaSettingsWidget(QWidget *parent)
: QWizardPage(parent)

2
rekonq/src/urlbar/sslwidget.cpp
View file

@ -41,6 +41,8 @@
#include <QPushButton>
#include <QTextDocument>
// KDE Includes
#include <KLocale>
const int c_dim = 16;

2
rekonq/src/useragent/useragentwidget.cpp
View file

@ -30,7 +30,7 @@
// KDE Includes
#include <KProtocolManager>
#include <KConfigGroup>
UserAgentWidget::UserAgentWidget(QWidget *parent)
: QWidget(parent)

1
rekonq/src/webtab/webpluginfactory.cpp
View file

@ -27,6 +27,7 @@
// Self Includes
#include "webpluginfactory.h"
#include "moc_qwebkitplatformplugin.cxx"
#include "moc_webpluginfactory.cpp"
// Auto Includes