Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: compiler warnings fixes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-05 22:06:42 +03:00
parent 6aab5c5b7c
commit 45fbbf2582
24 changed files with 67 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dolphin/src/dolphinmainwindow.cpp
View file

@ -1087,10 +1087,10 @@ void DolphinMainWindow::updateControlMenu()
KActionCollection* ac = actionCollection();
// Add "Edit" actions
bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
addActionToMenu(ac->action("select_all"), menu) |
addActionToMenu(ac->action("invert_selection"), menu);
bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu);
added |= addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu);
added |= addActionToMenu(ac->action("select_all"), menu);
added |= addActionToMenu(ac->action("invert_selection"), menu);
if (added) {
menu->addSeparator();
@ -1103,20 +1103,20 @@ void DolphinMainWindow::updateControlMenu()
menu->addSeparator();
}
added = addActionToMenu(ac->action("view_mode"), menu) |
addActionToMenu(ac->action("sort"), menu) |
addActionToMenu(ac->action("additional_info"), menu) |
addActionToMenu(ac->action("show_preview"), menu) |
addActionToMenu(ac->action("show_in_groups"), menu) |
addActionToMenu(ac->action("show_hidden_files"), menu);
added = addActionToMenu(ac->action("view_mode"), menu);
added |= addActionToMenu(ac->action("sort"), menu);
added |= addActionToMenu(ac->action("additional_info"), menu);
added |= addActionToMenu(ac->action("show_preview"), menu);
added |= addActionToMenu(ac->action("show_in_groups"), menu);
added |= addActionToMenu(ac->action("show_hidden_files"), menu);
if (added) {
menu->addSeparator();
}
added = addActionToMenu(ac->action("split_view"), menu) |
addActionToMenu(ac->action("reload"), menu) |
addActionToMenu(ac->action("view_properties"), menu);
added = addActionToMenu(ac->action("split_view"), menu);
added |= addActionToMenu(ac->action("reload"), menu);
added |= addActionToMenu(ac->action("view_properties"), menu);
if (added) {
menu->addSeparator();
}

1
dolphin/src/panels/places/placespanel.cpp
View file

@ -334,7 +334,6 @@ void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
}
const PlacesItem* destItem = m_model->placesItem(index);
const PlacesItem::GroupType group = destItem->groupType();
if (m_model->storageSetupNeeded(index)) {
connect(m_model, SIGNAL(storageSetupDone(int,bool)),

1
kcontrol/autostart/autostart.cpp
View file

@ -201,7 +201,6 @@ void Autostart::load()
else
{
ScriptStartItem *item = new ScriptStartItem( fi.absoluteFilePath(), m_scriptItem,this );
int typeOfStartup = m_paths.indexOf((item->fileName().directory()+'/') );
if ( fi.isSymLink() ) {
QString link = fi.readLink();
addItem(item, filename, link );

35
kcontrol/keyboard/keyboard_hardware.cpp
View file

@ -42,21 +42,28 @@ extern "C" void numlockx_change_numlock_state(Display* dpy, int state);
static
void set_repeatrate(int delay, double rate)
{
if( !X11Helper::xkbSupported(NULL) ) {
kError() << "Failed to set keyboard repeat rate: xkb is not supported";
return;
}
if( !X11Helper::xkbSupported(NULL) ) {
kError() << "Failed to set keyboard repeat rate: xkb is not supported";
return;
}
XkbDescPtr xkb = XkbAllocKeyboard();
if (xkb) {
Display* dpy = QX11Info::display();
int res = XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
xkb->ctrls->repeat_delay = delay;
xkb->ctrls->repeat_interval = (int)floor(1000/rate + 0.5);
res = XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
XkbFreeKeyboard(xkb, 0, true);
return;
}
XkbDescPtr xkb = XkbAllocKeyboard();
if (xkb) {
Display* dpy = QX11Info::display();
int res = XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
if (res != True) {
kError() << "Failed to get keyboard repeat controls";
XkbFreeKeyboard(xkb, 0, true);
return;
}
xkb->ctrls->repeat_delay = delay;
xkb->ctrls->repeat_interval = (int)floor(1000/rate + 0.5);
res = XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
if (res != True) {
kError() << "Failed to set keyboard repeat controls";
}
XkbFreeKeyboard(xkb, 0, true);
}
}
static

4
kcontrol/kio/kproxydlg.cpp
View file

@ -308,7 +308,6 @@ void KProxyDialog::load()
void KProxyDialog::save()
{
const KProtocolManager::ProxyType lastProxyType = KProtocolManager::proxyType();
KProtocolManager::ProxyType proxyType = KProtocolManager::NoProxy;
if (mUi.manualProxyRadioButton->isChecked()) {
proxyType = KProtocolManager::ManualProxy;
@ -325,8 +324,7 @@ void KProxyDialog::save()
mProxyMap[QL1S("FtpProxy")] = mUi.systemProxyFtpEdit->text();
mProxyMap[QL1S("SocksProxy")] = mUi.systemProxySocksEdit->text();
mProxyMap[QL1S("NoProxy")] = mUi.systemNoProxyEdit->text();
}
else {
} else {
mProxyMap[QL1S("HttpProxy")] = mProxyMap.take(mUi.systemProxyHttpEdit->objectName());
mProxyMap[QL1S("HttpsProxy")] = mProxyMap.take(mUi.systemProxyHttpsEdit->objectName());
mProxyMap[QL1S("FtpProxy")] = mProxyMap.take(mUi.systemProxyFtpEdit->objectName());

1
khotkeys/kcm_hotkeys/hotkeys_model.cpp
View file

@ -602,6 +602,7 @@ bool KHotkeysModel::removeRows( int row, int count, const QModelIndex &parent )
list = _actions;
}
Q_ASSERT(list);
Q_UNUSED(list);
KHotKeys::ActionDataBase *action = indexToActionDataBase(index(row,0,parent));

4
khotkeys/libkhotkeysprivate/conditions/conditions_visitor.cpp
View file

@ -21,13 +21,11 @@
namespace KHotKeys {
ConditionsVisitor::ConditionsVisitor( bool recurse )
: _recurse(recurse)
ConditionsVisitor::ConditionsVisitor()
{}
ConditionsVisitor::~ConditionsVisitor()
{}
} // namespace KHotKeys

4
khotkeys/libkhotkeysprivate/conditions/conditions_visitor.h
View file

@ -33,7 +33,7 @@ class KDE_EXPORT ConditionsVisitor
{
public:
ConditionsVisitor( bool recurse = true );
ConditionsVisitor();
virtual ~ ConditionsVisitor();
virtual void visitCondition( Condition *condition ) = 0;
@ -42,8 +42,6 @@ public:
private:
bool _recurse;
}; // class ConditionsVisitor

21
kinfocenter/Modules/pci/kpci.cpp
View file

@ -72,6 +72,7 @@ static QTreeWidgetItem* addDeviceClass(QTreeWidgetItem *parent, QTreeWidgetItem
localAfter=create(after, i18n("Primary programmable indicator"), (info->cooked.devProgIface.devProgIface_bits.progPriProgInd ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Primary operating mode"), (info->cooked.devProgIface.devProgIface_bits.progPriOperMode ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
}//if
Q_UNUSED(localAfter);
return after;
}//addDeviceClass
@ -155,6 +156,7 @@ static QTreeWidgetItem* addInterrupt(QTreeWidgetItem *parent, QTreeWidgetItem *a
localAfter=create(after, i18n("IRQ"), value.sprintf("%i", irq));
localAfter=create(after, i18n("Pin"), value.sprintf("%c", (pin==0 ? '?' : 'A'-1+pin)));
}//if
Q_UNUSED(localAfter);
return after;
}//addInterrupt
@ -173,6 +175,7 @@ static QTreeWidgetItem* addControl(QTreeWidgetItem *parent, QTreeWidgetItem *aft
localAfter=create(after, i18n("System error"), (info->cooked.command.command_bits.comSerr ? i18nc(strCtxt, strEnabled) : i18nc(strCtxt, strDisabled)));
localAfter=create(after, i18n("Back-to-back writes"), (info->cooked.command.command_bits.comFastBack ? i18nc(strCtxt, strEnabled) : i18nc(strCtxt, strDisabled)));
localAfter=create(after, i18n("Interrupt"), (info->cooked.command.command_bits.comInterrupt ? i18nc(strCtxt, strDisabled) : i18nc(strCtxt, strEnabled))); //reverse order is intentional
Q_UNUSED(localAfter);
return after;
}//addControl
@ -192,6 +195,7 @@ static QTreeWidgetItem* addStatus(QTreeWidgetItem *parent, QTreeWidgetItem *afte
localAfter=create(after, i18n("Received master abort"), (info->cooked.status.status_bits.statRecMasterAbort ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Signaled system error"), (info->cooked.status.status_bits.statSigSystemError ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Parity error"), (info->cooked.status.status_bits.statDetectedParity ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
Q_UNUSED(localAfter);
return after;
}//addStatus
@ -213,6 +217,7 @@ static QTreeWidgetItem* addLatency(QTreeWidgetItem *parent, QTreeWidgetItem *aft
localAfter=create(after, i18n("MAX_LAT"), value.sprintf("%u ns (0x%02X)", info->cooked.header.header0.maxLat*250, info->cooked.header.header0.maxLat));
}//else
}//if
Q_UNUSED(localAfter);
return after;
}//addLatency
@ -222,6 +227,7 @@ static QTreeWidgetItem* addHeaderType(QTreeWidgetItem *parent, QTreeWidgetItem *
after=create(parent, i18n("Header"),value.sprintf("0x%02X",info->cooked.headerType.headerTypeFull));
localAfter=create(after, i18n("Type"),getNameById(headerType,info->cooked.headerType.headerType_bits.headerType)+value.sprintf(" (0x%02X)",info->cooked.headerType.headerType_bits.headerType));
localAfter=create(after, i18n("Multifunctional"),(info->cooked.headerType.headerType_bits.multifunctional?i18nc(strCtxt, strYes):i18nc(strCtxt, strNo)));
Q_UNUSED(localAfter);
return after;
}//addHeaderType
@ -234,6 +240,7 @@ static QTreeWidgetItem* addBist(QTreeWidgetItem *parent, QTreeWidgetItem *after,
localAfter=create(after, i18n("BIST Start"), (info->cooked.bist.bist_bits.bistStart ? i18nc(strCtxt, strYes) : i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Completion code"), value.sprintf("0x%01X", info->cooked.bist.bist_bits.bistCode));
}//if
Q_UNUSED(localAfter);
return after;
}//addBist
@ -317,6 +324,7 @@ static QTreeWidgetItem* addMapping(QTreeWidgetItem *parent, QTreeWidgetItem *aft
}//else
}//else
}//for
Q_UNUSED(localAfter);
return after;
}//addMapping
@ -337,6 +345,7 @@ static QTreeWidgetItem* addBus(QTreeWidgetItem *parent, QTreeWidgetItem *after,
localAfter=create(after, i18n("Subordinate bus number"), value.sprintf("0x%02X", info->cooked.header.header2.cbSubordinateBus));
localAfter=create(after, i18n("CardBus latency timer"), value.sprintf("0x%02X", info->cooked.header.header2.cbLatencyTimer));
}//elif
Q_UNUSED(localAfter);
return after;
}//addBus
@ -373,6 +382,7 @@ static QTreeWidgetItem* addSecStatus(QTreeWidgetItem *parent, QTreeWidgetItem *a
localAfter=create(after, i18n("Signaled system error"),(info->cooked.header.header2.cbSecStatus.cbSecStatus_bits.cbSecStatSigSystemError?i18nc(strCtxt, strYes):i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Parity error"),(info->cooked.header.header2.cbSecStatus.cbSecStatus_bits.cbSecStatDetectedParity?i18nc(strCtxt, strYes):i18nc(strCtxt, strNo)));
}//elif
Q_UNUSED(localAfter);
return after;
}//addSecStatus
@ -404,6 +414,7 @@ static QTreeWidgetItem* addBridgeBehind(QTreeWidgetItem *parent, QTreeWidgetItem
localAfter=create(after, i18n("Limit"),value.sprintf("0x%0x8X%08X",info->cooked.header.header1.prefLimitUpper32,(info->cooked.header.header1.prefMemoryLimit<<16)|0x0FFFFF));
}//else
}//if
Q_UNUSED(localAfter);
return after;
}//addBridgeBechind
@ -424,6 +435,7 @@ static QTreeWidgetItem* addBridgeControl(QTreeWidgetItem *parent, QTreeWidgetIte
localAfter=create(after, i18n("Discard timer error"),(info->cooked.header.header1.bridgeControl.bridgeControl_bits.bridgeControlDisTimStat?i18nc(strCtxt, strYes):i18nc(strCtxt, strNo)));
localAfter=create(after, i18n("Discard timer system error"),(info->cooked.header.header1.bridgeControl.bridgeControl_bits.bridgeControlDisTimeSerr?i18nc(strCtxt, strEnabled):i18nc(strCtxt, strDisabled)));
}//if
Q_UNUSED(localAfter);
return after;
}//addBridgeControl
@ -442,6 +454,7 @@ static QTreeWidgetItem* addRom(QTreeWidgetItem *parent, QTreeWidgetItem *after,
localAfter=addSize(after, localAfter, PCIDevice->rom_size);
}//else
}//if
Q_UNUSED(localAfter);
return after;
}//addRom
@ -474,6 +487,7 @@ static QTreeWidgetItem* addCardbusResource(QTreeWidgetItem *parent, QTreeWidgetI
}//for
after=create(parent, i18n("16-bit legacy interface ports"),value.sprintf("0x%04X",info->cooked.header.header2.cbLegacyModeBase));
}//if
Q_UNUSED(localAfter);
return after;
}//addCardbusResource
@ -492,6 +506,7 @@ static QTreeWidgetItem* addCardbusControl(QTreeWidgetItem *parent, QTreeWidgetIt
localAfter=create(after, i18n("Window 1 prefetchable memory"),(info->cooked.header.header2.cbControl.cbControl_bits.cbControlPref1?i18nc(strCtxt, strEnabled):i18nc(strCtxt, strDisabled)));
localAfter=create(after, i18n("Post writes"),(info->cooked.header.header2.cbControl.cbControl_bits.cbControlPostWrites?i18nc(strCtxt, strEnabled):i18nc(strCtxt, strDisabled)));
}//if
Q_UNUSED(localAfter);
return after;
}//addCardbusControl
@ -510,6 +525,7 @@ static QTreeWidgetItem* addRaw(QTreeWidgetItem *parent, QTreeWidgetItem *after,
}//for
localAfter=create(after, temp.sprintf("0x%02X:",i*16),value);
}//for
Q_UNUSED(localAfter);
return after;
}//addRaw
@ -548,6 +564,8 @@ static QTreeWidgetItem* addCapsPm(QTreeWidgetItem *parent, QTreeWidgetItem *afte
}//if
}//if
after=create(parent, i18n("Data"),value.sprintf("0x%02X",infoPm.cooked.data));
Q_UNUSED(localAfter);
Q_UNUSED(subLocalAfter);
return after;
}//addCapsPm
@ -599,6 +617,7 @@ static QTreeWidgetItem* addCapsAgp(QTreeWidgetItem *parent, QTreeWidgetItem *aft
}//if
localAfter=create(after, i18n("Maximum number of AGP command"),value.sprintf("%i (0x%02X)",infoAgp.cooked.config.config_bits1.configReq+1,infoAgp.cooked.config.config_bits1.configReq));
}//if
Q_UNUSED(localAfter);
return after;
}//addCapsAgp
@ -648,6 +667,7 @@ static QTreeWidgetItem* addCapsMsi(QTreeWidgetItem *parent, QTreeWidgetItem *aft
}//else
}//if
}//if
Q_UNUSED(localAfter);
return after;
}//addCapsMsi
@ -716,6 +736,7 @@ static QTreeWidgetItem* addCaps(QTreeWidgetItem *parent, QTreeWidgetItem *after,
after=create(parent, i18n("Capabilities"),i18n("0x00 (None)"));
}//else
}//if
Q_UNUSED(localAfter);
return after;
}//addCaps

2
kioslave/floppy/kio_floppy.cpp
View file

@ -981,7 +981,6 @@ void FloppyProtocol::get( const KUrl& url )
clearBuffers();
int result;
int bytesRead(0);
bool loopFinished(false);
bool errorOccured(false);
do
@ -997,7 +996,6 @@ void FloppyProtocol::get( const KUrl& url )
if (readStdout()>0)
{
kDebug(7101)<<"Floppy::get(): m_stdoutSize:"<<m_stdoutSize;
bytesRead+=m_stdoutSize;
data( QByteArray::fromRawData(m_stdoutBuffer, m_stdoutSize) );
}
else

5
krunner/interfaces/quicksand/qs_dialog.cpp
View file

@ -184,11 +184,6 @@ void QsDialog::display(const QString &term)
adjustSize();
m_matchView->setFocus();
int screen = 0;
if (QApplication::desktop()->screenCount() > 1) {
screen = QApplication::desktop()->screenNumber(QCursor::pos());
}
//positionOnScreen will call QWidget::show anyways so we don't need to call it here
positionOnScreen();
KWindowSystem::forceActiveWindow(winId());

1
krunner/krunnerdialog.cpp
View file

@ -283,7 +283,6 @@ void KRunnerDialog::configCompleted()
void KRunnerDialog::themeUpdated()
{
bool useShadowsForMargins = false;
if (m_floating) {
// recalc the contents margins
m_background->blockSignals(true);

2
ksplash/ksplashx/qimage.cpp
View file

@ -4492,7 +4492,7 @@ void bitBlt( QImage* dst, int dx, int dy, const QImage* src,
// Now assume palette can be ignored
if ( dst->depth() != src->depth() ) {
if ( sw == src->width() && sh == src->height() || dst->depth()==32 ) {
if ( (sw == src->width() && sh == src->height()) || dst->depth()==32 ) {
QImage srcconv = src->convertDepth( dst->depth(), conversion_flags );
bitBlt( dst, dx, dy, &srcconv, sx, sy, sw, sh, conversion_flags );
} else {

2
ksysguard/ksysguardd/Linux/diskstats.c
View file

@ -38,7 +38,7 @@
#include "diskstats.h"
#define DISKSTATSBUFSIZE (32 * 1024)
#define DISKDEVNAMELEN 20
#define DISKDEVNAMELEN 21
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)

1
kwin/scene_xrender.cpp
View file

@ -305,7 +305,6 @@ QRect SceneXrender::Window::temp_visibleRect;
SceneXrender::Window::Window(Toplevel* c)
: Scene::Window(c)
, format(findFormatForVisual(c->visual()->visualid))
, alpha_cached_opacity(0.0)
{
}

1
kwin/scene_xrender.h
View file

@ -92,7 +92,6 @@ private:
void prepareTempPixmap();
void setPictureFilter(xcb_render_picture_t pic, ImageFilterType filter);
xcb_render_pictformat_t format;
double alpha_cached_opacity;
QRegion transformed_shape;
static QRect temp_visibleRect;
static XRenderPicture *s_tempPicture;

4
libs/konq/tests/favicontest.cpp
View file

@ -88,9 +88,9 @@ static void cleanCache()
FavIconTest::FavIconTest()
: QObject(),
m_favIconModule("org.kde.kded", "/modules/favicons", QDBusConnection::sessionBus()),
m_iconChanged(false),
m_isHost(false)
m_isHost(false),
m_favIconModule("org.kde.kded", "/modules/favicons", QDBusConnection::sessionBus())
{
connect(
&m_favIconModule, SIGNAL(iconChanged(bool,QString,QString)),

1
libs/plasmaclock/calendartable.cpp
View file

@ -743,7 +743,6 @@ void CalendarTable::paint(QPainter *p, const QStyleOptionGraphicsItem *option, Q
CalendarTable::CellTypes type(CalendarTable::NoType);
// get cell info
const int cellDay = calendar()->day(cellDate);
const int julian = cellDate.toJulianDay();
// check what kind of cell we are
if (calendar()->month(cellDate) != d->selectedMonth) {

2
libs/taskmanager/taskactions.cpp
View file

@ -520,7 +520,7 @@ void AppSelectorDialog::launcherSelected()
}
NewInstanceActionImpl::NewInstanceActionImpl(QObject *parent, AbstractGroupableItem *item)
: QAction(parent), m_abstractItem(item)
: QAction(parent)
{
if (LauncherItemType == item->itemType()) {
setVisible(false);

1
libs/taskmanager/taskactions_p.h
View file

@ -97,7 +97,6 @@ private Q_SLOTS:
void launchNewInstance();
private:
AbstractGroupableItem *m_abstractItem;
KUrl m_url;
};

12
plasma/applets/folderview/tooltipwidget.cpp
View file

@ -73,18 +73,6 @@ void ToolTipWidget::updateToolTip(const QModelIndex &index, const QRectF &rect)
Plasma::ToolTipManager::self()->show(this);
}
static qreal convertToReal(const QString &string)
{
const int pos = string.indexOf('/');
if (pos != -1) {
const int left = string.left(pos).toInt();
const int right = string.mid(pos + 1).toInt();
return right > 0 ? qreal(left) / qreal(right) : 0.0;
}
return qreal(string.toInt());
}
QString ToolTipWidget::metaInfo() const
{
const QString mimetype = m_item.mimetype();

5
plasma/dataengines/hotplug/hotplugjob.h
View file

@ -28,13 +28,11 @@ class HotplugJob : public Plasma::ServiceJob
Q_OBJECT
public:
HotplugJob (HotplugEngine* engine,
const QString& destination,
HotplugJob (const QString& destination,
const QString& operation,
QMap<QString, QVariant>& parameters,
QObject* parent = 0)
: ServiceJob (destination, operation, parameters, parent),
m_engine (engine),
m_dest (destination)
{
}
@ -42,7 +40,6 @@ public:
void start();
private:
HotplugEngine* m_engine;
QString m_dest;
};

5
plasma/dataengines/hotplug/hotplugservice.cpp
View file

@ -21,8 +21,7 @@
#include "hotplugengine.h"
HotplugService::HotplugService (HotplugEngine* parent, const QString& source)
: Plasma::Service (parent),
m_engine(parent)
: Plasma::Service (parent)
{
setName ("hotplug");
setDestination (source);
@ -31,7 +30,7 @@ HotplugService::HotplugService (HotplugEngine* parent, const QString& source)
Plasma::ServiceJob* HotplugService::createJob (const QString& operation,
QMap <QString, QVariant>& parameters)
{
return new HotplugJob (m_engine, destination(), operation, parameters, this);
return new HotplugJob (destination(), operation, parameters, this);
}
#include "moc_hotplugservice.cpp"

1
plasma/dataengines/hotplug/hotplugservice.h
View file

@ -35,7 +35,6 @@ protected:
QMap<QString, QVariant>& parameters);
private:
HotplugEngine *m_engine;
QString m_dest;
};