From bf501e6429523c18e7c30cd9c871af94b9942850 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 23 Apr 2015 14:50:12 +0000 Subject: [PATCH] generic: remove redudant virtual_hook definitions --- dnssd/dummy-publicservice.cpp | 4 ---- dnssd/dummy-remoteservice.cpp | 6 ----- dnssd/dummy-servicebrowser.cpp | 3 --- dnssd/publicservice.h | 3 --- dnssd/remoteservice.h | 2 -- dnssd/servicebase.cpp | 4 ---- dnssd/servicebase.h | 1 - dnssd/servicebrowser.h | 3 --- .../kregexpeditor/kregexpeditorinterface.h | 4 ++-- kdecore/compression/kfilterbase.cpp | 2 -- kdecore/compression/kfilterbase.h | 6 +---- kdecore/config/kconfig.cpp | 4 ---- kdecore/config/kconfig.h | 5 ---- kdecore/config/kconfigbase.cpp | 2 -- kdecore/config/kconfigbase.h | 5 ---- kdecore/config/kdesktopfile.cpp | 3 --- kdecore/config/kdesktopfile.h | 5 ---- kdecore/io/kar.cpp | 2 -- kdecore/io/kar.h | 2 -- kdecore/io/karchive.cpp | 11 --------- kdecore/io/karchive.h | 8 ------- kdecore/io/ktar.cpp | 3 --- kdecore/io/ktar.h | 4 ---- kdecore/io/kzip.cpp | 5 ---- kdecore/io/kzip.h | 3 --- kdecore/kernel/kcomponentdata.cpp | 2 -- kdecore/kernel/kcomponentdata.h | 3 --- kdecore/services/kservicefactory.cpp | 3 --- kdecore/services/kservicefactory.h | 2 -- kdecore/services/kservicegroupfactory.cpp | 2 -- kdecore/services/kservicegroupfactory.h | 2 -- kdecore/services/kservicetypefactory.cpp | 2 -- kdecore/services/kservicetypefactory.h | 2 -- kdecore/sycoca/kprotocolinfofactory.cpp | 3 --- kdecore/sycoca/kprotocolinfofactory.h | 5 ---- kdecore/sycoca/ksycocafactory.cpp | 3 --- kdecore/sycoca/ksycocafactory.h | 6 ----- kdesu/process.cpp | 3 --- kdesu/process.h | 3 --- kdesu/ssh.cpp | 3 --- kdesu/ssh.h | 2 -- kdesu/stub.cpp | 3 --- kdesu/stub.h | 2 -- kdesu/su.cpp | 3 --- kdesu/su.h | 2 -- kdeui/icons/kiconengine.cpp | 13 ----------- kdeui/icons/kiconengine_p.h | 2 -- kdeui/kernel/ksessionmanager.cpp | 3 --- kdeui/kernel/ksessionmanager.h | 6 ----- kdeui/util/kcompletion.h | 6 ----- kdeui/util/kcompletionbase.cpp | 2 -- kdeui/util/kpixmapprovider.cpp | 2 -- kdeui/util/kpixmapprovider.h | 5 ---- kdeui/util/kwallet.cpp | 4 ---- kdeui/util/kwallet.h | 5 ---- kdeui/windowmanagement/netwm.cpp | 6 ----- kdeui/windowmanagement/netwm.h | 10 -------- kdeui/xmlgui/kxmlguibuilder.cpp | 2 -- kdeui/xmlgui/kxmlguibuilder.h | 2 -- kdeui/xmlgui/kxmlguiclient.cpp | 2 -- kdeui/xmlgui/kxmlguiclient.h | 3 --- kfile/kfilewidget.cpp | 23 ------------------- kfile/kfilewidget.h | 3 --- kio/kfile/kabstractfilewidget.h | 5 ---- kio/kio/fileundomanager.cpp | 4 ---- kio/kio/fileundomanager.h | 5 ---- kio/kio/kacl.cpp | 3 --- kio/kio/kacl.h | 2 -- kio/kio/kremoteencoding.cpp | 3 --- kio/kio/kremoteencoding.h | 3 --- kio/kio/kurlpixmapprovider.cpp | 2 -- kio/kio/kurlpixmapprovider.h | 2 -- kio/kio/slavebase.cpp | 4 ---- kio/kio/slavebase.h | 1 - kio/kio/tcpslavebase.cpp | 8 ------- kio/kio/tcpslavebase.h | 3 --- kross/core/object.cpp | 5 ---- kross/core/object.h | 6 ----- 78 files changed, 3 insertions(+), 308 deletions(-) diff --git a/dnssd/dummy-publicservice.cpp b/dnssd/dummy-publicservice.cpp index d3135a41..d1b90793 100644 --- a/dnssd/dummy-publicservice.cpp +++ b/dnssd/dummy-publicservice.cpp @@ -89,10 +89,6 @@ void PublicService::publishAsync() emit published(false); } -void PublicService::virtual_hook(int, void*) -{ -} - } #include "moc_publicservice.cpp" diff --git a/dnssd/dummy-remoteservice.cpp b/dnssd/dummy-remoteservice.cpp index 22eb623e..84c6e934 100644 --- a/dnssd/dummy-remoteservice.cpp +++ b/dnssd/dummy-remoteservice.cpp @@ -50,12 +50,6 @@ bool RemoteService::isResolved() const } -void RemoteService::virtual_hook(int, void*) -{ - // BASE::virtual_hook(int, void*); -} - - } #include "moc_remoteservice.cpp" diff --git a/dnssd/dummy-servicebrowser.cpp b/dnssd/dummy-servicebrowser.cpp index 888c5858..38e51aae 100644 --- a/dnssd/dummy-servicebrowser.cpp +++ b/dnssd/dummy-servicebrowser.cpp @@ -53,9 +53,6 @@ QList ServiceBrowser::services() const return QList(); } -void ServiceBrowser::virtual_hook(int, void*) -{} - QHostAddress ServiceBrowser::resolveHostName(const QString &hostname) { Q_UNUSED(hostname); diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h index 6232f1b7..8ca8e855 100644 --- a/dnssd/publicservice.h +++ b/dnssd/publicservice.h @@ -225,9 +225,6 @@ Q_SIGNALS: private: friend class PublicServicePrivate; - -protected: - virtual void virtual_hook(int, void*); }; diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h index 12d7e5d5..20c2b243 100644 --- a/dnssd/remoteservice.h +++ b/dnssd/remoteservice.h @@ -126,8 +126,6 @@ Q_SIGNALS: */ void resolved(bool successful); -protected: - virtual void virtual_hook(int id, void *data); private: friend class RemoteServicePrivate; diff --git a/dnssd/servicebase.cpp b/dnssd/servicebase.cpp index 9ddfdf5e..7652ab22 100644 --- a/dnssd/servicebase.cpp +++ b/dnssd/servicebase.cpp @@ -80,10 +80,6 @@ bool ServiceBase::operator!=(const ServiceBase& o) const return !(*this == o); } -void ServiceBase::virtual_hook(int, void*) -{} - - bool domainIsLocal(const QString& domain) { return domain.section('.',-1,-1).toLower()==QLatin1String("local"); diff --git a/dnssd/servicebase.h b/dnssd/servicebase.h index 6ae9d20e..5c1924a3 100644 --- a/dnssd/servicebase.h +++ b/dnssd/servicebase.h @@ -185,7 +185,6 @@ public: protected: ServiceBase(ServiceBasePrivate* const d); - virtual void virtual_hook(int, void*); ServiceBasePrivate* const d; }; diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h index 0a28e423..c38fe896 100644 --- a/dnssd/servicebrowser.h +++ b/dnssd/servicebrowser.h @@ -279,9 +279,6 @@ Q_SIGNALS: */ void finished(); -protected: - virtual void virtual_hook(int, void*); - private: friend class ServiceBrowserPrivate; ServiceBrowserPrivate* const d; diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index 4e8d73bb..c7e07292 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -95,7 +95,7 @@ class KRegExpEditorInterface { public: /** - * returns the regular expression of the editor in Qt3 QRegExp + * returns the regular expression of the editor in Qt QRegExp * syntax. Note, there is also a 'regexp' Qt property available. */ virtual QString regExp() const = 0; @@ -127,7 +127,7 @@ public: // These are public slots: in classes that implement the interface. /** - * Set the regular expression for the editor. The syntax must be Qt3 + * Set the regular expression for the editor. The syntax must be Qt * QRegExp syntax. */ virtual void setRegExp( const QString ®exp ) = 0; diff --git a/kdecore/compression/kfilterbase.cpp b/kdecore/compression/kfilterbase.cpp index b37284f7..c5e194c1 100644 --- a/kdecore/compression/kfilterbase.cpp +++ b/kdecore/compression/kfilterbase.cpp @@ -165,5 +165,3 @@ KFilterBase::FilterFlags KFilterBase::filterFlags() const return d->m_flags; } -void KFilterBase::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } diff --git a/kdecore/compression/kfilterbase.h b/kdecore/compression/kfilterbase.h index 8cb585af..860ec4a8 100644 --- a/kdecore/compression/kfilterbase.h +++ b/kdecore/compression/kfilterbase.h @@ -119,11 +119,7 @@ public: protected: // TODO KDE5: move to d pointer QIODevice * m_dev; bool m_bAutoDel; -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); + private: Q_DISABLE_COPY( KFilterBase ) class Private; diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp index 375f06c1..f827053c 100644 --- a/kdecore/config/kconfig.cpp +++ b/kdecore/config/kconfig.cpp @@ -874,8 +874,4 @@ QString KConfigPrivate::lookupData(const QByteArray& group, const char* key, return entryMap.getEntry(group, key, QString(), flags, expand); } -void KConfig::virtual_hook(int /*id*/, void* /*data*/) -{ - /* nothing */ -} diff --git a/kdecore/config/kconfig.h b/kdecore/config/kconfig.h index ab0e40f2..3272db34 100644 --- a/kdecore/config/kconfig.h +++ b/kdecore/config/kconfig.h @@ -368,11 +368,6 @@ protected: friend class KConfigGroup; friend class KConfigGroupPrivate; - /** Virtual hook, used to add new "virtual" functions while maintaining - * binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); - KConfigPrivate *const d_ptr; KConfig(KConfigPrivate &d); diff --git a/kdecore/config/kconfigbase.cpp b/kdecore/config/kconfigbase.cpp index 4be7ac23..f4ebc8d1 100644 --- a/kdecore/config/kconfigbase.cpp +++ b/kdecore/config/kconfigbase.cpp @@ -108,5 +108,3 @@ KConfigBase::~KConfigBase() KConfigBase::KConfigBase() {} -void KConfigBase::virtual_hook(int , void *) -{} diff --git a/kdecore/config/kconfigbase.h b/kdecore/config/kconfigbase.h index 716f20f8..2868867f 100644 --- a/kdecore/config/kconfigbase.h +++ b/kdecore/config/kconfigbase.h @@ -170,11 +170,6 @@ protected: virtual const KConfigGroup groupImpl(const QByteArray &b) const = 0; virtual void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags = Normal) = 0; virtual bool isGroupImmutableImpl(const QByteArray& aGroup) const = 0; - - /** Virtual hook, used to add new "virtual" functions while maintaining - * binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); }; Q_DECLARE_OPERATORS_FOR_FLAGS(KConfigBase::WriteConfigFlags) diff --git a/kdecore/config/kdesktopfile.cpp b/kdecore/config/kdesktopfile.cpp index 54e5910d..265ece31 100644 --- a/kdecore/config/kdesktopfile.cpp +++ b/kdecore/config/kdesktopfile.cpp @@ -353,9 +353,6 @@ KDesktopFile::sortOrder() const return d->desktopGroup.readEntry("SortOrder", QStringList()); } -//void KDesktopFile::virtual_hook( int id, void* data ) -//{ KConfig::virtual_hook( id, data ); } - QString KDesktopFile::readDocPath() const { Q_D(const KDesktopFile); diff --git a/kdecore/config/kdesktopfile.h b/kdecore/config/kdesktopfile.h index 1c4eae6f..c2d287c2 100644 --- a/kdecore/config/kdesktopfile.h +++ b/kdecore/config/kdesktopfile.h @@ -243,11 +243,6 @@ public: const char *resource() const; -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ -// virtual void virtual_hook( int id, void* data ); private: Q_DISABLE_COPY(KDesktopFile) diff --git a/kdecore/io/kar.cpp b/kdecore/io/kar.cpp index 16cd5fdf..27cf230c 100644 --- a/kdecore/io/kar.cpp +++ b/kdecore/io/kar.cpp @@ -179,5 +179,3 @@ bool KAr::closeArchive() return true; } -void KAr::virtual_hook( int id, void* data ) -{ KArchive::virtual_hook( id, data ); } diff --git a/kdecore/io/kar.h b/kdecore/io/kar.h index f2000f01..ade16256 100644 --- a/kdecore/io/kar.h +++ b/kdecore/io/kar.h @@ -83,8 +83,6 @@ protected: virtual bool openArchive( QIODevice::OpenMode mode ); virtual bool closeArchive(); -protected: - virtual void virtual_hook( int id, void* data ); private: class KArPrivate; KArPrivate* const d; diff --git a/kdecore/io/karchive.cpp b/kdecore/io/karchive.cpp index eb0bf2e7..1a0f0ab4 100644 --- a/kdecore/io/karchive.cpp +++ b/kdecore/io/karchive.cpp @@ -857,14 +857,3 @@ void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const } } -void KArchive::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data )*/; } - -void KArchiveEntry::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - -void KArchiveFile::virtual_hook( int id, void* data ) -{ KArchiveEntry::virtual_hook( id, data ); } - -void KArchiveDirectory::virtual_hook( int id, void* data ) -{ KArchiveEntry::virtual_hook( id, data ); } diff --git a/kdecore/io/karchive.h b/kdecore/io/karchive.h index c6053a22..94dd437d 100644 --- a/kdecore/io/karchive.h +++ b/kdecore/io/karchive.h @@ -352,8 +352,6 @@ protected: */ void setRootDir( KArchiveDirectory *rootDir ); -protected: - virtual void virtual_hook( int id, void* data ); private: KArchivePrivate* const d; }; @@ -440,8 +438,6 @@ public: protected: KArchive* archive() const; -protected: - virtual void virtual_hook( int id, void* data ); private: KArchiveEntryPrivate* const d; }; @@ -525,8 +521,6 @@ public: */ void copyTo(const QString& dest) const; -protected: - virtual void virtual_hook( int id, void* data ); private: KArchiveFilePrivate* const d; }; @@ -599,8 +593,6 @@ public: */ void copyTo(const QString& dest, bool recursive = true) const; -protected: - virtual void virtual_hook( int id, void* data ); private: KArchiveDirectoryPrivate* const d; }; diff --git a/kdecore/io/ktar.cpp b/kdecore/io/ktar.cpp index e03cad80..1b26cd42 100644 --- a/kdecore/io/ktar.cpp +++ b/kdecore/io/ktar.cpp @@ -857,6 +857,3 @@ bool KTar::doWriteSymLink(const QString &name, const QString &target, return retval; } -void KTar::virtual_hook( int id, void* data ) { - KArchive::virtual_hook( id, data ); -} diff --git a/kdecore/io/ktar.h b/kdecore/io/ktar.h index fd9bae61..90634432 100644 --- a/kdecore/io/ktar.h +++ b/kdecore/io/ktar.h @@ -97,10 +97,6 @@ protected: virtual bool createDevice( QIODevice::OpenMode mode ); -private: - -protected: - virtual void virtual_hook( int id, void* data ); private: class KTarPrivate; KTarPrivate* const d; diff --git a/kdecore/io/kzip.cpp b/kdecore/io/kzip.cpp index 4ae9fd1a..f2b24fd9 100644 --- a/kdecore/io/kzip.cpp +++ b/kdecore/io/kzip.cpp @@ -1228,11 +1228,6 @@ bool KZip::doWriteSymLink(const QString &name, const QString &target, return true; } -void KZip::virtual_hook( int id, void* data ) -{ - KArchive::virtual_hook( id, data ); -} - bool KZip::writeData(const char * data, qint64 size) { Q_ASSERT( d->m_currentFile ); diff --git a/kdecore/io/kzip.h b/kdecore/io/kzip.h index 89ef292e..4644880f 100644 --- a/kdecore/io/kzip.h +++ b/kdecore/io/kzip.h @@ -155,9 +155,6 @@ protected: const QString& group, mode_t perm, time_t atime, time_t mtime, time_t ctime ); -protected: - virtual void virtual_hook( int id, void* data ); - private: class KZipPrivate; KZipPrivate * const d; diff --git a/kdecore/kernel/kcomponentdata.cpp b/kdecore/kernel/kcomponentdata.cpp index dfad14d1..ace3bc8c 100644 --- a/kdecore/kernel/kcomponentdata.cpp +++ b/kdecore/kernel/kcomponentdata.cpp @@ -231,5 +231,3 @@ QString KComponentData::catalogName() const return d->aboutData.catalogName(); } -void KComponentData::virtual_hook(int, void*) -{ /*BASE::virtual_hook(id, data);*/ } diff --git a/kdecore/kernel/kcomponentdata.h b/kdecore/kernel/kcomponentdata.h index a8ff6fac..1898a8c8 100644 --- a/kdecore/kernel/kcomponentdata.h +++ b/kdecore/kernel/kcomponentdata.h @@ -180,9 +180,6 @@ protected: */ void setConfigName(const QString &name); - /** Standard trick to add virtuals later. @internal */ - virtual void virtual_hook( int id, void* data ); - private: // Ref-counted data KComponentDataPrivate* d; diff --git a/kdecore/services/kservicefactory.cpp b/kdecore/services/kservicefactory.cpp index 834ff8b2..dc3958de 100644 --- a/kdecore/services/kservicefactory.cpp +++ b/kdecore/services/kservicefactory.cpp @@ -309,6 +309,3 @@ bool KServiceFactory::hasOffer( int serviceTypeOffset, int serviceOffersOffset, return found; } -void KServiceFactory::virtual_hook( int id, void* data ) -{ KSycocaFactory::virtual_hook( id, data ); } - diff --git a/kdecore/services/kservicefactory.h b/kdecore/services/kservicefactory.h index 495f21d3..41338510 100644 --- a/kdecore/services/kservicefactory.h +++ b/kdecore/services/kservicefactory.h @@ -117,8 +117,6 @@ protected: KSycocaDict *m_menuIdDict; int m_menuIdDictOffset; -protected: - virtual void virtual_hook( int id, void* data ); private: class KServiceFactoryPrivate* d; }; diff --git a/kdecore/services/kservicegroupfactory.cpp b/kdecore/services/kservicegroupfactory.cpp index 198dc680..ebf9a8a2 100644 --- a/kdecore/services/kservicegroupfactory.cpp +++ b/kdecore/services/kservicegroupfactory.cpp @@ -130,6 +130,4 @@ KServiceGroup* KServiceGroupFactory::createEntry(int offset) const return createGroup(offset, true); } -void KServiceGroupFactory::virtual_hook( int id, void* data ) -{ KSycocaFactory::virtual_hook( id, data ); } diff --git a/kdecore/services/kservicegroupfactory.h b/kdecore/services/kservicegroupfactory.h index ddd7b3d0..de6531d8 100644 --- a/kdecore/services/kservicegroupfactory.h +++ b/kdecore/services/kservicegroupfactory.h @@ -71,8 +71,6 @@ protected: KSycocaDict *m_baseGroupDict; int m_baseGroupDictOffset; -protected: - virtual void virtual_hook( int id, void* data ); private: class KServiceGroupFactoryPrivate* d; }; diff --git a/kdecore/services/kservicetypefactory.cpp b/kdecore/services/kservicetypefactory.cpp index 490a05ff..29ae6e53 100644 --- a/kdecore/services/kservicetypefactory.cpp +++ b/kdecore/services/kservicetypefactory.cpp @@ -133,5 +133,3 @@ KServiceType * KServiceTypeFactory::createEntry(int offset) const return newEntry; } -void KServiceTypeFactory::virtual_hook( int id, void* data ) -{ KSycocaFactory::virtual_hook( id, data ); } diff --git a/kdecore/services/kservicetypefactory.h b/kdecore/services/kservicetypefactory.h index dac21baf..35ab808f 100644 --- a/kdecore/services/kservicetypefactory.h +++ b/kdecore/services/kservicetypefactory.h @@ -85,8 +85,6 @@ protected: // protected for KBuildServiceTypeFactory QMap m_propertyTypeDict; -protected: - virtual void virtual_hook( int id, void* data ); private: class KServiceTypeFactoryPrivate* d; }; diff --git a/kdecore/sycoca/kprotocolinfofactory.cpp b/kdecore/sycoca/kprotocolinfofactory.cpp index a47af930..0d65a071 100644 --- a/kdecore/sycoca/kprotocolinfofactory.cpp +++ b/kdecore/sycoca/kprotocolinfofactory.cpp @@ -113,9 +113,6 @@ KProtocolInfo::Ptr KProtocolInfoFactory::findProtocol(const QString &protocol) return info; } -void KProtocolInfoFactory::virtual_hook( int id, void* data ) -{ KSycocaFactory::virtual_hook( id, data ); } - KProtocolInfoFactory* KProtocolInfoFactory::self() { return kProtocolInfoFactoryInstance->self(); diff --git a/kdecore/sycoca/kprotocolinfofactory.h b/kdecore/sycoca/kprotocolinfofactory.h index c0d5a2a3..0e8d285e 100644 --- a/kdecore/sycoca/kprotocolinfofactory.h +++ b/kdecore/sycoca/kprotocolinfofactory.h @@ -86,11 +86,6 @@ protected: */ virtual KProtocolInfo *createEntry(int offset) const; -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); private: QMap m_cache; class KProtocolInfoFactoryPrivate* d; diff --git a/kdecore/sycoca/ksycocafactory.cpp b/kdecore/sycoca/ksycocafactory.cpp index 24ceca53..f598aff3 100644 --- a/kdecore/sycoca/ksycocafactory.cpp +++ b/kdecore/sycoca/ksycocafactory.cpp @@ -243,6 +243,3 @@ QDataStream* KSycocaFactory::stream() const return m_str; } -void KSycocaFactory::virtual_hook( int /*id*/, void* /*data*/) -{ /*BASE::virtual_hook( id, data );*/ } - diff --git a/kdecore/sycoca/ksycocafactory.h b/kdecore/sycoca/ksycocafactory.h index 8ebcf95c..3c6e205b 100644 --- a/kdecore/sycoca/ksycocafactory.h +++ b/kdecore/sycoca/ksycocafactory.h @@ -133,12 +133,6 @@ private: QDataStream *m_str; class Private; Private* const d; - -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); }; /** diff --git a/kdesu/process.cpp b/kdesu/process.cpp index ee93396f..b31932e0 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -551,7 +551,4 @@ int PtyProcess::setupTTY() return 0; } -void PtyProcess::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - } diff --git a/kdesu/process.h b/kdesu/process.h index f2b916d2..0a114bab 100644 --- a/kdesu/process.h +++ b/kdesu/process.h @@ -191,9 +191,6 @@ private: int init(); int setupTTY(); -protected: - /** Standard hack to add virtual methods in a BC way. Unused. */ - virtual void virtual_hook( int id, void* data ); private: class PtyProcessPrivate; PtyProcessPrivate* const d; diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp index e71012be..68a131bd 100644 --- a/kdesu/ssh.cpp +++ b/kdesu/ssh.cpp @@ -256,7 +256,4 @@ QByteArray SshProcess::displayAuth() return "no"; } -void SshProcess::virtual_hook( int id, void* data ) -{ StubProcess::virtual_hook( id, data ); } - } diff --git a/kdesu/ssh.h b/kdesu/ssh.h index bb702340..e954cbc1 100644 --- a/kdesu/ssh.h +++ b/kdesu/ssh.h @@ -71,8 +71,6 @@ protected: private: int ConverseSsh(const char *password, int check); -protected: - virtual void virtual_hook( int id, void* data ); private: class SshProcessPrivate; SshProcessPrivate * const d; diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp index b3bcae67..2c0dcf2d 100644 --- a/kdesu/stub.cpp +++ b/kdesu/stub.cpp @@ -230,7 +230,4 @@ QByteArray StubProcess::displayAuth() #endif -void StubProcess::virtual_hook( int id, void* data ) -{ PtyProcess::virtual_hook( id, data ); } - } diff --git a/kdesu/stub.h b/kdesu/stub.h index 7d6cb1d2..35057de1 100644 --- a/kdesu/stub.h +++ b/kdesu/stub.h @@ -97,8 +97,6 @@ private: QByteArray commaSeparatedList(const QList &); void writeString(const QByteArray &str); -protected: - virtual void virtual_hook( int id, void* data ); private: class StubProcessPrivate; StubProcessPrivate * const d; diff --git a/kdesu/su.cpp b/kdesu/su.cpp index 3277ad08..05044c6d 100644 --- a/kdesu/su.cpp +++ b/kdesu/su.cpp @@ -329,7 +329,4 @@ int SuProcess::ConverseSU(const char *password) return ok; } -void SuProcess::virtual_hook( int id, void* data ) -{ StubProcess::virtual_hook( id, data ); } - } diff --git a/kdesu/su.h b/kdesu/su.h index 8681f2ca..dc4ec089 100644 --- a/kdesu/su.h +++ b/kdesu/su.h @@ -64,8 +64,6 @@ private: enum SuErrors { error=-1, ok=0, killme=1, notauthorized=2 } ; int ConverseSU(const char *password); -protected: - virtual void virtual_hook( int id, void* data ); private: class SuProcessPrivate; SuProcessPrivate * const d; diff --git a/kdeui/icons/kiconengine.cpp b/kdeui/icons/kiconengine.cpp index 3182da8b..316a8805 100644 --- a/kdeui/icons/kiconengine.cpp +++ b/kdeui/icons/kiconengine.cpp @@ -138,16 +138,3 @@ bool KIconEngine::write(QDataStream &out) const return true; } -void KIconEngine::virtual_hook(int id, void *data) -{ - switch (id) { - case IconNameHook: { - QString *name = reinterpret_cast(data); - *name = mIconName; - break; - } - default: - QIconEngineV2::virtual_hook(id, data); - break; - } -} diff --git a/kdeui/icons/kiconengine_p.h b/kdeui/icons/kiconengine_p.h index 9fba63c4..b2a89c81 100644 --- a/kdeui/icons/kiconengine_p.h +++ b/kdeui/icons/kiconengine_p.h @@ -64,8 +64,6 @@ class KIconEngine : public QIconEngineV2 virtual void paint ( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state ); /// Reimplementation virtual QPixmap pixmap ( const QSize & size, QIcon::Mode mode, QIcon::State state ); - /// Reimplementation - virtual void virtual_hook ( int id, void * data ); virtual QString key() const; virtual QIconEngineV2 *clone() const; diff --git a/kdeui/kernel/ksessionmanager.cpp b/kdeui/kernel/ksessionmanager.cpp index 182a5251..caba02e3 100644 --- a/kdeui/kernel/ksessionmanager.cpp +++ b/kdeui/kernel/ksessionmanager.cpp @@ -48,7 +48,4 @@ QList& KSessionManager::sessionClients() return session_clients; } -void KSessionManager::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - diff --git a/kdeui/kernel/ksessionmanager.h b/kdeui/kernel/ksessionmanager.h index d08b34b2..9544b5ec 100644 --- a/kdeui/kernel/ksessionmanager.h +++ b/kdeui/kernel/ksessionmanager.h @@ -71,12 +71,6 @@ public: static QList& sessionClients(); -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); - private: class Private; Private* const d; diff --git a/kdeui/util/kcompletion.h b/kdeui/util/kcompletion.h index fc77e779..16de7b07 100644 --- a/kdeui/util/kcompletion.h +++ b/kdeui/util/kcompletion.h @@ -951,12 +951,6 @@ private: // signals internally flags to the provided values. void setup( bool, bool, bool ); - // BCI -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); private: Q_DISABLE_COPY( KCompletionBase ) KCompletionBasePrivate * const d; diff --git a/kdeui/util/kcompletionbase.cpp b/kdeui/util/kcompletionbase.cpp index 59ca6b04..d35dd35d 100644 --- a/kdeui/util/kcompletionbase.cpp +++ b/kdeui/util/kcompletionbase.cpp @@ -240,6 +240,4 @@ void KCompletionBase::setup( bool autodel, bool hsig, bool esig ) d->m_bEmitSignals = esig; } -void KCompletionBase::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } diff --git a/kdeui/util/kpixmapprovider.cpp b/kdeui/util/kpixmapprovider.cpp index 1745e68f..e2e91ec9 100644 --- a/kdeui/util/kpixmapprovider.cpp +++ b/kdeui/util/kpixmapprovider.cpp @@ -22,6 +22,4 @@ KPixmapProvider::~KPixmapProvider() {} -void KPixmapProvider::virtual_hook( int , void* ) -{ /*BASE::virtual_hook( id, data );*/ } diff --git a/kdeui/util/kpixmapprovider.h b/kdeui/util/kpixmapprovider.h index 58e0775e..3384010b 100644 --- a/kdeui/util/kpixmapprovider.h +++ b/kdeui/util/kpixmapprovider.h @@ -47,11 +47,6 @@ public: * @return the pixmap for the arguments, or null if there is none */ virtual QPixmap pixmapFor( const QString& text, int size = 0 ) = 0; -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); }; diff --git a/kdeui/util/kwallet.cpp b/kdeui/util/kwallet.cpp index cf5787f8..34f1e3cd 100644 --- a/kdeui/util/kwallet.cpp +++ b/kdeui/util/kwallet.cpp @@ -1652,10 +1652,6 @@ bool Wallet::keyDoesNotExist(const QString& wallet, const QString& folder, const #endif } -void Wallet::virtual_hook(int, void*) { - //BASE::virtual_hook( id, data ); -} - KWalletDLauncher::KWalletDLauncher() : m_wallet(0), diff --git a/kdeui/util/kwallet.h b/kdeui/util/kwallet.h index d7f703f0..01c9df23 100644 --- a/kdeui/util/kwallet.h +++ b/kdeui/util/kwallet.h @@ -543,11 +543,6 @@ class KDEUI_EXPORT Wallet : public QObject WalletPrivate* const d; Q_PRIVATE_SLOT(d, void walletServiceUnregistered()) - protected: - /** - * @internal - */ - virtual void virtual_hook(int id, void *data); }; } diff --git a/kdeui/windowmanagement/netwm.cpp b/kdeui/windowmanagement/netwm.cpp index ad5f03d8..5ef22675 100644 --- a/kdeui/windowmanagement/netwm.cpp +++ b/kdeui/windowmanagement/netwm.cpp @@ -4674,12 +4674,6 @@ NET::MappingState NETWinInfo::mappingState() const { return p->mapping_state; } -void NETRootInfo::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - -void NETWinInfo::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - int NET::timestampCompare( unsigned long time1, unsigned long time2 ) { return KXUtils::timestampCompare( time1, time2 ); diff --git a/kdeui/windowmanagement/netwm.h b/kdeui/windowmanagement/netwm.h index 028383b6..d3ad3ba5 100644 --- a/kdeui/windowmanagement/netwm.h +++ b/kdeui/windowmanagement/netwm.h @@ -804,11 +804,6 @@ private: void setDefaultProperties(); void updateSupportedProperties( Atom atom ); -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); private: NETRootInfoPrivate *p; // krazy:exclude=dpointer (implicitly shared) }; @@ -1353,11 +1348,6 @@ private: void setIconInternal(NETRArray& icons, int& icon_count, Atom property, NETIcon icon, Bool replace); NETIcon iconInternal(NETRArray& icons, int icon_count, int width, int height) const; -protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. - */ - virtual void virtual_hook( int id, void* data ); private: NETWinInfoPrivate *p; // krazy:exclude=dpointer (implicitly shared) friend class NETWinInfo2; diff --git a/kdeui/xmlgui/kxmlguibuilder.cpp b/kdeui/xmlgui/kxmlguibuilder.cpp index 1addb475..d970943d 100644 --- a/kdeui/xmlgui/kxmlguibuilder.cpp +++ b/kdeui/xmlgui/kxmlguibuilder.cpp @@ -417,6 +417,4 @@ void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * ) #endif } -void KXMLGUIBuilder::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } diff --git a/kdeui/xmlgui/kxmlguibuilder.h b/kdeui/xmlgui/kxmlguibuilder.h index d145cab5..abf5afb9 100644 --- a/kdeui/xmlgui/kxmlguibuilder.h +++ b/kdeui/xmlgui/kxmlguibuilder.h @@ -89,8 +89,6 @@ class KDEUI_EXPORT KXMLGUIBuilder virtual void finalizeGUI( KXMLGUIClient *client ); -protected: - virtual void virtual_hook( int id, void* data ); private: KXMLGUIBuilderPrivate * const d; }; diff --git a/kdeui/xmlgui/kxmlguiclient.cpp b/kdeui/xmlgui/kxmlguiclient.cpp index 2c6fe10a..00f43f14 100644 --- a/kdeui/xmlgui/kxmlguiclient.cpp +++ b/kdeui/xmlgui/kxmlguiclient.cpp @@ -747,5 +747,3 @@ void KXMLGUIClient::prepareXMLUnplug( QWidget * w ) client->prepareXMLUnplug( w ); } -void KXMLGUIClient::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } diff --git a/kdeui/xmlgui/kxmlguiclient.h b/kdeui/xmlgui/kxmlguiclient.h index 3a834b61..dec39d57 100644 --- a/kdeui/xmlgui/kxmlguiclient.h +++ b/kdeui/xmlgui/kxmlguiclient.h @@ -383,9 +383,6 @@ protected: // KDE5 TODO: virtual void loadActionLists() {}, called when the guiclient is added to the xmlgui factory -protected: - virtual void virtual_hook( int id, void* data ); - private: KXMLGUIClientPrivate * const d; }; diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp index 20674e5e..aa71eff2 100644 --- a/kfile/kfilewidget.cpp +++ b/kfile/kfilewidget.cpp @@ -2706,29 +2706,6 @@ void KFileWidget::setCustomWidget(const QString& text, QWidget* widget) d->lafBox->addWidget(widget, 2, 1, Qt::AlignVCenter); } -void KFileWidget::virtual_hook( int id, void* data ) -{ - // this is a workaround to avoid binary compatibility breakage - // since setConfirmOverwrite in kabstractfilewidget.h is a new function - // introduced for 4.2. As stated in kabstractfilewidget.h this workaround - // is going to become a virtual function for KDE5 - - switch (id) { - case 0: { // setConfirmOverwrite(bool) - bool *enable = static_cast(data); - d->confirmOverwrite = *enable; - } - break; - case 1: { // setInlinePreviewShown(bool) - bool *show = static_cast(data); - d->setInlinePreviewShown(*show); - } - break; - default: - break; - } -} - KDirOperator* KFileWidget::dirOperator() { return d->ops; diff --git a/kfile/kfilewidget.h b/kfile/kfilewidget.h index 47c768c8..8bef7235 100644 --- a/kfile/kfilewidget.h +++ b/kfile/kfilewidget.h @@ -414,9 +414,6 @@ public: */ virtual void setCustomWidget(const QString& text, QWidget* widget); - /// @internal for future extensions - virtual void virtual_hook( int id, void* data ); - public Q_SLOTS: /** * Called when clicking ok (when this widget is used in KFileDialog) diff --git a/kio/kfile/kabstractfilewidget.h b/kio/kfile/kabstractfilewidget.h index 2ad5ca7c..683b6c1b 100644 --- a/kio/kfile/kabstractfilewidget.h +++ b/kio/kfile/kabstractfilewidget.h @@ -370,9 +370,6 @@ public: virtual void accept() = 0; virtual void slotCancel() = 0; - /// @internal for future extensions - virtual void virtual_hook( int id, void* data ) = 0; - /** * Sets whether the user should be asked for confirmation * when an overwrite might occurr. @@ -381,7 +378,6 @@ public: * @since 4.2 */ void setConfirmOverwrite(bool enable){ // KDE5 TODO: make this virtual - virtual_hook(0, static_cast(&enable)); } /** @@ -391,7 +387,6 @@ public: * @since 4.2 */ void setInlinePreviewShown(bool show) { // KDE5 TODO: make this virtual - virtual_hook(1, static_cast(&show)); } }; diff --git a/kio/kio/fileundomanager.cpp b/kio/kio/fileundomanager.cpp index c8100cb8..4e2a34f9 100644 --- a/kio/kio/fileundomanager.cpp +++ b/kio/kio/fileundomanager.cpp @@ -812,9 +812,5 @@ bool FileUndoManager::UiInterface::showProgressInfo() const return d->m_showProgressInfo; } -void FileUndoManager::UiInterface::virtual_hook(int, void*) -{ -} - #include "moc_fileundomanager_p.cpp" #include "moc_fileundomanager.cpp" diff --git a/kio/kio/fileundomanager.h b/kio/kio/fileundomanager.h index ce42804c..09358876 100644 --- a/kio/kio/fileundomanager.h +++ b/kio/kio/fileundomanager.h @@ -103,11 +103,6 @@ public: */ virtual bool copiedFileWasModified(const KUrl& src, const KUrl& dest, const KDateTime& srcTime, const KDateTime& destTime); - /** - * \internal, for future extensions - */ - virtual void virtual_hook(int id, void* data); - private: class UiInterfacePrivate; UiInterfacePrivate *d; diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 3f432d4b..5cad2646 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -652,9 +652,6 @@ QString KACL::KACLPrivate::getGroupName( gid_t gid ) const } #endif -void KACL::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - QDataStream & operator<< ( QDataStream & s, const KACL & a ) { s << a.asString(); diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h index 61806372..024d151b 100644 --- a/kio/kio/kacl.h +++ b/kio/kio/kacl.h @@ -190,8 +190,6 @@ public: * to take such strings as input. */ QString asString() const; -protected: - virtual void virtual_hook( int id, void* data ); private: class KACLPrivate; KACLPrivate* const d; diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp index 934cc680..253c4ed8 100644 --- a/kio/kio/kremoteencoding.cpp +++ b/kio/kio/kremoteencoding.cpp @@ -116,6 +116,3 @@ void KRemoteEncoding::setEncoding(const char *name) << "for name=" << name; } -void KRemoteEncoding::virtual_hook(int, void*) -{ -} diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h index 5d1f01c5..1a3ad22f 100644 --- a/kio/kio/kremoteencoding.h +++ b/kio/kio/kremoteencoding.h @@ -109,9 +109,6 @@ public: */ void setEncoding(const char* name); -protected: - virtual void virtual_hook(int id, void* data); - private: KRemoteEncodingPrivate* const d; diff --git a/kio/kio/kurlpixmapprovider.cpp b/kio/kio/kurlpixmapprovider.cpp index 76af0207..b6ba6374 100644 --- a/kio/kio/kurlpixmapprovider.cpp +++ b/kio/kio/kurlpixmapprovider.cpp @@ -41,5 +41,3 @@ QPixmap KUrlPixmapProvider::pixmapFor( const QString& url, int size ) return KIO::pixmapForUrl( u, 0, KIconLoader::Desktop, size ); } -void KUrlPixmapProvider::virtual_hook( int id, void* data ) -{ KPixmapProvider::virtual_hook( id, data ); } diff --git a/kio/kio/kurlpixmapprovider.h b/kio/kio/kurlpixmapprovider.h index 5c6c78fa..fc000725 100644 --- a/kio/kio/kurlpixmapprovider.h +++ b/kio/kio/kurlpixmapprovider.h @@ -61,8 +61,6 @@ public: * @see KIconLoader::StdSizes */ virtual QPixmap pixmapFor( const QString& url, int size = 0 ); -protected: - virtual void virtual_hook( int id, void* data ); private: class Private; diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index 9c264a72..e80d4013 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -985,7 +985,6 @@ void SlaveBase::dispatch( int command, const QByteArray &data ) disconnectSlave(); d->isConnectedToApp = true; connectSlave(app_socket); - virtual_hook(AppConnectionMade, 0); } break; case CMD_SLAVE_HOLD: { KUrl url; @@ -1285,9 +1284,6 @@ void SlaveBase::send(int cmd, const QByteArray& arr ) if (slaveWriteError) exit(); } -void SlaveBase::virtual_hook( int, void* ) -{ /*BASE::virtual_hook( id, data );*/ } - void SlaveBase::lookupHost(const QString& host) { KIO_DATA << host; diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index b0bb4bda..eee4e88a 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -896,7 +896,6 @@ protected: enum VirtualFunctionId { AppConnectionMade = 0 }; - virtual void virtual_hook( int id, void* data ); private: #if 0 // TODO KDE5: enable diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index fe833104..aebf76bc 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -994,11 +994,3 @@ void TCPSlaveBase::setBlocking(bool b) d->isBlocking = b; } -void TCPSlaveBase::virtual_hook(int id, void* data) -{ - if (id == SlaveBase::AppConnectionMade) { - d->sendSslMetaData(); - } else { - SlaveBase::virtual_hook(id, data); - } -} diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h index c20a67de..311f991a 100644 --- a/kio/kio/tcpslavebase.h +++ b/kio/kio/tcpslavebase.h @@ -207,9 +207,6 @@ protected: */ QIODevice *socket() const; -protected: - virtual void virtual_hook( int id, void* data ); - private: // For the certificate verification code SslResult verifyServerCertificate(); diff --git a/kross/core/object.cpp b/kross/core/object.cpp index ce299aca..fe298243 100644 --- a/kross/core/object.cpp +++ b/kross/core/object.cpp @@ -58,8 +58,3 @@ QStringList Object::methodNames() return QStringList(); } -void Object::virtual_hook(int id, void* ptr) -{ - Q_UNUSED(id); - Q_UNUSED(ptr); -} diff --git a/kross/core/object.h b/kross/core/object.h index 45552555..b4b8b402 100644 --- a/kross/core/object.h +++ b/kross/core/object.h @@ -109,12 +109,6 @@ namespace Kross { */ virtual QStringList methodNames(); - /** - * \internal used virtual hook to easier the job to keep - * binary compatibility. - */ - virtual void virtual_hook(int id, void* ptr); - private: /// \internal d-pointer class. class Private;