From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- lib/interfaces/extensions/kdevcreatefile.h | 4 ++-- lib/interfaces/extensions/kdevversioncontrol.h | 8 ++++---- lib/interfaces/external/designer.h | 2 +- lib/interfaces/hashedstring.cpp | 6 +++--- lib/interfaces/kdevplugincontroller.cpp | 2 +- lib/interfaces/kdevplugininfo.cpp | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/interfaces') diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index ee30f555..76dff18b 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -54,7 +54,7 @@ public: public: /**The status of a file.*/ - enum tqStatus { + enum Status { STATUS_OK /**synchronous operation (blocking). @param dirPath The relative (to project dir) directory path to stat. - @return tqStatus for all registered files.*/ + @return Status for all registered files.*/ virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0; /**Starts a request for directory status to the remote repository. @@ -210,18 +210,18 @@ public: @param dirPath The (relative to project directory) directory which status you are asking for. @param callerData The pointer to some data you want the provider will return to you when it has done. - @param recursive If false, retrieve information only for dirPath's immediate tqchildren. + @param recursive If false, retrieve information only for dirPath's immediate children. @param checkRepos If true, contact remote repository and augment repository's status. If false, retrieve only for local modification information. @return true if the request has been successfully started, false otherwise.*/ - virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; signals: /**Emitted when the status request to remote repository has finished. @param fileInfoMap The status for registered in repository files. @param callerData The pointer to some data you want the provider will return to you when it has done - @see requesttqStatus for to find out when this signal should be used.*/ + @see requestStatus for to find out when this signal should be used.*/ void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData); protected: diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index 9f0c0064..c071f2db 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -91,7 +91,7 @@ signals: /**Emitted when a form state is changed in the designer. @param formName An absolute name of the form file. @param status 0: form is clean, 1: form is modified.*/ - void newtqStatus(const TQString &formName, int status); + void newStatus(const TQString &formName, int status); }; } diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index f974df10..8392e271 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) { size_t hash = 0; int len = str.length(); for( int a = 0; a < len; a++ ) { - hash = str[a].tqunicode() + (hash * 17); + hash = str[a].unicode() + (hash * 17); } return hash; } @@ -43,12 +43,12 @@ size_t HashedString::hashString( const TQString& str ) size_t fastHashString( const TQString& str ) { size_t hash = 0; if( !str.isEmpty() ) { - const TQChar* curr = str.tqunicode(); + const TQChar* curr = str.unicode(); const TQChar* end = curr + str.length(); TQChar c; for(; curr < end ;) { c = *curr; - hash = c.tqunicode() + ( hash * 17 ); + hash = c.unicode() + ( hash * 17 ); ++curr; } } diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 86384440..c9746047 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { return KTrader::self()->query(serviceType, - TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); } KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index ae5ddf2d..6c869d23 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); @@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); -- cgit v1.2.3