From 08bd97aff5e03b6419042dde59d7b89d18bbcbbf Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 13 Jun 2021 16:51:17 +0300 Subject: [PATCH] generic: compiler warning fixes Signed-off-by: Ivailo Monev --- kcontrol/access/kcmaccess.h | 2 +- kcontrol/dateandtime/dtime.h | 2 - kcontrol/dateandtime/main.h | 1 - kcontrol/icons/icons.h | 3 +- kcontrol/kfontinst/dbus/Utils.cpp | 2 +- .../kfontinst/kcmfontinst/KCmFontInst.cpp | 2 - kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 15 +++---- kcontrol/kfontinst/lib/FcEngine.h | 2 +- kcontrol/kfontinst/lib/Misc.cpp | 3 +- kcontrol/kfontinst/viewpart/FontViewPart.h | 1 - kcontrol/launch/kcmlaunch.cpp | 2 - kcontrol/randr/krandrapp.h | 1 - kcontrol/randr/krandrtray.cpp | 1 - kcontrol/randr/krandrtray.h | 1 - kcontrol/randr/legacyrandrscreen.cpp | 1 - kcontrol/randr/legacyrandrscreen.h | 2 - kcontrol/randr/outputconfig.h | 1 - kcontrol/randr/randrconfig.h | 1 - kcontrol/randr/randroutput.h | 1 - keditfiletype/filetypedetails.h | 9 ++-- kinfocenter/Modules/samba/kcmsambaimports.cpp | 4 +- kinfocenter/Modules/samba/kcmsambaimports.h | 3 +- .../Modules/samba/kcmsambastatistics.cpp | 4 +- .../Modules/samba/kcmsambastatistics.h | 3 +- kinfocenter/Modules/samba/ksmbstatus.cpp | 4 +- kinfocenter/Modules/samba/ksmbstatus.h | 3 +- kinfocenter/Modules/samba/main.cpp | 2 +- kioslave/mtp/devicecache.h | 2 - kioslave/mtp/kio_mtp.cpp | 43 +++++++++---------- kioslave/recentdocuments/recentdocuments.cpp | 1 - kioslave/recentdocuments/recentdocuments.h | 2 - kioslave/sftp/kio_sftp.h | 3 -- kioslave/trash/trashimpl.h | 1 - knotify/knotifyplugin.cpp | 3 +- knotify/knotifyplugin.h | 4 -- kscreensaver/kdesavers/kvm.cpp | 6 ++- ksmserver/shutdowndlg.cpp | 2 +- ksmserver/shutdowndlg.h | 1 - ksplash/ksplashx/qcolor_x11.cpp | 4 +- kstyles/oxygen/oxygenstyle.h | 2 +- ksysguard/ksysguardd/Linux/cpuinfo.c | 2 - ksystraycmd/main.cpp | 7 +-- kwalletmanager/src/manager/kwalleteditor.h | 3 -- .../oxygen/oxygenclientgroupitemdata.cpp | 1 - .../oxygen/oxygenclientgroupitemdata.h | 3 -- kwin/libkdecorations/kcommondecoration.h | 12 +----- plasma/applets/folderview/iconview.cpp | 1 - plasma/applets/folderview/iconview.h | 1 - plasma/applets/folderview/listview.h | 1 - plasma/containments/desktop/itemspace.cpp | 1 - .../newspaper/appletscontainer.cpp | 2 +- plasma/containments/newspaper/newspaper.h | 1 - plasma/containments/screensaver/desktop.cpp | 4 +- plasma/containments/screensaver/desktop.h | 4 -- .../dataengines/weather/ions/noaa/ion_noaa.h | 1 - 55 files changed, 60 insertions(+), 134 deletions(-) diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index 0fcc9ad5..6b45c036 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -48,7 +48,7 @@ private: QCheckBox *systemBell, *customBell, *visibleBell; QRadioButton *invertScreen, *flashScreen; - QLabel *soundLabel, *colorLabel; + QLabel *soundLabel; QLineEdit *soundEdit; QPushButton *soundButton; KColorButton *colorButton; diff --git a/kcontrol/dateandtime/dtime.h b/kcontrol/dateandtime/dtime.h index 10c9c2f3..2e5a8835 100644 --- a/kcontrol/dateandtime/dtime.h +++ b/kcontrol/dateandtime/dtime.h @@ -78,8 +78,6 @@ private: QTimer internalTimer; QString timeServer; - int BufI; - bool refresh; bool ontimeout; }; diff --git a/kcontrol/dateandtime/main.h b/kcontrol/dateandtime/main.h index 489ee105..e9746635 100644 --- a/kcontrol/dateandtime/main.h +++ b/kcontrol/dateandtime/main.h @@ -38,7 +38,6 @@ public: void load(); private: - QTabWidget *tab; Dtime *dtime; }; diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index 3bd77059..bfbd9c84 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -100,8 +100,7 @@ private: QListWidget *mpUsageList; QComboBox *mpSizeBox; - QCheckBox *wordWrapCB, *underlineCB, *mpAnimatedCheck; - QTabWidget *m_pTabWidget; + QCheckBox *mpAnimatedCheck; QWidget *m_pTab1; }; diff --git a/kcontrol/kfontinst/dbus/Utils.cpp b/kcontrol/kfontinst/dbus/Utils.cpp index d6088202..45aabfe9 100644 --- a/kcontrol/kfontinst/dbus/Utils.cpp +++ b/kcontrol/kfontinst/dbus/Utils.cpp @@ -227,7 +227,7 @@ EFileType check(const QString &file, Family &fam) foundry; quint32 style; int index; - qulonglong ws; + qulonglong ws = 0; EFileType type=(FcResultMatch!=FcPatternGetBool(pat, FC_SCALABLE, 0, &scalable) || !scalable) ? FILE_BITMAP : FILE_SCALABLE; diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 2b570398..59a76bfc 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -174,9 +174,7 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const QVariantList&) : KCModule(FontInstallFactory::componentData(), parent), itsPreview(NULL), itsConfig(KFI_UI_CFG_FILE), - itsJob(NULL), itsProgress(NULL), - itsUpdateDialog(NULL), itsTempDir(NULL), itsPrintProc(NULL), itsDownloadFontsAct(NULL) diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 474cb166..0aa83402 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -26,7 +26,12 @@ #include "GroupList.h" #include "JobRunner.h" -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -38,11 +43,6 @@ class KTempDir; class KToggleAction; class KActionMenu; class KAction; -#include -#include -#include -#include -#include namespace KFI { @@ -124,14 +124,11 @@ class CKCmFontInst : public KCModule *itsDeleteFontControl; CFontFilter *itsFilter; QString itsLastStatusBarMsg; - KIO::Job *itsJob; KProgressDialog *itsProgress; - CUpdateDialog *itsUpdateDialog; KTempDir *itsTempDir; QProcess *itsPrintProc; QSet itsDeletedFonts; KUrl::List itsModifiedUrls; - CJobRunner *itsRunner; QMenu *itsPreviewMenu, *itsPreviewListMenu; KAction *itsDownloadFontsAct; diff --git a/kcontrol/kfontinst/lib/FcEngine.h b/kcontrol/kfontinst/lib/FcEngine.h index 75d46569..885d262d 100644 --- a/kcontrol/kfontinst/lib/FcEngine.h +++ b/kcontrol/kfontinst/lib/FcEngine.h @@ -49,7 +49,7 @@ class KDE_EXPORT CFcEngine { public: - struct Xft; + class Xft; struct TRange { diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index 4aa057ef..70ca9aff 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -415,8 +415,7 @@ QMap getFontFileMap(const QSet &files) { QVector orig(fIt.value().count()), modified(fIt.value().count()); - QSet::ConstIterator oIt(fIt.value().constBegin()), - oEnd(fIt.value().constEnd()); + QSet::ConstIterator oIt(fIt.value().constBegin()); bool good=true; int count=fIt.value().count(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 2e7ad677..3152844e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -92,7 +92,6 @@ class CFontViewPart : public KParts::ReadOnlyPart // *itsMetaLabel; KIntNumInput *itsFaceSelector; QAction *itsChangeTextAction; - int itsFace; KSharedConfigPtr itsConfig; BrowserExtension *itsExtension; QProcess *itsProc; diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 7cee5471..231f4f05 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -229,8 +229,6 @@ LaunchConfig::checkChanged() c = conf.group("BusyCursorSettings"); unsigned int savedCursorTimeout = c.readEntry( "Timeout", 30 ); - bool savedBusyBlinking =c.readEntry("Blinking", false); - bool savedBusyBouncing =c.readEntry("Bouncing", true); c = conf.group("TaskbarButtonSettings"); unsigned int savedTaskbarTimeout = c.readEntry( "Timeout", 30 ); diff --git a/kcontrol/randr/krandrapp.h b/kcontrol/randr/krandrapp.h index 715c8cad..d1fbf83a 100644 --- a/kcontrol/randr/krandrapp.h +++ b/kcontrol/randr/krandrapp.h @@ -37,7 +37,6 @@ public: private: KRandRSystemTray *m_tray; - RandRConfig *m_widget; RandRDisplay *m_display; }; diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index d1bf024d..178c868e 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -47,7 +47,6 @@ KRandRSystemTray::KRandRSystemTray(RandRDisplay *dpy, QWidget* parent) : KStatusNotifierItem(parent), m_help(new KHelpMenu(parent, KGlobal::mainComponent().aboutData(), false, actionCollection())), - m_popupUp(false), m_display(dpy) { setIconByName("preferences-desktop-display-randr"); diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h index af5e0376..5cae1c61 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/krandrtray.h @@ -63,7 +63,6 @@ private: QActionGroup *populateRates(KMenu *menu, const RateList &rates, float rate); KHelpMenu* m_help; - bool m_popupUp; QList m_screenPopups; KMenu* m_menu; RandRDisplay *m_display; diff --git a/kcontrol/randr/legacyrandrscreen.cpp b/kcontrol/randr/legacyrandrscreen.cpp index 411902c5..26eb0c92 100644 --- a/kcontrol/randr/legacyrandrscreen.cpp +++ b/kcontrol/randr/legacyrandrscreen.cpp @@ -37,7 +37,6 @@ LegacyRandRScreen::LegacyRandRScreen(int screenIndex) : m_config(0L) , m_screen(screenIndex) - , m_shownDialog(NULL) { loadSettings(); setOriginal(); diff --git a/kcontrol/randr/legacyrandrscreen.h b/kcontrol/randr/legacyrandrscreen.h index da04d507..a275669f 100644 --- a/kcontrol/randr/legacyrandrscreen.h +++ b/kcontrol/randr/legacyrandrscreen.h @@ -152,8 +152,6 @@ private: int m_proposedSize; int m_proposedRefreshRate; - KTimerDialog* m_shownDialog; - }; #endif diff --git a/kcontrol/randr/outputconfig.h b/kcontrol/randr/outputconfig.h index d6b4d200..fa318706 100644 --- a/kcontrol/randr/outputconfig.h +++ b/kcontrol/randr/outputconfig.h @@ -87,7 +87,6 @@ signals: private: static bool isRelativeTo( QRect rect, QRect to, Relation rel ); - int m_changes; bool m_changed; bool m_unified; QPoint m_pos; diff --git a/kcontrol/randr/randrconfig.h b/kcontrol/randr/randrconfig.h index f2b24a1b..3f5c0080 100644 --- a/kcontrol/randr/randrconfig.h +++ b/kcontrol/randr/randrconfig.h @@ -75,7 +75,6 @@ protected: private: void insufficientVirtualSize(); RandRDisplay *m_display; - bool m_firstLoad; SettingsContainer *m_container; QList m_outputList; diff --git a/kcontrol/randr/randroutput.h b/kcontrol/randr/randroutput.h index 94ead6b3..ea39d098 100644 --- a/kcontrol/randr/randroutput.h +++ b/kcontrol/randr/randroutput.h @@ -154,7 +154,6 @@ protected: private: RROutput m_id; - XRROutputInfo* m_info; QString m_name; QString m_alias; diff --git a/keditfiletype/filetypedetails.h b/keditfiletype/filetypedetails.h index c41177e5..7cead75a 100644 --- a/keditfiletype/filetypedetails.h +++ b/keditfiletype/filetypedetails.h @@ -21,16 +21,16 @@ #define FILETYPEDETAILS_H #include - -class KIconButton; -class MimeTypeData; -class TypesListItem; #include #include #include #include #include #include + +class KIconButton; +class MimeTypeData; +class TypesListItem; class KLineEdit; class KPushButton; class KServiceListWidget; @@ -96,7 +96,6 @@ private: QGroupBox *m_autoEmbedBox; QButtonGroup *m_autoEmbedGroup; KServiceListWidget *embedServiceListWidget; - QRadioButton *m_rbOpenSeparate; QCheckBox *m_chkAskSave; QRadioButton *m_rbGroupSettings; }; diff --git a/kinfocenter/Modules/samba/kcmsambaimports.cpp b/kinfocenter/Modules/samba/kcmsambaimports.cpp index d0f3ff4b..41710d03 100644 --- a/kinfocenter/Modules/samba/kcmsambaimports.cpp +++ b/kinfocenter/Modules/samba/kcmsambaimports.cpp @@ -31,8 +31,8 @@ #include -ImportsView::ImportsView(QWidget * parent, KConfig *config) : - QWidget(parent), configFile(config), list(this) { +ImportsView::ImportsView(QWidget * parent) : + QWidget(parent), list(this) { QBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setMargin(KDialog::marginHint()); topLayout->setSpacing(KDialog::spacingHint()); diff --git a/kinfocenter/Modules/samba/kcmsambaimports.h b/kinfocenter/Modules/samba/kcmsambaimports.h index 013bcf0c..d53834f7 100644 --- a/kinfocenter/Modules/samba/kcmsambaimports.h +++ b/kinfocenter/Modules/samba/kcmsambaimports.h @@ -32,7 +32,7 @@ class ImportsView : public QWidget { Q_OBJECT public: - explicit ImportsView(QWidget *parent, KConfig *config=0); + explicit ImportsView(QWidget *parent); virtual ~ImportsView() { } void saveSettings() { @@ -40,7 +40,6 @@ public: void loadSettings() { } private: - KConfig *configFile; QTreeWidget list; QTimer timer; private Q_SLOTS: diff --git a/kinfocenter/Modules/samba/kcmsambastatistics.cpp b/kinfocenter/Modules/samba/kcmsambastatistics.cpp index 2bc93bd0..d0f8df28 100644 --- a/kinfocenter/Modules/samba/kcmsambastatistics.cpp +++ b/kinfocenter/Modules/samba/kcmsambastatistics.cpp @@ -38,8 +38,8 @@ #include #include -StatisticsView::StatisticsView(QWidget *parent, KConfig *config) : - QWidget(parent), configFile(config), dataList(0), connectionsCount(0), filesCount(0), calcCount(0) { +StatisticsView::StatisticsView(QWidget *parent) : + QWidget(parent), dataList(0), connectionsCount(0), filesCount(0), calcCount(0) { viewStatistics = new QTreeWidget( this ); connectionsL = new QLabel( i18n( "Connections: 0" ), this ); connectionsL->setTextInteractionFlags(Qt::TextSelectableByMouse); diff --git a/kinfocenter/Modules/samba/kcmsambastatistics.h b/kinfocenter/Modules/samba/kcmsambastatistics.h index 38216220..432fdaed 100644 --- a/kinfocenter/Modules/samba/kcmsambastatistics.h +++ b/kinfocenter/Modules/samba/kcmsambastatistics.h @@ -83,7 +83,7 @@ private: class StatisticsView : public QWidget { Q_OBJECT public: - explicit StatisticsView(QWidget *parent=0, KConfig *config=0); + explicit StatisticsView(QWidget *parent=0); virtual ~StatisticsView() { } void saveSettings() { @@ -93,7 +93,6 @@ public: public Q_SLOTS: void setListInfo(QTreeWidget *list, int nrOfFiles, int nrOfConnections); private: - KConfig *configFile; QTreeWidget* dataList; QTreeWidget* viewStatistics; QLabel* connectionsL, *filesL; diff --git a/kinfocenter/Modules/samba/ksmbstatus.cpp b/kinfocenter/Modules/samba/ksmbstatus.cpp index 7ced0c19..28a86394 100644 --- a/kinfocenter/Modules/samba/ksmbstatus.cpp +++ b/kinfocenter/Modules/samba/ksmbstatus.cpp @@ -34,8 +34,8 @@ #define Before(ttf,in) in.left(in.indexOf(ttf)) #define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.indexOf(ttf)+QString(ttf).length())):QString("")) -NetMon::NetMon(QWidget * parent, KConfig *config) : - QWidget(parent), configFile(config), showmountProc(0), strShare(""), strUser(""), strGroup(""), strMachine(""), strSince(""), strPid(""), iUser(0), iGroup(0), iMachine(0), iPid(0) { +NetMon::NetMon(QWidget * parent) : + QWidget(parent), showmountProc(0), strShare(""), strUser(""), strGroup(""), strMachine(""), strSince(""), strPid(""), iUser(0), iGroup(0), iMachine(0), iPid(0) { QBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setMargin(KDialog::marginHint()); topLayout->setSpacing(KDialog::spacingHint()); diff --git a/kinfocenter/Modules/samba/ksmbstatus.h b/kinfocenter/Modules/samba/ksmbstatus.h index 3190d0d3..81fe21f9 100644 --- a/kinfocenter/Modules/samba/ksmbstatus.h +++ b/kinfocenter/Modules/samba/ksmbstatus.h @@ -31,13 +31,12 @@ class NetMon : public QWidget { Q_OBJECT public: - explicit NetMon(QWidget *parent, KConfig * config=0); + explicit NetMon(QWidget *parent); void saveSettings() { } void loadSettings() { } private: - KConfig *configFile; QProcess *showmountProc; QTreeWidget *list; QLabel *version; diff --git a/kinfocenter/Modules/samba/main.cpp b/kinfocenter/Modules/samba/main.cpp index f0e767aa..d88bb4b4 100644 --- a/kinfocenter/Modules/samba/main.cpp +++ b/kinfocenter/Modules/samba/main.cpp @@ -52,7 +52,7 @@ K_PLUGIN_FACTORY(SambaFactory, K_EXPORT_PLUGIN(SambaFactory("kcmsamba")) SambaContainer::SambaContainer(QWidget *parent, const QVariantList&) : - KCModule(SambaFactory::componentData(), parent), config("kcmsambarc"), tabs(this), status(&tabs, &config), imports(&tabs, &config), logView(&tabs, &config), statisticsView(&tabs, &config) { + KCModule(SambaFactory::componentData(), parent), config("kcmsambarc"), tabs(this), status(&tabs), imports(&tabs), logView(&tabs, &config), statisticsView(&tabs) { QVBoxLayout *layout = new QVBoxLayout( this ); layout->setMargin(0); layout->setSpacing(0); diff --git a/kioslave/mtp/devicecache.h b/kioslave/mtp/devicecache.h index 42affb64..0dc21bd8 100644 --- a/kioslave/mtp/devicecache.h +++ b/kioslave/mtp/devicecache.h @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -38,7 +37,6 @@ class CachedDevice : public QObject private: qint32 timeout; - QTimer *timer; LIBMTP_mtpdevice_t* mtpdevice; LIBMTP_raw_device_t rawdevice; diff --git a/kioslave/mtp/kio_mtp.cpp b/kioslave/mtp/kio_mtp.cpp index 4cf491d7..5fd8cab5 100644 --- a/kioslave/mtp/kio_mtp.cpp +++ b/kioslave/mtp/kio_mtp.cpp @@ -823,7 +823,7 @@ void MTPSlave::mkdir ( const KUrl& url, int ) kDebug ( KIO_MTP ) << url.path(); QStringList pathItems = url.path().split ( QLatin1Char ( '/' ) , QString::SkipEmptyParts ); - int pathDepth= pathItems.size(); + int pathDepth= pathItems.size(); if ( pathItems.size() > 2 && !getPath ( url.path() ).first ) { @@ -831,19 +831,18 @@ void MTPSlave::mkdir ( const KUrl& url, int ) LIBMTP_mtpdevice_t *device; LIBMTP_file_t *file; - LIBMTP_devicestorage_t *storage; - int ret; + LIBMTP_devicestorage_t *storage; + int ret = 0; QPair pair = getPath ( url.directory() ); - if (pathDepth == 3) - {//the folder need to be created straight to a storage device - storage= ( LIBMTP_devicestorage_t* ) pair.first; - device = pair.second; - ret = LIBMTP_Create_Folder ( device, dirName, 0xFFFFFFFF, storage->id ); - } - else - if ( pair.first ) + if (pathDepth == 3) + { //the folder need to be created straight to a storage device + storage= ( LIBMTP_devicestorage_t* ) pair.first; + device = pair.second; + ret = LIBMTP_Create_Folder ( device, dirName, 0xFFFFFFFF, storage->id ); + } + else if ( pair.first ) { file = ( LIBMTP_file_t* ) pair.first; device = pair.second; @@ -857,17 +856,17 @@ void MTPSlave::mkdir ( const KUrl& url, int ) } } - if ( ret != 0 ) - { - fileCache->addPath( url.path(), ret ); - finished(); - return; - } - else - { - LIBMTP_Dump_Errorstack ( device ); - LIBMTP_Clear_Errorstack ( device ); - } + if ( ret != 0 ) + { + fileCache->addPath( url.path(), ret ); + finished(); + return; + } + else + { + LIBMTP_Dump_Errorstack ( device ); + LIBMTP_Clear_Errorstack ( device ); + } } else { diff --git a/kioslave/recentdocuments/recentdocuments.cpp b/kioslave/recentdocuments/recentdocuments.cpp index ea5ec452..8d5d63ab 100644 --- a/kioslave/recentdocuments/recentdocuments.cpp +++ b/kioslave/recentdocuments/recentdocuments.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include diff --git a/kioslave/recentdocuments/recentdocuments.h b/kioslave/recentdocuments/recentdocuments.h index 194f647b..170643e5 100644 --- a/kioslave/recentdocuments/recentdocuments.h +++ b/kioslave/recentdocuments/recentdocuments.h @@ -19,8 +19,6 @@ protected: virtual void stat(const KUrl& url); virtual void mimetype(const KUrl& url); virtual void del(const KUrl& url, bool isfile); -private: - KDirWatch* m_recentDocWatch; }; #endif diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h index 484ebea8..da55beaf 100644 --- a/kioslave/sftp/kio_sftp.h +++ b/kioslave/sftp/kio_sftp.h @@ -106,9 +106,6 @@ private: // Private variables ssh_callbacks mCallbacks; - /** Version of the sftp protocol we are using. */ - int sftpVersion; - struct Status { int code; diff --git a/kioslave/trash/trashimpl.h b/kioslave/trash/trashimpl.h index bc68723f..2051e163 100644 --- a/kioslave/trash/trashimpl.h +++ b/kioslave/trash/trashimpl.h @@ -171,7 +171,6 @@ private: mutable TrashDirMap m_topDirectories; // id -> $topdir of partition dev_t m_homeDevice; mutable bool m_trashDirectoriesScanned; - int m_mibEnum; KConfig m_config; diff --git a/knotify/knotifyplugin.cpp b/knotify/knotifyplugin.cpp index 3fc68f47..8fd2510e 100644 --- a/knotify/knotifyplugin.cpp +++ b/knotify/knotifyplugin.cpp @@ -23,8 +23,7 @@ #include "knotifyplugin.h" KNotifyPlugin::KNotifyPlugin(QObject *parent, const QVariantList &args) - : QObject(parent), - d(0) + : QObject(parent) { Q_UNUSED(args); } diff --git a/knotify/knotifyplugin.h b/knotify/knotifyplugin.h index 0591d94e..2316ffe5 100644 --- a/knotify/knotifyplugin.h +++ b/knotify/knotifyplugin.h @@ -28,7 +28,6 @@ #include "knotify_export.h" -class KNotifyPluginPrivate; class KNotifyConfig; @@ -99,9 +98,6 @@ class KNOTIFY_EXPORT KNotifyPlugin : public QObject */ void actionInvoked(int id , int action); - private: - KNotifyPluginPrivate *const d; - }; #define K_EXPORT_KNOTIFY_METHOD(libname,classname) \ diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index f767a4e1..ab51b06b 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -168,8 +168,8 @@ draw_pool (m_state *state) } break; } - if( state->show_threads ) - if( state->modified[index] == 1 ) + if( state->show_threads ) { + if( state->modified[index] == 1 ) { pos_x += 2; QPainter p(state->w); p.setPen( Qt::green ); @@ -179,6 +179,8 @@ draw_pool (m_state *state) state->images, pos_x*state->char_width, pos_y*state->char_height, state->char_width, state->char_height ); + } + } --state->modified[index]; } } diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index ffdf5240..f5700048 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -67,7 +67,7 @@ KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L; KSMShutdownFeedback::KSMShutdownFeedback() : QWidget( 0L, Qt::Popup ), - m_currentY( 0 ), initialized( false ) + initialized( false ) { setObjectName( "feedbackwidget" ); setAttribute( Qt::WA_NoSystemBackground ); diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index 90627458..41e69bde 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -63,7 +63,6 @@ private Q_SLOTS: private: static KSMShutdownFeedback * s_pSelf; KSMShutdownFeedback(); - int m_currentY; QPixmap m_pixmap; LogoutEffect *effect; bool initialized; diff --git a/ksplash/ksplashx/qcolor_x11.cpp b/ksplash/ksplashx/qcolor_x11.cpp index d2505a0c..76648518 100644 --- a/ksplash/ksplashx/qcolor_x11.cpp +++ b/ksplash/ksplashx/qcolor_x11.cpp @@ -79,10 +79,10 @@ struct QColorData { #if 0 typedef QIntDict QColorDict; typedef QIntDictIterator QColorDictIt; -#endif -static int current_alloc_context = 0; // current color alloc context static const uint col_std_dict = 419; static const uint col_large_dict = 18397; +#endif +static int current_alloc_context = 0; // current color alloc context class QColorScreenData { public: diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h index 774eb788..91cc74c7 100644 --- a/kstyles/oxygen/oxygenstyle.h +++ b/kstyles/oxygen/oxygenstyle.h @@ -707,7 +707,7 @@ namespace Oxygen void renderHeaderLines( const QRect&, const QPalette&, QPainter*, TileSet::Tiles ) const; void renderMenuItemRect( const QStyleOption* opt, const QRect& rect, const QPalette& pal, QPainter* p ) const - { renderMenuItemRect( opt, rect, pal.color(QPalette::Window), p ); } + { renderMenuItemRect( opt, rect, pal.color(QPalette::Window), pal, p ); } void renderMenuItemRect( const QStyleOption*, const QRect&, const QColor&, const QPalette&, QPainter* p ) const; diff --git a/ksysguard/ksysguardd/Linux/cpuinfo.c b/ksysguard/ksysguardd/Linux/cpuinfo.c index 9427ec03..b119f9a4 100644 --- a/ksysguard/ksysguardd/Linux/cpuinfo.c +++ b/ksysguard/ksysguardd/Linux/cpuinfo.c @@ -214,7 +214,6 @@ void printCPUClock( const char* cmd ) { int id; float clock = 0; - cmd = cmd; /*Silence warning*/ if ( Dirty ) { processCpuInfo(); @@ -237,7 +236,6 @@ void printCPUxClockInfo( const char* cmd ) void printCPUClockInfo( const char* cmd ) { - cmd = cmd; /*Silence warning*/ output( "CPU Clock Frequency\t0\t0\tMHz\n" ); } diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index 8339c152..818ab0c1 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -11,12 +11,7 @@ #include #include -const int XFocusOut = FocusOut; -const int XFocusIn = FocusIn; -#undef FocusOut -#undef FocusIn -#undef KeyPress -#undef KeyRelease +#include int main( int argc, char *argv[] ) diff --git a/kwalletmanager/src/manager/kwalleteditor.h b/kwalletmanager/src/manager/kwalleteditor.h index ee505364..f6642131 100644 --- a/kwalletmanager/src/manager/kwalleteditor.h +++ b/kwalletmanager/src/manager/kwalleteditor.h @@ -114,7 +114,6 @@ private: static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction; static KAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction; static KAction *_copyPassAction; - QLabel*_details; QString _currentFolder; QMap _currentMap; // save memory by storing // only the most recent map. @@ -124,8 +123,6 @@ private: KMenu *_contextMenu; QTreeWidgetItem *_displayedItem; // used to find old item when selection just changed KActionCollection *_actionCollection; - KMenu *_controlMenu; - KMenu *_walletSubmenu; KTreeWidgetSearchLine *_searchLine; static QAction *_alwaysShowContentsAction, *_alwaysHideContentsAction; bool _alwaysShowContents; diff --git a/kwin/clients/oxygen/oxygenclientgroupitemdata.cpp b/kwin/clients/oxygen/oxygenclientgroupitemdata.cpp index a1097eae..3cd5e1a0 100644 --- a/kwin/clients/oxygen/oxygenclientgroupitemdata.cpp +++ b/kwin/clients/oxygen/oxygenclientgroupitemdata.cpp @@ -39,7 +39,6 @@ namespace Oxygen QList(), _client( *parent ), _dirty( false ), - draggedItem_( NoItem ), targetItem_( NoItem ) { diff --git a/kwin/clients/oxygen/oxygenclientgroupitemdata.h b/kwin/clients/oxygen/oxygenclientgroupitemdata.h index fff0f313..694e062b 100644 --- a/kwin/clients/oxygen/oxygenclientgroupitemdata.h +++ b/kwin/clients/oxygen/oxygenclientgroupitemdata.h @@ -135,9 +135,6 @@ namespace Oxygen /* used to trigger update at next paintEvent */ bool _dirty; - //! dragged item - int draggedItem_; - //! target item int targetItem_; diff --git a/kwin/libkdecorations/kcommondecoration.h b/kwin/libkdecorations/kcommondecoration.h index 8d5a3968..09753f38 100644 --- a/kwin/libkdecorations/kcommondecoration.h +++ b/kwin/libkdecorations/kcommondecoration.h @@ -33,6 +33,8 @@ class KDecorationBridge; class KDecorationFactory; +class KCommonDecorationButton; +class KCommonDecorationWrapper; enum ButtonType { HelpButton = 0, @@ -50,12 +52,6 @@ enum ButtonType { ItemMenuButton // shows the window menu for one tab }; -class KCommonDecorationButton; - -class KCommonDecorationButtonPrivate; -class KCommonDecorationPrivate; -class KCommonDecorationWrapper; - /** * This class eases development of decorations by implementing parts of KDecoration * which are error prone and common for most decorations. @@ -436,8 +432,6 @@ private: bool closing; // for menu doubleclick closing... KCommonDecorationWrapper* wrapper; - - KCommonDecorationPrivate *d; }; /** @@ -519,8 +513,6 @@ private: Qt::MouseButtons m_lastMouse; bool m_isLeft; - - KCommonDecorationButtonPrivate *d; }; /** @} */ diff --git a/plasma/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp index f63d7a95..5534596f 100644 --- a/plasma/applets/folderview/iconview.cpp +++ b/plasma/applets/folderview/iconview.cpp @@ -71,7 +71,6 @@ IconView::IconView(QGraphicsWidget *parent) m_numTextLines(2), m_layoutBroken(false), m_needPostLayoutPass(false), - m_positionsLoaded(false), m_doubleClick(false), m_dragInProgress(false), m_hoverDrag(false), diff --git a/plasma/applets/folderview/iconview.h b/plasma/applets/folderview/iconview.h index 699927b5..e9a4c225 100644 --- a/plasma/applets/folderview/iconview.h +++ b/plasma/applets/folderview/iconview.h @@ -252,7 +252,6 @@ private: int m_numTextLines; bool m_layoutBroken; bool m_needPostLayoutPass; - bool m_positionsLoaded; bool m_doubleClick; bool m_dragInProgress; bool m_hoverDrag; diff --git a/plasma/applets/folderview/listview.h b/plasma/applets/folderview/listview.h index 8171d513..7f0ea26e 100644 --- a/plasma/applets/folderview/listview.h +++ b/plasma/applets/folderview/listview.h @@ -95,7 +95,6 @@ private: QPersistentModelIndex m_pressedIndex; bool m_dragInProgress; bool m_wordWrap; - bool m_drawShadows; }; #endif // LISTVIEW_H diff --git a/plasma/containments/desktop/itemspace.cpp b/plasma/containments/desktop/itemspace.cpp index 9ca820ea..3bbe1dd6 100644 --- a/plasma/containments/desktop/itemspace.cpp +++ b/plasma/containments/desktop/itemspace.cpp @@ -132,7 +132,6 @@ void ItemSpace::checkPreferredPositions() ItemSpaceItem &item = group.m_groupItems[itemId]; qreal push; - PushPower power; /* Push items back towards their perferred positions. diff --git a/plasma/containments/newspaper/appletscontainer.cpp b/plasma/containments/newspaper/appletscontainer.cpp index 3d1fd874..b3212978 100644 --- a/plasma/containments/newspaper/appletscontainer.cpp +++ b/plasma/containments/newspaper/appletscontainer.cpp @@ -650,7 +650,7 @@ void AppletsContainer::resizeEvent(QGraphicsSceneResizeEvent *event) void AppletsContainer::syncBorders() { - qreal left, top, right, bottom = 0; + qreal left, top, right, bottom = 0.0; if (m_background->isValid()) { setFlag(QGraphicsItem::ItemHasNoContents, false); diff --git a/plasma/containments/newspaper/newspaper.h b/plasma/containments/newspaper/newspaper.h index 44184838..fb5728f5 100644 --- a/plasma/containments/newspaper/newspaper.h +++ b/plasma/containments/newspaper/newspaper.h @@ -84,7 +84,6 @@ private: QGraphicsLinearLayout *m_externalLayout; Qt::Orientation m_orientation; bool m_expandAll; - Plasma::FrameSvg *m_background; AppletOverlay *m_appletOverlay; QTimer *m_updateSizeTimer; QTimer *m_relayoutTimer; diff --git a/plasma/containments/screensaver/desktop.cpp b/plasma/containments/screensaver/desktop.cpp index 3d0101f9..db0430b5 100644 --- a/plasma/containments/screensaver/desktop.cpp +++ b/plasma/containments/screensaver/desktop.cpp @@ -38,9 +38,7 @@ using namespace Plasma; SaverDesktop::SaverDesktop(QObject *parent, const QVariantList &args) - : Containment(parent, args), - m_lockDesktopAction(0), - m_appletBrowserAction(0) + : Containment(parent, args) { setContainmentType(CustomContainment); connect(this, SIGNAL(appletAdded(Plasma::Applet*,QPointF)), SLOT(newApplet(Plasma::Applet*,QPointF))); diff --git a/plasma/containments/screensaver/desktop.h b/plasma/containments/screensaver/desktop.h index fa5fd750..7172ce08 100644 --- a/plasma/containments/screensaver/desktop.h +++ b/plasma/containments/screensaver/desktop.h @@ -44,10 +44,6 @@ public: private slots: void newApplet(Plasma::Applet *applet, const QPointF &pos); - -private: - QAction *m_lockDesktopAction; - QAction *m_appletBrowserAction; }; #endif diff --git a/plasma/dataengines/weather/ions/noaa/ion_noaa.h b/plasma/dataengines/weather/ions/noaa/ion_noaa.h index f7cc79a2..49ae896e 100644 --- a/plasma/dataengines/weather/ions/noaa/ion_noaa.h +++ b/plasma/dataengines/weather/ions/noaa/ion_noaa.h @@ -176,7 +176,6 @@ private: Plasma::DataEngine *m_timeEngine; QDateTime m_dateFormat; - bool emitWhenSetup; QStringList m_sourcesToReset; };