From 86996600853e0c6ee477469391f0e8b75a37e998 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 19 Aug 2015 05:07:27 +0300 Subject: [PATCH] generic: misc cleanups --- kdecore/sycoca/ksycocafactory.cpp | 3 ++- kdeui/kernel/kstyle.cpp | 8 -------- kinit/config-kdeinit.h.cmake | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kdecore/sycoca/ksycocafactory.cpp b/kdecore/sycoca/ksycocafactory.cpp index 48e1536d..f598aff3 100644 --- a/kdecore/sycoca/ksycocafactory.cpp +++ b/kdecore/sycoca/ksycocafactory.cpp @@ -61,9 +61,10 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) d->m_endEntryOffset = i; QDataStream* str = stream(); + int saveOffset = str->device()->pos(); // Init index tables d->m_sycocaDict = new KSycocaDict(str, d->m_sycocaDictOffset); - str->device()->seek(str->device()->pos()); + saveOffset = str->device()->seek(saveOffset); } else { // We are in kbuildsycoca4 -- build new database! m_entryDict = new KSycocaEntryDict; diff --git a/kdeui/kernel/kstyle.cpp b/kdeui/kernel/kstyle.cpp index 50d4a5bb..46b78042 100644 --- a/kdeui/kernel/kstyle.cpp +++ b/kdeui/kernel/kstyle.cpp @@ -272,14 +272,6 @@ KStyle::KStyle() : clickedLabel(0), d(new KStylePrivate) KStyle::~KStyle() { - // this is just for stupid msvc compiler to force the creation of - // DoubleButtonOption::defaultOption() inside kstyle lib - // hope the optimizer won't throw it away - const DoubleButtonOption* bOpt = extractOption(NULL); - Q_UNUSED(bOpt) -#ifdef __GNUC__ -#warning "mem leak: need to delete bOpt" -#endif delete d; } diff --git a/kinit/config-kdeinit.h.cmake b/kinit/config-kdeinit.h.cmake index 34e76bd9..53e2061c 100644 --- a/kinit/config-kdeinit.h.cmake +++ b/kinit/config-kdeinit.h.cmake @@ -4,3 +4,4 @@ #cmakedefine HAVE___PROGNAME_FULL 1 #cmakedefine HAVE_SYS_PSTAT_H 1 #cmakedefine HAVE_PSTAT 1 +#cmakedefine HAVE_SETPROCTITLE 1