mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 10:22:48 +00:00
generic: remove redudant virtual_hook definitions
This commit is contained in:
parent
f025c6a437
commit
bf501e6429
78 changed files with 3 additions and 308 deletions
|
@ -89,10 +89,6 @@ void PublicService::publishAsync()
|
|||
emit published(false);
|
||||
}
|
||||
|
||||
void PublicService::virtual_hook(int, void*)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#include "moc_publicservice.cpp"
|
||||
|
|
|
@ -50,12 +50,6 @@ bool RemoteService::isResolved() const
|
|||
}
|
||||
|
||||
|
||||
void RemoteService::virtual_hook(int, void*)
|
||||
{
|
||||
// BASE::virtual_hook(int, void*);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
#include "moc_remoteservice.cpp"
|
||||
|
|
|
@ -53,9 +53,6 @@ QList<RemoteService::Ptr> ServiceBrowser::services() const
|
|||
return QList<RemoteService::Ptr>();
|
||||
}
|
||||
|
||||
void ServiceBrowser::virtual_hook(int, void*)
|
||||
{}
|
||||
|
||||
QHostAddress ServiceBrowser::resolveHostName(const QString &hostname)
|
||||
{
|
||||
Q_UNUSED(hostname);
|
||||
|
|
|
@ -225,9 +225,6 @@ Q_SIGNALS:
|
|||
|
||||
private:
|
||||
friend class PublicServicePrivate;
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook(int, void*);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -126,8 +126,6 @@ Q_SIGNALS:
|
|||
*/
|
||||
void resolved(bool successful);
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook(int id, void *data);
|
||||
private:
|
||||
friend class RemoteServicePrivate;
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -185,7 +185,6 @@ public:
|
|||
|
||||
protected:
|
||||
ServiceBase(ServiceBasePrivate* const d);
|
||||
virtual void virtual_hook(int, void*);
|
||||
ServiceBasePrivate* const d;
|
||||
|
||||
};
|
||||
|
|
|
@ -279,9 +279,6 @@ Q_SIGNALS:
|
|||
*/
|
||||
void finished();
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook(int, void*);
|
||||
|
||||
private:
|
||||
friend class ServiceBrowserPrivate;
|
||||
ServiceBrowserPrivate* const d;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -165,5 +165,3 @@ KFilterBase::FilterFlags KFilterBase::filterFlags() const
|
|||
return d->m_flags;
|
||||
}
|
||||
|
||||
void KFilterBase::virtual_hook( int, void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -108,5 +108,3 @@ KConfigBase::~KConfigBase()
|
|||
KConfigBase::KConfigBase()
|
||||
{}
|
||||
|
||||
void KConfigBase::virtual_hook(int , void *)
|
||||
{}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -179,5 +179,3 @@ bool KAr::closeArchive()
|
|||
return true;
|
||||
}
|
||||
|
||||
void KAr::virtual_hook( int id, void* data )
|
||||
{ KArchive::virtual_hook( id, data ); }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ); }
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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 );
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -231,5 +231,3 @@ QString KComponentData::catalogName() const
|
|||
return d->aboutData.catalogName();
|
||||
}
|
||||
|
||||
void KComponentData::virtual_hook(int, void*)
|
||||
{ /*BASE::virtual_hook(id, data);*/ }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ); }
|
||||
|
||||
|
|
|
@ -117,8 +117,6 @@ protected:
|
|||
KSycocaDict *m_menuIdDict;
|
||||
int m_menuIdDictOffset;
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
private:
|
||||
class KServiceFactoryPrivate* d;
|
||||
};
|
||||
|
|
|
@ -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 ); }
|
||||
|
||||
|
|
|
@ -71,8 +71,6 @@ protected:
|
|||
KSycocaDict *m_baseGroupDict;
|
||||
int m_baseGroupDictOffset;
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
private:
|
||||
class KServiceGroupFactoryPrivate* d;
|
||||
};
|
||||
|
|
|
@ -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 ); }
|
||||
|
|
|
@ -85,8 +85,6 @@ protected:
|
|||
// protected for KBuildServiceTypeFactory
|
||||
QMap<QString,int> m_propertyTypeDict;
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
private:
|
||||
class KServiceTypeFactoryPrivate* d;
|
||||
};
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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<QString,KProtocolInfo::Ptr> m_cache;
|
||||
class KProtocolInfoFactoryPrivate* d;
|
||||
|
|
|
@ -243,6 +243,3 @@ QDataStream* KSycocaFactory::stream() const
|
|||
return m_str;
|
||||
}
|
||||
|
||||
void KSycocaFactory::virtual_hook( int /*id*/, void* /*data*/)
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
||||
|
|
|
@ -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 );
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -551,7 +551,4 @@ int PtyProcess::setupTTY()
|
|||
return 0;
|
||||
}
|
||||
|
||||
void PtyProcess::virtual_hook( int, void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -256,7 +256,4 @@ QByteArray SshProcess::displayAuth()
|
|||
return "no";
|
||||
}
|
||||
|
||||
void SshProcess::virtual_hook( int id, void* data )
|
||||
{ StubProcess::virtual_hook( id, data ); }
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -230,7 +230,4 @@ QByteArray StubProcess::displayAuth()
|
|||
#endif
|
||||
|
||||
|
||||
void StubProcess::virtual_hook( int id, void* data )
|
||||
{ PtyProcess::virtual_hook( id, data ); }
|
||||
|
||||
}
|
||||
|
|
|
@ -97,8 +97,6 @@ private:
|
|||
QByteArray commaSeparatedList(const QList<QByteArray> &);
|
||||
void writeString(const QByteArray &str);
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
private:
|
||||
class StubProcessPrivate;
|
||||
StubProcessPrivate * const d;
|
||||
|
|
|
@ -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 ); }
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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<QString*>(data);
|
||||
*name = mIconName;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
QIconEngineV2::virtual_hook(id, data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -48,7 +48,4 @@ QList<KSessionManager *>& KSessionManager::sessionClients()
|
|||
return session_clients;
|
||||
}
|
||||
|
||||
void KSessionManager::virtual_hook( int, void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
||||
|
||||
|
|
|
@ -71,12 +71,6 @@ public:
|
|||
|
||||
static QList<KSessionManager*>& 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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 );*/ }
|
||||
|
||||
|
|
|
@ -22,6 +22,4 @@
|
|||
|
||||
KPixmapProvider::~KPixmapProvider() {}
|
||||
|
||||
void KPixmapProvider::virtual_hook( int , void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
||||
|
|
|
@ -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 );
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool replace);
|
||||
NETIcon iconInternal(NETRArray<NETIcon>& 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;
|
||||
|
|
|
@ -417,6 +417,4 @@ void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * )
|
|||
#endif
|
||||
}
|
||||
|
||||
void KXMLGUIBuilder::virtual_hook( int, void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -747,5 +747,3 @@ void KXMLGUIClient::prepareXMLUnplug( QWidget * w )
|
|||
client->prepareXMLUnplug( w );
|
||||
}
|
||||
|
||||
void KXMLGUIClient::virtual_hook( int, void* )
|
||||
{ /*BASE::virtual_hook( id, data );*/ }
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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<bool*>(data);
|
||||
d->confirmOverwrite = *enable;
|
||||
}
|
||||
break;
|
||||
case 1: { // setInlinePreviewShown(bool)
|
||||
bool *show = static_cast<bool*>(data);
|
||||
d->setInlinePreviewShown(*show);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
KDirOperator* KFileWidget::dirOperator()
|
||||
{
|
||||
return d->ops;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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<void*>(&enable));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -391,7 +387,6 @@ public:
|
|||
* @since 4.2
|
||||
*/
|
||||
void setInlinePreviewShown(bool show) { // KDE5 TODO: make this virtual
|
||||
virtual_hook(1, static_cast<void*>(&show));
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -116,6 +116,3 @@ void KRemoteEncoding::setEncoding(const char *name)
|
|||
<< "for name=" << name;
|
||||
}
|
||||
|
||||
void KRemoteEncoding::virtual_hook(int, void*)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -109,9 +109,6 @@ public:
|
|||
*/
|
||||
void setEncoding(const char* name);
|
||||
|
||||
protected:
|
||||
virtual void virtual_hook(int id, void* data);
|
||||
|
||||
private:
|
||||
KRemoteEncodingPrivate* const d;
|
||||
|
||||
|
|
|
@ -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 ); }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -896,7 +896,6 @@ protected:
|
|||
enum VirtualFunctionId {
|
||||
AppConnectionMade = 0
|
||||
};
|
||||
virtual void virtual_hook( int id, void* data );
|
||||
|
||||
private:
|
||||
#if 0 // TODO KDE5: enable
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -58,8 +58,3 @@ QStringList Object::methodNames()
|
|||
return QStringList();
|
||||
}
|
||||
|
||||
void Object::virtual_hook(int id, void* ptr)
|
||||
{
|
||||
Q_UNUSED(id);
|
||||
Q_UNUSED(ptr);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue