From e3912937d80498e3ce5ccc449335b805bd429e20 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 6 Jun 2022 14:49:42 +0300 Subject: [PATCH] generic: compiler warnings fixes Signed-off-by: Ivailo Monev --- gwenview/lib/document/loadingdocumentimpl.cpp | 2 - jovie/jovie/filtermgr.cpp | 2 +- jovie/jovie/filtermgr.h | 2 +- jovie/jovie/speaker.cpp | 4 +- .../applets/binary-clock/binaryclock.cpp | 1 - .../applets/binary-clock/binaryclock.h | 1 - kdeplasma-addons/applets/frame/frame.h | 1 - .../applets/fuzzy-clock/fuzzyClock.cpp | 2 +- kdeplasma-addons/applets/icontasks/tasks.h | 4 -- kdeplasma-addons/applets/notes/notes.cpp | 2 +- kdeplasma-addons/applets/notes/textedit.cpp | 3 +- kdeplasma-addons/applets/notes/textedit.h | 3 +- kdeplasma-addons/applets/paste/appkey.h | 3 -- kdeplasma-addons/applets/paste/sendkeys.cpp | 2 +- .../applets/qalculate/qalculate_labels.cpp | 28 +++++++++--- .../applets/unitconverter/unitconverter.h | 1 - .../groupingdesktop/lib/freehandle.cpp | 5 --- .../groupingdesktop/lib/gridhandle.h | 1 - .../lib/groupexplorer/groupiconlist.cpp | 4 -- kdeplasma-addons/wallpapers/virus/virus.cpp | 2 - kdeplasma-addons/wallpapers/virus/virus.h | 2 - .../wallpapers/weather/backgrounddelegate.cpp | 2 +- .../wallpapers/weather/backgrounddelegate.h | 1 - kget/core/transfer.cpp | 16 ++++--- kget/core/verificationdelegate.cpp | 3 +- kget/core/verificationmodel.cpp | 3 +- kget/core/verifier_p.h | 3 +- .../checksumsearch/dlgchecksumsearch.h | 1 - kmix/apps/kmix.cpp | 3 -- kmix/apps/kmix.h | 2 - kmix/apps/kmixd.h | 1 - kmix/core/ControlManager.cpp | 6 --- kmix/core/mixdevicecomposite.h | 1 - kmix/gui/kmixerwidget.h | 1 - krfb/framebuffers/qt/qtframebuffer.cpp | 3 +- krfb/krfb/rfbservermanager.cpp | 3 +- kuser/ku_edituser.cpp | 3 +- kuser/ku_groupfiles.cpp | 2 - kuser/ku_userfiles.cpp | 2 - okular/conf/preferencesdialog.h | 2 + okular/core/area.h | 26 +---------- okular/core/bookmarkmanager.cpp | 3 ++ okular/generators/dvi/TeXFont_PFB.cpp | 2 +- okular/generators/dvi/TeXFont_PK.cpp | 3 +- okular/generators/dvi/dviFile.cpp | 3 +- okular/generators/dvi/dvisourcesplitter.h | 1 - okular/generators/fax/faxdocument.cpp | 6 +-- okular/generators/fax/faxexpand.cpp | 10 ++--- okular/generators/markdown/document_md.cpp | 6 +-- okular/generators/xps/generator_xps.cpp | 44 ------------------- okular/ui/videowidget.cpp | 19 -------- .../libparted/libpartedpartitiontable.cpp | 2 +- 52 files changed, 75 insertions(+), 183 deletions(-) diff --git a/gwenview/lib/document/loadingdocumentimpl.cpp b/gwenview/lib/document/loadingdocumentimpl.cpp index e6a21d3d..66708453 100644 --- a/gwenview/lib/document/loadingdocumentimpl.cpp +++ b/gwenview/lib/document/loadingdocumentimpl.cpp @@ -66,8 +66,6 @@ namespace Gwenview #define LOG(x) ; #endif -const int MIN_PREV_SIZE = 1000; - const int HEADER_SIZE = 256; struct LoadingDocumentImplPrivate diff --git a/jovie/jovie/filtermgr.cpp b/jovie/jovie/filtermgr.cpp index b14c6431..768070a1 100644 --- a/jovie/jovie/filtermgr.cpp +++ b/jovie/jovie/filtermgr.cpp @@ -62,7 +62,7 @@ FilterMgr::~FilterMgr() * Loads and initializes the filters. * @return False if FilterMgr is not ready to filter. */ -bool FilterMgr::init() +bool FilterMgr::init(KConfig *c, const QString &configGroup) { // Load each of the filters and initialize. KSharedConfig::Ptr pConfig = KSharedConfig::openConfig( QLatin1String( "kttsdrc" ) ); diff --git a/jovie/jovie/filtermgr.h b/jovie/jovie/filtermgr.h index df9594ef..6939de44 100644 --- a/jovie/jovie/filtermgr.h +++ b/jovie/jovie/filtermgr.h @@ -66,7 +66,7 @@ class FilterMgr : public KttsFilterProc * Note: The parameters are for reading from kttsdrc file. Plugins may wish to maintain * separate configuration files of their own. */ - virtual bool init(); + virtual bool init(KConfig *c, const QString &configGroup); /** * Synchronously convert text. diff --git a/jovie/jovie/speaker.cpp b/jovie/jovie/speaker.cpp index 70409f0c..6d1f30bf 100644 --- a/jovie/jovie/speaker.cpp +++ b/jovie/jovie/speaker.cpp @@ -105,7 +105,7 @@ class SpeakerPrivate config(new KConfig(QLatin1String( "kttsdrc" ))), q(parent) { - filterMgr->init(); + filterMgr->init(config, QLatin1String( "General" )); } ~SpeakerPrivate() @@ -306,7 +306,7 @@ void Speaker::init() kDebug() << "Running: Speaker::init()"; delete d->filterMgr; d->filterMgr = new FilterMgr(); - d->filterMgr->init(); + d->filterMgr->init(d->config, QLatin1String( "General" )); // Reread config setting the top voice if there is one. d->readTalkerData(); diff --git a/kdeplasma-addons/applets/binary-clock/binaryclock.cpp b/kdeplasma-addons/applets/binary-clock/binaryclock.cpp index 182ba4c4..8ee07f41 100644 --- a/kdeplasma-addons/applets/binary-clock/binaryclock.cpp +++ b/kdeplasma-addons/applets/binary-clock/binaryclock.cpp @@ -271,7 +271,6 @@ void BinaryClock::paintInterface(QPainter *p, const QStyleOptionGraphicsItem *op return; } - QSizeF m_size = contentsRect.size(); int appletHeight = (int) contentsRect.height(); int appletWidth = (int) contentsRect.width(); int dots = m_showSeconds ? 6 : 4; diff --git a/kdeplasma-addons/applets/binary-clock/binaryclock.h b/kdeplasma-addons/applets/binary-clock/binaryclock.h index 3d207184..ce1c4959 100644 --- a/kdeplasma-addons/applets/binary-clock/binaryclock.h +++ b/kdeplasma-addons/applets/binary-clock/binaryclock.h @@ -77,7 +77,6 @@ class BinaryClock : public ClockApplet QTime m_lastTimeSeen; QTime m_time; - int m_updateIndex; Ui::clockConfig ui; }; diff --git a/kdeplasma-addons/applets/frame/frame.h b/kdeplasma-addons/applets/frame/frame.h index 5ee67374..46fba250 100644 --- a/kdeplasma-addons/applets/frame/frame.h +++ b/kdeplasma-addons/applets/frame/frame.h @@ -126,7 +126,6 @@ private: bool m_doAutoUpdate; QTimer* m_autoUpdateTimer; /// Day Change for PoTD - QTimer *m_dateChangedTimer; QDate m_currentDay; QList actions; diff --git a/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.cpp b/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.cpp index e187c5e6..5379c118 100644 --- a/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.cpp +++ b/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.cpp @@ -35,9 +35,9 @@ Clock::Clock(QObject *parent, const QVariantList &args) : ClockApplet(parent, args), m_oldContentSize(QSizeF (0,0)), + m_configUpdated(false), m_adjustToHeight(1), m_useCustomFontColor(false), - m_configUpdated(false), m_fontColor(Qt::white), m_fontTimeBold(false), m_fontTimeItalic(false), diff --git a/kdeplasma-addons/applets/icontasks/tasks.h b/kdeplasma-addons/applets/icontasks/tasks.h index 4b4c23d5..e7f764a2 100644 --- a/kdeplasma-addons/applets/icontasks/tasks.h +++ b/kdeplasma-addons/applets/icontasks/tasks.h @@ -224,7 +224,6 @@ private: MiddleClick m_middleClick; int m_spacing; int m_iconScale; - Plasma::LayoutAnimator *m_animator; QGraphicsLinearLayout *layout; Ui::appearanceconfig m_appUi; @@ -246,10 +245,7 @@ private: TaskGroupItem *m_rootGroupItem; GroupManager *m_groupManager; - TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy; - bool m_groupWhenFull; - int m_currentDesktop; QWeakPointer m_popupDialog; QAction *m_lockAct; QAction *m_unlockAct; diff --git a/kdeplasma-addons/applets/notes/notes.cpp b/kdeplasma-addons/applets/notes/notes.cpp index 7b1294a4..d11267cc 100644 --- a/kdeplasma-addons/applets/notes/notes.cpp +++ b/kdeplasma-addons/applets/notes/notes.cpp @@ -123,7 +123,7 @@ Notes::Notes(QObject *parent, const QVariantList &args) m_textEdit->setMinimumSize(QSize(60, 60)); //Ensure a minimum size (height) for the textEdit KTextEdit *w = m_textEdit->nativeWidget(); - m_noteEditor = new NotesTextEdit(this); + m_noteEditor = new NotesTextEdit(); m_noteEditor->setFrameShape(QFrame::NoFrame); m_noteEditor->viewport()->setAutoFillBackground(false); m_noteEditor->setWindowFlags(m_noteEditor->windowFlags() | Qt::BypassGraphicsProxyWidget); diff --git a/kdeplasma-addons/applets/notes/textedit.cpp b/kdeplasma-addons/applets/notes/textedit.cpp index 6caa4786..ef995c70 100644 --- a/kdeplasma-addons/applets/notes/textedit.cpp +++ b/kdeplasma-addons/applets/notes/textedit.cpp @@ -37,9 +37,8 @@ #include -NotesTextEdit::NotesTextEdit(Plasma::Applet *applet, QWidget *parent) +NotesTextEdit::NotesTextEdit(QWidget *parent) : KRichTextEdit(parent), - m_applet(applet), m_formatMenu(0) { } diff --git a/kdeplasma-addons/applets/notes/textedit.h b/kdeplasma-addons/applets/notes/textedit.h index 5acf0e2a..e2e4b01e 100644 --- a/kdeplasma-addons/applets/notes/textedit.h +++ b/kdeplasma-addons/applets/notes/textedit.h @@ -46,7 +46,7 @@ class NotesTextEdit : public KRichTextEdit Q_OBJECT public: - NotesTextEdit(Plasma::Applet *applet, QWidget *parent = 0); + NotesTextEdit(QWidget *parent = 0); ~NotesTextEdit(); void setFormatMenu(QMenu *menu); @@ -74,7 +74,6 @@ class NotesTextEdit : public KRichTextEdit void wheelEvent(QWheelEvent *event); private: - Plasma::Applet *m_applet; QMenu *m_formatMenu; }; diff --git a/kdeplasma-addons/applets/paste/appkey.h b/kdeplasma-addons/applets/paste/appkey.h index b244136f..9fd7bad4 100644 --- a/kdeplasma-addons/applets/paste/appkey.h +++ b/kdeplasma-addons/applets/paste/appkey.h @@ -34,9 +34,6 @@ protected slots: void appClicked(); void activeWindowChanged(WId id); void enableWidgets(); - -private: - WId m_me; }; #endif // APPKEY_HEADER diff --git a/kdeplasma-addons/applets/paste/sendkeys.cpp b/kdeplasma-addons/applets/paste/sendkeys.cpp index 2d99c2d9..dc909df0 100644 --- a/kdeplasma-addons/applets/paste/sendkeys.cpp +++ b/kdeplasma-addons/applets/paste/sendkeys.cpp @@ -104,7 +104,7 @@ void SendKeys::send(uint k) if (d->keys.contains(keycode)) { keycode = d->keys[keycode]; - } else if (keycode < Qt::Key_Space && keycode > Qt::Key_ydiaeresis) { + } else if (keycode < Qt::Key_Space || keycode > Qt::Key_ydiaeresis) { return; } keycode = XKeysymToKeycode(dsp, keycode); diff --git a/kdeplasma-addons/applets/qalculate/qalculate_labels.cpp b/kdeplasma-addons/applets/qalculate/qalculate_labels.cpp index 7162e7a2..67d8563c 100644 --- a/kdeplasma-addons/applets/qalculate/qalculate_labels.cpp +++ b/kdeplasma-addons/applets/qalculate/qalculate_labels.cpp @@ -250,19 +250,29 @@ QString QalculateLabels::drawStructure(MathStructure& m, const PrintOptions& po, } for (size_t i = 0; i < terms.size(); i++) { if (!po.short_multiplication && i > 0) { - if (do_space[i - 1]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i - 1]) { + STR_MARKUP_ADD(mstr, " "); + } mstr += mul_str; - if (do_space[i]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i]) { + STR_MARKUP_ADD(mstr, " "); + } } else if (i > 0) { switch (nm[i]) { case MULTIPLICATION_SIGN_SPACE: { - if (do_space[i - 1] && do_space[i]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i - 1] && do_space[i]) { + STR_MARKUP_ADD(mstr, " "); + } break; } case MULTIPLICATION_SIGN_OPERATOR: { - if (do_space[i - 1]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i - 1]) { + STR_MARKUP_ADD(mstr, " "); + } mstr += mul_str; - if (do_space[i]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i]) { + STR_MARKUP_ADD(mstr, " "); + } break; } case MULTIPLICATION_SIGN_OPERATOR_SHORT: { @@ -294,7 +304,9 @@ QString QalculateLabels::drawStructure(MathStructure& m, const PrintOptions& po, } for (size_t i = 0; i < terms.size(); i++) { if (i > 0) { - if (do_space[i - 1]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i - 1]) { + STR_MARKUP_ADD(mstr, " "); + } if (m[i].type() == STRUCT_NEGATE) { if (po.use_unicode_signs && (!po.can_display_unicode_string_function || (*po.can_display_unicode_string_function)(SIGN_MINUS, po.can_display_unicode_string_arg))) { STR_MARKUP_ADD(mstr, SIGN_MINUS); @@ -304,7 +316,9 @@ QString QalculateLabels::drawStructure(MathStructure& m, const PrintOptions& po, } else { STR_MARKUP_ADD(mstr, "+"); } - if (do_space[i]) STR_MARKUP_ADD(mstr, " "); + if (do_space[i]) { + STR_MARKUP_ADD(mstr, " "); + } } mstr += terms[i]; } diff --git a/kdeplasma-addons/applets/unitconverter/unitconverter.h b/kdeplasma-addons/applets/unitconverter/unitconverter.h index 53cbdc9f..61ec8e7f 100644 --- a/kdeplasma-addons/applets/unitconverter/unitconverter.h +++ b/kdeplasma-addons/applets/unitconverter/unitconverter.h @@ -76,7 +76,6 @@ class UnitConverter : public Plasma::PopupApplet Plasma::LineEdit *m_pTxtValue1; Plasma::LineEdit *m_pTxtValue2; Plasma::Label *m_pInfo; - int m_iCategory; bool m_bCalculateReverse; }; diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/freehandle.cpp b/kdeplasma-addons/containments/groupingdesktop/lib/freehandle.cpp index ec2e5a75..7373bd75 100644 --- a/kdeplasma-addons/containments/groupingdesktop/lib/freehandle.cpp +++ b/kdeplasma-addons/containments/groupingdesktop/lib/freehandle.cpp @@ -323,7 +323,6 @@ void FreeHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *option //XXX this code is duplicated in the next function QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin); - QPointF separator = step + QPointF(0, iconMargin); //end duplicate code QPointF shiftC; @@ -408,7 +407,6 @@ Handle::ButtonType FreeHandle::mapToButton(const QPointF &point) const //XXX this code is duplicated in the prev. function QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin); - QPointF separator = step + QPointF(0, iconMargin); //end duplicate code QRectF activeArea = QRectF(basePoint, QSizeF(m_iconSize, m_iconSize)); @@ -630,9 +628,6 @@ void FreeHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) return; } - //Track how much the mouse has moved. - QPointF deltaScene = event->scenePos() - event->lastScenePos(); - if (m_pressedButton == MoveButton) { if (leaveCurrentView(event->screenPos())) { Plasma::View *v = Plasma::View::topLevelViewAt(event->screenPos()); diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/gridhandle.h b/kdeplasma-addons/containments/groupingdesktop/lib/gridhandle.h index a94c8aac..9be36707 100644 --- a/kdeplasma-addons/containments/groupingdesktop/lib/gridhandle.h +++ b/kdeplasma-addons/containments/groupingdesktop/lib/gridhandle.h @@ -62,7 +62,6 @@ class GridHandle : public Handle bool m_moving; QPointF m_startPos; - int m_savedZValue; QPointF m_widgetPos; QSizeF m_widgetSize; Plasma::Svg *m_configureIcons; diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.cpp b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.cpp index fb3b7fff..31a0efe5 100644 --- a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.cpp +++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.cpp @@ -46,10 +46,6 @@ #include "abstractgroup.h" #include "groupicon.h" -const int ICON_SIZE = 70; -const int SEARCH_DELAY = 300; -const int SCROLL_STEP_DURATION = 300; - GroupIconList::GroupIconList(Plasma::Location loc, QGraphicsItem *parent) : QGraphicsWidget(parent), m_arrowsSvg(new Plasma::Svg(this)), diff --git a/kdeplasma-addons/wallpapers/virus/virus.cpp b/kdeplasma-addons/wallpapers/virus/virus.cpp index 4a19617c..0eb2a820 100644 --- a/kdeplasma-addons/wallpapers/virus/virus.cpp +++ b/kdeplasma-addons/wallpapers/virus/virus.cpp @@ -32,10 +32,8 @@ K_EXPORT_PLASMA_WALLPAPER(virus, Virus) Virus::Virus(QObject *parent, const QVariantList &args) : Plasma::Wallpaper(parent, args), m_configWidget(0), - m_currentSlide(-1), m_model(0), m_dialog(0), - m_randomize(true), m_startupResumed(false) { connect(this, SIGNAL(renderCompleted(QImage)), this, SLOT(updateBackground(QImage))); diff --git a/kdeplasma-addons/wallpapers/virus/virus.h b/kdeplasma-addons/wallpapers/virus/virus.h index 10c5cd05..9cccc4f6 100644 --- a/kdeplasma-addons/wallpapers/virus/virus.h +++ b/kdeplasma-addons/wallpapers/virus/virus.h @@ -79,13 +79,11 @@ class Virus : public Plasma::Wallpaper QPixmap m_pixmap; QPixmap m_oldPixmap; QPixmap m_oldFadedPixmap; - int m_currentSlide; BackgroundListModel *m_model; KFileDialog *m_dialog; QSize m_size; QString m_img; QDateTime m_previousModified; - bool m_randomize; bool m_startupResumed; QTimer m_timer; diff --git a/kdeplasma-addons/wallpapers/weather/backgrounddelegate.cpp b/kdeplasma-addons/wallpapers/weather/backgrounddelegate.cpp index acd04051..2bd3a23f 100644 --- a/kdeplasma-addons/wallpapers/weather/backgrounddelegate.cpp +++ b/kdeplasma-addons/wallpapers/weather/backgrounddelegate.cpp @@ -17,9 +17,9 @@ BackgroundDelegate::BackgroundDelegate(QObject *listener, float ratio, QObject *parent) : QAbstractItemDelegate(parent), - m_listener(listener), m_ratio(ratio) { + Q_UNUSED(listener); } void BackgroundDelegate::paint(QPainter *painter, diff --git a/kdeplasma-addons/wallpapers/weather/backgrounddelegate.h b/kdeplasma-addons/wallpapers/weather/backgrounddelegate.h index 6e7502e2..56859f2a 100644 --- a/kdeplasma-addons/wallpapers/weather/backgrounddelegate.h +++ b/kdeplasma-addons/wallpapers/weather/backgrounddelegate.h @@ -34,7 +34,6 @@ public: private: static const int MARGIN = 5; - QObject *m_listener; float m_ratio; }; diff --git a/kget/core/transfer.cpp b/kget/core/transfer.cpp index 46f4679c..73046b2a 100644 --- a/kget/core/transfer.cpp +++ b/kget/core/transfer.cpp @@ -123,24 +123,28 @@ QHash > Transfer::availableMirrors(const KUrl &file) cons void Transfer::setUploadLimit(int ulLimit, SpeedLimit limit) { - if (limit == Transfer::VisibleSpeedLimit) + if (limit == Transfer::VisibleSpeedLimit) { m_visibleUploadLimit = ulLimit; - if (ulLimit < m_uploadLimit || m_uploadLimit == 0) + if (ulLimit < m_uploadLimit || m_uploadLimit == 0) { m_uploadLimit = ulLimit; - else + } + } else { m_uploadLimit = ulLimit; + } setSpeedLimits(m_uploadLimit, m_downloadLimit); } void Transfer::setDownloadLimit(int dlLimit, SpeedLimit limit) { - if (limit == Transfer::VisibleSpeedLimit) + if (limit == Transfer::VisibleSpeedLimit) { m_visibleDownloadLimit = dlLimit; - if (dlLimit < m_downloadLimit || m_downloadLimit == 0) + if (dlLimit < m_downloadLimit || m_downloadLimit == 0) { m_downloadLimit = dlLimit; - else + } + } else { m_downloadLimit = dlLimit; + } setSpeedLimits(m_uploadLimit, m_downloadLimit); } diff --git a/kget/core/verificationdelegate.cpp b/kget/core/verificationdelegate.cpp index 232dd389..f4b5993d 100644 --- a/kget/core/verificationdelegate.cpp +++ b/kget/core/verificationdelegate.cpp @@ -24,8 +24,9 @@ #include #include -struct VerificationDelegatePrivate +class VerificationDelegatePrivate { +public: VerificationDelegatePrivate() { } diff --git a/kget/core/verificationmodel.cpp b/kget/core/verificationmodel.cpp index b13826d7..523b9e6e 100644 --- a/kget/core/verificationmodel.cpp +++ b/kget/core/verificationmodel.cpp @@ -26,8 +26,9 @@ #include #include -struct VerificationModelPrivate +class VerificationModelPrivate { +public: VerificationModelPrivate() { } diff --git a/kget/core/verifier_p.h b/kget/core/verifier_p.h index de3ee925..6a1df051 100644 --- a/kget/core/verifier_p.h +++ b/kget/core/verifier_p.h @@ -26,8 +26,9 @@ class Verifier; #include "verifier.h" #include "verificationthread.h" -struct VerifierPrivate +class VerifierPrivate { +public: VerifierPrivate(Verifier *verifier) : q(verifier), model(0) diff --git a/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h b/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h index be3608a4..51637666 100644 --- a/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h +++ b/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h @@ -126,7 +126,6 @@ class DlgChecksumSettingsWidget : public KCModule private: Ui::ChecksumSearch ui; - KDialog *m_parent; QStandardItemModel *m_model; QSortFilterProxyModel *m_proxy; QStringList m_modes; diff --git a/kmix/apps/kmix.cpp b/kmix/apps/kmix.cpp index 6fbcdbff..71f61c6f 100644 --- a/kmix/apps/kmix.cpp +++ b/kmix/apps/kmix.cpp @@ -569,9 +569,6 @@ KMixWindow::loadBaseConfig() { KConfigGroup config(KGlobal::config(), "Global"); -// GlobalConfig& gcfg = GlobalConfig::instance(); - GlobalConfigData& gcd = GlobalConfig::instance().data; - QList preferredMixersInSoundMenu; preferredMixersInSoundMenu = config.readEntry("Soundmenu.Mixers", preferredMixersInSoundMenu); GlobalConfig::instance().setMixersForSoundmenu(preferredMixersInSoundMenu.toSet()); diff --git a/kmix/apps/kmix.h b/kmix/apps/kmix.h index 1f9083ef..52115bc6 100644 --- a/kmix/apps/kmix.h +++ b/kmix/apps/kmix.h @@ -97,7 +97,6 @@ private: void forkExec(const QStringList& args); void errorPopup(const QString& msg); - KAccel *m_keyAccel; KAction* _actionShowMenubar; private: @@ -107,7 +106,6 @@ private: GlobalConfigData configDataSnapshot; bool m_startVisible; - bool m_visibilityUpdateAllowed; bool m_multiDriverMode; // Not officially supported. bool m_autouseMultimediaKeys; // Due to message freeze, not in config dialog in KDE4.4 diff --git a/kmix/apps/kmixd.h b/kmix/apps/kmixd.h index 78d5addc..341489be 100644 --- a/kmix/apps/kmixd.h +++ b/kmix/apps/kmixd.h @@ -68,7 +68,6 @@ KMixD : public KDEDModule, protected QDBusContext //virtual void applyPrefs( KMixPrefDlg *prefDlg ); private: - //KAccel *m_keyAccel; //KAction* _actionShowMenubar; bool m_multiDriverMode; // Not officially supported. diff --git a/kmix/core/ControlManager.cpp b/kmix/core/ControlManager.cpp index ba6da222..c30ce71f 100644 --- a/kmix/core/ControlManager.cpp +++ b/kmix/core/ControlManager.cpp @@ -57,12 +57,6 @@ void ControlManager::announce(QString mixerId, ControlChangeType::Type changeTyp for (it = listeners.begin(); it != listeners.end(); ++it) { Listener& listener = *it; - if ( &listener == 0 ) - { - kWarning() << "null Listener detected ... skipping"; - continue; - } - bool mixerIsOfInterest = listener.getMixerId().isEmpty() || mixerId.isEmpty() || listener.getMixerId() == mixerId; diff --git a/kmix/core/mixdevicecomposite.h b/kmix/core/mixdevicecomposite.h index b4273083..8684daf9 100644 --- a/kmix/core/mixdevicecomposite.h +++ b/kmix/core/mixdevicecomposite.h @@ -98,7 +98,6 @@ public: private: long calculateVolume(Volume::VolumeType vt); - Mixer *_mixer; QList > _mds; static const long VolMax; diff --git a/kmix/gui/kmixerwidget.h b/kmix/gui/kmixerwidget.h index 96a60a44..008d63e8 100644 --- a/kmix/gui/kmixerwidget.h +++ b/kmix/gui/kmixerwidget.h @@ -76,7 +76,6 @@ class KMixerWidget : public QWidget Mixer *_mixer; QVBoxLayout *m_topLayout; // contains TabWidget QString _guiprofId; - ProfTab* _tab; std::vector _views; KActionCollection* _actionCollection; // -<- applciations wide action collection diff --git a/krfb/framebuffers/qt/qtframebuffer.cpp b/krfb/framebuffers/qt/qtframebuffer.cpp index 82d9119b..d3a291bc 100644 --- a/krfb/framebuffers/qt/qtframebuffer.cpp +++ b/krfb/framebuffers/qt/qtframebuffer.cpp @@ -67,7 +67,6 @@ void QtFrameBuffer::getServerFormat(rfbPixelFormat &format) void QtFrameBuffer::updateFrameBuffer() { QImage img = QPixmap::grabWindow(win).toImage(); - QSize imgSize = img.size(); // verify what part of the image need to be marked as changed @@ -75,7 +74,7 @@ void QtFrameBuffer::updateFrameBuffer() // img is the current one #if 0 // This is actually slower than updating the whole desktop... - + QSize imgSize = img.size(); QImage map(imgSize, QImage::Format_Mono); map.fill(0); diff --git a/krfb/krfb/rfbservermanager.cpp b/krfb/krfb/rfbservermanager.cpp index a706d717..ca87a1f4 100644 --- a/krfb/krfb/rfbservermanager.cpp +++ b/krfb/krfb/rfbservermanager.cpp @@ -77,8 +77,9 @@ static const char *mask = " xxx "; -struct RfbServerManagerStatic +class RfbServerManagerStatic { +public: RfbServerManager server; }; diff --git a/kuser/ku_edituser.cpp b/kuser/ku_edituser.cpp index 6693ee70..ba9805f2 100644 --- a/kuser/ku_edituser.cpp +++ b/kuser/ku_edituser.cpp @@ -430,7 +430,7 @@ void KU_EditUser::selectuser() if ( first ) { if ( !shell.isEmpty() ) { bool tested = false; - for ( int i=0; icount(); i++ ) + for ( int i=0; icount(); i++ ) { if ( leshell->itemText(i) == shell ) { tested = true; leshell->setCurrentIndex(i); @@ -440,6 +440,7 @@ void KU_EditUser::selectuser() leshell->insertItem( leshell->count(), shell ); leshell->setCurrentIndex( leshell->count()-1 ); } + } } else leshell->setCurrentIndex( 0 ); } else { diff --git a/kuser/ku_groupfiles.cpp b/kuser/ku_groupfiles.cpp index 90ad76b7..51c80344 100644 --- a/kuser/ku_groupfiles.cpp +++ b/kuser/ku_groupfiles.cpp @@ -133,7 +133,6 @@ bool KU_GroupFiles::save() kDebug() << "KU_GroupFiles::save() "; FILE *group_fd = NULL; FILE *gshadow_fd = NULL; - gid_t tmp_gid = 0; QString tmpGe, tmpSe, tmp2; QString group_filename, new_group_filename; QString gshadow_filename, new_gshadow_filename; @@ -213,7 +212,6 @@ bool KU_GroupFiles::save() tmpGe.replace( QLatin1Char( ':' ), QLatin1String( "_" ) ); group.setName( tmpGe ); - tmp_gid = group.getGID(); tmpGe += QLatin1Char( ':' ) + group.getPwd() + QLatin1Char( ':' ) + QString::number( group.getGID() ) + QLatin1Char( ':' ); diff --git a/kuser/ku_userfiles.cpp b/kuser/ku_userfiles.cpp index ec50363d..10b9cbd5 100644 --- a/kuser/ku_userfiles.cpp +++ b/kuser/ku_userfiles.cpp @@ -244,7 +244,6 @@ bool KU_UserFiles::savepwd() { FILE *passwd_fd = NULL; FILE *shadow_fd = NULL; - uid_t tmp_uid = 0; QString s; QString s1; QString tmp, tmp2; @@ -321,7 +320,6 @@ bool KU_UserFiles::savepwd() usersindex++; } - tmp_uid = user.getUID(); if ( caps & Cap_Shadow ) tmp = QLatin1String( "x" ); else { diff --git a/okular/conf/preferencesdialog.h b/okular/conf/preferencesdialog.h index ac6e198e..874ebcc3 100644 --- a/okular/conf/preferencesdialog.h +++ b/okular/conf/preferencesdialog.h @@ -47,7 +47,9 @@ class PreferencesDialog : public KConfigDialog DlgPresentation * m_presentation; DlgAnnotations * m_annotations; DlgEditor * m_editor; +#ifdef OKULAR_DEBUG_CONFIGPAGE DlgDebug * m_debug; +#endif KPageWidgetItem * m_annotationsPage; }; diff --git a/okular/core/area.h b/okular/core/area.h index 206fea4c..b77da459 100644 --- a/okular/core/area.h +++ b/okular/core/area.h @@ -654,9 +654,6 @@ void RegularArea::simplify() template bool RegularArea::isNull() const { - if ( !this ) - return false; - if ( this->isEmpty() ) return false; @@ -671,9 +668,6 @@ bool RegularArea::isNull() const template bool RegularArea::intersects( const NormalizedShape& rect ) const { - if ( !this ) - return false; - if ( this->isEmpty() ) return false; @@ -688,9 +682,6 @@ bool RegularArea::intersects( const NormalizedShape& rec template bool RegularArea::intersects( const RegularArea *area ) const { - if ( !this ) - return false; - if ( this->isEmpty() ) return false; @@ -711,9 +702,6 @@ bool RegularArea::intersects( const RegularArea void RegularArea::appendArea( const RegularArea *area ) { - if ( !this ) - return; - typename QList::const_iterator areaIt = area->begin(), areaItEnd = area->end(); for ( ; areaIt != areaItEnd; ++areaIt ) this->append( *areaIt ); @@ -723,9 +711,6 @@ void RegularArea::appendArea( const RegularArea void RegularArea::appendShape( const NormalizedShape& shape, MergeSide side ) { - if ( !this ) - return; - int size = this->count(); // if the list is empty, adds the shape normally if ( size == 0 ) @@ -798,9 +783,6 @@ void RegularArea::appendShape( const NormalizedShape& sh template bool RegularArea::contains( double x, double y ) const { - if ( !this ) - return false; - if ( this->isEmpty() ) return false; @@ -815,9 +797,6 @@ bool RegularArea::contains( double x, double y ) const template bool RegularArea::contains( const NormalizedShape& shape ) const { - if ( !this ) - return false; - if ( this->isEmpty() ) return false; @@ -827,7 +806,7 @@ bool RegularArea::contains( const NormalizedShape& shape template QList RegularArea::geometry( int xScale, int yScale, int dx, int dy ) const { - if ( !this || this->isEmpty() ) + if ( this->isEmpty() ) return QList(); QList ret; @@ -846,9 +825,6 @@ QList RegularArea::geometry( int xScale, int ySca template void RegularArea::transform( const QTransform &matrix ) { - if ( !this ) - return; - if ( this->isEmpty() ) return; diff --git a/okular/core/bookmarkmanager.cpp b/okular/core/bookmarkmanager.cpp index 69183f02..2e7b07fd 100644 --- a/okular/core/bookmarkmanager.cpp +++ b/okular/core/bookmarkmanager.cpp @@ -407,6 +407,7 @@ bool BookmarkManager::addBookmark( const KUrl& referurl, const Okular::DocumentV KBookmarkGroup thebg; QHash::iterator it = d->bookmarkFind( referurl, true, &thebg ); Q_ASSERT( it != d->knownFiles.end() ); + Q_UNUSED( it ); int count = 0; // Number of bookmarks in the current page bool found = false; @@ -506,6 +507,7 @@ QString BookmarkManager::titleForUrl( const KUrl& referurl ) const KBookmarkGroup thebg; QHash::iterator it = d->bookmarkFind( referurl, false, &thebg ); Q_ASSERT( it != d->knownFiles.end() ); + Q_UNUSED( it ); return thebg.fullText(); } @@ -634,6 +636,7 @@ bool BookmarkManager::setPageBookmark( int page ) KBookmarkGroup thebg; QHash::iterator it = d->bookmarkFind( d->url, true, &thebg ); Q_ASSERT( it != d->knownFiles.end() ); + Q_UNUSED( it ); bool found = false; bool added = false; diff --git a/okular/generators/dvi/TeXFont_PFB.cpp b/okular/generators/dvi/TeXFont_PFB.cpp index 6b270936..d7e134e6 100644 --- a/okular/generators/dvi/TeXFont_PFB.cpp +++ b/okular/generators/dvi/TeXFont_PFB.cpp @@ -149,7 +149,7 @@ glyph* TeXFont_PFB::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCo } // This is the address of the glyph that will be returned. - struct glyph *g = glyphtable+ch; + glyph *g = glyphtable+ch; if (fatalErrorInFontLoading == true) diff --git a/okular/generators/dvi/TeXFont_PK.cpp b/okular/generators/dvi/TeXFont_PK.cpp index 93f2d355..5e236425 100644 --- a/okular/generators/dvi/TeXFont_PK.cpp +++ b/okular/generators/dvi/TeXFont_PK.cpp @@ -322,7 +322,7 @@ glyph* TeXFont_PK::getGlyph(quint16 ch, bool generateCharacterPixmap, const QCol #define SUB(a, b) ((quint32 *) (((char *) a) - b)) - +#if Q_BYTE_ORDER == Q_BIG_ENDIAN // This table is used for changing the bit order in a byte. The // expression bitflp[byte] takes a byte in big endian and gives the // little endian equivalent of that. @@ -344,6 +344,7 @@ static const uchar bitflip[256] = { 7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247, 15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255 }; +#endif // Q_BYTE_ORDER static quint32 bit_masks[33] = { 0x0, 0x1, 0x3, 0x7, diff --git a/okular/generators/dvi/dviFile.cpp b/okular/generators/dvi/dviFile.cpp index cbed2cee..3110d80a 100644 --- a/okular/generators/dvi/dviFile.cpp +++ b/okular/generators/dvi/dviFile.cpp @@ -340,7 +340,7 @@ void dvifile::renumber() for(int i=1; i<=total_pages; i++) { quint8 *ptr = dviData.data() + page_offset[i-1]+1; quint8 *num = (quint8 *)&i; - for(quint8 j=0; j<4; j++) + for(quint8 j=0; j<4; j++) { #if Q_BYTE_ORDER == Q_BIG_ENDIAN *(ptr++) = num[0]; *(ptr++) = num[1]; @@ -352,6 +352,7 @@ void dvifile::renumber() *(ptr++) = num[1]; *(ptr++) = num[0]; #endif + } } } diff --git a/okular/generators/dvi/dvisourcesplitter.h b/okular/generators/dvi/dvisourcesplitter.h index f720c77b..b89a727b 100644 --- a/okular/generators/dvi/dvisourcesplitter.h +++ b/okular/generators/dvi/dvisourcesplitter.h @@ -28,6 +28,5 @@ public: private: QFileInfo m_fileInfo; quint32 m_line; - bool m_exists; }; #endif diff --git a/okular/generators/fax/faxdocument.cpp b/okular/generators/fax/faxdocument.cpp index ed586322..0ccb9945 100644 --- a/okular/generators/fax/faxdocument.cpp +++ b/okular/generators/fax/faxdocument.cpp @@ -19,7 +19,7 @@ static const char FAXMAGIC[] = "\000PC Research, Inc\000\000\000\000\000\000"; #define FAX_DPI_FINE QPoint(203,196) /* rearrange input bits into t16bits lsb-first chunks */ -static void normalize( struct pagenode *pn, int revbits, int swapbytes, size_t length ) +static void normalize( pagenode *pn, int revbits, int swapbytes, size_t length ) { t32bits *p = (t32bits *) pn->data; @@ -205,7 +205,7 @@ static void draw_line( pixnum *run, int lineNum, pagenode *pn ) } } -static bool get_image( struct pagenode *pn ) +static bool get_image( pagenode *pn ) { unsigned char *data = getstrip( pn, 0 ); if ( !data ) @@ -229,7 +229,7 @@ class FaxDocument::Private } FaxDocument *mParent; - struct pagenode mPageNode; + pagenode mPageNode; FaxDocument::DocumentType mType; }; diff --git a/okular/generators/fax/faxexpand.cpp b/okular/generators/fax/faxexpand.cpp index b004af32..645c3f50 100644 --- a/okular/generators/fax/faxexpand.cpp +++ b/okular/generators/fax/faxexpand.cpp @@ -343,7 +343,7 @@ unexpected(const char *what, int LineNum) /* Expand tiff modified huffman data (g3-1d without EOLs) */ void -MHexpand(struct pagenode *pn, drawfunc df) +MHexpand(pagenode *pn, drawfunc df) { int a0; /* reference element */ int lastx; /* copy line width to register */ @@ -396,7 +396,7 @@ MHexpand(struct pagenode *pn, drawfunc df) /* Expand group-3 1-dimensional data */ void -g31expand(struct pagenode *pn, drawfunc df) +g31expand(pagenode *pn, drawfunc df) { int a0; /* reference element */ int lastx; /* copy line width to register */ @@ -480,7 +480,7 @@ g31expand(struct pagenode *pn, drawfunc df) /* Expand group-3 2-dimensional data */ void -g32expand(struct pagenode *pn, drawfunc df) +g32expand(pagenode *pn, drawfunc df) { int RunLength; /* Length of current run */ int a0; /* reference element */ @@ -600,7 +600,7 @@ g32expand(struct pagenode *pn, drawfunc df) /* Expand group-4 data */ void -g4expand(struct pagenode *pn, drawfunc df) +g4expand(pagenode *pn, drawfunc df) { int RunLength; /* Length of current run */ int a0; /* reference element */ @@ -717,7 +717,7 @@ static const unsigned char zerotab[256] = { /* count fax lines */ int -G3count(struct pagenode *pn, int twoD) +G3count(pagenode *pn, int twoD) { t16bits *p = pn->data; t16bits *end = p + pn->length/sizeof(*p); diff --git a/okular/generators/markdown/document_md.cpp b/okular/generators/markdown/document_md.cpp index ea2e5027..b80f99fb 100644 --- a/okular/generators/markdown/document_md.cpp +++ b/okular/generators/markdown/document_md.cpp @@ -91,13 +91,13 @@ void MDDocument::slotKIOData(KIO::Job *kiojob, const QByteArray &data) void MDDocument::slotKIOResult(KJob *kiojob) { - KIO::TransferJob *transferjob = static_cast(kiojob); - if (kiojob->error() != 0) { + KIO::TransferJob *transferjob = qobject_cast(kiojob); + if (transferjob->error() != 0) { kWarning() << "Could not fetch resource"; } else { kDebug() << "Resource fetched"; } - kiojob->deleteLater(); + transferjob->deleteLater(); } #include "moc_document_md.cpp" diff --git a/okular/generators/xps/generator_xps.cpp b/okular/generators/xps/generator_xps.cpp index 33b1c625..378c503d 100644 --- a/okular/generators/xps/generator_xps.cpp +++ b/okular/generators/xps/generator_xps.cpp @@ -118,32 +118,6 @@ static QRectF stringToRectF( const QString &data ) return QRectF( origin, size ); } -static bool parseGUID( const QString &guidString, unsigned short guid[16]) { - - if (guidString.length() <= 35) { - return false; - } - - // Maps bytes to positions in guidString - const static int indexes[] = {6, 4, 2, 0, 11, 9, 16, 14, 19, 21, 24, 26, 28, 30, 32, 34}; - - for (int i = 0; i < 16; i++) { - int hex1 = hex2int(guidString[indexes[i]].cell()); - int hex2 = hex2int(guidString[indexes[i]+1].cell()); - - if ((hex1 < 0) || (hex2 < 0)) - { - return false; - } - - guid[i] = hex1 * 16 + hex2; - } - - return true; - -} - - // Read next token of abbreviated path data static bool nextAbbPathToken(AbbPathToken *token) { @@ -592,24 +566,6 @@ static const KZipFileEntry* loadFile( KZip *archive, const QString &fileName, Qt return entry->isFile() ? static_cast< const KZipFileEntry * >( entry ) : 0; } -/** - \return The name of a resource from the \p fileName -*/ -static QString resourceName( const QString &fileName ) -{ - QString resource = fileName; - const int slashPos = fileName.lastIndexOf( QLatin1Char( '/' ) ); - const int dotPos = fileName.lastIndexOf( QLatin1Char( '.' ) ); - if ( slashPos > -1 ) { - if ( dotPos > -1 && dotPos > slashPos ) { - resource = fileName.mid( slashPos + 1, dotPos - slashPos - 1 ); - } else { - resource = fileName.mid( slashPos + 1 ); - } - } - return resource; -} - static QColor interpolatedColor( const QColor &c1, const QColor &c2 ) { QColor res; diff --git a/okular/ui/videowidget.cpp b/okular/ui/videowidget.cpp index 01e1c9d4..b78e518f 100644 --- a/okular/ui/videowidget.cpp +++ b/okular/ui/videowidget.cpp @@ -32,25 +32,6 @@ #include "core/movie.h" #include "snapshottaker.h" -static QAction* createToolBarButtonWithWidgetPopup( QToolBar* toolBar, QWidget *widget, const QIcon &icon ) -{ - QToolButton *button = new QToolButton( toolBar ); - QAction *action = toolBar->addWidget( button ); - button->setAutoRaise( true ); - button->setIcon( icon ); - button->setPopupMode( QToolButton::InstantPopup ); - QMenu *menu = new QMenu( button ); - button->setMenu( menu ); - QWidgetAction *widgetAction = new QWidgetAction( menu ); - QWidget *dummy = new QWidget( menu ); - widgetAction->setDefaultWidget( dummy ); - QVBoxLayout *dummyLayout = new QVBoxLayout( dummy ); - dummyLayout->setMargin( 5 ); - dummyLayout->addWidget( widget ); - menu->addAction( widgetAction ); - return action; -} - /* Private storage. */ class VideoWidget::Private { diff --git a/partitionmanager/src/plugins/libparted/libpartedpartitiontable.cpp b/partitionmanager/src/plugins/libparted/libpartedpartitiontable.cpp index bd18e705..4a69649d 100644 --- a/partitionmanager/src/plugins/libparted/libpartedpartitiontable.cpp +++ b/partitionmanager/src/plugins/libparted/libpartedpartitiontable.cpp @@ -165,7 +165,7 @@ QString LibPartedPartitionTable::createPartition(Report& report, const Partition else if (partition.roles().has(PartitionRole::Primary)) pedType = PED_PARTITION_NORMAL; - if (pedType == static_cast(0xffffffff)) + if (pedType == static_cast(0xffffffff)) { report.line() << i18nc("@info/plain", "Unknown partition role for new partition %1 (roles: %2)", partition.deviceNode(), partition.roles().toString()); return "";