mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: compiler warning fixes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
71151f9f6f
commit
59f92c0970
7 changed files with 8 additions and 48 deletions
|
@ -75,7 +75,6 @@ protected:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool bDirty:1;
|
bool bDirty:1;
|
||||||
bool bLocaleInitialized:1;
|
|
||||||
bool bReadDefaults:1;
|
bool bReadDefaults:1;
|
||||||
bool bFileImmutable:1;
|
bool bFileImmutable:1;
|
||||||
bool bForceGlobal:1;
|
bool bForceGlobal:1;
|
||||||
|
|
|
@ -234,7 +234,6 @@ void KShortcutsEditor::addCollection(KActionCollection *collection, const QStrin
|
||||||
topitem->setText(0, collectionname);
|
topitem->setText(0, collectionname);
|
||||||
topitem->setIcon(0, KIcon(collectionicon));
|
topitem->setIcon(0, KIcon(collectionicon));
|
||||||
}
|
}
|
||||||
int rowcounter = 0;
|
|
||||||
const bool addlocal = (d->actiontypes & KShortcutsEditor::LocalAction);
|
const bool addlocal = (d->actiontypes & KShortcutsEditor::LocalAction);
|
||||||
const bool addglobal = (d->actiontypes & KShortcutsEditor::GlobalAction);
|
const bool addglobal = (d->actiontypes & KShortcutsEditor::GlobalAction);
|
||||||
foreach (QAction *action, collection->actions()) {
|
foreach (QAction *action, collection->actions()) {
|
||||||
|
@ -304,10 +303,6 @@ void KShortcutsEditor::addCollection(KActionCollection *collection, const QStrin
|
||||||
d->treewidget->setItemWidget(actionitem, 2, globalkswidget);
|
d->treewidget->setItemWidget(actionitem, 2, globalkswidget);
|
||||||
d->keysequencewidgets.append(globalkswidget);
|
d->keysequencewidgets.append(globalkswidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (actionitem) {
|
|
||||||
rowcounter++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
topitem->sortChildren(0, Qt::AscendingOrder);
|
topitem->sortChildren(0, Qt::AscendingOrder);
|
||||||
d->treewidget->addTopLevelItem(topitem);
|
d->treewidget->addTopLevelItem(topitem);
|
||||||
|
@ -321,8 +316,6 @@ void KShortcutsEditor::addCollection(KActionCollection *collection, const QStrin
|
||||||
int globalcounter = 0;
|
int globalcounter = 0;
|
||||||
foreach (KKeySequenceWidget *kswidget, d->keysequencewidgets) {
|
foreach (KKeySequenceWidget *kswidget, d->keysequencewidgets) {
|
||||||
kswidget->setCheckActionCollections(d->actioncollections.keys());
|
kswidget->setCheckActionCollections(d->actioncollections.keys());
|
||||||
QAction* action = qvariant_cast<QAction*>(kswidget->property("_k_action"));
|
|
||||||
Q_ASSERT(action != nullptr);
|
|
||||||
const bool global = kswidget->property("_k_global").toBool();
|
const bool global = kswidget->property("_k_global").toBool();
|
||||||
if (global) {
|
if (global) {
|
||||||
globalcounter++;
|
globalcounter++;
|
||||||
|
|
|
@ -197,8 +197,8 @@ KKeySequenceWidgetPrivate::KKeySequenceWidgetPrivate(KKeySequenceWidget *q)
|
||||||
modifierKeys(0),
|
modifierKeys(0),
|
||||||
isRecording(false),
|
isRecording(false),
|
||||||
multiKeyShortcutsAllowed(true),
|
multiKeyShortcutsAllowed(true),
|
||||||
associatedAction(nullptr),
|
checkAgainstShortcutTypes(KKeySequenceWidget::LocalShortcuts & KKeySequenceWidget::GlobalShortcuts),
|
||||||
checkAgainstShortcutTypes(KKeySequenceWidget::LocalShortcuts & KKeySequenceWidget::GlobalShortcuts)
|
associatedAction(nullptr)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,8 @@ KMessageWidgetPrivate::KMessageWidgetPrivate(KMessageWidget *_messagewidget)
|
||||||
iconwidget(nullptr),
|
iconwidget(nullptr),
|
||||||
textlabel(nullptr),
|
textlabel(nullptr),
|
||||||
closebutton(nullptr),
|
closebutton(nullptr),
|
||||||
buttonslayout(nullptr),
|
messagetype(KMessageWidget::Information),
|
||||||
messagetype(KMessageWidget::Information)
|
buttonslayout(nullptr)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -285,6 +285,9 @@ bool KMessageWidget::event(QEvent *event)
|
||||||
d->updateLayout();
|
d->updateLayout();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
default: {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,39 +41,6 @@ static const char* undoStateToString(UndoState state) {
|
||||||
return s_undoStateToString[state];
|
return s_undoStateToString[state];
|
||||||
}
|
}
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
static QDataStream &operator<<(QDataStream &stream, const KIO::BasicOperation &op)
|
|
||||||
{
|
|
||||||
stream << op.m_valid << (qint8)op.m_type << op.m_renamed
|
|
||||||
<< op.m_src << op.m_dst << op.m_target << (qint64)op.m_mtime;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
static QDataStream &operator>>(QDataStream &stream, BasicOperation &op)
|
|
||||||
{
|
|
||||||
qint8 type;
|
|
||||||
qint64 mtime;
|
|
||||||
stream >> op.m_valid >> type >> op.m_renamed
|
|
||||||
>> op.m_src >> op.m_dst >> op.m_target >> mtime;
|
|
||||||
op.m_type = static_cast<BasicOperation::Type>(type);
|
|
||||||
op.m_mtime = mtime;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
static QDataStream &operator<<(QDataStream &stream, const UndoCommand &cmd)
|
|
||||||
{
|
|
||||||
stream << cmd.m_valid << (qint8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
static QDataStream &operator>>(QDataStream &stream, UndoCommand &cmd)
|
|
||||||
{
|
|
||||||
qint8 type;
|
|
||||||
stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst;
|
|
||||||
cmd.m_type = static_cast<FileUndoManager::CommandType>(type);
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* checklist:
|
* checklist:
|
||||||
* copy dir -> overwrite -> works
|
* copy dir -> overwrite -> works
|
||||||
|
|
|
@ -308,8 +308,6 @@ void SimpleJob::setRedirectionHandlingEnabled(bool handle)
|
||||||
|
|
||||||
SimpleJob::~SimpleJob()
|
SimpleJob::~SimpleJob()
|
||||||
{
|
{
|
||||||
Q_D(SimpleJob);
|
|
||||||
kDebug(7007) << "Killing job" << this << "in destructor!" << kBacktrace();
|
|
||||||
Scheduler::self()->cancelJob(this);
|
Scheduler::self()->cancelJob(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,7 @@ namespace KIO {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a list of all supported MIME types. The list can
|
* Returns a list of all supported MIME types. The list can
|
||||||
* contain entries like text/* (i.e. globs).
|
* contain glob entries.
|
||||||
* @return the list of mime types
|
* @return the list of mime types
|
||||||
*/
|
*/
|
||||||
static QStringList supportedMimeTypes();
|
static QStringList supportedMimeTypes();
|
||||||
|
|
Loading…
Add table
Reference in a new issue