diff options
Diffstat (limited to 'src/kvirc/kvs')
218 files changed, 3180 insertions, 3170 deletions
diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/kvi_kvs.cpp index 9c36a34..96d74f9 100644 --- a/src/kvirc/kvs/kvi_kvs.cpp +++ b/src/kvirc/kvs/kvi_kvs.cpp @@ -61,12 +61,12 @@ namespace KviKvs KviKvsKernel::done(); } - void loadPopups(const QString &szFileName) + void loadPopups(const TQString &szFileName) { KviKvsPopupManager::instance()->load(szFileName); } - void savePopups(const QString &szFileName) + void savePopups(const TQString &szFileName) { KviKvsPopupManager::instance()->save(szFileName); } @@ -76,12 +76,12 @@ namespace KviKvs KviKvsPopupManager::instance()->clear(); } - void loadAliases(const QString &szFileName) + void loadAliases(const TQString &szFileName) { KviKvsAliasManager::instance()->load(szFileName); } - void saveAliases(const QString &szFileName) + void saveAliases(const TQString &szFileName) { KviKvsAliasManager::instance()->save(szFileName); } @@ -91,12 +91,12 @@ namespace KviKvs KviKvsAliasManager::instance()->clear(); } - void loadAppEvents(const QString &szFileName) + void loadAppEvents(const TQString &szFileName) { KviKvsEventManager::instance()->loadAppEvents(szFileName); } - void saveAppEvents(const QString &szFileName) + void saveAppEvents(const TQString &szFileName) { KviKvsEventManager::instance()->saveAppEvents(szFileName); } @@ -106,12 +106,12 @@ namespace KviKvs KviKvsEventManager::instance()->removeAllScriptAppHandlers(); } - void loadRawEvents(const QString &szFileName) + void loadRawEvents(const TQString &szFileName) { KviKvsEventManager::instance()->loadRawEvents(szFileName); } - void saveRawEvents(const QString &szFileName) + void saveRawEvents(const TQString &szFileName) { KviKvsEventManager::instance()->saveRawEvents(szFileName); } @@ -121,12 +121,12 @@ namespace KviKvs KviKvsEventManager::instance()->removeAllScriptRawHandlers(); } - void loadScriptAddons(const QString &szFileName) + void loadScriptAddons(const TQString &szFileName) { KviKvsScriptAddonManager::instance()->load(szFileName); } - void saveScriptAddons(const QString &szFileName) + void saveScriptAddons(const TQString &szFileName) { KviKvsScriptAddonManager::instance()->save(szFileName); } diff --git a/src/kvirc/kvs/kvi_kvs.h b/src/kvirc/kvs/kvi_kvs.h index bb92a30..3a083ab 100644 --- a/src/kvirc/kvs/kvi_kvs.h +++ b/src/kvirc/kvs/kvi_kvs.h @@ -32,24 +32,24 @@ namespace KviKvs void init(); // this never fails void done(); // this never fails - void loadAliases(const QString &szFileName); - void saveAliases(const QString &szFileName); + void loadAliases(const TQString &szFileName); + void saveAliases(const TQString &szFileName); void clearAliases(); - void loadPopups(const QString &szFileName); - void savePopups(const QString &szFileName); + void loadPopups(const TQString &szFileName); + void savePopups(const TQString &szFileName); void clearPopups(); - void loadAppEvents(const QString &szFileName); - void saveAppEvents(const QString &szFileName); + void loadAppEvents(const TQString &szFileName); + void saveAppEvents(const TQString &szFileName); void clearAppEvents(); - void loadRawEvents(const QString &szFileName); - void saveRawEvents(const QString &szFileName); + void loadRawEvents(const TQString &szFileName); + void saveRawEvents(const TQString &szFileName); void clearRawEvents(); - void loadScriptAddons(const QString &szFileName); - void saveScriptAddons(const QString &szFileName); + void loadScriptAddons(const TQString &szFileName); + void saveScriptAddons(const TQString &szFileName); void clearScriptAddons(); void flushUserClasses(); diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp index 0829114..82972d3 100644 --- a/src/kvirc/kvs/kvi_kvs_action.cpp +++ b/src/kvirc/kvs/kvi_kvs_action.cpp @@ -28,19 +28,19 @@ #include "kvi_kvs_script.h" #include "kvi_window.h" -KviKvsAction::KviKvsAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, +KviKvsAction::KviKvsAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory, - const QString &szBigIcon, + const TQString &szBigIcon, int iSmallIconId, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) : KviAction(pParent,szName,szVisibleName,szDescription,pCategory,szBigIcon,iSmallIconId,uFlags,szKeySequence) { - QString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; + TQString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; tmp += szName; m_pScript = new KviKvsScript(tmp,szScriptCode); } @@ -52,7 +52,7 @@ KviKvsAction::~KviKvsAction() delete m_pScript; } -const QString & KviKvsAction::scriptCode() +const TQString & KviKvsAction::scriptCode() { return m_pScript->code(); } diff --git a/src/kvirc/kvs/kvi_kvs_action.h b/src/kvirc/kvs/kvi_kvs_action.h index 0a33569..25edfd7 100644 --- a/src/kvirc/kvs/kvi_kvs_action.h +++ b/src/kvirc/kvs/kvi_kvs_action.h @@ -34,22 +34,23 @@ class KviKvsScript; class KVIRC_API KviKvsAction : public KviAction { Q_OBJECT + TQ_OBJECT protected: KviKvsScript * m_pScript; public: - KviKvsAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, + KviKvsAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory = 0, - const QString &szBigIcon = QString::null, + const TQString &szBigIcon = TQString(), int iSmallIconId = 0, unsigned int uFlags = 0, - const QString &szKeySequence = QString::null); + const TQString &szKeySequence = TQString()); ~KviKvsAction(); public: - const QString & scriptCode(); + const TQString & scriptCode(); virtual void activate(); }; diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp index 257b6cf..2192dc5 100644 --- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp @@ -32,7 +32,7 @@ KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0; KviKvsAliasManager::KviKvsAliasManager() { m_pAliasManager = this; - m_pAliasDict = new KviPointerHashTable<QString,KviKvsScript>(51,false); + m_pAliasDict = new KviPointerHashTable<TQString,KviKvsScript>(51,false); m_pAliasDict->setAutoDelete(true); } @@ -61,25 +61,25 @@ void KviKvsAliasManager::done() delete KviKvsAliasManager::instance(); } -void KviKvsAliasManager::completeCommand(const QString &word,KviPointerList<QString> * matches) +void KviKvsAliasManager::completeCommand(const TQString &word,KviPointerList<TQString> * matches) { - KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict); + KviPointerHashTableIterator<TQString,KviKvsScript> it(*m_pAliasDict); while(it.current()) { - if(KviQString::equalCIN(word,it.current()->name(),word.length())) - matches->append(new QString(it.current()->name())); + if(KviTQString::equalCIN(word,it.current()->name(),word.length())) + matches->append(new TQString(it.current()->name())); ++it; } } // FIXME: #warning "A binary config would work better and faster here!" -void KviKvsAliasManager::save(const QString & filename) +void KviKvsAliasManager::save(const TQString & filename) { KviConfig cfg(filename,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict); + KviPointerHashTableIterator<TQString,KviKvsScript> it(*m_pAliasDict); while(it.current()) { @@ -89,26 +89,26 @@ void KviKvsAliasManager::save(const QString & filename) } } -void KviKvsAliasManager::load(const QString & filename) +void KviKvsAliasManager::load(const TQString & filename) { m_pAliasDict->clear(); KviConfig cfg(filename,KviConfig::Read); KviConfigIterator it(*(cfg.dict())); - KviPointerList<QString> l; + KviPointerList<TQString> l; l.setAutoDelete(true); while(it.current()) { - l.append(new QString(it.currentKey())); + l.append(new TQString(it.currentKey())); ++it; } - for(QString * s = l.first();s;s = l.next()) + for(TQString * s = l.first();s;s = l.next()) { cfg.setGroup(*s); - QString szCode = cfg.readQStringEntry("_Buffer",""); + TQString szCode = cfg.readTQStringEntry("_Buffer",""); if(!szCode.isEmpty()) { KviKvsScript * m = new KviKvsScript(*s,szCode); diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h index 6f25ecc..49fda27 100644 --- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h +++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h @@ -38,7 +38,7 @@ protected: // it only can be created and destroyed by KviKvsAliasManager::init() KviKvsAliasManager(); ~KviKvsAliasManager(); protected: - KviPointerHashTable<QString,KviKvsScript> * m_pAliasDict; + KviPointerHashTable<TQString,KviKvsScript> * m_pAliasDict; static KviKvsAliasManager * m_pAliasManager; public: static KviKvsAliasManager * instance() @@ -46,20 +46,20 @@ public: static void init(); // called by KviKvs::init() static void done(); // called by KviKvs::done() - KviPointerHashTable<QString,KviKvsScript> * aliasDict(){ return m_pAliasDict; }; - const KviKvsScript * lookup(const QString & szName) - { return m_pAliasDict->find(szName); }; - void add(const QString &szName,KviKvsScript * pAlias) - { m_pAliasDict->replace(szName,pAlias); }; - bool remove(const QString & szName) + KviPointerHashTable<TQString,KviKvsScript> * aliasDict(){ return m_pAliasDict; }; + const KviKvsScript * lookup(const TQString & szName) + { return m_pAliasDict->tqfind(szName); }; + void add(const TQString &szName,KviKvsScript * pAlias) + { m_pAliasDict->tqreplace(szName,pAlias); }; + bool remove(const TQString & szName) { return m_pAliasDict->remove(szName); }; void clear() { m_pAliasDict->clear(); }; - void save(const QString & filename); - void load(const QString & filename); + void save(const TQString & filename); + void load(const TQString & filename); - void completeCommand(const QString &word,KviPointerList<QString> * matches); + void completeCommand(const TQString &word,KviPointerList<TQString> * matches); }; // namespaces are handled completly in the editing! diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/kvi_kvs_array.cpp index 545d828..9d19aae 100644 --- a/src/kvirc/kvs/kvi_kvs_array.cpp +++ b/src/kvirc/kvs/kvi_kvs_array.cpp @@ -191,9 +191,9 @@ KviKvsVariant * KviKvsArray::getAt(kvs_uint_t uIdx) return m_pData[uIdx]; } -void KviKvsArray::serialize(QString& result) +void KviKvsArray::serialize(TQString& result) { - QString tmpBuffer; + TQString tmpBuffer; result="["; kvs_uint_t u = 0; bool bNeedComma = false; @@ -212,7 +212,7 @@ void KviKvsArray::serialize(QString& result) result.append(']'); } -void KviKvsArray::appendAsString(QString &szBuffer) +void KviKvsArray::appendAsString(TQString &szBuffer) { kvs_uint_t u = 0; bool bNeedComma = false; diff --git a/src/kvirc/kvs/kvi_kvs_array.h b/src/kvirc/kvs/kvi_kvs_array.h index 6c6ca46..73ec29d 100644 --- a/src/kvirc/kvs/kvi_kvs_array.h +++ b/src/kvirc/kvs/kvi_kvs_array.h @@ -51,8 +51,8 @@ public: KviKvsVariant * getAt(kvs_uint_t uIdx); bool isEmpty(){ return m_uSize == 0; }; kvs_uint_t size(){ return m_uSize; }; - void appendAsString(QString &szBuffer); - void serialize(QString& result); + void appendAsString(TQString &szBuffer); + void serialize(TQString& result); void sort(); void rsort(); protected: diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index e7e2b62..b9f85d0 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -34,10 +34,10 @@ #include "kvi_error.h" #include "kvi_kvs_variantlist.h" -#include <qtimer.h> +#include <tqtimer.h> -KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) +KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) : KviKvsAsyncOperation(pWnd) { m_pDns = new KviDns(); @@ -45,9 +45,9 @@ KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQue m_eType = eType; m_pCallback = pCallback; m_pMagic = pMagic; - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupTerminated(KviDns *))); + connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupTerminated(KviDns *))); if(!m_pDns->lookup(szQuery,eType)) - QTimer::singleShot(10,this,SLOT(dnsStartFailed())); + TQTimer::singleShot(10,this,TQT_SLOT(dnsStartFailed())); } KviKvsAsyncDnsOperation::~KviKvsAsyncDnsOperation() @@ -79,13 +79,13 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) params.append(new KviKvsVariant()); params.append(new KviKvsVariant(*m_pMagic)); } else { - QString * fh = m_pDns->hostnameList()->first(); - QString * fi = m_pDns->ipAddressList()->first(); + TQString * fh = m_pDns->hostnameList()->first(); + TQString * fi = m_pDns->ipAddressList()->first(); params.append(new KviKvsVariant(m_szQuery)); params.append(new KviKvsVariant((kvs_int_t)1)); - params.append(new KviKvsVariant(fi ? *fi : QString("?.?.?.?"))); - params.append(new KviKvsVariant(fh ? *fh : QString("?.?"))); + params.append(new KviKvsVariant(fi ? *fi : TQString("?.?.?.?"))); + params.append(new KviKvsVariant(fh ? *fh : TQString("?.?"))); params.append(new KviKvsVariant(*m_pMagic)); } @@ -96,22 +96,22 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) } // we have no callback : output the results - QString szQuery = m_pDns->query(); + TQString szQuery = m_pDns->query(); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery); if(m_pDns->state() == KviDns::Failure) { - QString strDescription(KviError::getDescription(m_pDns->error())); + TQString strDescription(KviError::getDescription(m_pDns->error())); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Error: %Q"),&strDescription); } else { int idx = 1; - for(QString * h = m_pDns->hostnameList()->first();h;h = m_pDns->hostnameList()->next()) + for(TQString * h = m_pDns->hostnameList()->first();h;h = m_pDns->hostnameList()->next()) { pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Hostname %d: %Q"),idx,h); idx++; } idx = 1; - for(QString * a = m_pDns->ipAddressList()->first();a;a = m_pDns->ipAddressList()->next()) + for(TQString * a = m_pDns->ipAddressList()->first();a;a = m_pDns->ipAddressList()->next()) { pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("IP address %d: %Q"),idx,a); idx++; diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h index 4e2046c..78909a5 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h @@ -36,15 +36,16 @@ class KviKvsVariant; class KVIRC_API KviKvsAsyncDnsOperation : public KviKvsAsyncOperation { Q_OBJECT + TQ_OBJECT public: - KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); + KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); virtual ~KviKvsAsyncDnsOperation(); protected: KviDns * m_pDns; KviDns::QueryType m_eType; KviKvsVariant * m_pMagic; KviKvsScript * m_pCallback; - QString m_szQuery; + TQString m_szQuery; protected slots: void lookupTerminated(KviDns *); void dnsStartFailed(); diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp index 549627e..19e4656 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp @@ -29,7 +29,7 @@ #include "kvi_window.h" KviKvsAsyncOperation::KviKvsAsyncOperation(KviWindow * pWnd) -: QObject() +: TQObject() { m_pWnd = pWnd; KviKvsKernel::instance()->asyncOperationManager()->registerOperation(this); diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.h b/src/kvirc/kvs/kvi_kvs_asyncoperation.h index 2b5641b..83aaa36 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncoperation.h +++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.h @@ -26,13 +26,14 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qobject.h> +#include <tqobject.h> class KviWindow; -class KVIRC_API KviKvsAsyncOperation : public QObject +class KVIRC_API KviKvsAsyncOperation : public TQObject { Q_OBJECT + TQ_OBJECT public: KviKvsAsyncOperation(KviWindow * pWnd); virtual ~KviKvsAsyncOperation(); diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp index 7f30424..7222f05 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp @@ -29,7 +29,7 @@ #include "kvi_app.h" -KviKvsCallbackObject::KviKvsCallbackObject(const QString &szCallbackName,KviWindow * pTargetWindow,const QString &szCallbackCode,KviKvsVariantList * pMagicParams,unsigned int uFlags) +KviKvsCallbackObject::KviKvsCallbackObject(const TQString &szCallbackName,KviWindow * pTargetWindow,const TQString &szCallbackCode,KviKvsVariantList * pMagicParams,unsigned int uFlags) : KviHeapObject() { m_uFlags = uFlags; @@ -42,7 +42,7 @@ KviKvsCallbackObject::KviKvsCallbackObject(const QString &szCallbackName,KviWind if(pMagicParams) for(KviKvsVariant * v = pMagicParams->first();v;v = pMagicParams->next()) m_pMagicParams->append(new KviKvsVariant(*v)); - QString szName; + TQString szName; szName = szCallbackName; szName += "::"; szName += "callback"; @@ -55,7 +55,7 @@ KviKvsCallbackObject::~KviKvsCallbackObject() delete m_pMagicParams; } -KviKvsCallbackObject::CallbackStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +KviKvsCallbackObject::CallbacktqStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // first of all check the window if(!m_pTargetWindow) diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/kvi_kvs_callbackobject.h index fb6e709..c45ec1b 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.h +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.h @@ -49,7 +49,7 @@ public: // the callback is executed in another window (the associated console, if possible, otherwise the first available console) OnlyIfWindowExists = 1 }; - enum CallbackStatus { + enum CallbacktqStatus { // succesfull execution Success, // error in command @@ -61,9 +61,9 @@ public: }; public: KviKvsCallbackObject( - const QString &szCallbackSource, // the name of this callback (should identify its source, like "dialog.message"): displayed in error messages + const TQString &szCallbackSource, // the name of this callback (should identify its source, like "dialog.message"): displayed in error messages KviWindow * pTargetWindow, // the window that this callback should be triggered in (can be zero: to execute in the first available console) - const QString &szCallbackCode, // the callback code (may be empty!) + const TQString &szCallbackCode, // the callback code (may be empty!) KviKvsVariantList * pMagicParams, // magic parameters that should be passed to the callback (this class makes a copy of them) unsigned int uFlags = 0 // a combination of CallbackFlags ); @@ -76,7 +76,7 @@ protected: unsigned int m_uFlags; protected: // the parameter list is always shallow! - CallbackStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); + CallbacktqStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); }; diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 308ac8d..e925492 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -42,7 +42,7 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> #include "kvi_tal_tooltip.h" namespace KviKvsCoreCallbackCommands @@ -135,7 +135,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(ahost) { - QString szQuery; + TQString szQuery; KviKvsVariant * pMagicPtr; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery) @@ -143,8 +143,8 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any; + if(KVSCCC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCCC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant(); @@ -243,11 +243,11 @@ namespace KviKvsCoreCallbackCommands return false; } - QString szName; + TQString szName; vName->asString(szName); // we allow only [\w:]+ - QRegExp re("[\\w:]+"); + TQRegExp re("[\\w:]+"); if(!re.exactMatch(szName)) { KVSCCC_pContext->error(__tr2qs("Alias names can contain only letters, digits, underscores and '::' namespace separators")); @@ -255,15 +255,15 @@ namespace KviKvsCoreCallbackCommands } // make sure that we have only doubled "::" and not ":" or ":::..." - QString tmp = szName; - tmp.replace("::","@"); // @ is not allowed by the rule above - if(tmp.find(":") != -1) + TQString tmp = szName; + tmp.tqreplace("::","@"); // @ is not allowed by the rule above + if(tmp.tqfind(":") != -1) { KVSCCC_pContext->error(__tr2qs("Stray ':' character in alias name: did you mean ...<namespace>::<name> ?")); return false; } - if(tmp.find("@@") != -1) + if(tmp.tqfind("@@") != -1) { KVSCCC_pContext->error(__tr2qs("Found an empty namespace in alias name")); return false; @@ -273,7 +273,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsAliasManager::instance()->remove(szName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The alias %Q is not existing"),&szName); } } else { @@ -340,16 +340,16 @@ namespace KviKvsCoreCallbackCommands KVSCCC(awhois) { - QString szNick; + TQString szNick; KviKvsVariant * pMagic; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCCC_PARAMETER("magic",KVS_PT_VARIANT,KVS_PF_OPTIONAL,pMagic) KVSCCC_PARAMETERS_END - KVSCCC_REQUIRE_CONNECTION + KVSCCC_RETQUIRE_CONNECTION - KviQCString szN = KVSCCC_pConnection->encodeText(szNick); + KviTQCString szN = KVSCCC_pConnection->encodeText(szNick); KviAsyncWhoisInfo * info = new KviAsyncWhoisInfo(); info->pCallback = new KviKvsScript(*KVSCCC_pCallback); @@ -359,7 +359,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC_pConnection->asyncWhoisData()->add(info); - if(KVSCCC_pSwitches->find('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); + if(KVSCCC_pSwitches->tqfind('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); else KVSCCC_pConnection->sendFmtData("WHOIS %s",szN.data()); return true; @@ -420,7 +420,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(button) { KviKvsVariant * pUnused; - QString szName,szIcon,szLabel; + TQString szName,szIcon,szLabel; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("type_unused",KVS_PT_VARIANT,0,pUnused) KVSCCC_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) @@ -432,7 +432,7 @@ namespace KviKvsCoreCallbackCommands if(!KVSCCC_pWindow->buttonContainer()) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -443,7 +443,7 @@ namespace KviKvsCoreCallbackCommands { if(pButton)delete pButton; else { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Window button '%Q' not found"),&szName); } return true; @@ -466,17 +466,17 @@ namespace KviKvsCoreCallbackCommands if(!szIcon.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon); if(pix) { pButton->setButtonPixmap(*pix); } else { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&szIcon); } } - pButton->setEnabled(!(KVSCCC_pSwitches->find('d',"disabled"))); + pButton->setEnabled(!(KVSCCC_pSwitches->tqfind('d',"disabled"))); return true; } @@ -514,7 +514,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(event) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("event_name",KVS_PT_NONEMPTYSTRING,0,szEventName) KVSCCC_PARAMETER("handler_name",KVS_PT_NONEMPTYSTRING,0,szHandlerName) @@ -528,7 +528,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -536,7 +536,7 @@ namespace KviKvsCoreCallbackCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -548,13 +548,13 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } @@ -563,15 +563,15 @@ namespace KviKvsCoreCallbackCommands { // remove the old handler KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName); - QString contextName; - KviQString::sprintf(contextName,"RawEvent%d::%Q",iNumber,&szHandlerName); + TQString contextName; + KviTQString::sprintf(contextName,"RawEvent%d::%Q",iNumber,&szHandlerName); KviKvsScriptEventHandler * pHandler = new KviKvsScriptEventHandler(szHandlerName,contextName,KVSCCC_pCallback->code()); KviKvsEventManager::instance()->addRawHandler(iNumber,pHandler); } else { // remove the old handler KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName); - QString contextName; - KviQString::sprintf(contextName,"%Q::%Q",&szEventName,&szHandlerName); + TQString contextName; + KviTQString::sprintf(contextName,"%Q::%Q",&szEventName,&szHandlerName); KviKvsScriptEventHandler * pHandler = new KviKvsScriptEventHandler(szHandlerName,contextName,KVSCCC_pCallback->code()); KviKvsEventManager::instance()->addAppHandler(iNumber,pHandler); } @@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands Trigger <callback command> with "ping" events every <timeout> milliseconds. !sw: -w | --bind-to-window Kill the process if the current window is closed. In this case the - termination event is NOT triggered (since the parent window has been lost). + termination event is NOT triggered (since the tqparent window has been lost). If this switch is not used then the process is rebound to the active console window and continues running. !sw: -s=<interpreter command> | --shell=<interpreter command> @@ -679,7 +679,7 @@ namespace KviKvsCoreCallbackCommands The stderr data event is similar to the stdout one but there are three differences. The first one is that the stderr event is NOT triggered by default: you must use the -e switch to enable it. The second difference is that $0 - contains "stderr" instead of "stdout". The last difference is that $1 contains data + tqcontains "stderr" instead of "stdout". The last difference is that $1 contains data coming from the slave process stderr stream.[br] [br] [b]Termination event[/b][br] @@ -883,8 +883,8 @@ namespace KviKvsCoreCallbackCommands { [comment]# We don't wait anymore :)[/comment] %:state++ - echo "Sending QUIT..." - return "QUIT$cr$lf" + echo "Sending TQUIT..." + return "TQUIT$cr$lf" } break; default: @@ -905,7 +905,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(exec) { - QString szCommandline; + TQString szCommandline; KviKvsVariant * pMagic; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("commandline",KVS_PT_NONEMPTYSTRING,0,szCommandline) @@ -914,21 +914,21 @@ namespace KviKvsCoreCallbackCommands int f = 0; - if(KVSCCC_pSwitches->find('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; - if(KVSCCC_pSwitches->find('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; - if(KVSCCC_pSwitches->find('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; - if(KVSCCC_pSwitches->find('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; - if(KVSCCC_pSwitches->find('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; - if(KVSCCC_pSwitches->find('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; - if(KVSCCC_pSwitches->find('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; - - QString szShell; + if(KVSCCC_pSwitches->tqfind('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; + if(KVSCCC_pSwitches->tqfind('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; + if(KVSCCC_pSwitches->tqfind('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; + if(KVSCCC_pSwitches->tqfind('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; + if(KVSCCC_pSwitches->tqfind('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; + if(KVSCCC_pSwitches->tqfind('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; + if(KVSCCC_pSwitches->tqfind('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; + + TQString szShell; KVSCCC_pSwitches->getAsStringIfExisting('s',"shell",szShell); kvs_int_t iPingTime = 0; kvs_int_t iMaxRunTime = 0; - KviKvsVariant * pPing = KVSCCC_pSwitches->find('p',"trigger-ping"); + KviKvsVariant * pPing = KVSCCC_pSwitches->tqfind('p',"trigger-ping"); if(pPing) { if(!(pPing->asInteger(iPingTime) && iPingTime > 0)) @@ -938,7 +938,7 @@ namespace KviKvsCoreCallbackCommands } } - KviKvsVariant * pKill = KVSCCC_pSwitches->find('k',"kill-after"); + KviKvsVariant * pKill = KVSCCC_pSwitches->tqfind('k',"kill-after"); if(pKill) { if(!(pKill->asInteger(iMaxRunTime) && iMaxRunTime > 0)) @@ -962,7 +962,7 @@ namespace KviKvsCoreCallbackCommands KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d); if(!op->start()) { - if(KVSCCC_pSwitches->find('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); + if(KVSCCC_pSwitches->tqfind('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); delete op; } @@ -998,7 +998,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(privateimpl) { kvs_hobject_t hObject; - QString szFunctionName; + TQString szFunctionName; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("object_handle",KVS_PT_HOBJECT,0,hObject) KVSCCC_PARAMETER("function_name",KVS_PT_NONEMPTYSTRING,0,szFunctionName) @@ -1114,7 +1114,7 @@ namespace KviKvsCoreCallbackCommands return false; } - QString szName; + TQString szName; vName->asString(szName); if(!vDelay) @@ -1132,8 +1132,8 @@ namespace KviKvsCoreCallbackCommands KviKvsTimer::Lifetime lt; - if(KVSCCC_pSwitches->find('s',"single-shot"))lt = KviKvsTimer::SingleShot; - else if(KVSCCC_pSwitches->find('p',"persistent"))lt = KviKvsTimer::Persistent; + if(KVSCCC_pSwitches->tqfind('s',"single-shot"))lt = KviKvsTimer::SingleShot; + else if(KVSCCC_pSwitches->tqfind('p',"persistent"))lt = KviKvsTimer::Persistent; else lt = KviKvsTimer::WindowLifetime; // prepare the callback parameters @@ -1165,7 +1165,7 @@ namespace KviKvsCoreCallbackCommands { \ KviKvsCoreCallbackCommandExecRoutine * r = new KviKvsCoreCallbackCommandExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreCallbackCommands::__routine); \ - pKern->registerCoreCallbackCommandExecRoutine(QString(__cmdName),r); \ + pKern->registerCoreCallbackCommandExecRoutine(TQString(__cmdName),r); \ } #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h index ce77ec6..478358d 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h @@ -48,7 +48,7 @@ KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(KVSCCC_pParams,KVSCCC_pContext,parameter_format_list))return false; -#define KVSCCC_REQUIRE_CONNECTION \ +#define KVSCCC_RETQUIRE_CONNECTION \ if(!KVSCCC_pContext->window()->context())return KVSCCC_pContext->errorNoIrcContext(); \ if(!KVSCCC_pContext->window()->connection())return KVSCCC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp index 74aa456..6af8b98 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp @@ -41,13 +41,13 @@ namespace KviKvsCoreFunctions { \ KviKvsCoreFunctionExecRoutine * r = new KviKvsCoreFunctionExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreFunctions::__routine); \ - pKern->registerCoreFunctionExecRoutine(QString(__fncName),r); \ + pKern->registerCoreFunctionExecRoutine(TQString(__fncName),r); \ } // a_f _REGFNC("active",active) _REGFNC("array",array) - _REGFNC("ascii",unicode) + _REGFNC("ascii",tqunicode) _REGFNC("asciiToHex",asciiToHex) _REGFNC("asciiToBase64",asciiToBase64) _REGFNC("away",away) @@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions _REGFNC("length",length) _REGFNC("lf",lf) // m_r - _REGFNC("mask",mask) + _REGFNC("tqmask",tqmask) _REGFNC("me",me) _REGFNC("msgtype",msgtype) _REGFNC("new",newCKEYWORDWORKAROUND) @@ -121,7 +121,7 @@ namespace KviKvsCoreFunctions _REGFNC("true",trueCKEYWORDWORKAROUND) _REGFNC("typeof",typeofCKEYWORDWORKAROUND) _REGFNC("u",u) - _REGFNC("unicode",unicode) + _REGFNC("tqunicode",tqunicode) _REGFNC("unixtime",unixtime) _REGFNC("unserialize",unserialize) _REGFNC("username",username) @@ -133,7 +133,7 @@ namespace KviKvsCoreFunctions #undef _REGCMD } - static QString g_szStaticStrayConstantAt("@"); + static TQString g_szStaticStrayConstantAt("@"); KVSCF(strayAt) { diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h index 9fd25ea..16d281a 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.h +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h @@ -101,7 +101,7 @@ namespace KviKvsCoreFunctions KVSCF(length); KVSCF(lf); // m_r - KVSCF(mask); + KVSCF(tqmask); KVSCF(me); KVSCF(msgtype); KVSCF(newCKEYWORDWORKAROUND); @@ -131,7 +131,7 @@ namespace KviKvsCoreFunctions KVSCF(trueCKEYWORDWORKAROUND); KVSCF(typeofCKEYWORDWORKAROUND); KVSCF(u); - KVSCF(unicode); + KVSCF(tqunicode); KVSCF(unixtime); KVSCF(unserialize); KVSCF(username); @@ -140,7 +140,7 @@ namespace KviKvsCoreFunctions // specials KVSCF(strayAt); KVSCF(mightBeStrayAtOrThis); - //bool redirectToModule(const QString &szFrom,const QString &szModName,const QString &szFuncName + //bool redirectToModule(const TQString &szFrom,const TQString &szModName,const TQString &szFuncName void init(); }; diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index 0fba8d7..508ec52 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -108,7 +108,7 @@ namespace KviKvsCoreFunctions @syntax: <variant> $ascii(<char:string>) @description: - This function has been renamed to $unicode and is present + This function has been renamed to $tqunicode and is present only for backward compatibility. @seealso: [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] @@ -139,7 +139,7 @@ namespace KviKvsCoreFunctions KVSCF(asciiToBase64) { - QString szAscii; + TQString szAscii; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii) KVSCF_PARAMETERS_END @@ -149,9 +149,9 @@ namespace KviKvsCoreFunctions { KviStr tmp2; tmp2.bufferToBase64(tmp1.ptr(),tmp1.len()); - KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); + KVSCF_pRetBuffer->setString(TQString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); } return true; } @@ -181,7 +181,7 @@ namespace KviKvsCoreFunctions KVSCF(asciiToHex) { - QString szAscii; + TQString szAscii; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii) KVSCF_PARAMETERS_END @@ -191,9 +191,9 @@ namespace KviKvsCoreFunctions { KviStr tmp2; tmp2.bufferToHex(tmp1.ptr(),tmp1.len()); - KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); + KVSCF_pRetBuffer->setString(TQString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); } return true; } @@ -320,7 +320,7 @@ namespace KviKvsCoreFunctions KVSCF(b) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_BOLD))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_BOLD))); return true; } @@ -344,7 +344,7 @@ namespace KviKvsCoreFunctions KVSCF(base64ToAscii) { - QString szBase64; + TQString szBase64; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("base64_encoded_string",KVS_PT_STRING,0,szBase64) KVSCF_PARAMETERS_END @@ -352,7 +352,7 @@ namespace KviKvsCoreFunctions KviStr tmp1(szBase64); char * buf; int len = tmp1.base64ToBuffer(&buf,true); - KVSCF_pRetBuffer->setString(QString(buf)); + KVSCF_pRetBuffer->setString(TQString(buf)); KviStr::freeBuffer(buf); return true; } @@ -444,7 +444,7 @@ namespace KviKvsCoreFunctions KVSCF(channel) { - QString szName; + TQString szName; kvs_uint_t uContextId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("channel_name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szName) @@ -489,30 +489,30 @@ namespace KviKvsCoreFunctions @title: $char @short: - Returns a character specified by unicode + Returns a character specified by tqunicode @syntax: - <string> $char(<unicode_value:integer>) + <string> $char(<tqunicode_value:integer>) @description: - Returns a character corresponding to the UNICODE code <unicode_value>.[br] + Returns a character corresponding to the UNICODE code <tqunicode_value>.[br] This function can not return NUL character (UNICODE 0). Basically you should never need it: if you do, drop me a mail.[br] - If the <unicode_code> is not a valid UNICODE code (or is 0), this function returns + If the <tqunicode_code> is not a valid UNICODE code (or is 0), this function returns an empty string.[br] @seealso: - [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$unicode[/fnc] + [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$tqunicode[/fnc] */ KVSCF(charCKEYWORDWORKAROUND) { kvs_uint_t ac; KVSCF_PARAMETERS_BEGIN - KVSCF_PARAMETER("unicode_value",KVS_PT_UINT,0,ac) + KVSCF_PARAMETER("tqunicode_value",KVS_PT_UINT,0,ac) KVSCF_PARAMETERS_END if(ac != 0 && ac < 65536) - KVSCF_pRetBuffer->setString(QString(QChar((unsigned short)ac))); + KVSCF_pRetBuffer->setString(TQString(TQChar((unsigned short)ac))); else - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); return true; } @@ -535,7 +535,7 @@ namespace KviKvsCoreFunctions KVSCF(classDefined) { // prologue: parameter handling - QString szClassName; + TQString szClassName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("className",KVS_PT_NONEMPTYSTRING,0,szClassName) @@ -627,7 +627,7 @@ namespace KviKvsCoreFunctions KVSCF(context) { - QString szServer,szNick; + TQString szServer,szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("server",KVS_PT_STRING,KVS_PF_OPTIONAL,szServer) KVSCF_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) @@ -665,7 +665,7 @@ namespace KviKvsCoreFunctions KVSCF(cr) { - KVSCF_pRetBuffer->setString(QString(QChar('\r'))); + KVSCF_pRetBuffer->setString(TQString(TQChar('\r'))); return true; } @@ -761,7 +761,7 @@ namespace KviKvsCoreFunctions KVSCF(date) { - QString szFormat; + TQString szFormat; kvs_int_t iTime; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("format",KVS_PT_NONEMPTYSTRING,0,szFormat) @@ -771,24 +771,24 @@ namespace KviKvsCoreFunctions KviStr tmpFormat(""); #ifdef COMPILE_ON_WINDOWS - QString szAllowedCharacters; + TQString szAllowedCharacters; //windows version of strftime() //kvirc crashes if other then these characters get an % character in front of them szAllowedCharacters = "AaBbcdHIjMmpSUWwXxYyZz"; #endif - const QChar * c = KviQString::nullTerminatedArray(szFormat); + const TQChar * c = KviTQString::nullTerminatedArray(szFormat); if(c) { - while(c->unicode()) + while(c->tqunicode()) { //Check for right Characters #ifdef COMPILE_ON_WINDOWS - if (szAllowedCharacters.find((char)(c->unicode()),0,true) >= 0) tmpFormat += '%'; + if (szAllowedCharacters.tqfind((char)(c->tqunicode()),0,true) >= 0) tmpFormat += '%'; #else if (c->isLetter()) tmpFormat += '%'; #endif - tmpFormat += (char)(c->unicode()); + tmpFormat += (char)(c->tqunicode()); c++; } } @@ -804,7 +804,7 @@ namespace KviKvsCoreFunctions { KviStr tmp = buf; if(tmp.lastCharIs('\n'))tmp.cutRight(1); - KVSCF_pRetBuffer->setString(QString(buf)); + KVSCF_pRetBuffer->setString(TQString(buf)); } else { KVSCF_pContext->warning(__tr2qs("The specified format string wasn't accepted by the underlying system time formatting function")); } @@ -900,7 +900,7 @@ namespace KviKvsCoreFunctions KVSCF(features) { - QString szFeature; + TQString szFeature; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("test_feature",KVS_PT_STRING,KVS_PF_OPTIONAL,szFeature) KVSCF_PARAMETERS_END @@ -948,9 +948,9 @@ namespace KviKvsCoreFunctions "ScriptToolBar", #endif // COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_USE_QT4 - "Qt4", + "TQt4", #else - "Qt3", + "TQt3", #endif #ifdef COMPILE_NEW_KVS "KVS", @@ -962,7 +962,7 @@ namespace KviKvsCoreFunctions { for(int i=0;feature_array[i];i++) { - if(KviQString::equalCI(feature_array[i],szFeature)) + if(KviTQString::equalCI(feature_array[i],szFeature)) { KVSCF_pRetBuffer->setBoolean(true); return true; @@ -972,7 +972,7 @@ namespace KviKvsCoreFunctions } else { KviKvsArray * a = new KviKvsArray(); int id = 0; - for(int i=0;feature_array[i];i++)a->set(i,new KviKvsVariant(QString(feature_array[i]))); + for(int i=0;feature_array[i];i++)a->set(i,new KviKvsVariant(TQString(feature_array[i]))); KVSCF_pRetBuffer->setArray(a); } @@ -1111,18 +1111,18 @@ namespace KviKvsCoreFunctions KVSCF(fmtlink) { - QString szLinkText,szCmd,szToolTip; + TQString szLinkText,szCmd,szToolTip; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("link_text",KVS_PT_NONEMPTYSTRING,0,szLinkText) KVSCF_PARAMETER("double_click_command",KVS_PT_STRING,0,szCmd) KVSCF_PARAMETER("tooltip_text",KVS_PT_STRING,KVS_PF_OPTIONAL,szToolTip) KVSCF_PARAMETERS_END - QString szPart; - KviQString::sprintf(szPart,"[!dbl]%Q",&szCmd); - if(!szToolTip.isEmpty())KviQString::appendFormatted(szPart,"[!txt]%Q",&szToolTip); - QString szLink; - KviQString::sprintf(szLink,"\r!%Q\r%Q\r",&szPart,&szLinkText); + TQString szPart; + KviTQString::sprintf(szPart,"[!dbl]%Q",&szCmd); + if(!szToolTip.isEmpty())KviTQString::appendFormatted(szPart,"[!txt]%Q",&szToolTip); + TQString szLink; + KviTQString::sprintf(szLink,"\r!%Q\r%Q\r",&szPart,&szLinkText); KVSCF_pRetBuffer->setString(szLink); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp index ce8728d..4e9f3c7 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp @@ -41,7 +41,7 @@ #include "kvi_time.h" #include "kvi_kvs_eventmanager.h" #include "kvi_kvs_eventhandler.h" -#include <qregexp.h> +#include <tqregexp.h> #include "kvi_lagmeter.h" namespace KviKvsCoreFunctions @@ -88,7 +88,7 @@ namespace KviKvsCoreFunctions { KviKvsVariant * val = KVSCF_pParams->next(); if(!val)break; - QString sz; + TQString sz; key->asString(sz); a->set(sz,new KviKvsVariant(*val)); } @@ -122,7 +122,7 @@ namespace KviKvsCoreFunctions KVSCF(hexToAscii) { - QString szHex; + TQString szHex; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("hex_encoded_string",KVS_PT_STRING,0,szHex) KVSCF_PARAMETERS_END @@ -130,7 +130,7 @@ namespace KviKvsCoreFunctions KviStr tmp1(szHex); char * buf; int len = tmp1.hexToBuffer(&buf,true); - KVSCF_pRetBuffer->setString(QString(KviQCString(buf,len+1))); + KVSCF_pRetBuffer->setString(TQString(KviTQCString(buf,len+1))); KviStr::freeBuffer(buf); return true; } @@ -172,7 +172,7 @@ namespace KviKvsCoreFunctions KVSCF(hostname) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -182,7 +182,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setString(e->host()); @@ -289,7 +289,7 @@ namespace KviKvsCoreFunctions KVSCF(icon) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("iconName",KVS_PT_NONEMPTYSTRING,0,szName) KVSCF_PARAMETERS_END @@ -511,7 +511,7 @@ namespace KviKvsCoreFunctions KVSCF(isEventEnabled) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KviKvsScriptEventHandler *h=0; KVSCF_PARAMETERS_BEGIN @@ -635,7 +635,7 @@ namespace KviKvsCoreFunctions KVSCF(isTimer) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("timerName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -668,7 +668,7 @@ namespace KviKvsCoreFunctions KVSCF(isWellKnown) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -678,7 +678,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setBoolean(e->hasHost() && e->hasUser()); @@ -705,7 +705,7 @@ namespace KviKvsCoreFunctions <string> $k(<foreground:integer>[,<background:integer>]) <string> $k @description: - Returns the COLOR mIRC control character (Qt::CTRL+K).[br] + Returns the COLOR mIRC control character (TQt::CTRL+K).[br] If <foreground> and <background> are passed, a standard mIRC color escape is returned.[br] @seealso: @@ -720,12 +720,12 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("background",KVS_PT_UINT,KVS_PF_OPTIONAL,iBack) KVSCF_PARAMETERS_END - QString szRet = QChar(KVI_TEXT_COLOR); + TQString szRet = TQChar(KVI_TEXT_COLOR); if(KVSCF_pParams->count() > 0) { - KviQString::appendFormatted(szRet,"%u",iFore); + KviTQString::appendFormatted(szRet,"%u",iFore); if(KVSCF_pParams->count() > 1) - KviQString::appendFormatted(szRet,",%u",iBack); + KviTQString::appendFormatted(szRet,",%u",iBack); } KVSCF_pRetBuffer->setString(szRet); return true; @@ -794,13 +794,13 @@ namespace KviKvsCoreFunctions KVSCF(lang) { - QString szType; + TQString szType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("type",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szType) KVSCF_PARAMETERS_END - QString szLocale(KviLocale::localeName().ptr()); + TQString szLocale(KviLocale::localeName().ptr()); if(szType=="lang") KVSCF_pRetBuffer->setString(szLocale.left(5)); else if(szType=="short") KVSCF_pRetBuffer->setString(szLocale.left(2)); else KVSCF_pRetBuffer->setString(szLocale); @@ -851,7 +851,7 @@ namespace KviKvsCoreFunctions break; default: { - QString tmp; + TQString tmp; pVar->asString(tmp); KVSCF_pRetBuffer->setInteger(tmp.length()); } @@ -880,7 +880,7 @@ namespace KviKvsCoreFunctions KVSCF(lf) { - KVSCF_pRetBuffer->setString(QString(QChar('\n'))); + KVSCF_pRetBuffer->setString(TQString(TQChar('\n'))); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 6316f1d..d3d68ec 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions /////////////////////////////////////////////////////////////////////////////////////////////// /* - @doc: mask + @doc: tqmask @type: function @title: - $mask + $tqmask @short: - Retrieves the host mask of a user + Retrieves the host tqmask of a user @syntax: - $mask[(<nickname>[,<mask_type>])] + $tqmask[(<nickname>[,<tqmask_type>])] @description: - Returns the specified type of mask for the user with <nickname>.[br] - If the host or username are not known, the mask may contain less information + Returns the specified type of tqmask for the user with <nickname>.[br] + If the host or username are not known, the tqmask may contain less information than requested.[br] If the <nickname> is not given it is assumed to be the current nickname.[br] - If <mask_type> is not given or is invalid, it is assumed to be 0.[br] - Available mask types:[br] + If <tqmask_type> is not given or is invalid, it is assumed to be 0.[br] + Available tqmask types:[br] 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)[br] 1 : nick!user@*.abc.host.top (nick!user@XXX.XXX.XXX.*)[br] 2 : nick!user@*[br] @@ -92,33 +92,33 @@ namespace KviKvsCoreFunctions 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br] 26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br] If some data is missing, these types may change:[br] - For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br] + For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br] If the user with <nickname> is not found in the current IRC context user database, an empty string is returned.[br] - The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses - in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then - the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK + The tqmasks 22-26 are the smart versions of the tqmasks 17-21 that try take care of tqmasked ip addresses + in the form xxx.xxx.INVALID-TOP-MASK. If a tqmasked ip address is found then + the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK @examples: @seealso: */ - KVSCF(mask) + KVSCF(tqmask) { - QString szNick; - kvs_uint_t maskType; + TQString szNick; + kvs_uint_t tqmaskType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nickname",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) - KVSCF_PARAMETER("maskType",KVS_PT_UINT,KVS_PF_OPTIONAL,maskType) + KVSCF_PARAMETER("tqmaskType",KVS_PT_UINT,KVS_PF_OPTIONAL,tqmaskType) KVSCF_PARAMETERS_END - if(maskType > 26) maskType = 0; + if(tqmaskType > 26) tqmaskType = 0; if(KVSCF_pContext->window()->console()) { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); if(e) { KviIrcMask u; @@ -126,8 +126,8 @@ namespace KviKvsCoreFunctions u.setUsername(e->user()); u.setHost(e->host()); - QString tmp; - u.mask(tmp,(KviIrcMask::MaskType)maskType); + TQString tmp; + u.tqmask(tmp,(KviIrcMask::MaskType)tqmaskType); KVSCF_pRetBuffer->setString(tmp); return true; } @@ -228,7 +228,7 @@ namespace KviKvsCoreFunctions KVSCF(msgtype) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("msg_type_color_set_name",KVS_PT_NONEMPTYSTRING,0,szName) KVSCF_PARAMETERS_END @@ -257,12 +257,12 @@ namespace KviKvsCoreFunctions @short: Creates a new object @syntax: - $new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]]) + $new(<className>,[<tqparentHandle> [,<name>[,<param>[,<param>[...]]]]) @description: Creates a new instance of the object <class> with - the parent object <parent_id> and the specified <name>.[br] - <name> and <parent_id> are optional: if not specified, <name> - is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br] + the tqparent object <tqparent_id> and the specified <name>.[br] + <name> and <tqparent_id> are optional: if not specified, <name> + is assumed to be an empty string and <tqparent_id> default to 0 (tqparentless object).[br] Please see the [doc:objects]objects documentation[/doc] for more information.[br] @examples: [example] @@ -275,14 +275,14 @@ namespace KviKvsCoreFunctions KVSCF(newCKEYWORDWORKAROUND) { // prologue: parameter handling - QString szClassName; - QString szName; + TQString szClassName; + TQString szName; kvs_hobject_t hParent; KviKvsVariantList vList; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("className",KVS_PT_NONEMPTYSTRING,0,szClassName) - KVSCF_PARAMETER("parentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent) + KVSCF_PARAMETER("tqparentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent) KVSCF_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCF_PARAMETER("parameterList",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,vList) KVSCF_PARAMETERS_END @@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent); if(!pParent) { - KVSCF_pContext->error(__tr2qs("The specified parent object does not exist")); + KVSCF_pContext->error(__tr2qs("The specified tqparent object does not exist")); return false; } } else { @@ -390,7 +390,7 @@ namespace KviKvsCoreFunctions KVSCF(o) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_RESET))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_RESET))); return true; } @@ -419,12 +419,12 @@ namespace KviKvsCoreFunctions KVSCF(option) { - QString szOpt; + TQString szOpt; // FIXME: This should return a variant in general KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("optionName",KVS_PT_NONEMPTYSTRING,0,szOpt) KVSCF_PARAMETERS_END - QString tmp; + TQString tmp; if(g_pApp->getOptionString(szOpt,tmp))KVSCF_pRetBuffer->setString(tmp); else { KVSCF_pContext->warning(__tr2qs("There is no option named '%Q'"),&szOpt); @@ -467,7 +467,7 @@ namespace KviKvsCoreFunctions KVSCF(query) { - QString szName; + TQString szName; kvs_uint_t uContextId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("query_name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szName) @@ -496,7 +496,7 @@ namespace KviKvsCoreFunctions } } } else { - if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_QUERY)wnd = KVSCF_pContext->window(); + if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_TQUERY)wnd = KVSCF_pContext->window(); } KVSCF_pRetBuffer->setInteger((kvs_int_t)(wnd ? wnd->numericId() : 0)); @@ -523,7 +523,7 @@ namespace KviKvsCoreFunctions KVSCF(r) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_REVERSE))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_REVERSE))); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 64b16c0..8b4ef73 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -73,7 +73,7 @@ namespace KviKvsCoreFunctions { ///////////////////////////////////////////////////////////////////////////////////////// - // FIXME: #warning "THIS HAS TO WORK FOR QUERIES TOO!" + // FIXME: #warning "THIS HAS TO WORK FOR TQUERIES TOO!" /* @doc: selected @type: @@ -106,7 +106,7 @@ namespace KviKvsCoreFunctions KVSCF(selected) { - QString winId; + TQString winId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("winId",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,winId) KVSCF_PARAMETERS_END @@ -135,7 +135,7 @@ namespace KviKvsCoreFunctions KviKvsArray * a = new KviKvsArray(); kvs_int_t i = 0; - for(QString * s = ((KviChannel *)wnd)->firstSelectedNickname();s;s = ((KviChannel *)wnd)->nextSelectedNickname()) + for(TQString * s = ((KviChannel *)wnd)->firstSelectedNickname();s;s = ((KviChannel *)wnd)->nextSelectedNickname()) { a->set(i,new KviKvsVariant(*s)); i++; @@ -187,7 +187,7 @@ namespace KviKvsCoreFunctions KVSCF(serialize) { KviKvsVariant *pVar = 0; - QString szBuffer; + TQString szBuffer; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,pVar) @@ -332,7 +332,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,v) KVSCF_PARAMETERS_END - QString szVal; + TQString szVal; v->asString(szVal); KVSCF_pRetBuffer->setString(szVal); return true; @@ -378,8 +378,8 @@ namespace KviKvsCoreFunctions KVSCF(sw) { - QString szSwitch; - QString szLongSwitch; + TQString szSwitch; + TQString szLongSwitch; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("switch_name",KVS_PT_STRING,0,szSwitch) @@ -399,14 +399,14 @@ namespace KviKvsCoreFunctions if(szSwitch.length() > 1) { if(szLongSwitch.isEmpty()) - v = sl->find(szSwitch); + v = sl->tqfind(szSwitch); else - v = sl->find(szSwitch[0].unicode(),szLongSwitch); + v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); }else { if(szLongSwitch.isEmpty()) - v = sl->find(szSwitch[0]); + v = sl->tqfind(szSwitch[0]); else - v = sl->find(szSwitch[0].unicode(),szLongSwitch); + v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); } if(v)KVSCF_pRetBuffer->copyFrom(*v); @@ -450,7 +450,7 @@ namespace KviKvsCoreFunctions KVSCF(target) { - QString winId; + TQString winId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("winId",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,winId) KVSCF_PARAMETERS_END @@ -470,7 +470,7 @@ namespace KviKvsCoreFunctions } //debug("CALLING $target on window %s",wnd->name()); - QString szTa = wnd->target(); + TQString szTa = wnd->target(); KVSCF_pRetBuffer->setString(wnd->target()); @@ -689,8 +689,8 @@ namespace KviKvsCoreFunctions KVSCF(tr) { // prologue: parameter handling - QString szString; - QString szCatalogue; + TQString szString; + TQString szCatalogue; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("default_language_string",KVS_PT_STRING,0,szString) @@ -698,17 +698,17 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETERS_END if(szString.isEmpty()) return true; // body: the real job - QString translation; + TQString translation; if(!szCatalogue.isEmpty()) { KviMessageCatalogue * pCat = KviLocale::getLoadedCatalogue(szCatalogue); if(pCat) { - translation = pCat->translateToQString(szString); + translation = pCat->translateToTQString(szString); } else { // attempt to load it automatically - QString szDir; + TQString szDir; g_pApp->getLocalKvircDirectory(szDir,KviApp::Locale); if(!KviLocale::loadCatalogue(szCatalogue,szDir)) { @@ -808,7 +808,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,v) KVSCF_PARAMETERS_END - QString szType; + TQString szType; v->getTypeName(szType); KVSCF_pRetBuffer->setString(szType); #endif @@ -835,22 +835,22 @@ namespace KviKvsCoreFunctions KVSCF(u) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_UNDERLINE))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_UNDERLINE))); return true; } ///////////////////////////////////////////////////////////////////////////////////////// /* - @doc: unicode + @doc: tqunicode @type: function @title: - $unicode + $tqunicode @short: Returns the UNICODE code of a sets of characters @syntax: - <variant> $unicode(<char:string>) + <variant> $tqunicode(<char:string>) @description: If <char> is composed only of a single character then returns its UNICODE code point as an integer. @@ -860,9 +860,9 @@ namespace KviKvsCoreFunctions [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] */ - KVSCF(unicode) + KVSCF(tqunicode) { - QString sz; + TQString sz; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("char",KVS_PT_NONEMPTYSTRING,0,sz) KVSCF_PARAMETERS_END @@ -871,10 +871,10 @@ namespace KviKvsCoreFunctions { KviKvsArray * a = new KviKvsArray(); for(kvs_int_t i=0;i<sz.length();i++) - a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].unicode()))); + a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].tqunicode()))); KVSCF_pRetBuffer->setArray(a); } else { - KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].unicode())); + KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].tqunicode())); } return true; } @@ -922,7 +922,7 @@ namespace KviKvsCoreFunctions KVSCF(unserialize) { - QString szData; + TQString szData; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("data",KVS_PT_NONEMPTYSTRING,0,szData) @@ -971,7 +971,7 @@ namespace KviKvsCoreFunctions KVSCF(username) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -981,7 +981,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setString(e->user()); @@ -1027,7 +1027,7 @@ namespace KviKvsCoreFunctions KVSCF(version) { - QString szType; + TQString szType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("type",KVS_PT_STRING,KVS_PF_OPTIONAL,szType) KVSCF_PARAMETERS_END @@ -1035,9 +1035,9 @@ namespace KviKvsCoreFunctions if(szType.isEmpty()) KVSCF_pRetBuffer->setString(KVI_VERSION); else { - if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); - else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); - else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); + if(szType.tqfind('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); + else if(szType.tqfind('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); + else if(szType.tqfind('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); else KVSCF_pRetBuffer->setString(KVI_VERSION); } return true; @@ -1078,7 +1078,7 @@ namespace KviKvsCoreFunctions KVSCF(window) { //#warning "FIXME: the window identifiers could be numbers!" - QString szCaption; + TQString szCaption; kvs_int_t iContextId; // kvs_int_t is 64bit while int is 32 (and thus KVSCF_PARAMETER() crashes) KVSCF_PARAMETERS_BEGIN diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp index a597963..97a669f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp @@ -34,8 +34,8 @@ #include "kvi_locale.h" #include "kvi_kvs_treenode_command.h" -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> namespace KviKvsCoreSimpleCommands { @@ -47,7 +47,7 @@ namespace KviKvsCoreSimpleCommands { \ KviKvsCoreSimpleCommandExecRoutine * r = new KviKvsCoreSimpleCommandExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreSimpleCommands::__routine); \ - pKern->registerCoreSimpleCommandExecRoutine(QString(__cmdName),r); \ + pKern->registerCoreSimpleCommandExecRoutine(TQString(__cmdName),r); \ } // a_f _REGCMD("admin",rfc2812wrapper) @@ -141,12 +141,12 @@ namespace KviKvsCoreSimpleCommands bool multipleModeCommand(KviKvsRunTimeContext * __pContext,KviKvsVariantList * __pParams,KviKvsSwitchList * __pSwitches,char plusminus,char flag) { - QString szTokens; + TQString szTokens; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("tokens",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szTokens) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL) { @@ -154,16 +154,16 @@ namespace KviKvsCoreSimpleCommands return true; } - QStringList sl = QStringList::split(QRegExp("[, ]+"),szTokens,false); + TQStringList sl = TQStringList::split(TQRegExp("[, ]+"),szTokens,false); - KviQCString szFlags; - KviQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName()); - KviQCString szMessage; + KviTQCString szFlags; + KviTQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName()); + KviTQCString szMessage; int i = 0; - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - KviQCString szTxt = KVSCSC_pConnection->encodeText(*it); + KviTQCString szTxt = KVSCSC_pConnection->encodeText(*it); if(!szTxt.isEmpty()) { szFlags += flag; @@ -217,15 +217,15 @@ namespace KviKvsCoreSimpleCommands KVSCSC(rfc2812wrapper) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString txt = KVSCSC_pConnection->encodeText(szText); - KviQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName()); + KviTQCString txt = KVSCSC_pConnection->encodeText(szText); + KviTQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName()); if(!KVSCSC_pConnection->sendFmtData("%s %s",cmd.data(),txt.data() ? txt.data() : "")) return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h index 94acbdc..9c773a9 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h @@ -46,7 +46,7 @@ KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(KVSCSC_pParams,KVSCSC_pContext,parameter_format_list))return false; -#define KVSCSC_REQUIRE_CONNECTION \ +#define KVSCSC_RETQUIRE_CONNECTION \ if(!KVSCSC_pContext->window()->context())return KVSCSC_pContext->errorNoIrcContext(); \ if(!KVSCSC_pContext->window()->connection())return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index c3911a3..cf86ed6 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -48,7 +48,7 @@ #include <unistd.h> // for usleep(); #ifdef COMPILE_USE_QT4 - #include <qx11info_x11.h> + #include <tqx11info_x11.h> #define get_xdisplay QX11Info::display #else #define get_xdisplay qt_xdisplay @@ -113,16 +113,16 @@ namespace KviKvsCoreSimpleCommands KVSCSC(away) { - QString szReason; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szReason.isEmpty())szReason = KVI_OPTION_STRING(KviOption_stringAwayMessage); - if(KVSCSC_pSwitches->find('a',"all-networks")) + if(KVSCSC_pSwitches->tqfind('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -138,7 +138,7 @@ namespace KviKvsCoreSimpleCommands ++it; } } else { - KviQCString szR = KVSCSC_pConnection->encodeText(szReason); + KviTQCString szR = KVSCSC_pConnection->encodeText(szReason); if(!(KVSCSC_pConnection->sendFmtData("AWAY :%s",szR.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } @@ -176,7 +176,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(back) { - if(KVSCSC_pSwitches->find('a',"all-networks")) + if(KVSCSC_pSwitches->tqfind('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -190,7 +190,7 @@ namespace KviKvsCoreSimpleCommands ++it; } } else { - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(!(KVSCSC_pConnection->sendFmtData("AWAY"))) return KVSCSC_pContext->warningNoIrcConnection(); @@ -208,11 +208,11 @@ namespace KviKvsCoreSimpleCommands @title: ban @syntax: - ban <mask_list> + ban <tqmask_list> @short: - Sets ban masks for the channel + Sets ban tqmasks for the channel @description: - Sets the ban masks specified in the <mask_list>, + Sets the ban tqmasks specified in the <tqmask_list>, which is a comma separated list of nicknames. This command works only if executed in a channel window. The command is translated to a set of MODE messages containing @@ -291,10 +291,10 @@ namespace KviKvsCoreSimpleCommands kvs_int_t pitch = -1; kvs_int_t duration = -1; - bool bSync = (KVSCSC_pSwitches->find('s',"sync") != 0); + bool bSync = (KVSCSC_pSwitches->tqfind('s',"sync") != 0); bool bOk = false; - KviKvsVariant * pPitch = KVSCSC_pSwitches->find('p',"pitch"); + KviKvsVariant * pPitch = KVSCSC_pSwitches->tqfind('p',"pitch"); if(pPitch) { if(!pPitch->asInteger(pitch)) @@ -304,7 +304,7 @@ namespace KviKvsCoreSimpleCommands } } - KviKvsVariant * pDuration = KVSCSC_pSwitches->find('d',"duration"); + KviKvsVariant * pDuration = KVSCSC_pSwitches->tqfind('d',"duration"); if(pDuration) { if(!pDuration->asInteger(duration)) @@ -328,19 +328,19 @@ namespace KviKvsCoreSimpleCommands XGetKeyboardControl(get_xdisplay(),&st); - unsigned long mask = KBBellPercent; + unsigned long tqmask = KBBellPercent; ctl.bell_percent = uVolume; if(pitch >= 0) { ctl.bell_pitch = pitch; - mask |= KBBellPitch; + tqmask |= KBBellPitch; } if(duration >= 0) { ctl.bell_duration = duration; - mask |= KBBellDuration; + tqmask |= KBBellDuration; } - XChangeKeyboardControl(get_xdisplay(),mask,&ctl); + XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); XBell(get_xdisplay(),100); @@ -354,7 +354,7 @@ namespace KviKvsCoreSimpleCommands ctl.bell_duration = st.bell_duration; ctl.bell_percent = st.bell_percent; - XChangeKeyboardControl(get_xdisplay(),mask,&ctl); + XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); #endif //COMPILE_NO_X_BELL #endif @@ -398,7 +398,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(buttonctl) { - QString tbTypeUnused,tbName,tbOp,tbPar; + TQString tbTypeUnused,tbName,tbOp,tbPar; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("type",KVS_PT_STRING,0,tbTypeUnused) KVSCSC_PARAMETER("name",KVS_PT_STRING,0,tbName) @@ -410,7 +410,7 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pWindow->buttonContainer()) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -418,16 +418,16 @@ namespace KviKvsCoreSimpleCommands if(!pButton) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); return true; } - QChar o; + TQChar o; if (tbOp.length() > 0) o=tbOp[0]; - else o=QChar('x'); + else o=TQChar('x'); - // QChar o = tbOp.length() > 0 ? tbOp[0] : QChar('x'); + // TQChar o = tbOp.length() > 0 ? tbOp[0] : TQChar('x'); - switch(o.unicode()) + switch(o.tqunicode()) { case 't': KviTalToolTip::remove(pButton); @@ -437,12 +437,12 @@ namespace KviKvsCoreSimpleCommands case 'i': if(!tbPar.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(tbPar); + TQPixmap * pix = g_pIconManager->getImage(tbPar); if(pix) { pButton->setButtonPixmap(*pix); } else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); } } break; @@ -508,26 +508,26 @@ namespace KviKvsCoreSimpleCommands KVSCSC(ctcp) { - QString szTarget,szCtcpData; + TQString szTarget,szCtcpData; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("ctcp_data",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szCtcpData) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - if(KviQString::equalCI(szCtcpData,"PING")) + if(KviTQString::equalCI(szCtcpData,"PING")) { struct timeval tv; kvi_gettimeofday(&tv,0); - KviQString::appendFormatted(szCtcpData," %d.%d",tv.tv_sec,tv.tv_usec); + KviTQString::appendFormatted(szCtcpData," %d.%d",tv.tv_sec,tv.tv_usec); } - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = KVSCSC_pConnection->encodeText(szCtcpData); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = KVSCSC_pConnection->encodeText(szCtcpData); if(!(KVSCSC_pConnection->sendFmtData("%s %s :%c%s%c", - KVSCSC_pSwitches->find('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) + KVSCSC_pSwitches->tqfind('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) return KVSCSC_pContext->warningNoIrcConnection(); return true; @@ -553,7 +553,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(debug) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KviWindow * pWnd = KviDebugWindow::getInstance(); pWnd->outputNoFmt(KVI_OUT_NONE,szAll); @@ -628,16 +628,16 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END if(hObject == (kvs_hobject_t)0) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete a null object reference")); } else { KviKvsObject * o = KviKvsKernel::instance()->objectController()->lookupObject(hObject); if(!o) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete an inexisting object")); } else { - if(KVSCSC_pSwitches->find('i',"immediate")) + if(KVSCSC_pSwitches->tqfind('i',"immediate")) o->dieNow(); else o->die(); @@ -679,7 +679,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(delpopupitem) { - QString szPopupName,szItemId; + TQString szPopupName,szItemId; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("popupname",KVS_PT_NONEMPTYSTRING,0,szPopupName) KVSCSC_PARAMETER("item_id",KVS_PT_NONEMPTYSTRING,0,szItemId) @@ -688,7 +688,7 @@ namespace KviKvsCoreSimpleCommands KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); if(!p) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Inexisting popup \"%Q\""),&szPopupName); return true; } @@ -699,9 +699,9 @@ namespace KviKvsCoreSimpleCommands return false; } - if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->find('d',"deep"))) + if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->tqfind('d',"deep"))) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("The menu item with id \"%Q\" does not exist in popup \"%Q\""),&szItemId,&szPopupName); } @@ -840,7 +840,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(echo) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); kvs_int_t iMsgType = KVI_OUT_NONE; @@ -849,11 +849,11 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pSwitches->isEmpty()) { KviKvsVariant * v; - if((v = KVSCSC_pSwitches->find('w',"window"))) + if((v = KVSCSC_pSwitches->tqfind('w',"window"))) { - QString szWnd; + TQString szWnd; v->asString(szWnd); - //#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)" + //#warning "FIXME: the window database is not tqunicode! (we even could keep integer window id's at this point!)" pWnd = g_pApp->findWindow(szWnd.utf8().data()); if(!pWnd) { @@ -862,7 +862,7 @@ namespace KviKvsCoreSimpleCommands } } - if((v = KVSCSC_pSwitches->find('i',"icon"))) + if((v = KVSCSC_pSwitches->tqfind('i',"icon"))) { if(!v->asInteger(iMsgType)) { @@ -873,13 +873,13 @@ namespace KviKvsCoreSimpleCommands } } - if(KVSCSC_pSwitches->find('d',"debug")) + if(KVSCSC_pSwitches->tqfind('d',"debug")) { pWnd = KviDebugWindow::getInstance(); } } - int iFlags = KVSCSC_pSwitches->find('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; + int iFlags = KVSCSC_pSwitches->tqfind('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; pWnd->outputNoFmt(iMsgType,szAll,iFlags); return true; } @@ -956,7 +956,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(echoprivmsg) { - QString szNick,szUser,szHost,szText; + TQString szNick,szUser,szHost,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCSC_PARAMETER("user",KVS_PT_STRING,0,szUser) @@ -971,7 +971,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant * v; - if(v = KVSCSC_pSwitches->find('i',"color-set")) + if(v = KVSCSC_pSwitches->tqfind('i',"color-set")) { kvs_int_t msgType; if(v->asInteger(msgType)) @@ -981,9 +981,9 @@ namespace KviKvsCoreSimpleCommands } else KVSCSC_pContext->warning(__tr2qs("Invalid color-set specification, using default")); } - if(v = KVSCSC_pSwitches->find('w',"window")) + if(v = KVSCSC_pSwitches->tqfind('w',"window")) { - QString szWin; + TQString szWin; v->asString(szWin); KviStr window = szWin; pWnd = g_pApp->findWindow(window.ptr()); @@ -994,30 +994,30 @@ namespace KviKvsCoreSimpleCommands } } - QString szPrefix,szSuffix; + TQString szPrefix,szSuffix; bool bPrefix = false; bool bSuffix = false; - if(v = KVSCSC_pSwitches->find('p',"prefix")) + if(v = KVSCSC_pSwitches->tqfind('p',"prefix")) { v->asString(szPrefix); bPrefix = true; } - if(v = KVSCSC_pSwitches->find('s',"suffix")) + if(v = KVSCSC_pSwitches->tqfind('s',"suffix")) { v->asString(szSuffix); bSuffix = true; } int iFlags = 0; - if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; - if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; - if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; + if(KVSCSC_pSwitches->tqfind('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; + if(KVSCSC_pSwitches->tqfind('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; + if(KVSCSC_pSwitches->tqfind('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; pConsole->outputPrivmsg(pWnd,type, szNick,szUser,szHost,szText, iFlags, - bPrefix ? szPrefix : QString::null,bSuffix ? szSuffix : QString::null); + bPrefix ? szPrefix : TQString(),bSuffix ? szSuffix : TQString()); return true; } @@ -1044,7 +1044,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(error) { #ifdef COMPILE_NEW_KVS - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->error("%Q",&szAll); #endif @@ -1114,19 +1114,19 @@ namespace KviKvsCoreSimpleCommands KVSCSC(eval) { - QString szCommands; + TQString szCommands; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("commands",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szCommands) KVSCSC_PARAMETERS_END KviKvsScript s("eval::inner",szCommands); int iRunFlags = 0; - if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->find('q',"quiet")) + if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->tqfind('q',"quiet")) iRunFlags |= KviKvsScript::Quiet; bool bRet = s.run(KVSCSC_pContext,iRunFlags) ? true : false; if(!bRet) { - if(!KVSCSC_pSwitches->find('f',"force")) + if(!KVSCSC_pSwitches->tqfind('f',"force")) return false; KVSCSC_pContext->clearError(); } @@ -1169,7 +1169,7 @@ namespace KviKvsCoreSimpleCommands */ KVSCSC(eventctl) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KviKvsVariantList vList; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("event_name",KVS_PT_NONEMPTYSTRING,0,szEventName) @@ -1185,7 +1185,7 @@ namespace KviKvsCoreSimpleCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -1193,42 +1193,42 @@ namespace KviKvsCoreSimpleCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } } - if(KVSCSC_pSwitches->find('u',"unregister")) + if(KVSCSC_pSwitches->tqfind('u',"unregister")) { // unregister it if(bIsRaw) { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } - } else if(KVSCSC_pSwitches->find('e',"enable") || KVSCSC_pSwitches->find('d',"disable")) + } else if(KVSCSC_pSwitches->tqfind('e',"enable") || KVSCSC_pSwitches->tqfind('d',"disable")) { // enable it if(bIsRaw) { - if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { - if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } else { // trigger it KviKvsScriptEventHandler * h; - QString code; + TQString code; if(bIsRaw) { @@ -1244,7 +1244,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant retVal; copy.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams); } else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index a43a33c..43222d4 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -38,7 +38,7 @@ #include "kvi_out.h" #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif namespace KviKvsCoreSimpleCommands @@ -94,16 +94,16 @@ namespace KviKvsCoreSimpleCommands help run help help help index - help $mask + help $tqmask help /home/pragma/myfile.html [/example] */ - static bool file_in_path(QStringList &pathlist,QString &file) + static bool file_in_path(TQStringList &pathlist,TQString &file) { - for(QStringList::Iterator it = pathlist.begin();it != pathlist.end();++it) + for(TQStringList::Iterator it = pathlist.begin();it != pathlist.end();++it) { - QString tmp = *it; + TQString tmp = *it; tmp.append('/'); tmp.append(file); KviFileUtils::adjustFilePath(tmp); @@ -114,7 +114,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(help) { - QString szTopic; + TQString szTopic; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic) KVSCSC_PARAMETERS_END @@ -126,23 +126,23 @@ namespace KviKvsCoreSimpleCommands szTopic.stripWhiteSpace(); } - QString szCommand; + TQString szCommand; if(szTopic.isEmpty())szCommand = "help.open index.html"; else { bool bWasFunc = false; - if(szTopic[0] == QChar('$')) + if(szTopic[0] == TQChar('$')) { bWasFunc = true; szTopic.remove(0,1); } - QString szOriginal = szTopic; + TQString szOriginal = szTopic; - QString topik = szTopic; + TQString topik = szTopic; #ifdef COMPILE_USE_QT4 - QStringList pl = Q3MimeSourceFactory::defaultFactory()->filePath(); + TQStringList pl = Q3MimeSourceFactory::defaultFactory()->filePath(); #else - QStringList pl = QMimeSourceFactory::defaultFactory()->filePath(); + TQStringList pl = TQMimeSourceFactory::defaultFactory()->filePath(); #endif bool bLowCaseTried = false; @@ -285,14 +285,14 @@ try_again: KVSCSC(host) { - QString szQuery; + TQString szQuery; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery) KVSCSC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any; + if(KVSCSC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCSC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; KviKvsAsyncDnsOperation * op = new KviKvsAsyncDnsOperation( KVSCSC_pContext->window(), @@ -383,24 +383,24 @@ try_again: KVSCSC(join) { - QString szChans,szKeys; + TQString szChans,szKeys; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("chans",KVS_PT_NONEMPTYSTRING,0,szChans) KVSCSC_PARAMETER("keys",KVS_PT_STRING,KVS_PF_OPTIONAL,szKeys) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - QStringList slChans = QStringList::split(",",szChans); + TQStringList slChans = TQStringList::split(",",szChans); - QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); - for(QStringList::Iterator it=slChans.begin();it != slChans.end();++it) + TQString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); + for(TQStringList::Iterator it=slChans.begin();it != slChans.end();++it) { if(!(*it).isEmpty()) { bool bFound = false; int id = 0; - QChar f = (*it)[0]; + TQChar f = (*it)[0]; while((id < szChanTypes.length()) && !bFound) { if(f == szChanTypes[id])bFound = true; @@ -412,14 +412,14 @@ try_again: } szChans = slChans.join(","); - KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); + KviTQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); if(szKeys.isEmpty()) { if(!(KVSCSC_pConnection->sendFmtData("JOIN %s",szEncodedChans.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } else { - KviQCString szEncodedKeys = KVSCSC_pConnection->encodeText(szKeys); + KviTQCString szEncodedKeys = KVSCSC_pConnection->encodeText(szKeys); if(!(KVSCSC_pConnection->sendFmtData("JOIN %s %s",szEncodedChans.data(),szEncodedKeys.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } @@ -451,14 +451,14 @@ try_again: KVSCSC(kick) { - QString szUser; - QString szReason; + TQString szUser; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("user",KVS_PT_NONEMPTYSTRING,0,szUser) KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL) { @@ -466,9 +466,9 @@ try_again: return false; } - KviQCString szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target()); - KviQCString szU = KVSCSC_pConnection->encodeText(szUser); - KviQCString szR = KVSCSC_pConnection->encodeText(szReason); + KviTQCString szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target()); + KviTQCString szU = KVSCSC_pConnection->encodeText(szUser); + KviTQCString szR = KVSCSC_pConnection->encodeText(szReason); if(szR.isEmpty()) { @@ -513,12 +513,12 @@ try_again: KVSCSC(killtimer) { - QString szName; + TQString szName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('a',"active")) + if(KVSCSC_pSwitches->tqfind('a',"active")) { KviKvsTimerManager::instance()->deleteAllTimers(); return true; @@ -528,13 +528,13 @@ try_again: { if(!KviKvsTimerManager::instance()->deleteCurrentTimer()) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Timer name omitted but there is not current timer (this is not a timer callback)")); } } else { if(!KviKvsTimerManager::instance()->deleteTimer(szName)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't kill the timer '%Q' since it is not running"),&szName); } } @@ -616,12 +616,12 @@ try_again: KVSCSC(listtimers) { - KviPointerHashTable<QString,KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict(); + KviPointerHashTable<TQString,KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict(); if(!pTimerDict) return true; - KviPointerHashTableIterator<QString,KviKvsTimer> it(*pTimerDict); + KviPointerHashTableIterator<TQString,KviKvsTimer> it(*pTimerDict); KVSCSC_pContext->window()->outputNoFmt(KVI_OUT_VERBOSE,__tr2qs("List of active timers")); @@ -629,8 +629,8 @@ try_again: while(KviKvsTimer * pTimer = it.current()) { - QString szName = pTimer->name(); - QString szLifetime; + TQString szName = pTimer->name(); + TQString szLifetime; switch(pTimer->lifetime()) { case KviKvsTimer::Persistent: @@ -646,9 +646,9 @@ try_again: szLifetime = __tr2qs("Unknown"); break; } - QString szDelay; + TQString szDelay; szDelay.setNum(pTimer->delay()); - QString szWindow; + TQString szWindow; szWindow = pTimer->window() ? pTimer->window()->id() : __tr2qs("None"); KVSCSC_pContext->window()->output(KVI_OUT_VERBOSE, @@ -674,15 +674,15 @@ try_again: @title: lusers @syntax: - lusers [ <mask> [ <target> ] ] + lusers [ <tqmask> [ <target> ] ] @short: Requests statistics about users on IRC @description: The LUSERS command is used to get statistics about the size of the IRC network.[br]If no parameter is given, the reply will be about the - whole net.[br]If a <mask> is specified, then the reply will only + whole net.[br]If a <tqmask> is specified, then the reply will only concern the part of the network formed by the servers matching the - mask.[br]Finally, if the <target> parameter is specified, the request + tqmask.[br]Finally, if the <target> parameter is specified, the request is forwarded to that server which will generate the reply.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index e0ac917..9744b6f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -47,9 +47,9 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_popupmanager.h" -#include <qcursor.h> -#include <qprocess.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqprocess.h> +#include <tqtimer.h> namespace KviKvsCoreSimpleCommands { @@ -78,17 +78,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(me) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION switch(KVSCSC_pWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: - case KVI_WINDOW_TYPE_QUERY: + case KVI_WINDOW_TYPE_TQUERY: case KVI_WINDOW_TYPE_DCCCHAT: KVSCSC_pWindow->ownAction(szText); break; @@ -125,14 +125,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(mode) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szTxt = KVSCSC_pConnection->encodeText(szText); + KviTQCString szTxt = KVSCSC_pConnection->encodeText(szText); if(!szTxt.isEmpty()) { @@ -212,14 +212,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(nick) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szData = KVSCSC_pConnection->encodeText(szNick); + KviTQCString szData = KVSCSC_pConnection->encodeText(szNick); if(!szData.data())szData = ""; if(!KVSCSC_pConnection->sendFmtData("NICK %s",szData.data())) @@ -259,26 +259,26 @@ namespace KviKvsCoreSimpleCommands KVSCSC(notice) { - QString szTarget,szText; + TQString szTarget,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviWindow * w = KVSCSC_pConnection->findChannel(szTarget); if(!w)w = KVSCSC_pConnection->findQuery(szTarget); - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); if(!szT.data())szT = ""; // encoding problems ? if(!szD.data())szD = ""; // encoding problems ? if(!(KVSCSC_pConnection->sendFmtData("NOTICE %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[NOTICE >>> %Q]: %Q",&szTarget,&szText); return true; @@ -355,37 +355,37 @@ namespace KviKvsCoreSimpleCommands KVSCSC(openurl) { - QString szUrl; + TQString szUrl; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("url",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szUrl) KVSCSC_PARAMETERS_END - QString szCommand; - if(KviQString::equalCIN(szUrl,"www.",4)) + TQString szCommand; + if(KviTQString::equalCIN(szUrl,"www.",4)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpCommand); szUrl.prepend("http://"); - } else if(KviQString::equalCIN(szUrl,"http:",5)) + } else if(KviTQString::equalCIN(szUrl,"http:",5)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpCommand); - } else if(KviQString::equalCIN(szUrl,"https:",6)) + } else if(KviTQString::equalCIN(szUrl,"https:",6)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand); - } else if(KviQString::equalCIN(szUrl,"ftp",3)) + } else if(KviTQString::equalCIN(szUrl,"ftp",3)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlFtpCommand); - if(KviQString::equalCIN(szUrl,"ftp.",4))szUrl.prepend("ftp://"); - } else if(KviQString::equalCIN(szUrl,"file",4)) + if(KviTQString::equalCIN(szUrl,"ftp.",4))szUrl.prepend("ftp://"); + } else if(KviTQString::equalCIN(szUrl,"file",4)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlFileCommand); - } else if(KviQString::equalCIN(szUrl,"irc",3)) + } else if(KviTQString::equalCIN(szUrl,"irc",3)) { if(KviIrcUrl::run(szUrl,KviIrcUrl::FirstFreeContext,KVSCSC_pContext->console()) & KviIrcUrl::InvalidProtocol) { KVSCSC_pContext->warning(__tr2qs("Invalid IRC url (%Q)"),&szUrl); } return true; - } else if(KviQString::equalCIN(szUrl,"mailto",6)) + } else if(KviTQString::equalCIN(szUrl,"mailto",6)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand); } @@ -403,7 +403,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariantList vList; vList.append(new KviKvsVariant(szUrl)); - QString szName = "openurl::handler"; + TQString szName = "openurl::handler"; KviKvsScript script(szName,szCommand); if(!script.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams)) @@ -497,8 +497,8 @@ namespace KviKvsCoreSimpleCommands KVSCSC(option) { - QString szName; - QString szValue; + TQString szName; + TQString szValue; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("optName",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCSC_PARAMETER("optValue",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szValue) @@ -589,7 +589,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(parse) { - QString szFileName; + TQString szFileName; KviKvsVariantList vList; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName) @@ -600,7 +600,7 @@ namespace KviKvsCoreSimpleCommands if(KviFileUtils::directoryExists(szFileName)) { - QString szTmp; + TQString szTmp; KVSCSC_pContext->enterBlockingSection(); bool bResult = KviFileDialog::askForOpenFileName(szTmp,__tr2qs("Choose a file to parse"),szFileName.utf8().data(),"*.kvs"); @@ -613,14 +613,14 @@ namespace KviKvsCoreSimpleCommands if(szFileName.isEmpty())return true; // done KviFileUtils::adjustFilePath(szFileName); } else { - QFileInfo inf(szFileName); + TQFileInfo inf(szFileName); if(inf.isRelative()) { - if(QString * pszPath = KVSCSC_pContext->scriptFilePath()) + if(TQString * pszPath = KVSCSC_pContext->scriptFilePath()) { - QFileInfo inf2(*pszPath); - QString szCheckFileName = inf2.dirPath(); - KviQString::ensureLastCharIs(szCheckFileName,KVI_PATH_SEPARATOR_CHAR); + TQFileInfo inf2(*pszPath); + TQString szCheckFileName = inf2.dirPath(); + KviTQString::ensureLastCharIs(szCheckFileName,KVI_PATH_SEPARATOR_CHAR); szCheckFileName += szFileName; if(KviFileUtils::fileExists(szCheckFileName)) szFileName = szCheckFileName; @@ -628,18 +628,18 @@ namespace KviKvsCoreSimpleCommands } } - QFileInfo infz(szFileName); + TQFileInfo infz(szFileName); szFileName = infz.absFilePath(); - QString szBuffer; + TQString szBuffer; if(!KviFileUtils::loadFile(szFileName,szBuffer,true)) // <-- scripts SHOULD be shipped in utf8 format { - if(KVSCSC_pSwitches->find('e',"fail-on-load")) + if(KVSCSC_pSwitches->tqfind('e',"fail-on-load")) { KVSCSC_pContext->error(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return false; } else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return true; } @@ -647,7 +647,7 @@ namespace KviKvsCoreSimpleCommands KviKvsScript s(szFileName,szBuffer); - KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; + KviKvsVariant * pRetVal = KVSCSC_pSwitches->tqfind('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; KviKvsVariant vFileName(szFileName); vList.prepend(&vFileName); @@ -655,7 +655,7 @@ namespace KviKvsCoreSimpleCommands if(!s.run(KVSCSC_pContext->window(),&vList,pRetVal,KviKvsScript::PreserveParams,&rtd)) { - if(KVSCSC_pSwitches->find('f',"fail-on-error"))return false; + if(KVSCSC_pSwitches->tqfind('f',"fail-on-error"))return false; } return true; } @@ -699,31 +699,31 @@ namespace KviKvsCoreSimpleCommands KVSCSC(part) { - QString szChans,szMsg; + TQString szChans,szMsg; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("chans",KVS_PT_STRING,KVS_PF_OPTIONAL,szChans) KVSCSC_PARAMETER("part_message",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szMsg) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szChans.isEmpty()) { if(KVSCSC_pWindow->type() == KVI_WINDOW_TYPE_CHANNEL) szChans = KVSCSC_pWindow->target(); else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); return true; } } - KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); + KviTQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); - QStringList sl = QStringList::split(",",szChans); + TQStringList sl = TQStringList::split(",",szChans); if(!szMsg.isEmpty()) { - KviQCString szText; + KviTQCString szText; if(sl.count() == 1) { // single chan , use channel encoding if possible @@ -743,14 +743,14 @@ namespace KviKvsCoreSimpleCommands return KVSCSC_pContext->warningNoIrcConnection(); } - for(QStringList::Iterator it=sl.begin();it != sl.end();it++) + for(TQStringList::Iterator it=sl.begin();it != sl.end();it++) { KviChannel * ch = KVSCSC_pConnection->findChannel(*it); if(ch) { - ch->partMessageSent(!KVSCSC_pSwitches->find('k',"keep"),!KVSCSC_pSwitches->find('s',"silent")); + ch->partMessageSent(!KVSCSC_pSwitches->tqfind('k',"keep"),!KVSCSC_pSwitches->tqfind('s',"silent")); } else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); } } @@ -845,7 +845,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(popup) { - QString szPopupName; + TQString szPopupName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("popup_name",KVS_PT_NONEMPTYSTRING,0,szPopupName) KVSCSC_PARAMETERS_END @@ -873,24 +873,24 @@ namespace KviKvsCoreSimpleCommands return false; } - QPoint pnt = QCursor::pos(); + TQPoint pnt = TQCursor::pos(); - KviKvsVariant * pCoords = KVSCSC_pSwitches->find('p',"point"); + KviKvsVariant * pCoords = KVSCSC_pSwitches->tqfind('p',"point"); if(pCoords) { - QString szCoords; + TQString szCoords; pCoords->asString(szCoords); - int idx = szCoords.find(','); + int idx = szCoords.tqfind(','); bool bCoordsOk = true; if(idx == -1)bCoordsOk = false; else { - QString szX = szCoords.left(idx); + TQString szX = szCoords.left(idx); szCoords.remove(0,idx + 1); bool bOk1,bOk2; int iX = szX.toInt(&bOk1); int iY = szCoords.toInt(&bOk2); - if(bOk1 && bOk2)pnt = QPoint(iX,iY); + if(bOk1 && bOk2)pnt = TQPoint(iX,iY); else bCoordsOk = false; } @@ -934,13 +934,13 @@ namespace KviKvsCoreSimpleCommands KVSCSC(privmsg) { - QString szTarget,szText; + TQString szTarget,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviWindow * w = KVSCSC_pConnection->findChannel(szTarget); if(!w)w = KVSCSC_pConnection->findQuery(szTarget); @@ -948,15 +948,15 @@ namespace KviKvsCoreSimpleCommands if(w)w->ownMessage(szText); else { - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); if(!szT.data())szT = ""; // encoding problems ? if(!szD.data())szD = ""; // encoding problems ? if(!(KVSCSC_pConnection->sendFmtData("PRIVMSG %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[PRIVMSG >>> %Q]: %Q",&szTarget,&szText); } @@ -994,31 +994,31 @@ namespace KviKvsCoreSimpleCommands KVSCSC(query) { - QString szTargets,szText; + TQString szTargets,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("targets",KVS_PT_NONEMPTYSTRING,0,szTargets) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviQuery * query; - QStringList sl = QStringList::split(",",szTargets); - for(QStringList::Iterator it = sl.begin();it != sl.end();it++) + TQStringList sl = TQStringList::split(",",szTargets); + for(TQStringList::Iterator it = sl.begin();it != sl.end();it++) { - QString szNick = *it; + TQString szNick = *it; if(szNick.isEmpty())KVSCSC_pContext->warning(__tr2qs("Empty target specified")); else { query = KVSCSC_pWindow->console()->connection()->findQuery(szNick); if(!query) { query = KVSCSC_pWindow->console()->connection()->createQuery(szNick); - QString user; - QString host; + TQString user; + TQString host; KviIrcUserDataBase * db = KVSCSC_pWindow->connection()->userDataBase(); if(db) { - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e) { user = e->user(); @@ -1053,21 +1053,21 @@ namespace KviKvsCoreSimpleCommands !sw: -q | --quit Terminates this KVIrc application instance !sw: -f | --force - Forces the immediate termination of the current IRC session (The QUIT message may be not sent) + Forces the immediate termination of the current IRC session (The TQUIT message may be not sent) !sw: -u | --unexpected Simulates an "unexpected disconnection" @description: Terminates the current IRC session.[br] - By default this command sends a QUIT message + By default this command sends a TQUIT message and waits for the server to close the connection.[br] If you want to force KVIrc to close the connection - immediately after sending the QUIT message you must use the -f switch.[br] + immediately after sending the TQUIT message you must use the -f switch.[br] Forcing the connection may cause your quit message to not be displayed to the other IRC users: most likely it will be replaced by a 'Connection reset by peer' or a 'EOF from client'.[br] If the -u switch is specified then an "unexpected disconnection" will be simulated and all the related options will be applied (e.g. automatic reconnection, - channels and queries kept open etc..). The QUIT message will be still sent unless + channels and queries kept open etc..). The TQUIT message will be still sent unless the -f switch is used. You can control all the "unexpected disconnection" options in the options dialog. If the -q switch is specified , this command terminates KVIrc immediately.[br] @@ -1079,17 +1079,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(quit) { - QString szReason; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('q',"quit")) + if(KVSCSC_pSwitches->tqfind('q',"quit")) { - QTimer::singleShot(0,g_pApp,SLOT(quit())); + TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit())); } else { - KVSCSC_REQUIRE_CONNECTION - KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected")); + KVSCSC_RETQUIRE_CONNECTION + KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->tqfind('f',"force"),szReason,KVSCSC_pSwitches->tqfind('u',"unexpected")); } return true; } @@ -1170,20 +1170,20 @@ namespace KviKvsCoreSimpleCommands KVSCSC(raw) { - QString szRawCommand; + TQString szRawCommand; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("raw_command",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szRawCommand) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szData = KVSCSC_pConnection->encodeText(szRawCommand); + KviTQCString szData = KVSCSC_pConnection->encodeText(szRawCommand); if(!szData.data())szData = ""; if(!KVSCSC_pConnection->sendData(szData.data())) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_RAW,__tr2qs("[RAW]: %Q"),&szRawCommand); return true; @@ -1225,7 +1225,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(rebind) { - QString szWinId; + TQString szWinId; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("window_id",KVS_PT_NONEMPTYSTRING,0,szWinId) KVSCSC_PARAMETERS_END @@ -1233,7 +1233,7 @@ namespace KviKvsCoreSimpleCommands KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data()); if(pAux)KVSCSC_pContext->setWindow(pAux); else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Window with id %Q not found: no rebinding performed"),&szWinId); } return true; @@ -1277,7 +1277,7 @@ namespace KviKvsCoreSimpleCommands return false; } - QString all; + TQString all; KVSCSC_pParams->allAsString(all); KVSCSC_pContext->returnValue()->setString(all); return false; @@ -1313,20 +1313,20 @@ namespace KviKvsCoreSimpleCommands KVSCSC(run) { - QString szCommand; - QStringList l; + TQString szCommand; + TQStringList l; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("command",KVS_PT_STRING,0,szCommand) KVSCSC_PARAMETER("parameters",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,l) KVSCSC_PARAMETERS_END #ifdef COMPILE_USE_QT4 - QProcess proc; + TQProcess proc; proc.start(szCommand,l); // FIXME: KVSCSC_pContext->warning(__tr2qs("Failed to execute command '%Q'"),&szCommand); #else - QProcess proc(szCommand); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) proc.addArgument(*it); + TQProcess proc(szCommand); + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) proc.addArgument(*it); if(!proc.start())KVSCSC_pContext->warning(__tr2qs("Failed to execute command '%Q'"),&szCommand); #endif return true; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index 1dfc454..96548ad 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -81,17 +81,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(say) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('x',"allow-exec")) + if(KVSCSC_pSwitches->tqfind('x',"allow-exec")) { // allow execution of commands if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs("say: injected commandline"))) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Say parse error: Broken command")); } } else { @@ -205,7 +205,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(server) { - QString szServer; + TQString szServer; kvs_uint_t uPort; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("server",KVS_PT_STRING,KVS_PF_OPTIONAL,szServer) @@ -213,9 +213,9 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END KviConsole * console = 0; - if(KVSCSC_pSwitches->find('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); + if(KVSCSC_pSwitches->tqfind('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); else { - if(KVSCSC_pSwitches->find('u',"unused-context")) + if(KVSCSC_pSwitches->tqfind('u',"unused-context")) { // first try the current console console = KVSCSC_pWindow->console(); @@ -239,7 +239,7 @@ namespace KviKvsCoreSimpleCommands } else console = KVSCSC_pWindow->console(); } - QString szCmd,szBindAddress,szSocketFilter,szPassword,szNick; + TQString szCmd,szBindAddress,szSocketFilter,szPassword,szNick; KVSCSC_pSwitches->getAsStringIfExisting('c',"command",szCmd); KVSCSC_pSwitches->getAsStringIfExisting('b',"bind-address",szBindAddress); KVSCSC_pSwitches->getAsStringIfExisting('f',"filter",szSocketFilter); @@ -261,7 +261,7 @@ namespace KviKvsCoreSimpleCommands return false; } else { KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseLastServerInContext = KVSCSC_pSwitches->find('l',"last") != 0; + d->bUseLastServerInContext = KVSCSC_pSwitches->tqfind('l',"last") != 0; d->szCommandToExecAfterConnect = szCmd; d->szBindAddress = szBindAddress; d->szPass = szPassword; @@ -273,13 +273,13 @@ namespace KviKvsCoreSimpleCommands } else { // server is not empty. KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseSSL = (KVSCSC_pSwitches->find('s',"ssl") != 0); + d->bUseSSL = (KVSCSC_pSwitches->tqfind('s',"ssl") != 0); d->szServer = szServer; d->uPort = (kvi_u32_t)uPort; d->szLinkFilter = szSocketFilter; d->bPortIsOk = (uPort > 0); #ifdef COMPILE_IPV6_SUPPORT - d->bUseIpV6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); + d->bUseIpV6 = (KVSCSC_pSwitches->tqfind('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); #else d->bUseIpV6 = false; #endif @@ -357,7 +357,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(setmenu) { - QString szVisibleText,szPopupName; + TQString szVisibleText,szPopupName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("visible_text",KVS_PT_NONEMPTYSTRING,0,szVisibleText) KVSCSC_PARAMETER("popup_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szPopupName) @@ -367,20 +367,20 @@ namespace KviKvsCoreSimpleCommands { if(!(KVSCSC_pWindow->frame()->mainMenuBar()->removeMenu(szVisibleText))) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); } return true; } KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); int idx = -1; - if(KviKvsVariant * pIdx = KVSCSC_pSwitches->find('i',"index")) + if(KviKvsVariant * pIdx = KVSCSC_pSwitches->tqfind('i',"index")) { kvs_int_t iIdx; if(pIdx->asInteger(iIdx)) idx = iIdx; else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Invalid index specified: ignored")); } } @@ -390,7 +390,7 @@ namespace KviKvsCoreSimpleCommands if(p)KVSCSC_pWindow->frame()->mainMenuBar()->addMenu(szVisibleText,p,idx); else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); } return true; @@ -430,7 +430,7 @@ namespace KviKvsCoreSimpleCommands return false; } - QString all; + TQString all; KVSCSC_pParams->allAsString(all); KVSCSC_pContext->returnValue()->setString(all); return true; @@ -445,12 +445,12 @@ namespace KviKvsCoreSimpleCommands @title: sockets @syntax: - sockets [[remote server] server mask] + sockets [[remote server] server tqmask] @short: Requests the sockets info from a server @description: Requests the sockets information from the specified server or the current server if no [remote server] is specified.[br] - The reply can be filtered by <server mask>.[br] + The reply can be filtered by <server tqmask>.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ // RFC2821 wrapper @@ -588,14 +588,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(topic) { - QString szChannel; - QString szTopic; + TQString szChannel; + TQString szTopic; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("channel",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szChannel) KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szChannel.isEmpty()) { @@ -607,8 +607,8 @@ namespace KviKvsCoreSimpleCommands } } - KviQCString szC = KVSCSC_pConnection->encodeText(szChannel); - KviQCString szT = KVSCSC_pConnection->encodeText(szTopic); + KviTQCString szC = KVSCSC_pConnection->encodeText(szChannel); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTopic); if(szTopic.isEmpty()) { if(!KVSCSC_pConnection->sendFmtData("TOPIC %s",szC.data())) @@ -673,14 +673,14 @@ namespace KviKvsCoreSimpleCommands to load catalogues that reside in different directories.[br] [b]NOTE[/b][br] This feature is currently work in progress: the scripting engine - is not yet fully unicode and thus some more exotic translations may still suffer... + is not yet fully tqunicode and thus some more exotic translations may still suffer... @seealso: [fnc]$tr[/fnc], [cmd]trunload[/cmd] */ KVSCSC(trload) { - QString szCatalogue,szDir; + TQString szCatalogue,szDir; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("catalogue",KVS_PT_NONEMPTYSTRING,0,szCatalogue) KVSCSC_PARAMETER("catalogueDir",KVS_PT_STRING,KVS_PF_OPTIONAL,szDir) @@ -702,7 +702,7 @@ namespace KviKvsCoreSimpleCommands if(KviLocale::loadCatalogue(szCatalogue,szDir)) return true; - if(KVSCSC_pSwitches->find('v',"verbose")) + if(KVSCSC_pSwitches->tqfind('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("No catalogue %Q for the current language found"),&szCatalogue); return true; @@ -734,14 +734,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(trunload) { - QString szCatalogue; + TQString szCatalogue; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("catalogue",KVS_PT_NONEMPTYSTRING,0,szCatalogue) KVSCSC_PARAMETERS_END if(!KviLocale::unloadCatalogue(szCatalogue)) { - if(KVSCSC_pSwitches->find('v',"verbose")) + if(KVSCSC_pSwitches->tqfind('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("The catalogue %Q was not loaded"),&szCatalogue); } return true; @@ -756,11 +756,11 @@ namespace KviKvsCoreSimpleCommands @title: unban @syntax: - unban <mask_list> + unban <tqmask_list> @short: - Unsets ban masks for the channel + Unsets ban tqmasks for the channel @description: - Removes the ban masks specified in the <mask_list>, + Removes the ban tqmasks specified in the <tqmask_list>, which is a comma separated list of nicknames. This command works only if executed in a channel window. The command is translated to a set of MODE messages containing @@ -859,7 +859,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(warning) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->warning("%Q",&szAll); @@ -875,7 +875,7 @@ namespace KviKvsCoreSimpleCommands @title: who @syntax: - who {[mask] | [channel]} + who {[tqmask] | [channel]} @short: Requests WHO information @description: @@ -919,12 +919,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whois) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick) KVSCSC_PARAMETERS_END - KviQCString szData = KVSCSC_pContext->window()->encodeText(szNick); + KviTQCString szData = KVSCSC_pContext->window()->encodeText(szNick); if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection(); if(!KVSCSC_pContext->connection()->sendFmtData("WHOIS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection(); @@ -959,12 +959,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whowas) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick) KVSCSC_PARAMETERS_END - KviQCString szData = KVSCSC_pContext->window()->encodeText(szNick); + KviTQCString szData = KVSCSC_pContext->window()->encodeText(szNick); if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection(); if(!KVSCSC_pContext->connection()->sendFmtData("WHOWAS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index ec1efde..2170362 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -39,7 +39,7 @@ KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0; -KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) +KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const TQString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) { m_pDns = pDns; m_pWindow = pWnd; @@ -51,7 +51,7 @@ KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &s KviKvsDnsObject::~KviKvsDnsObject() { - QObject::disconnect(m_pDns,0,0,0); + TQObject::disconnect(m_pDns,0,0,0); if(m_pDns->isRunning()) { g_pApp->collectGarbage(m_pDns); @@ -64,7 +64,7 @@ KviKvsDnsObject::~KviKvsDnsObject() KviKvsDnsManager::KviKvsDnsManager() -: QObject() +: TQObject() { m_pDnsObjects = 0; } @@ -102,13 +102,13 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject) m_pDnsObjects = new KviPointerHashTable<void *,KviKvsDnsObject>; m_pDnsObjects->setAutoDelete(true); } - m_pDnsObjects->replace(pObject->dns(),pObject); - connect(pObject->dns(),SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupTerminated(KviDns *))); + m_pDnsObjects->tqreplace(pObject->dns(),pObject); + connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *))); } void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) { - KviKvsDnsObject * o = m_pDnsObjects->find(pDns); + KviKvsDnsObject * o = m_pDnsObjects->tqfind(pDns); if(!o) { debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure"); @@ -140,12 +140,12 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) o->parameterList()->prepend(new KviKvsVariant(KviError::getDescription(o->dns()->error()))); // $2 o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)0)); // $1 } else { - QString * fh = o->dns()->hostnameList()->first(); - QString * fi = o->dns()->ipAddressList()->first(); + TQString * fh = o->dns()->hostnameList()->first(); + TQString * fi = o->dns()->ipAddressList()->first(); // $4... is the magic data - o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : QString("?.?"))); // $3 - o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : QString("?.?.?.?"))); // $2 + o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : TQString("?.?"))); // $3 + o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : TQString("?.?.?.?"))); // $2 o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)1)); // $1 } o->parameterList()->prepend(new KviKvsVariant(o->query())); // $0 @@ -153,22 +153,22 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) copy.run(o->window(),o->parameterList(),0,KviKvsScript::PreserveParams); } else { - QString szQuery = o->dns()->query(); + TQString szQuery = o->dns()->query(); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery); if(o->dns()->state() == KviDns::Failure) { - QString szErr = KviError::getDescription(o->dns()->error()); + TQString szErr = KviError::getDescription(o->dns()->error()); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Error: %Q"),&szErr); } else { int idx = 1; - for(QString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next()) + for(TQString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next()) { o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Hostname %d: %Q"),idx,h); idx++; } idx = 1; - for(QString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next()) + for(TQString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next()) { o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("IP address %d: %Q"),idx,a); idx++; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/kvi_kvs_dnsmanager.h index 69d152c..f01f93f 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.h @@ -25,9 +25,9 @@ //============================================================================= #include "kvi_settings.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" -#include <qstring.h> +#include <tqstring.h> class KviDns; class KviWindow; @@ -39,7 +39,7 @@ class KviKvsDnsObject public: KviKvsDnsObject(KviDns * pDns, KviWindow * pWnd, - const QString &szQuery, + const TQString &szQuery, bool bRebindOnWindowClose = true, KviKvsScript * pCallback = 0, KviKvsVariantList * pParameterList = 0); @@ -47,7 +47,7 @@ public: protected: KviDns * m_pDns; KviWindow * m_pWindow; - QString m_szQuery; + TQString m_szQuery; KviKvsScript * m_pCallback; // callback to be executed when the dns terminates KviKvsVariantList * m_pParameterList; // parameter list (magic) bool m_bRebindOnWindowClose; // should we trigger the callback even if m_pWindow no longer exists ? @@ -56,15 +56,16 @@ public: KviWindow * window(){ return m_pWindow; }; KviKvsScript * callback(){ return m_pCallback; }; KviKvsVariantList * parameterList(){ return m_pParameterList; }; - const QString & query(){ return m_szQuery; }; + const TQString & query(){ return m_szQuery; }; bool rebindOnWindowClose(){ return m_bRebindOnWindowClose; }; void setWindow(KviWindow * pWnd){ m_pWindow = pWnd; }; void setParameterList(KviKvsVariantList * pList){ m_pParameterList = pList; }; }; -class KviKvsDnsManager : public QObject +class KviKvsDnsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviKvsDnsManager(); ~KviKvsDnsManager(); diff --git a/src/kvirc/kvs/kvi_kvs_event.h b/src/kvirc/kvs/kvi_kvs_event.h index 663777b..49ef57f 100644 --- a/src/kvirc/kvs/kvi_kvs_event.h +++ b/src/kvirc/kvs/kvi_kvs_event.h @@ -33,8 +33,8 @@ class KVIRC_API KviKvsEvent { protected: - QString m_szName; - QString m_szParameterDescription; + TQString m_szName; + TQString m_szParameterDescription; KviPointerList<KviKvsEventHandler> * m_pHandlers; public: // the event name and the parameter description are NOT translated @@ -47,8 +47,8 @@ public: KviPointerList<KviKvsEventHandler> * handlers(){ return m_pHandlers; }; void addHandler(KviKvsEventHandler * h); void removeHandler(KviKvsEventHandler * h); - const QString & name(){ return m_szName; }; - const QString & parameterDescription(){ return m_szParameterDescription; }; + const TQString & name(){ return m_szName; }; + const TQString & parameterDescription(){ return m_szParameterDescription; }; }; #endif //!_KVI_KVS_EVENT_H_ diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp index f6e311f..14fa725 100644 --- a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp @@ -37,7 +37,7 @@ KviKvsEventHandler::~KviKvsEventHandler() -KviKvsScriptEventHandler::KviKvsScriptEventHandler(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled) +KviKvsScriptEventHandler::KviKvsScriptEventHandler(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled) : KviKvsEventHandler(KviKvsEventHandler::Script), m_szName(szHandlerName), m_bEnabled(bEnabled) { m_pScript = new KviKvsScript(szContextName,szCode); @@ -48,7 +48,7 @@ KviKvsScriptEventHandler::~KviKvsScriptEventHandler() delete m_pScript; } -KviKvsScriptEventHandler * KviKvsScriptEventHandler::createInstance(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled) +KviKvsScriptEventHandler * KviKvsScriptEventHandler::createInstance(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled) { return new KviKvsScriptEventHandler(szHandlerName,szContextName,szCode,bEnabled); } diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.h b/src/kvirc/kvs/kvi_kvs_eventhandler.h index f8124b6..cba6a18 100644 --- a/src/kvirc/kvs/kvi_kvs_eventhandler.h +++ b/src/kvirc/kvs/kvi_kvs_eventhandler.h @@ -48,16 +48,16 @@ class KVIRC_API KviKvsScriptEventHandler : public KviKvsEventHandler { public: // the event handler becomes the owned of pszCode! - KviKvsScriptEventHandler(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled = true); + KviKvsScriptEventHandler(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled = true); virtual ~KviKvsScriptEventHandler(); protected: - QString m_szName; + TQString m_szName; KviKvsScript * m_pScript; bool m_bEnabled; public: KviKvsScript * script(){ return m_pScript; }; - const QString & name(){ return m_szName; }; - const QString & code(){ return m_pScript->code(); }; + const TQString & name(){ return m_szName; }; + const TQString & code(){ return m_pScript->code(); }; bool isEnabled(){ return m_bEnabled; }; void setEnabled(bool bEnabled){ m_bEnabled = bEnabled; }; @@ -66,7 +66,7 @@ public: // This MUST be used by the modules to allocate event structures // instead of the new operator. // See kvi_heapobject.cpp for an explaination. - static KviKvsScriptEventHandler * createInstance(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled = true); + static KviKvsScriptEventHandler * createInstance(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled = true); }; diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp index 1a2131c..f84aee9 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp @@ -123,25 +123,25 @@ void KviKvsEventManager::done() delete KviKvsEventManager::instance(); } -unsigned int KviKvsEventManager::findAppEventIndexByName(const QString &szName) +unsigned int KviKvsEventManager::findAppEventIndexByName(const TQString &szName) { for(unsigned int u = 0;u < KVI_KVS_NUM_APP_EVENTS;u++) { - if(KviQString::equalCI(szName,m_appEventTable[u].name()))return u; + if(KviTQString::equalCI(szName,m_appEventTable[u].name()))return u; //Backwards compatibility >_< - if((u == 4) && KviQString::equalCI(szName,"OnIrcConnectionEstabilished")) + if((u == 4) && KviTQString::equalCI(szName,"OnIrcConnectionEstabilished")) return u; } return KVI_KVS_NUM_APP_EVENTS; // <-- invalid event number } -KviKvsEvent * KviKvsEventManager::findAppEventByName(const QString &szName) +KviKvsEvent * KviKvsEventManager::findAppEventByName(const TQString &szName) { for(unsigned int u = 0;u < KVI_KVS_NUM_APP_EVENTS;u++) { - if(KviQString::equalCI(szName,m_appEventTable[u].name()))return &(m_appEventTable[u]); + if(KviTQString::equalCI(szName,m_appEventTable[u].name()))return &(m_appEventTable[u]); //Backwards compatibility >_< - if((u == 4) && KviQString::equalCI(szName,"OnIrcConnectionEstabilished")) + if((u == 4) && KviTQString::equalCI(szName,"OnIrcConnectionEstabilished")) return &(m_appEventTable[u]); } return 0; @@ -166,7 +166,7 @@ bool KviKvsEventManager::addRawHandler(unsigned int uRawIdx,KviKvsEventHandler * return true; } -bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QString &szName) +bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_APP_EVENTS)return false; KviKvsEventHandler * h; @@ -175,7 +175,7 @@ bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QStrin { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { m_appEventTable[uEvIdx].removeHandler(h); return true; @@ -185,7 +185,7 @@ bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QStrin return false; } -KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int uEvIdx,const QString &szName) +KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_RAW_EVENTS)return 0; if(!m_rawEventTable[uEvIdx])return 0; @@ -194,7 +194,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { return (KviKvsScriptEventHandler *)h; } @@ -203,7 +203,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int return 0; } -KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int uEvIdx,const QString &szName) +KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_APP_EVENTS)return 0; KviKvsEventHandler * h; @@ -212,7 +212,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { return (KviKvsScriptEventHandler *)h; } @@ -221,7 +221,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int return 0; } -bool KviKvsEventManager::enableScriptAppHandler(unsigned int uEvIdx,const QString &szName,bool bEnable) +bool KviKvsEventManager::enableScriptAppHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable) { KviKvsScriptEventHandler * h = findScriptAppHandler(uEvIdx,szName); if(!h)return false; @@ -336,7 +336,7 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface *pIfac } } -bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QString &szName) +bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_RAW_EVENTS)return false; if(!m_rawEventTable[uEvIdx])return false; @@ -345,7 +345,7 @@ bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QStrin { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { m_rawEventTable[uEvIdx]->removeRef(h); if(m_rawEventTable[uEvIdx]->isEmpty()) @@ -361,7 +361,7 @@ bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QStrin } -bool KviKvsEventManager::enableScriptRawHandler(unsigned int uEvIdx,const QString &szName,bool bEnable) +bool KviKvsEventManager::enableScriptRawHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable) { KviKvsScriptEventHandler * h = findScriptRawHandler(uEvIdx,szName); if(!h)return false; @@ -523,7 +523,7 @@ bool KviKvsEventManager::triggerHandlers(KviPointerList<KviKvsEventHandler> * pH } -void KviKvsEventManager::loadRawEvents(const QString &szFileName) +void KviKvsEventManager::loadRawEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); removeAllScriptRawHandlers(); @@ -531,8 +531,8 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) for(i=0;i<KVI_KVS_NUM_RAW_EVENTS;i++) { - QString tmp; - KviQString::sprintf(tmp,"RAW%d",i); + TQString tmp; + KviTQString::sprintf(tmp,"RAW%d",i); if(cfg.hasGroup(tmp)) { cfg.setGroup(tmp); @@ -543,13 +543,13 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) m_rawEventTable[i]->setAutoDelete(true); for(unsigned int index = 0;index < nHandlers;index++) { - KviQString::sprintf(tmp,"Name%u",index); - QString szName = cfg.readQStringEntry(tmp,"unnamed"); - KviQString::sprintf(tmp,"Buffer%u",index); - QString szCode = cfg.readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"RawEvent%u::%Q",index,&szName); + KviTQString::sprintf(tmp,"Name%u",index); + TQString szName = cfg.readTQStringEntry(tmp,"unnamed"); + KviTQString::sprintf(tmp,"Buffer%u",index); + TQString szCode = cfg.readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"RawEvent%u::%Q",index,&szName); KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(szName,tmp,szCode); - KviQString::sprintf(tmp,"Enabled%u",index); + KviTQString::sprintf(tmp,"Enabled%u",index); s->setEnabled(cfg.readBoolEntry(tmp,false)); m_rawEventTable[i]->append(s); } @@ -558,7 +558,7 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) } } -void KviKvsEventManager::saveRawEvents(const QString &szFileName) +void KviKvsEventManager::saveRawEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); @@ -568,8 +568,8 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) { if(m_rawEventTable[i]) { - QString tmp; - KviQString::sprintf(tmp,"RAW%d",i); + TQString tmp; + KviTQString::sprintf(tmp,"RAW%d",i); cfg.setGroup(tmp); int index = 0; @@ -577,11 +577,11 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) { if(s->type() == KviKvsEventHandler::Script) { - KviQString::sprintf(tmp,"Name%d",index); + KviTQString::sprintf(tmp,"Name%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->name()); - KviQString::sprintf(tmp,"Buffer%d",index); + KviTQString::sprintf(tmp,"Buffer%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->code()); - KviQString::sprintf(tmp,"Enabled%d",index); + KviTQString::sprintf(tmp,"Enabled%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->isEnabled()); index++; } @@ -592,7 +592,7 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) } -void KviKvsEventManager::loadAppEvents(const QString &szFileName) +void KviKvsEventManager::loadAppEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); removeAllScriptAppHandlers(); @@ -600,7 +600,7 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) int i; for(i=0;i<KVI_KVS_NUM_APP_EVENTS;i++) { - QString szEventName(m_appEventTable[i].name()); + TQString szEventName(m_appEventTable[i].name()); // Backwards compatibility >_< if((i == 4) && !cfg.hasGroup(szEventName)) szEventName = "OnIrcConnectionEstabilished"; @@ -612,15 +612,15 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) { for(unsigned int index = 0;index < nHandlers;index++) { - QString tmp; - KviQString::sprintf(tmp,"Name%u",index); - QString szName = cfg.readQStringEntry(tmp,"unnamed"); - KviQString::sprintf(tmp,"Buffer%u",index); - QString szCode = cfg.readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"Enabled%u",index); + TQString tmp; + KviTQString::sprintf(tmp,"Name%u",index); + TQString szName = cfg.readTQStringEntry(tmp,"unnamed"); + KviTQString::sprintf(tmp,"Buffer%u",index); + TQString szCode = cfg.readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"Enabled%u",index); bool bEnabled = cfg.readBoolEntry(tmp,false); - QString szCntx; - KviQString::sprintf(szCntx,"%Q::%Q",&(m_appEventTable[i].name()),&szName); + TQString szCntx; + KviTQString::sprintf(szCntx,"%Q::%Q",&(m_appEventTable[i].name()),&szName); KviKvsScriptEventHandler *s = new KviKvsScriptEventHandler(szName,szCntx,szCode,bEnabled); m_appEventTable[i].addHandler(s); } @@ -630,7 +630,7 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) } -void KviKvsEventManager::saveAppEvents(const QString &szFileName) +void KviKvsEventManager::saveAppEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); @@ -641,7 +641,7 @@ void KviKvsEventManager::saveAppEvents(const QString &szFileName) { if(m_appEventTable[i].hasHandlers()) { - QString szEventName(m_appEventTable[i].name()); + TQString szEventName(m_appEventTable[i].name()); // Backwards compatibility >_< if((i == 4) && cfg.hasGroup(szEventName)) { @@ -654,12 +654,12 @@ void KviKvsEventManager::saveAppEvents(const QString &szFileName) { if(s->type() == KviKvsEventHandler::Script) { - QString tmp; - KviQString::sprintf(tmp,"Name%d",index); + TQString tmp; + KviTQString::sprintf(tmp,"Name%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->name()); - KviQString::sprintf(tmp,"Buffer%d",index); + KviTQString::sprintf(tmp,"Buffer%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->code()); - KviQString::sprintf(tmp,"Enabled%d",index); + KviTQString::sprintf(tmp,"Enabled%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->isEnabled()); index++; } diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/kvi_kvs_eventmanager.h index d31d219..93691d3 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.h +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.h @@ -60,8 +60,8 @@ public: bool hasRawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; KviPointerList<KviKvsEventHandler> * rawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; - KviKvsEvent * findAppEventByName(const QString &szName); - unsigned int findAppEventIndexByName(const QString &szName); + KviKvsEvent * findAppEventByName(const TQString &szName); + unsigned int findAppEventIndexByName(const TQString &szName); bool isValidAppEvent(unsigned int uEvIdx){ return (uEvIdx < KVI_KVS_NUM_APP_EVENTS); }; bool isValidRawEvent(unsigned int uEvIdx){ return (uEvIdx < KVI_KVS_NUM_RAW_EVENTS); }; @@ -69,11 +69,11 @@ public: bool addAppHandler(unsigned int uEvIdx,KviKvsEventHandler * h); bool addRawHandler(unsigned int uRawIdx,KviKvsEventHandler * h); - bool removeScriptAppHandler(unsigned int uEvIdx,const QString &szName); - bool removeScriptRawHandler(unsigned int uEvIdx,const QString &szName); + bool removeScriptAppHandler(unsigned int uEvIdx,const TQString &szName); + bool removeScriptRawHandler(unsigned int uEvIdx,const TQString &szName); - bool enableScriptAppHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); - bool enableScriptRawHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); + bool enableScriptAppHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable); + bool enableScriptRawHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable); bool removeModuleAppHandler(unsigned int uEvIdx,KviKvsModuleInterface *i); bool removeModuleRawHandler(unsigned int uRawIdx,KviKvsModuleInterface *i); @@ -83,8 +83,8 @@ public: void removeAllModuleHandlers(KviKvsModuleInterface * i); - KviKvsScriptEventHandler * findScriptRawHandler(unsigned int uEvIdx,const QString &szName); - KviKvsScriptEventHandler * findScriptAppHandler(unsigned int uEvIdx,const QString &szName); + KviKvsScriptEventHandler * findScriptRawHandler(unsigned int uEvIdx,const TQString &szName); + KviKvsScriptEventHandler * findScriptAppHandler(unsigned int uEvIdx,const TQString &szName); // returns true if further processing should be stopped // none of these functions takes params ownership, so be sure to delete them ! @@ -109,10 +109,10 @@ public: void clearRawEvents(); void clear(); - void loadAppEvents(const QString &szFileName); - void saveAppEvents(const QString &szFileName); - void loadRawEvents(const QString &szFileName); - void saveRawEvents(const QString &szFileName); + void loadAppEvents(const TQString &szFileName); + void saveAppEvents(const TQString &szFileName); + void loadRawEvents(const TQString &szFileName); + void saveRawEvents(const TQString &szFileName); }; diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index 4b8c8c9..e2bab77 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -254,7 +254,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @description: This event is triggered in the first console of a new frame window. A frame window is the toplevel window that contains the consoles - and the other MDI children windows. + and the other MDI tqchildren windows. @seealso: [event:onframewindowdestroyed]OnFrameWindowDestroyed[/event] */ @@ -842,7 +842,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= Console @description: Triggered when an user is quitting IRC.[br] - The QUIT message has already been processed by the server , so + The TQUIT message has already been processed by the server , so the user is effectively no longer on IRC. On the other side, it might be useful to access the user-related data from this event, thus the handler is called effectively just BEFORE the @@ -1035,7 +1035,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel window @description: @@ -1043,7 +1043,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onunban]OnUnban[/event] */ - EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onunban @type: @@ -1056,7 +1056,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = unban mask + $3 = unban tqmask @window: Channel window @description: @@ -1064,7 +1064,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onban]OnBan[/event] */ - EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onmeban @type: @@ -1077,15 +1077,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel @description: - Triggered when someone has set a +b flag that matches your mask (bans you) in the channel.[br] + Triggered when someone has set a +b flag that matches your tqmask (bans you) in the channel.[br] @seealso: [event:onmeunban]OnMeUnban[/event] */ - EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onmeunban @type: @@ -1098,15 +1098,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel @description: - Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br] + Triggered when someone has set a -b flag that matches your tqmask (debans you) in the channel.[br] @seealso: [event:onmeban]OnMeBan[/event] */ -EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), +EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onbanexception @type: @@ -1119,7 +1119,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = banexception mask + $3 = banexception tqmask @window: Channel window @description: @@ -1128,7 +1128,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ [event:onbanexceptionremove]OnBanExceptionRemove[/event] */ - EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), + EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), /* @doc: onbanexceptionremove @type: @@ -1141,7 +1141,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = unban mask + $3 = unban tqmask @window: Channel window @description: @@ -1149,7 +1149,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ @seealso: [event:onbanexception]OnBanException[/event] */ - EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), + EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), /* @doc: onmebanexception @type: @@ -1162,7 +1162,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = mask + $3 = tqmask @window: Channel window @description: @@ -1171,7 +1171,7 @@ channel @seealso: [event:onmebanexceptionremove]OnMeBanExceptionRemove[/event] */ - EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onmebanexceptionremove @type: @@ -1184,7 +1184,7 @@ channel $0 = source nick $1 = source username $2 = source hostname - $3 = mask + $3 = tqmask @window: Channel window @description: @@ -1192,7 +1192,7 @@ channel @seealso: [event:onmebanexception]OnMeBanException[/event] */ - EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onop @type: @@ -1622,7 +1622,7 @@ channel @short: An unhandled literal server message has been received @parameters: - $0 = source mask + $0 = source tqmask $1 = message (literal) $2- = parameters @window: @@ -1636,7 +1636,7 @@ channel raw numeric events to handle them.[br] @seealso: */ - EVENT("OnUnhandledLiteral","$0 = source mask\n$1 = message\n$2- parameters"), + EVENT("OnUnhandledLiteral","$0 = source tqmask\n$1 = message\n$2- parameters"), /* @doc: onmehalfop @type: @@ -1731,7 +1731,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target mask + $3 = target tqmask @window: Channels window @description: @@ -1739,7 +1739,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), + EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), /* @doc: oninviteexceptionremove @type: @@ -1752,7 +1752,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target mask + $3 = target tqmask @window: Channels window @description: @@ -1760,7 +1760,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), + EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), /* @doc: onmeinviteexception @type: @@ -1773,16 +1773,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = mask + $3 = tqmask @window: Channels window @description: - Someone has set mode +I on a channel with a target mask that matches - the local user mask + Someone has set mode +I on a channel with a target tqmask that matches + the local user tqmask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onmeinviteexceptionremove @type: @@ -1795,16 +1795,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = mask + $3 = tqmask @window: Channels window @description: - Someone has set mode -I on a channel with a target mask that matches - the local user mask + Someone has set mode -I on a channel with a target tqmask that matches + the local user tqmask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onaction @type: @@ -2107,7 +2107,7 @@ channel $5 contains the original color/icon set of the message that depends on the type of the message itself.[br] Since the CTCP ACTION messages generally have different format of output - then for your convenience $6 contains 1 if the message was caused by a + then for your convenience $6 tqcontains 1 if the message was caused by a CTCP ACTION and 0 otherwise.[br] If you call [cmd]halt[/cmd] in this event the message output will be completely disabled (thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br] @@ -2797,11 +2797,11 @@ channel Triggered when the user requests a disconnection from a server by pressing the "disconnect", by closing the console or closing KVIrc. It is your last chance - to send some meaningful data to the server before the QUIT message + to send some meaningful data to the server before the TQUIT message is sent. You can't prevent the user from disconnecting: [cmd]halt [/cmd]does nothing here.[br] This event is useful to either give a salute to all the users you were talking with or maybe to send some commands to the - bouncer you're connected to. Note that you can override the QUIT + bouncer you're connected to. Note that you can override the TQUIT message sent by KVIrc by sending it by youself first.[br] @seealso: */ @@ -2967,7 +2967,7 @@ channel channel @description: Triggered when a channel mode has been changed, AFTER all the mode specific events - were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains + were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 tqcontains the unparsed mode parameter string (you need to split it!). */ EVENT("OnChannelModeChange","$0 = sourcenick\n$1 = sourceusername\n$2 = sourcehost\n$3 = modeflags\n$4 = mode params"), diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp index 3c391fc..0d4c93f 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.cpp +++ b/src/kvirc/kvs/kvi_kvs_hash.cpp @@ -28,18 +28,18 @@ KviKvsHash::KviKvsHash() { - m_pDict = new KviPointerHashTable<QString,KviKvsVariant>(17,false); + m_pDict = new KviPointerHashTable<TQString,KviKvsVariant>(17,false); m_pDict->setAutoDelete(true); } KviKvsHash::KviKvsHash(const KviKvsHash &h) { - m_pDict = new KviPointerHashTable<QString,KviKvsVariant>(); + m_pDict = new KviPointerHashTable<TQString,KviKvsVariant>(); m_pDict->setAutoDelete(true); - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(h.m_pDict)); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(h.m_pDict)); while(it.current()) { - m_pDict->replace(it.currentKey(),new KviKvsVariant(*(it.current()))); + m_pDict->tqreplace(it.currentKey(),new KviKvsVariant(*(it.current()))); ++it; } } @@ -49,9 +49,9 @@ KviKvsHash::~KviKvsHash() delete m_pDict; } -void KviKvsHash::appendAsString(QString &szBuffer) const +void KviKvsHash::appendAsString(TQString &szBuffer) const { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*m_pDict); bool bNeedComma = false; while(KviKvsVariant * s = it.current()) { @@ -62,11 +62,11 @@ void KviKvsHash::appendAsString(QString &szBuffer) const } } -void KviKvsHash::serialize(QString& result) +void KviKvsHash::serialize(TQString& result) { - QString tmpBuffer; + TQString tmpBuffer; result="{"; - KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*m_pDict); bool bNeedComma = false; while(KviKvsVariant * s = it.current()) { @@ -86,11 +86,11 @@ void KviKvsHash::serialize(QString& result) result.append('}'); } -KviKvsVariant * KviKvsHash::get(const QString &szKey) +KviKvsVariant * KviKvsHash::get(const TQString &szKey) { - KviKvsVariant * v = m_pDict->find(szKey); + KviKvsVariant * v = m_pDict->tqfind(szKey); if(v)return v; v = new KviKvsVariant(); - m_pDict->replace(szKey,v); + m_pDict->tqreplace(szKey,v); return v; } diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h index e0b2d86..69ce692 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.h +++ b/src/kvirc/kvs/kvi_kvs_hash.h @@ -32,7 +32,7 @@ #include "kvi_kvs_variant.h" #include "kvi_heapobject.h" -typedef KVIRC_API KviPointerHashTableIterator<QString,KviKvsVariant> KviKvsHashIterator; +typedef KVIRC_API KviPointerHashTableIterator<TQString,KviKvsVariant> KviKvsHashIterator; // This class must not have virtual funcitons nor destructor // Otherwise it will happily crash on windows when it is @@ -44,21 +44,21 @@ public: KviKvsHash(const KviKvsHash &h); ~KviKvsHash(); protected: - KviPointerHashTable<QString,KviKvsVariant> * m_pDict; + KviPointerHashTable<TQString,KviKvsVariant> * m_pDict; public: - void unset(const QString &szKey){ m_pDict->remove(szKey); }; - void set(const QString &szKey,KviKvsVariant * pVal){ m_pDict->replace(szKey,pVal); }; - KviKvsVariant * find(const QString &szKey) const { return m_pDict->find(szKey); }; - KviKvsVariant * get(const QString &szKey); + void unset(const TQString &szKey){ m_pDict->remove(szKey); }; + void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->tqreplace(szKey,pVal); }; + KviKvsVariant * tqfind(const TQString &szKey) const { return m_pDict->tqfind(szKey); }; + KviKvsVariant * get(const TQString &szKey); bool isEmpty() const { return m_pDict->isEmpty(); }; kvs_uint_t size() const { return m_pDict->count(); }; - void appendAsString(QString &szBuffer) const; + void appendAsString(TQString &szBuffer) const; - const KviPointerHashTable<QString,KviKvsVariant> * dict(){ return m_pDict; }; + const KviPointerHashTable<TQString,KviKvsVariant> * dict(){ return m_pDict; }; - void serialize(QString& result); + void serialize(TQString& result); }; #endif //!_KVI_KVS_HASH_H_ diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp index 9c709fe..e16bed3 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.cpp +++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp @@ -47,13 +47,13 @@ KviKvsKernel::KviKvsKernel() { m_pKvsKernel = this; - m_pSpecialCommandParsingRoutineDict = new KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine>(17,false); + m_pSpecialCommandParsingRoutineDict = new KviPointerHashTable<TQString,KviKvsSpecialCommandParsingRoutine>(17,false); m_pSpecialCommandParsingRoutineDict->setAutoDelete(true); - m_pCoreSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine>(51,false); + m_pCoreSimpleCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreSimpleCommandExecRoutine>(51,false); m_pCoreSimpleCommandExecRoutineDict->setAutoDelete(true); - m_pCoreFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine>(51,false); + m_pCoreFunctionExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreFunctionExecRoutine>(51,false); m_pCoreFunctionExecRoutineDict->setAutoDelete(true); - m_pCoreCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine>(17,false); + m_pCoreCallbackCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreCallbackCommandExecRoutine>(17,false); m_pCoreCallbackCommandExecRoutineDict->setAutoDelete(true); m_pGlobalVariables = new KviKvsHash(); @@ -101,20 +101,20 @@ void KviKvsKernel::done() #define COMPLETE_COMMAND_BY_DICT(__type,__dict) \ { \ - KviPointerHashTableIterator<QString,__type> it(*__dict); \ + KviPointerHashTableIterator<TQString,__type> it(*__dict); \ int l = szCommandBegin.length(); \ while(it.current()) \ { \ - if(KviQString::equalCIN(szCommandBegin,it.currentKey(),l)) \ - pMatches->append(new QString(it.currentKey())); \ + if(KviTQString::equalCIN(szCommandBegin,it.currentKey(),l)) \ + pMatches->append(new TQString(it.currentKey())); \ ++it; \ } \ } -void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - int idx = szCommandBegin.find(QChar('.')); + int idx = szCommandBegin.tqfind(TQChar('.')); if(idx == -1) { // no module name inside @@ -122,97 +122,97 @@ void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList< COMPLETE_COMMAND_BY_DICT(KviKvsSpecialCommandParsingRoutine,m_pSpecialCommandParsingRoutineDict) COMPLETE_COMMAND_BY_DICT(KviKvsCoreCallbackCommandExecRoutine,m_pCoreCallbackCommandExecRoutineDict) - KviPointerList<QString> lModules; + KviPointerList<TQString> lModules; lModules.setAutoDelete(true); g_pModuleManager->completeModuleNames(szCommandBegin,&lModules); - QString szEmpty = ""; - for(QString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) + TQString szEmpty = ""; + for(TQString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) completeModuleCommand(*pszModuleName,szEmpty,pMatches); KviKvsAliasManager::instance()->completeCommand(szCommandBegin,pMatches); } else { // contains a module name - QString szModuleName = szCommandBegin.left(idx); - QString szRight = szCommandBegin.right(szCommandBegin.length() - (idx+1)); + TQString szModuleName = szCommandBegin.left(idx); + TQString szRight = szCommandBegin.right(szCommandBegin.length() - (idx+1)); completeModuleCommand(szModuleName,szRight,pMatches); } } -void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); if(!pModule)return; - KviPointerList<QString> lModuleMatches; + KviPointerList<TQString> lModuleMatches; lModuleMatches.setAutoDelete(true); pModule->completeCommand(szCommandBegin,&lModuleMatches); - for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) + for(TQString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) { - QString * pszMatch = new QString(*pszModuleMatch); + TQString * pszMatch = new TQString(*pszModuleMatch); pszMatch->prepend("."); pszMatch->prepend(szModuleName); pMatches->append(pszMatch); } } -void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches) { - int idx = szFunctionBegin.find(QChar('.')); + int idx = szFunctionBegin.tqfind(TQChar('.')); if(idx == -1) { // no module name inside - KviPointerHashTableIterator<QString,KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict); + KviPointerHashTableIterator<TQString,KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict); int l = szFunctionBegin.length(); while(it.current()) { - if(KviQString::equalCIN(szFunctionBegin,it.currentKey(),l)) + if(KviTQString::equalCIN(szFunctionBegin,it.currentKey(),l)) { - QString * pMatch = new QString(it.currentKey()); + TQString * pMatch = new TQString(it.currentKey()); //pMatch->prepend("$"); pMatches->append(pMatch); } ++it; } - KviPointerList<QString> lModules; + KviPointerList<TQString> lModules; lModules.setAutoDelete(true); g_pModuleManager->completeModuleNames(szFunctionBegin,&lModules); - QString szEmpty = ""; - for(QString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) + TQString szEmpty = ""; + for(TQString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) completeModuleFunction(*pszModuleName,szEmpty,pMatches); - KviPointerList<QString> lAliases; + KviPointerList<TQString> lAliases; lAliases.setAutoDelete(true); KviKvsAliasManager::instance()->completeCommand(szFunctionBegin,&lAliases); - for(QString * pszAlias = lAliases.first();pszAlias;pszAlias = lAliases.next()) + for(TQString * pszAlias = lAliases.first();pszAlias;pszAlias = lAliases.next()) { - QString * pszAliasMatch = new QString(*pszAlias); + TQString * pszAliasMatch = new TQString(*pszAlias); //pszAliasMatch->prepend("$"); pMatches->append(pszAliasMatch); } } else { // contains a module name - QString szModuleName = szFunctionBegin.left(idx); - QString szRight = szFunctionBegin.right(szFunctionBegin.length() - (idx+1)); + TQString szModuleName = szFunctionBegin.left(idx); + TQString szRight = szFunctionBegin.right(szFunctionBegin.length() - (idx+1)); completeModuleFunction(szModuleName,szRight,pMatches); } } -void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeModuleFunction(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); if(!pModule)return; - KviPointerList<QString> lModuleMatches; + KviPointerList<TQString> lModuleMatches; lModuleMatches.setAutoDelete(true); pModule->completeFunction(szCommandBegin,&lModuleMatches); - for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) + for(TQString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) { - QString * pszMatch = new QString(*pszModuleMatch); + TQString * pszMatch = new TQString(*pszModuleMatch); pszMatch->prepend("."); pszMatch->prepend(szModuleName); //pszMatch->prepend("$"); diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h index a6f8eb2..7c15655 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.h +++ b/src/kvirc/kvs/kvi_kvs_kernel.h @@ -76,11 +76,11 @@ public: private: static KviKvsKernel * m_pKvsKernel; // global kernel object - KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine> * m_pSpecialCommandParsingRoutineDict; + KviPointerHashTable<TQString,KviKvsSpecialCommandParsingRoutine> * m_pSpecialCommandParsingRoutineDict; - KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine> * m_pCoreSimpleCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine> * m_pCoreCallbackCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine> * m_pCoreFunctionExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreSimpleCommandExecRoutine> * m_pCoreSimpleCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreCallbackCommandExecRoutine> * m_pCoreCallbackCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreFunctionExecRoutine> * m_pCoreFunctionExecRoutineDict; KviKvsHash * m_pGlobalVariables; KviKvsVariantList * m_pEmptyParameterList; @@ -100,34 +100,34 @@ public: KviKvsAsyncOperationManager * asyncOperationManager(){ return m_pAsyncOperationManager; }; - void registerSpecialCommandParsingRoutine(const QString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) - { m_pSpecialCommandParsingRoutineDict->replace(szCmdName,r); }; - KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const QString &szCmdName) - { return m_pSpecialCommandParsingRoutineDict->find(szCmdName); }; - - void registerCoreSimpleCommandExecRoutine(const QString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r) - { m_pCoreSimpleCommandExecRoutineDict->replace(szCmdName,r); }; - KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const QString &szCmdName) - { return m_pCoreSimpleCommandExecRoutineDict->find(szCmdName); }; - - void registerCoreFunctionExecRoutine(const QString &szFncName,KviKvsCoreFunctionExecRoutine * r) - { m_pCoreFunctionExecRoutineDict->replace(szFncName,r); }; - KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const QString &szFncName) - { return m_pCoreFunctionExecRoutineDict->find(szFncName); }; - - void registerCoreCallbackCommandExecRoutine(const QString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r) - { m_pCoreCallbackCommandExecRoutineDict->replace(szCmdName,r); }; - KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const QString &szCmdName) - { return m_pCoreCallbackCommandExecRoutineDict->find(szCmdName); }; - - void completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches); - void completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches); - void completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * matches); - void completeModuleFunction(const QString &szModuleName,const QString &szFunctionBegin,KviPointerList<QString> * matches); + void registerSpecialCommandParsingRoutine(const TQString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) + { m_pSpecialCommandParsingRoutineDict->tqreplace(szCmdName,r); }; + KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const TQString &szCmdName) + { return m_pSpecialCommandParsingRoutineDict->tqfind(szCmdName); }; + + void registerCoreSimpleCommandExecRoutine(const TQString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r) + { m_pCoreSimpleCommandExecRoutineDict->tqreplace(szCmdName,r); }; + KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const TQString &szCmdName) + { return m_pCoreSimpleCommandExecRoutineDict->tqfind(szCmdName); }; + + void registerCoreFunctionExecRoutine(const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r) + { m_pCoreFunctionExecRoutineDict->tqreplace(szFncName,r); }; + KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const TQString &szFncName) + { return m_pCoreFunctionExecRoutineDict->tqfind(szFncName); }; + + void registerCoreCallbackCommandExecRoutine(const TQString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r) + { m_pCoreCallbackCommandExecRoutineDict->tqreplace(szCmdName,r); }; + KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const TQString &szCmdName) + { return m_pCoreCallbackCommandExecRoutineDict->tqfind(szCmdName); }; + + void completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches); + void completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches); + void completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * matches); + void completeModuleFunction(const TQString &szModuleName,const TQString &szFunctionBegin,KviPointerList<TQString> * matches); /* - KviPointerList<QString> * completeCommandAllocateResult(const QString &szCommandBegin); - KviPointerList<QString> * completeFunctionAllocateResult(const QString &szFunctionBegin); - void freeCompletionResult(KviPointerList<QString> * l); + KviPointerList<TQString> * completeCommandAllocateResult(const TQString &szCommandBegin); + KviPointerList<TQString> * completeFunctionAllocateResult(const TQString &szFunctionBegin); + void freeCompletionResult(KviPointerList<TQString> * l); */ }; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp index 911eb8c..c678cef 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp @@ -32,13 +32,13 @@ #include "kvi_kvs_treenode_data.h" #include "kvi_kvs_treenode_datalist.h" -bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QString &szParamBuffer) +bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer) { if(!m_pParameterDataList)return false; KviKvsTreeNodeData * d = m_pParameterDataList->item(uParamIdx); if(!d)return false; - const QChar * pBegin = d->location(); - const QChar * pEnd = d->endingLocation(); + const TQChar * pBegin = d->location(); + const TQChar * pEnd = d->endingLocation(); if(!(pBegin && pEnd))return false; szParamBuffer.setUnicode(pBegin,pEnd - pBegin); szParamBuffer.stripWhiteSpace(); @@ -48,11 +48,11 @@ bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QS KviKvsModuleInterface::KviKvsModuleInterface() { - m_pModuleSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine>(17,false); + m_pModuleSimpleCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleSimpleCommandExecRoutine>(17,false); m_pModuleSimpleCommandExecRoutineDict->setAutoDelete(true); - m_pModuleFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine>(17,false); + m_pModuleFunctionExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleFunctionExecRoutine>(17,false); m_pModuleFunctionExecRoutineDict->setAutoDelete(true); - m_pModuleCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine>(17,false); + m_pModuleCallbackCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleCallbackCommandExecRoutine>(17,false); m_pModuleCallbackCommandExecRoutineDict->setAutoDelete(true); } @@ -66,41 +66,41 @@ KviKvsModuleInterface::~KviKvsModuleInterface() #define COMPLETE_WORD_BY_DICT(__word,__list,__type,__dict) \ { \ - KviPointerHashTableIterator<QString,__type> it(*__dict); \ + KviPointerHashTableIterator<TQString,__type> it(*__dict); \ int l = __word.length(); \ while(it.current()) \ { \ - if(KviQString::equalCIN(__word,it.currentKey(),l)) \ - __list->append(new QString(it.currentKey())); \ + if(KviTQString::equalCIN(__word,it.currentKey(),l)) \ + __list->append(new TQString(it.currentKey())); \ ++it; \ } \ } -void KviKvsModuleInterface::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsModuleInterface::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleSimpleCommandExecRoutine,m_pModuleSimpleCommandExecRoutineDict) COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleCallbackCommandExecRoutine,m_pModuleCallbackCommandExecRoutineDict) } -void KviKvsModuleInterface::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches) +void KviKvsModuleInterface::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches) { COMPLETE_WORD_BY_DICT(szFunctionBegin,pMatches,KviKvsModuleFunctionExecRoutine,m_pModuleFunctionExecRoutineDict) } -void KviKvsModuleInterface::kvsRegisterSimpleCommand(const QString &szCommand,KviKvsModuleSimpleCommandExecRoutine r) +void KviKvsModuleInterface::kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r) { - m_pModuleSimpleCommandExecRoutineDict->replace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); + m_pModuleSimpleCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); } -void KviKvsModuleInterface::kvsRegisterCallbackCommand(const QString &szCommand,KviKvsModuleCallbackCommandExecRoutine r) +void KviKvsModuleInterface::kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r) { - m_pModuleCallbackCommandExecRoutineDict->replace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); + m_pModuleCallbackCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); } -void KviKvsModuleInterface::kvsRegisterFunction(const QString &szFunction,KviKvsModuleFunctionExecRoutine r) +void KviKvsModuleInterface::kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r) { - m_pModuleFunctionExecRoutineDict->replace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); + m_pModuleFunctionExecRoutineDict->tqreplace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); } @@ -161,7 +161,7 @@ static bool default_module_kvs_cmd_unload(KviKvsModuleCommandCall *c) { if(c->module()->isLocked()) { - if(!c->switches()->find('f',"force")) + if(!c->switches()->tqfind('f',"force")) { c->warning(__tr2qs("Can't unload the module: it has locked itself in memory")); return true; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h index ccfbaca..698c393 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h @@ -79,8 +79,8 @@ public: KviKvsSwitchList * switchList(){ return m_pSwitchList; }; // forwarders for the switch list - bool hasSwitch(unsigned short u,const QString &szSwitch){ return (m_pSwitchList->find(u,szSwitch) != 0); }; - KviKvsVariant * getSwitch(unsigned short u,const QString &szSwitch){ return m_pSwitchList->find(u,szSwitch); }; + bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->tqfind(u,szSwitch) != 0); }; + KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->tqfind(u,szSwitch); }; }; class KVIRC_API KviKvsModuleCallbackCommandCall : public KviKvsModuleCommandCall @@ -100,7 +100,7 @@ public: public: // Never NULL, but may have empty code const KviKvsScript * callback(){ return m_pCallback; }; - virtual bool getParameterCode(unsigned int uParamIdx,QString &szParamBuffer); + virtual bool getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer); }; @@ -137,21 +137,21 @@ public: KviKvsModuleInterface(); ~KviKvsModuleInterface(); protected: - KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine> * m_pModuleSimpleCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine> * m_pModuleFunctionExecRoutineDict; - KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine> * m_pModuleCallbackCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleSimpleCommandExecRoutine> * m_pModuleSimpleCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleFunctionExecRoutine> * m_pModuleFunctionExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleCallbackCommandExecRoutine> * m_pModuleCallbackCommandExecRoutineDict; public: - void kvsRegisterSimpleCommand(const QString &szCommand,KviKvsModuleSimpleCommandExecRoutine r); - void kvsRegisterCallbackCommand(const QString &szCommand,KviKvsModuleCallbackCommandExecRoutine r); - void kvsRegisterFunction(const QString &szFunction,KviKvsModuleFunctionExecRoutine r); + void kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r); + void kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r); + void kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r); bool kvsRegisterAppEventHandler(unsigned int iEventIdx,KviKvsModuleEventHandlerRoutine r); bool kvsRegisterRawEventHandler(unsigned int iRawIdx,KviKvsModuleEventHandlerRoutine r); - void kvsUnregisterSimpleCommand(const QString &szCommand) + void kvsUnregisterSimpleCommand(const TQString &szCommand) { m_pModuleSimpleCommandExecRoutineDict->remove(szCommand); }; - void kvsUnregisterCallbackCommand(const QString &szCommand) + void kvsUnregisterCallbackCommand(const TQString &szCommand) { m_pModuleCallbackCommandExecRoutineDict->remove(szCommand); }; - void kvsUnregisterFunction(const QString &szFunction) + void kvsUnregisterFunction(const TQString &szFunction) { m_pModuleFunctionExecRoutineDict->remove(szFunction); }; void kvsUnregisterAppEventHandler(unsigned int iEventIdx); void kvsUnregisterRawEventHandler(unsigned int iRawIdx); @@ -166,15 +166,15 @@ public: void kvsUnregisterAllRawEventHandlers(); void kvsUnregisterAllEventHandlers(); - KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const QString &szCommand) - { return m_pModuleSimpleCommandExecRoutineDict->find(szCommand); }; - KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const QString &szCommand) - { return m_pModuleCallbackCommandExecRoutineDict->find(szCommand); }; - KviKvsModuleFunctionExecRoutine * kvsFindFunction(const QString &szFunction) - { return m_pModuleFunctionExecRoutineDict->find(szFunction); }; + KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const TQString &szCommand) + { return m_pModuleSimpleCommandExecRoutineDict->tqfind(szCommand); }; + KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const TQString &szCommand) + { return m_pModuleCallbackCommandExecRoutineDict->tqfind(szCommand); }; + KviKvsModuleFunctionExecRoutine * kvsFindFunction(const TQString &szFunction) + { return m_pModuleFunctionExecRoutineDict->tqfind(szFunction); }; - void completeCommand(const QString &cmd,KviPointerList<QString> * matches); - void completeFunction(const QString &cmd,KviPointerList<QString> * matches); + void completeCommand(const TQString &cmd,KviPointerList<TQString> * matches); + void completeFunction(const TQString &cmd,KviPointerList<TQString> * matches); protected: void registerDefaultCommands(); }; @@ -219,7 +219,7 @@ protected: KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(pCall->params(),pCall->context(),parameter_format_list))return false; -#define KVSM_REQUIRE_CONNECTION(pCall) \ +#define KVSM_RETQUIRE_CONNECTION(pCall) \ if(!pCall->window()->context())return c->context()->errorNoIrcContext(); \ if(!pCall->window()->connection())return c->context()->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 0447cfd..6d51de2 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -43,10 +43,10 @@ #include "kvi_kvs_object_functioncall.h" #include "kvi_kvs_object_functionhandlerimpl.h" -#include <qmetaobject.h> -#include <qtimer.h> +#include <tqmetaobject.h> +#include <tqtimer.h> #include <time.h> -#include <qiconset.h> +#include <tqiconset.h> @@ -69,11 +69,11 @@ [big]Basic concepts[/big] Objects are arranged in tree structures. - Each object that you create is either toplevel object or a children - of another object. A toplevel object is a parentless one. - Obviously all objects can have children objects.[br][br] + Each object that you create is either toplevel object or a tqchildren + of another object. A toplevel object is a tqparentless one. + Obviously all objects can have tqchildren objects.[br][br] - When an object is destroyed , all its children are also destroyed. + When an object is destroyed , all its tqchildren are also destroyed. The toplevel objects are automatically destroyed when KVIrc quits. The objects are global to the entire application (this is different from previous KVIrc releases where the objects were local @@ -85,7 +85,7 @@ by the programmer; the name is just a mnemonic expedient, and you may also not need it.[br][br] - Each object is identified by an [b]OPAQUE UNIQUE ID[/b]. + Each object is identified by an [b]OPAQUE UNITQUE ID[/b]. The ID is assigned by KVIrc and can be held in any variable. You can think the object id as a "handle for the object" or the object's pointer. Any action performed on the object will require its ID.[br][br] @@ -95,7 +95,7 @@ To create an object you must use the [fnc]$new[/fnc]() function. [fnc]$new[/fnc]() requires three parameters:[br] - The object class (more about object classes later in this document)[br] - - The ID of the parent object , (that can be 0 for toplevel objects).[br] + - The ID of the tqparent object , (that can be 0 for toplevel objects).[br] - The object name (eventually empty)[br] [example] %myobject = [fnc]$new[/fnc]([class]object[/class],0,theName) @@ -113,7 +113,7 @@ [example] [cmd]if[/cmd](%myobject == %anotherobject)[cmd]echo[/cmd] "This is the same object!"; [/example] - The parent object id is optional, if not specified it is assumed to be 0. + The tqparent object id is optional, if not specified it is assumed to be 0. The object name is optional , but it may help you later in finding the object.[br][br] To destroy an object use the [cmd]delete[/cmd] command. (In previous versions @@ -121,7 +121,7 @@ [example] [cmd]delete[/cmd] %myobject [/example] - If the destroyed object has children objects , these are destroyed too.[br][br] + If the destroyed object has tqchildren objects , these are destroyed too.[br][br] [big]Fields : objects as pseudo-structures[/big] @@ -196,15 +196,15 @@ [cmd]delete[/cmd] %tmp [/example] Another cool function exported by the [class:object]object[/class] class is the - [classfnc:object]$children[/classfnc]() function. - It returns a comma separated list of children identifiers.[br] + [classfnc:object]$tqchildren[/classfnc]() function. + It returns a comma separated list of tqchildren identifiers.[br] [example] %tmp = [fnc]$new[/fnc]([class]object[/class],0,myobject) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child1) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child2) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child3) - [cmd]echo[/cmd] The object's children list is : %tmp->[classfnc:object]$children[/classfnc]() - # Destroy the object and the children + [cmd]echo[/cmd] The object's tqchildren list is : %tmp->[classfnc:object]$tqchildren[/classfnc]() + # Destroy the object and the tqchildren [cmd]delete[/cmd] %tmp [/example] There are two special functions for each objects: the "constructor" and the "destructor". @@ -230,25 +230,25 @@ [cmd]privateimpl[/cmd](%tmp,destructor) { %count = 0; - [cmd]foreach[/cmd](%t,[fnc]$this[/fnc]->[classfnc:object]$children[/classfnc]()) + [cmd]foreach[/cmd](%t,[fnc]$this[/fnc]->[classfnc:object]$tqchildren[/classfnc]()) { [cmd]echo[/cmd] Children : %t->[classfnc:object]$name[/classfnc]() with class %t->[classfnc:object]$class[/classfnc]() %count++ } - [cmd]echo[/cmd] Just before destroying my %count children. + [cmd]echo[/cmd] Just before destroying my %count tqchildren. } - # Destroy the object and the children + # Destroy the object and the tqchildren [cmd]delete[/cmd] %tmp [/example] In the example above four objects have been created. - A "parent" object named "myobject" , and three children objects. + A "tqparent" object named "myobject" , and three tqchildren objects. The destructor has been reimplemented for each child object, to make it "say" its name (Please note the usage of [fnc]$this[/fnc]). - In the parent destructor the children have been counted and listed.[br] - Then the parent object is destroyed causing to:[br] - - trigger the parent destructor.[br] - - destroy all the children (and conseguently trigger all the "individual" destructors).[br][br] + In the tqparent destructor the tqchildren have been counted and listed.[br] + Then the tqparent object is destroyed causing to:[br] + - trigger the tqparent destructor.[br] + - destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br] Not all the object functions must return a value: If a function does not return a meaningful value , or you just want to ignore it , you can call it in the following way:[br] @@ -339,7 +339,7 @@ The above class is named "helloworld". It inherits the [class]object[/class] class. This means that it acquires all the [class]object[/class] fuunctions: [classfnc:object]$name[/classfnc]() , - [classfnc:object]$class[/class]() , [classfnc:object]$children[/classfnc]()... + [classfnc:object]$class[/class]() , [classfnc:object]$tqchildren[/classfnc]()... Additionally , it has the $sayhello() function, that "echoes Hello world" to the console. Now you can create an instance of this class: [example] @@ -486,7 +486,7 @@ @description: This is the base class for all the builtin KVirc object classes. It exports the functions to retrieve the object name, to iterate - through children objects and to lookup a child object by name or class. + through tqchildren objects and to lookup a child object by name or class. Additionally , this class provides the builtin timer functionality. The [classfnc]$constructor[/classfnc] and [classfnc]$destructor[/classfnc] functions are empty implementations that all the other classes inherit. @@ -499,8 +499,8 @@ The default implementation emits the signal "[classsignal]destroyed[/classsignal]". !fn: $name() Returns the name of this object. - !fn: $parent() - Returns the parent object of this object or 0 if this object has no parent. + !fn: $tqparent() + Returns the tqparent object of this object or 0 if this object has no tqparent. !fn: $timerEvent(<timerId>) Handler for the timer events. The default implementation does nothing. @@ -521,15 +521,15 @@ Returns the first child that matches <class> and <name>. If <class> is an empty string, any class matches, if <name> is an empty string, any name matches. - This function traverses the entire tree of children + This function traverses the entire tree of tqchildren but is NOT recursive. !fn: $childCount() - Returns the number of children objects + Returns the number of tqchildren objects !fn: $emit(<signal_name>[,parameters]) Emits the signal <signal_name> passing the optional [parameters]. See the [doc:objects]objects documentation[/doc] for an overview of signals and slots. - !fn: $children() - Returns an array of children object identifiers. + !fn: $tqchildren() + Returns an array of tqchildren object identifiers. !fn: $signalSender() Returns the current signal sender when in a slot connected to a signal. In other contexts this function returns an empty string. @@ -540,11 +540,11 @@ one of this object's slots. This means that in a slot handler it returns the name of the signal that has triggered it. - !fn: $property(<Qt property name>[,bNowarning:boolean]) + !fn: $property(<TQt property name>[,bNowarning:boolean]) This is for really advanced scripting.[br] - All KVIrc widgets are based on the Qt library ones.[br] - The Qt library allow to set and read special properties.[br] - You will have to take a look at the Qt documentation for each widget type + All KVIrc widgets are based on the TQt library ones.[br] + The TQt library allow to set and read special properties.[br] + You will have to take a look at the TQt documentation for each widget type to see the available property names.[br] The supported property types are: Rect, Size, Point, Color, String, CString, Int, UInt, Bool and enumeration types.[br] @@ -553,9 +553,9 @@ There are many properties that are available ony through the [classfnc]$property()[classfnc]" call:[br] For example, you can find out if the widget accepts drops by calling [classfnc]$property(acceptDrops)[classfnc].[br] This function will be mainly useful in the [class]wrapper[/class] class. - !fn: $setProperty(<Qt property>,<property value>) + !fn: $setProperty(<TQt property>,<property value>) Sets a qt property for this widget.[br] - This is for advanced scripting, and can control really many features of the Qt widgets.[br] + This is for advanced scripting, and can control really many features of the TQt widgets.[br] For example, the [class]multilineedit[/class] widgets can be set to the "password" echo mode only by using this function call:[br] [example] @@ -586,8 +586,8 @@ static char * g_hNextObjectHandle = (char *)0; -KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName) -: QObject(pParent) +KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const TQString &szName) +: TQObject(pParent) { if(g_hNextObjectHandle == 0)g_hNextObjectHandle++; // make sure it's never 0 m_hObject = (kvs_hobject_t)g_hNextObjectHandle; @@ -639,7 +639,7 @@ KviKvsObject::~KviKvsObject() // Disconnect all the signals if(m_pSignalDict) { - KviPointerHashTableIterator<QString,KviKvsObjectConnectionList> it(*m_pSignalDict); + KviPointerHashTableIterator<TQString,KviKvsObjectConnectionList> it(*m_pSignalDict); while(it.current()) { @@ -660,7 +660,7 @@ KviKvsObject::~KviKvsObject() KviKvsObjectConnectionListIterator cit(*m_pConnectionList); while(cit.current()) { - QString szSig = cit.current()->szSignal; + TQString szSig = cit.current()->szSignal; cit.current()->pSourceObject->disconnectSignal(szSig,cit.current()); //++cit;// NO!... we point to the next now! } @@ -670,7 +670,7 @@ KviKvsObject::~KviKvsObject() for(;;) { if(!m_pSignalDict)break; - KviPointerHashTableEntry<QString,KviKvsObjectConnectionList> * pSignalList = m_pSignalDict->firstEntry(); + KviPointerHashTableEntry<TQString,KviKvsObjectConnectionList> * pSignalList = m_pSignalDict->firstEntry(); if(!pSignalList)break; KviKvsObjectConnection * pConnection = pSignalList->data()->first(); if(!pConnection)break; @@ -683,18 +683,18 @@ KviKvsObject::~KviKvsObject() if(!m_pConnectionList)break; KviKvsObjectConnection * pConnection = m_pConnectionList->first(); if(!pConnection)break; - QString szSignalCopy = pConnection->szSignal; // we need this since pConnection is deleted inside disconnectSignal() and pConnection->szSignal dies too (but is referenced after the connection delete) + TQString szSignalCopy = pConnection->szSignal; // we need this since pConnection is deleted inside disconnectSignal() and pConnection->szSignal dies too (but is referenced after the connection delete) pConnection->pSourceObject->disconnectSignal(szSignalCopy,pConnection); } #endif KviKvsKernel::instance()->objectController()->unregisterObject(this); - if(parentObject())parentObject()->unregisterChild(this); + if(tqparentObject())tqparentObject()->unregisterChild(this); if(m_pObject) { - disconnect(m_pObject,SIGNAL(destroyed()),this,SLOT(objectDestroyed())); + disconnect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); if(m_bObjectOwner)delete m_pObject; } @@ -707,14 +707,14 @@ bool KviKvsObject::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pPara return true; } -QWidget * KviKvsObject::parentScriptWidget() +TQWidget * KviKvsObject::tqparentScriptWidget() { - if(parentObject()) + if(tqparentObject()) { - if(parentObject()->object()) + if(tqparentObject()->object()) { - if(parentObject()->object()->isWidgetType()) - return (QWidget *)(parentObject()->object()); + if(tqparentObject()->object()->isWidgetType()) + return (TQWidget *)(tqparentObject()->object()); } } return 0; @@ -730,19 +730,19 @@ void KviKvsObject::registerChild(KviKvsObject *pChild) m_pChildList->append(pChild); } -// SIGNAL/SLOT stuff +// SIGNAL/TQT_SLOT stuff -bool KviKvsObject::connectSignal(const QString &sigName,KviKvsObject * pTarget,const QString &slotName) +bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName) { if(!pTarget->lookupFunctionHandler(slotName))return false; // no such slot if(!m_pSignalDict) { - m_pSignalDict = new KviPointerHashTable<QString,KviKvsObjectConnectionList>(7,false); + m_pSignalDict = new KviPointerHashTable<TQString,KviKvsObjectConnectionList>(7,false); m_pSignalDict->setAutoDelete(true); } - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l) { l = new KviKvsObjectConnectionList; @@ -772,11 +772,11 @@ void KviKvsObject::registerConnection(KviKvsObjectConnection *pConnection) m_pConnectionList->append(pConnection); } -bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarget,const QString &slotName) +bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName) { if(!m_pSignalDict)return false; //no such signal to disconnect - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l)return false; KviKvsObjectConnectionListIterator it(*l); @@ -785,7 +785,7 @@ bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarge { if(sl->pTargetObject == pTarget) { - if(KviQString::equalCI(sl->szSlot,slotName)) + if(KviTQString::equalCI(sl->szSlot,slotName)) { pTarget->unregisterConnection(sl); l->removeRef(sl); @@ -803,14 +803,14 @@ bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarge return false; } -bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObjectConnection * pConnection) +bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObjectConnection * pConnection) { if(!m_pSignalDict)return false; - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); //__range_valid(l); if(!l)return false; pConnection->pTargetObject->unregisterConnection(pConnection); - //__range_valid(l->findRef(pConnection) > -1); + //__range_valid(l->tqfindRef(pConnection) > -1); l->removeRef(pConnection); if(l->isEmpty())m_pSignalDict->remove(sigName); if(m_pSignalDict->isEmpty()) @@ -834,11 +834,11 @@ bool KviKvsObject::unregisterConnection(KviKvsObjectConnection * pConnection) return true; } -int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams) +int KviKvsObject::emitSignal(const TQString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams) { if(!m_pSignalDict)return 0; - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l)return 0; // no slots registered KviKvsVariant retVal; @@ -863,7 +863,7 @@ int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * p pTarget->setSignalSender(m_hObject); pTarget->setSignalName(sigName); - if(!pTarget->callFunction(this,s->szSlot,QString::null,pOuterCall->context(),&retVal,pParams)) + if(!pTarget->callFunction(this,s->szSlot,TQString(),pOuterCall->context(),&retVal,pParams)) { if(KviKvsKernel::instance()->objectController()->lookupObject(hTarget) && it.current()) { @@ -920,7 +920,7 @@ bool KviKvsObject::function_name(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_parent(KviKvsObjectFunctionCall * c) { - KviKvsObject * o = parentObject(); + KviKvsObject * o = tqparentObject(); c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t)0); return true; } @@ -955,7 +955,7 @@ bool KviKvsObject::function_destructor(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c) +bool KviKvsObject::function_tqchildren(KviKvsObjectFunctionCall * c) { KviKvsArray * a = new KviKvsArray(); int id=0; @@ -969,7 +969,7 @@ bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c) } bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c) { - QString szClass,szName; + TQString szClass,szName; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("className",KVS_PT_STRING,KVS_PF_OPTIONAL,szClass) KVSO_PARAMETER("objectName",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) @@ -983,7 +983,7 @@ bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_emit(KviKvsObjectFunctionCall * c) { - QString szSignal; + TQString szSignal; KviKvsVariantList vList; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("signal",KVS_PT_NONEMPTYSTRING,0,szSignal) @@ -1017,7 +1017,7 @@ bool KviKvsObject::function_killTimer(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_killTimers(KviKvsObjectFunctionCall * c) { - // FIXME: QT4 does not seem to have QObject::killTimers() + // FIXME: QT4 does not seem to have TQObject::killTimers() #ifndef COMPILE_USE_QT4 killTimers(); #endif @@ -1038,38 +1038,38 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) KviWindow * w = c->context()->window(); if(!bArray) - w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Listing Qt properties for object named \"%Q\" of KVS class %Q"),&m_szName,&(m_pClass->name())); + w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Listing TQt properties for object named \"%Q\" of KVS class %Q"),&m_szName,&(m_pClass->name())); kvs_int_t cnt = 0; if(m_pObject) { - const QMetaObject *o = m_pObject->metaObject(); + const TQMetaObject *o = m_pObject->tqmetaObject(); if(!bArray) - w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for Qt class %s"),o->className()); + w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for TQt class %s"),o->className()); #ifndef COMPILE_USE_QT4 while(o) { #endif kvs_int_t idx = 0; #ifdef COMPILE_USE_QT4 - QMetaProperty prop = o->property(idx); - const QMetaProperty *p = ∝ + TQMetaProperty prop = o->property(idx); + const TQMetaProperty *p = ∝ #else - const QMetaProperty *p = o->property(idx); + const TQMetaProperty *p = o->property(idx); #endif while(p) { - QString szOut; - QString szName = p->name(); + TQString szOut; + TQString szName = p->name(); #ifdef COMPILE_USE_QT4 - QString szType = p->typeName(); + TQString szType = p->typeName(); #else - QString szType = p->type(); + TQString szType = p->type(); #endif if(bArray) - KviQString::sprintf(szOut,"%Q, %Q",&szName,&szType); + KviTQString::sprintf(szOut,"%Q, %Q",&szName,&szType); else { - KviQString::sprintf(szOut,__tr2qs("Property: %c%Q%c, type %Q"),KVI_TEXT_BOLD,&szName,KVI_TEXT_BOLD,&szType); + KviTQString::sprintf(szOut,__tr2qs("Property: %c%Q%c, type %Q"),KVI_TEXT_BOLD,&szName,KVI_TEXT_BOLD,&szType); szOut.prepend(" "); } @@ -1077,8 +1077,8 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) { szOut += ", enum("; #ifndef COMPILE_USE_QT4 - // FIXME: Qt 4.x needs QMetaEnum for this loop - QStrList le = p->enumKeys(); + // FIXME: TQt 4.x needs TQMetaEnum for this loop + TQStrList le = p->enumKeys(); int i = 0; for(char *c2 = le.first(); c2; c2 = le.next()) { @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) cnt++; } #ifndef COMPILE_USE_QT4 - o = o->superClass(); + o = o->tqsuperClass(); } #endif @@ -1137,7 +1137,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) // rewritten using the new KVS features :) bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { - QString szName; + TQString szName; KviKvsVariant * v; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("propertyName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -1148,26 +1148,26 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!m_pObject) { - // there are no Qt properties at all - c->warning(__tr2qs("The object named \"%Q\" of class %Q has no Qt properties"),&m_szName,&(m_pClass->name())); + // there are no TQt properties at all + c->warning(__tr2qs("The object named \"%Q\" of class %Q has no TQt properties"),&m_szName,&(m_pClass->name())); return true; } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->metaObject()->indexOfProperty(szName); + int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); #endif if(idx < 0) { - c->warning(__tr2qs("No Qt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); return true; } #ifdef COMPILE_USE_QT4 - QMetaProperty prop = m_pObject->metaObject()->property(idx); - const QMetaProperty * p = ∝ + TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + const TQMetaProperty * p = ∝ #else - const QMetaProperty * p = m_pObject->metaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); #endif if(!p) { @@ -1175,7 +1175,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - QVariant vv = m_pObject->property(szName); + TQVariant vv = m_pObject->property(szName); if(!vv.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1184,14 +1184,14 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(p->isEnumType()) { - QString szKey; + TQString szKey; v->asString(szKey); #ifdef COMPILE_USE_QT4 int val = p->enumerator().keyToValue(szKey); #else int val = p->keyToValue(szKey); #endif - QVariant var(val); + TQVariant var(val); m_pObject->setProperty(szName,var); return true; } @@ -1204,39 +1204,39 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) switch(vv.type()) { - case QVariant::Int: + case TQVariant::Int: { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("integer") - m_pObject->setProperty(szName,QVariant((int)i)); + m_pObject->setProperty(szName,TQVariant((int)i)); } break; - case QVariant::UInt: + case TQVariant::UInt: { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("unsigned integer") if(i < 0)WRONG_TYPE("unsigned integer") - m_pObject->setProperty(szName,QVariant((unsigned int)i)); + m_pObject->setProperty(szName,TQVariant((unsigned int)i)); } break; - case QVariant::Bool: - m_pObject->setProperty(szName,QVariant(v->asBoolean())); + case TQVariant::Bool: + m_pObject->setProperty(szName,TQVariant(v->asBoolean())); break; - case QVariant::String: + case TQVariant::String: { - QString s; + TQString s; v->asString(s); - m_pObject->setProperty(szName,QVariant(s)); + m_pObject->setProperty(szName,TQVariant(s)); } break; - case QVariant::CString: + case TQVariant::CString: { - QString s; + TQString s; v->asString(s); - m_pObject->setProperty(szName,QVariant(s.utf8())); + m_pObject->setProperty(szName,TQVariant(s.utf8())); } break; - case QVariant::Point: + case TQVariant::Point: { if(!v->isArray())WRONG_TYPE("array(integer,integer)") KviKvsArray * a = v->array(); @@ -1245,10 +1245,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y)WRONG_TYPE("array(integer,integer)") kvs_int_t iX,iY; if(!x->asInteger(iX) || !y->asInteger(iY))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,QVariant(QPoint(iX,iY))); + m_pObject->setProperty(szName,TQVariant(TQPoint(iX,iY))); } break; - case QVariant::Size: + case TQVariant::Size: { if(!v->isArray())WRONG_TYPE("array(integer,integer)") KviKvsArray * a = v->array(); @@ -1257,10 +1257,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!w || !h)WRONG_TYPE("array(integer,integer)") kvs_int_t iW,iH; if(!w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,QVariant(QSize(iW,iH))); + m_pObject->setProperty(szName,TQVariant(TQSize(iW,iH))); } break; - case QVariant::Rect: + case TQVariant::Rect: { if(!v->isArray())WRONG_TYPE("array(integer,integer,integer,integer)") KviKvsArray * a = v->array(); @@ -1271,12 +1271,12 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y || !w || !h)WRONG_TYPE("array(integer,integer,integer,integer)") kvs_int_t iX,iY,iW,iH; if(!x->asInteger(iX) || !y->asInteger(iY) || !w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer,integer,integer)") - m_pObject->setProperty(szName,QVariant(QRect(iX,iY,iW,iH))); + m_pObject->setProperty(szName,TQVariant(TQRect(iX,iY,iW,iH))); } break; #ifndef COMPILE_USE_QT4 // FIXME: QT4 ???? - case QVariant::Color: + case TQVariant::Color: { if(!v->isArray())WRONG_TYPE("array(integer,integer,integer)") KviKvsArray * a = v->array(); @@ -1286,10 +1286,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!r || !g || !b)WRONG_TYPE("array(integer,integer,integer)") kvs_int_t iR,iG,iB; if(!r->asInteger(iR) || !g->asInteger(iG) || !b->asInteger(iB))WRONG_TYPE("array(integer,integer,integer)") - m_pObject->setProperty(szName,QVariant(QColor(iR,iG,iB))); + m_pObject->setProperty(szName,TQVariant(TQColor(iR,iG,iB))); } break; - case QVariant::Font: + case TQVariant::Font: { if(!v->isArray())WRONG_TYPE("array(string,integer,string)") KviKvsArray * a = v->array(); @@ -1299,55 +1299,55 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!ff || !ps)WRONG_TYPE("array(string,integer,string)") kvs_int_t iPs; if(!ps->asInteger(iPs))WRONG_TYPE("array(string,integer,string)") - QString szFf,szFl; + TQString szFf,szFl; ff->asString(szFf); if(fl)fl->asString(szFl); - QFont fnt; + TQFont fnt; fnt.setFamily(szFf); fnt.setPointSize(iPs); - if(szFl.find('b') != -1)fnt.setBold(true); - if(szFl.find('i') != -1)fnt.setItalic(true); - if(szFl.find('u') != -1)fnt.setUnderline(true); - if(szFl.find('o') != -1)fnt.setOverline(true); - if(szFl.find('f') != -1)fnt.setFixedPitch(true); - if(szFl.find('s') != -1)fnt.setStrikeOut(true); - m_pObject->setProperty(szName,QVariant(fnt)); + if(szFl.tqfind('b') != -1)fnt.setBold(true); + if(szFl.tqfind('i') != -1)fnt.setItalic(true); + if(szFl.tqfind('u') != -1)fnt.setUnderline(true); + if(szFl.tqfind('o') != -1)fnt.setOverline(true); + if(szFl.tqfind('f') != -1)fnt.setFixedPitch(true); + if(szFl.tqfind('s') != -1)fnt.setStrikeOut(true); + m_pObject->setProperty(szName,TQVariant(fnt)); } break; - case QVariant::Pixmap: - case QVariant::IconSet: + case TQVariant::Pixmap: + case TQVariant::IconSet: { if(v->isHObject()) { if(v->hobject() == (kvs_hobject_t)0) { // null pixmap - if(vv.type() == QVariant::Pixmap) - m_pObject->setProperty(szName,QVariant(QPixmap())); + if(vv.type() == TQVariant::Pixmap) + m_pObject->setProperty(szName,TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,QVariant(QIconSet())); + m_pObject->setProperty(szName,TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) c->warning(__tr2qs("A pixmap object, an image_id or an image file path is required for this property")); else { - QVariant pixv = pix->property("pixmap"); - if(vv.type() == QVariant::Pixmap) + TQVariant pixv = pix->property("pixmap"); + if(vv.type() == TQVariant::Pixmap) m_pObject->setProperty(szName,pixv); else - m_pObject->setProperty(szName,QVariant(QIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { - QString szStr; + TQString szStr; v->asString(szStr); - QPixmap * pPix = g_pIconManager->getImage(szStr); + TQPixmap * pPix = g_pIconManager->getImage(szStr); if(pPix) { - if(vv.type() == QVariant::Pixmap) - m_pObject->setProperty(szName,QVariant(*pPix)); + if(vv.type() == TQVariant::Pixmap) + m_pObject->setProperty(szName,TQVariant(*pPix)); else - m_pObject->setProperty(szName,QVariant(QIconSet(*pPix))); + m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); } else c->warning(__tr2qs("Can't find the requested image")); @@ -1365,7 +1365,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) { - QString szName; + TQString szName; bool bNoerror; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("propertyName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -1374,36 +1374,36 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) if(!m_pObject) { - // there are no Qt properties at all - if (bNoerror) c->returnValue()->setString("No Qt properties"); + // there are no TQt properties at all + if (bNoerror) c->returnValue()->setString("No TQt properties"); else { - c->warning(__tr2qs("The object named \"%Q\" of class %Q has no Qt properties"),&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("The object named \"%Q\" of class %Q has no TQt properties"),&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->metaObject()->indexOfProperty(szName); + int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); #endif if(idx < 0) { - if (bNoerror) c->returnValue()->setString("No Qt properties"); + if (bNoerror) c->returnValue()->setString("No TQt properties"); else { - c->warning(__tr2qs("No Qt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; } #ifdef COMPILE_USE_QT4 - QMetaProperty prop = m_pObject->metaObject()->property(idx); - const QMetaProperty * p = ∝ + TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + const TQMetaProperty * p = ∝ #else - const QMetaProperty * p = m_pObject->metaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); #endif if(!p) { @@ -1412,7 +1412,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - QVariant v = m_pObject->property(szName); + TQVariant v = m_pObject->property(szName); if(!v.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1432,42 +1432,42 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) switch(v.type()) { - case QVariant::Int: + case TQVariant::Int: c->returnValue()->setInteger((kvs_int_t)v.toInt()); break; - case QVariant::UInt: + case TQVariant::UInt: c->returnValue()->setInteger((kvs_int_t)v.toUInt()); break; - case QVariant::Bool: + case TQVariant::Bool: c->returnValue()->setBoolean(v.toBool()); break; - case QVariant::String: + case TQVariant::String: c->returnValue()->setString(v.toString()); break; - case QVariant::CString: - c->returnValue()->setString(QString::fromUtf8(v.toCString().data())); + case TQVariant::CString: + c->returnValue()->setString(TQString::fromUtf8(v.toCString().data())); break; - case QVariant::Point: + case TQVariant::Point: { - QPoint p = v.toPoint(); + TQPoint p = v.toPoint(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.x())); a->set(1,new KviKvsVariant((kvs_int_t)p.y())); c->returnValue()->setArray(a); } break; - case QVariant::Size: + case TQVariant::Size: { - QSize p = v.toSize(); + TQSize p = v.toSize(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.width())); a->set(1,new KviKvsVariant((kvs_int_t)p.height())); c->returnValue()->setArray(a); } break; - case QVariant::Rect: + case TQVariant::Rect: { - QRect p = v.toRect(); + TQRect p = v.toRect(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.x())); a->set(1,new KviKvsVariant((kvs_int_t)p.y())); @@ -1478,9 +1478,9 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) break; #ifndef COMPILE_USE_QT4 // FIXME: QT4 ? - case QVariant::Color: + case TQVariant::Color: { - QColor clr = v.toColor(); + TQColor clr = v.toColor(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)clr.red())); a->set(1,new KviKvsVariant((kvs_int_t)clr.green())); @@ -1488,13 +1488,13 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) c->returnValue()->setArray(a); } break; - case QVariant::Font: + case TQVariant::Font: { - QFont f = v.toFont(); + TQFont f = v.toFont(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant(f.family())); a->set(1,new KviKvsVariant((kvs_int_t)f.pointSize())); - QString szFlags; + TQString szFlags; if(f.bold())szFlags += "b"; if(f.underline())szFlags += "u"; if(f.overline())szFlags += "o"; @@ -1543,7 +1543,7 @@ bool KviKvsObject::inheritsClass(KviKvsObjectClass * pClass) return false; } -KviKvsObjectClass * KviKvsObject::getClass(const QString & classOverride) +KviKvsObjectClass * KviKvsObject::getClass(const TQString & classOverride) { if(classOverride.isEmpty())return m_pClass; KviKvsObjectClass * cl = m_pClass; // class override can be also THIS class @@ -1551,20 +1551,20 @@ KviKvsObjectClass * KviKvsObject::getClass(const QString & classOverride) // is the class member function (not the local override) while(cl) { - if(KviQString::equalCI(cl->name(),classOverride))break; + if(KviTQString::equalCI(cl->name(),classOverride))break; else cl = cl->m_pParentClass; } return cl; } -KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const QString & funcName,const QString & classOverride) +KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const TQString & funcName,const TQString & classOverride) { KviKvsObjectFunctionHandler * h = 0; if(classOverride.isEmpty() && m_pFunctionHandlers) { // lookup the local overrides - h = m_pFunctionHandlers->find(funcName); + h = m_pFunctionHandlers->tqfind(funcName); } if(!h) @@ -1582,7 +1582,7 @@ bool KviKvsObject::die() { if(m_bInDelayedDeath)return false; m_bInDelayedDeath = true; - QTimer::singleShot(0,this,SLOT(delayedDie())); + TQTimer::singleShot(0,this,TQT_SLOT(delayedDie())); return true; } @@ -1599,13 +1599,13 @@ void KviKvsObject::delayedDie() delete this; // byez! } -void KviKvsObject::setObject(QObject * o,bool bIsOwned) +void KviKvsObject::setObject(TQObject * o,bool bIsOwned) { //__range_invalid(m_pObject); m_bObjectOwner = bIsOwned; m_pObject = o; o->installEventFilter(this); - connect(m_pObject,SIGNAL(destroyed()),this,SLOT(objectDestroyed())); + connect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); } void KviKvsObject::objectDestroyed() @@ -1614,12 +1614,12 @@ void KviKvsObject::objectDestroyed() die(); } -bool KviKvsObject::eventFilter(QObject *o,QEvent *e) +bool KviKvsObject::eventFilter(TQObject *o,TQEvent *e) { return false; // do not stop } -void KviKvsObject::timerEvent(QTimerEvent *e) +void KviKvsObject::timerEvent(TQTimerEvent *e) { KviKvsVariant * v = new KviKvsVariant(); v->setInteger(e->timerId()); @@ -1628,17 +1628,17 @@ void KviKvsObject::timerEvent(QTimerEvent *e) callFunction(this,"timerEvent",&parms); } -bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams) +bool KviKvsObject::callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams) { KviKvsVariant rv; if(!pRetVal)pRetVal = &rv; KviKvsRunTimeContext ctx(0,g_pApp->activeConsole(),KviKvsKernel::instance()->emptyParameterList(),pRetVal,0); if(!pParams)pParams = KviKvsKernel::instance()->emptyParameterList(); - return callFunction(pCaller,fncName,QString::null,&ctx,pRetVal,pParams); + return callFunction(pCaller,fncName,TQString(),&ctx,pRetVal,pParams); } -bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams) +bool KviKvsObject::callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariantList * pParams) { KviKvsVariant fakeRetVal; return callFunction(pCaller,fncName,&fakeRetVal,pParams); @@ -1646,8 +1646,8 @@ bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,Kv bool KviKvsObject::callFunction( KviKvsObject * pCaller, - const QString & fncName, - const QString & classOverride, + const TQString & fncName, + const TQString & classOverride, KviKvsRunTimeContext * pContext, KviKvsVariant * pRetVal, KviKvsVariantList * pParams) @@ -1687,7 +1687,7 @@ bool KviKvsObject::callFunction( -void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,const QString &szCode) +void KviKvsObject::registerPrivateImplementation(const TQString &szFunctionName,const TQString &szCode) { if(szCode.isEmpty()) { @@ -1703,20 +1703,20 @@ void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,c } else { if(!m_pFunctionHandlers) { - m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(7,false); + m_pFunctionHandlers = new KviPointerHashTable<TQString,KviKvsObjectFunctionHandler>(7,false); m_pFunctionHandlers->setAutoDelete(true); } - QString szContext = m_pClass->name(); + TQString szContext = m_pClass->name(); szContext += "[privateimpl]::"; szContext += szFunctionName; - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); } } -KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szName) +KviKvsObject * KviKvsObject::findChild(const TQString &szClass,const TQString &szName) { for(KviKvsObject * o = m_pChildList->first();o;o= m_pChildList->next()) { @@ -1725,13 +1725,13 @@ KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szN // any class matches if(szName.isEmpty())return o; // any name matches // name must match - if(KviQString::equalCI(szName,o->name()))return o; + if(KviTQString::equalCI(szName,o->name()))return o; } else { - if(KviQString::equalCI(szClass,o->getClass()->name())) + if(KviTQString::equalCI(szClass,o->getClass()->name())) { if(szName.isEmpty())return o; // any name matches // name must match - if(KviQString::equalCI(szName,o->name()))return o; + if(KviTQString::equalCI(szName,o->name()))return o; } } KviKvsObject * c = o->findChild(szClass,szName); diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h index 7cd6468..10f2564 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -32,7 +32,7 @@ #include "kvi_kvs_object_functionhandler.h" #include "kvi_kvs_types.h" -#include <qobject.h> +#include <tqobject.h> class KviKvsObjectFunctionCall; @@ -41,24 +41,25 @@ typedef struct _KviKvsObjectConnection { KviKvsObject * pSourceObject; // source object (owner of the struct) KviKvsObject * pTargetObject; // target object - QString szSignal; // source signal name - QString szSlot; // target slot function + TQString szSignal; // source signal name + TQString szSlot; // target slot function } KviKvsObjectConnection; typedef KviPointerList<KviKvsObjectConnection> KviKvsObjectConnectionList; typedef KviPointerListIterator<KviKvsObjectConnection> KviKvsObjectConnectionListIterator; -class KVIRC_API KviKvsObject : public QObject +class KVIRC_API KviKvsObject : public TQObject { friend class KviKvsObjectController; friend class KviKvsObjectClass; Q_OBJECT + TQ_OBJECT public: - KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName); + KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const TQString &szName); virtual ~KviKvsObject(); protected: // main data - QString m_szName; // object name + TQString m_szName; // object name kvs_hobject_t m_hObject; // global object handle KviKvsObjectClass * m_pClass; // the class definition @@ -66,18 +67,18 @@ protected: KviPointerList<KviKvsObject> * m_pChildList; - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // our function handlers + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // our function handlers - KviPointerHashTable<QString,KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions + KviPointerHashTable<TQString,KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions KviKvsObjectConnectionList * m_pConnectionList; // signals connected to this object functions // this is valid when processing one of our slots kvs_hobject_t m_hSignalSender; - QString m_szSignalName; + TQString m_szSignalName; // if this object wraps a qt one, it is here - QObject * m_pObject; + TQObject * m_pObject; bool m_bObjectOwner; // do we have to destroy it ? // internal stuff for die() @@ -85,18 +86,18 @@ protected: public: kvs_hobject_t handle(){ return m_hObject; }; - // the wrapped Qt object (may be 0!) - QObject * object() const { return m_pObject; }; - void setObject(QObject * o,bool bIsOwned = true); + // the wrapped TQt object (may be 0!) + TQObject * object() const { return m_pObject; }; + void setObject(TQObject * o,bool bIsOwned = true); - const QString & getName(){ return m_szName; }; + const TQString & getName(){ return m_szName; }; - KviKvsObject * parentObject(){ return (KviKvsObject *)parent(); }; - QWidget * parentScriptWidget(); + KviKvsObject * tqparentObject(){ return (KviKvsObject *)tqparent(); }; + TQWidget * tqparentScriptWidget(); - bool connectSignal(const QString &sigName,KviKvsObject * target,const QString &slotName); - bool disconnectSignal(const QString &sigName,KviKvsObjectConnection * con); - bool disconnectSignal(const QString &sigName,KviKvsObject * target,const QString & slotName); + bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName); + bool disconnectSignal(const TQString &sigName,KviKvsObjectConnection * con); + bool disconnectSignal(const TQString &sigName,KviKvsObject * target,const TQString & slotName); // Emits a signal by calling all the attacched slots in an unspecified order. // Returns the number of slots called (may be 0, if no slot is connected) @@ -104,13 +105,13 @@ public: // this is intended to be called from other function calls (the parameters are copied from pOuterCall) // since we should NEVER emit totally spontaneous signals: all of them // should be generated inside object functions (either from scripting or by core calls) - int emitSignal(const QString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams = 0); + int emitSignal(const TQString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams = 0); void setSignalSender(kvs_hobject_t hObject){ m_hSignalSender = hObject; }; kvs_hobject_t signalSender(){ return m_hSignalSender; }; - void setSignalName(const QString &szSigName){ m_szSignalName = szSigName; }; + void setSignalName(const TQString &szSigName){ m_szSignalName = szSigName; }; - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; KviKvsHash * dataContainer(){ return m_pDataContainer; }; @@ -118,30 +119,30 @@ public: bool dieNow(); KviKvsObjectClass * getExactClass(){ return m_pClass; }; - KviKvsObjectClass * getClass(const QString & classOverride = QString::null); + KviKvsObjectClass * getClass(const TQString & classOverride = TQString()); bool inheritsClass(KviKvsObjectClass * pClass); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & funcName,const QString & classOverride = QString::null); + KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & funcName,const TQString & classOverride = TQString()); // Registers a private implementation of a function // The function may or may not be already registered in the class // If szCode is empty the the private implementation is removed instead - void registerPrivateImplementation(const QString &szFunctionName,const QString &szCode); + void registerPrivateImplementation(const TQString &szFunctionName,const TQString &szCode); // ONLY pCaller can be zero here! // please use one of the wrappers, if possible bool callFunction( KviKvsObject * pCaller, // calling object, can be zero (used for the "internal" access list verification) - const QString & fncName, // name of the function to call - const QString & classOverride, // eventual class override for the functon call, may be QString::null + const TQString & fncName, // name of the function to call + const TQString & classOverride, // eventual class override for the functon call, may be TQString() KviKvsRunTimeContext * pContext, // calling runtime context (you'll have problems with instantiating this... :P ) KviKvsVariant * pRetVal, // the return value KviKvsVariantList * pParams); // the parameters for the call // a nice and simple wrapper: it accepts a parameter list only (eventually 0) - bool callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams = 0); + bool callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariantList * pParams = 0); // this one gets a non null ret val too - bool callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams = 0); + bool callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams = 0); - KviKvsObject * findChild(const QString &szClass,const QString &szName); + KviKvsObject * findChild(const TQString &szClass,const TQString &szName); void killAllChildrenWithClass(KviKvsObjectClass *cl); protected: void registerConnection(KviKvsObjectConnection * con); @@ -152,8 +153,8 @@ protected: void registerChild(KviKvsObject * c); void unregisterChild(KviKvsObject *c); - virtual bool eventFilter(QObject *o,QEvent *e); //necessary ? - virtual void timerEvent(QTimerEvent *e); + virtual bool eventFilter(TQObject *o,TQEvent *e); //necessary ? + virtual void timerEvent(TQTimerEvent *e); protected: bool function_name(KviKvsObjectFunctionCall *c); bool function_startTimer(KviKvsObjectFunctionCall *c); @@ -163,7 +164,7 @@ protected: bool function_findChild(KviKvsObjectFunctionCall *c); bool function_childCount(KviKvsObjectFunctionCall *c); bool function_emit(KviKvsObjectFunctionCall *c); - bool function_children(KviKvsObjectFunctionCall *c); + bool function_tqchildren(KviKvsObjectFunctionCall *c); bool function_signalSender(KviKvsObjectFunctionCall *c); bool function_signalName(KviKvsObjectFunctionCall *c); bool function_destructor(KviKvsObjectFunctionCall *c); diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index 312fcb4..7a01532 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -39,7 +39,7 @@ KviKvsObjectClass::KviKvsObjectClass( KviKvsObjectClass * pParent, - const QString &szName, + const TQString &szName, KviKvsObjectAllocateInstanceProc pProc, bool bBuiltin) { @@ -49,7 +49,7 @@ KviKvsObjectClass::KviKvsObjectClass( m_szName = szName; m_bBuiltin = bBuiltin; m_bDirty = !bBuiltin; - m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(17,false); + m_pFunctionHandlers = new KviPointerHashTable<TQString,KviKvsObjectFunctionHandler>(17,false); m_pFunctionHandlers->setAutoDelete(true); m_pChildClasses = new KviPointerList<KviKvsObjectClass>; m_pChildClasses->setAutoDelete(false); @@ -58,7 +58,7 @@ KviKvsObjectClass::KviKvsObjectClass( // inherit everything from the class above if(pParent) { - KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers())); + KviPointerHashTableIterator<TQString,KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers())); while(KviKvsObjectFunctionHandler * fh = it.current()) { m_pFunctionHandlers->insert(it.currentKey(),fh->clone()); @@ -79,7 +79,7 @@ KviKvsObjectClass::~KviKvsObjectClass() // then kill all objects that belong to our class KviKvsKernel::instance()->objectController()->killAllObjectsWithClass(this); // now we're quite clean: should have no object depending on us alive - // unregister from the parent, if any + // unregister from the tqparent, if any if(m_pParentClass)m_pParentClass->unregisterChildClass(this); // unregister from the object controller KviKvsKernel::instance()->objectController()->unregisterClass(this); @@ -89,36 +89,36 @@ KviKvsObjectClass::~KviKvsObjectClass() delete m_pChildClasses; } -void KviKvsObjectClass::registerFunctionHandler(const QString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags) +void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); } -void KviKvsObjectClass::registerFunctionHandler(const QString & szFunctionName,const QString &szBuffer,unsigned int uFlags) +void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags) { - QString szContext = m_szName; + TQString szContext = m_szName; szContext += "::"; szContext += szFunctionName; - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); } -void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); } -void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); } -void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); } -KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const QString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { if(!m_allocProc)return 0; KviKvsObject * pObject = m_allocProc(this,pParent,szName); @@ -141,7 +141,7 @@ KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const v = pParams->next(); } - if(!pObject->callFunction(pObject,"constructor",QString::null,pContext,&ret,©)) + if(!pObject->callFunction(pObject,"constructor",TQString(),pContext,&ret,©)) { // ops...constructor failed (script error!) delete pObject; @@ -179,22 +179,22 @@ void KviKvsObjectClass::unregisterChildClass(KviKvsObjectClass *pClass) m_pChildClasses->removeRef(pClass); } -bool KviKvsObjectClass::save(const QString &szFileName) +bool KviKvsObjectClass::save(const TQString &szFileName) { if(!m_pParentClass)return false; if(isBuiltin())return false; - QString szBuffer; - QString szParentName = m_pParentClass->name(); + TQString szBuffer; + TQString szParentName = m_pParentClass->name(); - KviQString::sprintf(szBuffer, + KviTQString::sprintf(szBuffer, "# Automatically generated KVS class dump\n\n" \ "class(\"%Q\",\"%Q\")\n" \ "{\n", &m_szName,&szParentName); - KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers); + KviPointerHashTableIterator<TQString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers); while(KviKvsObjectFunctionHandler * h = it.current()) { @@ -206,7 +206,7 @@ bool KviKvsObjectClass::save(const QString &szFileName) szBuffer += "function "; szBuffer += it.currentKey(); szBuffer += "()\n"; - QString szCode = h->scriptHandlerCode(); + TQString szCode = h->scriptHandlerCode(); KviCommandFormatter::blockFromBuffer(szCode); KviCommandFormatter::indent(szCode); szBuffer += szCode; @@ -219,16 +219,16 @@ bool KviKvsObjectClass::save(const QString &szFileName) return KviFileUtils::writeFile(szFileName,szBuffer); } -void KviKvsObjectClass::getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h) +void KviKvsObjectClass::getFunctionCode(TQString &szCode,KviKvsObjectFunctionHandler &h) { szCode=h.scriptHandlerCode(); } -bool KviKvsObjectClass::load(const QString &szFileName) +bool KviKvsObjectClass::load(const TQString &szFileName) { - QString szBuffer; + TQString szBuffer; if(!KviFileUtils::readFile(szFileName,szBuffer,0xffffff))return false; return KviKvsScript::run(szBuffer,g_pActiveWindow); } diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h index 44b093a..6b334dd 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.h +++ b/src/kvirc/kvs/kvi_kvs_object_class.h @@ -38,8 +38,8 @@ class KviKvsRunTimeContext; class KviKvsVariantList; // Object allocation function -// parameters are: the class, the parent object (eventually 0), the object name (eventually empty) -typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const QString &); +// parameters are: the class, the tqparent object (eventually 0), the object name (eventually empty) +typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const TQString &); // An object function callback typedef bool (KviKvsObject::*KviKvsObjectFunctionHandlerProc)(KviKvsObjectFunctionCall * pCall); @@ -53,48 +53,48 @@ class KVIRC_API KviKvsObjectClass friend class KviKvsObjectController; public: KviKvsObjectClass( - KviKvsObjectClass * pParent, // parent class - const QString & szName, // class name + KviKvsObjectClass * pParent, // tqparent class + const TQString & szName, // class name KviKvsObjectAllocateInstanceProc proc, // intance allocation proc bool bBuiltin = true // this is a builtin or script based class ? ); ~KviKvsObjectClass(); protected: - KviKvsObjectClass * m_pParentClass; // the parent (base) class - QString m_szName; // the class name + KviKvsObjectClass * m_pParentClass; // the tqparent (base) class + TQString m_szName; // the class name bool m_bBuiltin; // is this a builtin or script based class ? - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers KviPointerList<KviKvsObjectClass> * m_pChildClasses; // KviKvsObjectAllocateInstanceProc m_allocProc; bool m_bDirty; // not yet flushed to disk (only for not builtin classes) protected: void registerChildClass(KviKvsObjectClass *pClass); void unregisterChildClass(KviKvsObjectClass *pClass); - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; public: void clearDirtyFlag(){ m_bDirty = false; }; bool isDirty(){ return m_bDirty; }; bool isBuiltin(){ return m_bBuiltin; }; - const QString & name(){ return m_szName; }; - KviKvsObjectClass * parentClass(){ return m_pParentClass; }; + const TQString & name(){ return m_szName; }; + KviKvsObjectClass * tqparentClass(){ return m_pParentClass; }; // pProc CAN'T be zero here! - void registerFunctionHandler(const QString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags = 0); - void registerFunctionHandler(const QString & szFunctionName,const QString &szBuffer,unsigned int uFlags = 0); + void registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags = 0); + void registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags = 0); // registers an empty handler that returns "nothing" - void registerStandardNothingReturnFunctionHandler(const QString & szFunc); + void registerStandardNothingReturnFunctionHandler(const TQString & szFunc); // retisters an empty handler that returns $true - void registerStandardTrueReturnFunctionHandler(const QString & szFunc); + void registerStandardTrueReturnFunctionHandler(const TQString & szFunc); // retisters an empty handler that returns $false - void registerStandardFalseReturnFunctionHandler(const QString & szFunc); + void registerStandardFalseReturnFunctionHandler(const TQString & szFunc); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & szFunc){ return m_pFunctionHandlers->find(szFunc); }; - KviKvsObject * allocateInstance(KviKvsObject * pParent,const QString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams); + KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->tqfind(szFunc); }; + KviKvsObject * allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams); - bool save(const QString &szFileName); - static bool load(const QString &szFileName); - void getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h); - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;}; + bool save(const TQString &szFileName); + static bool load(const TQString &szFileName); + void getFunctionCode(TQString &szCode,KviKvsObjectFunctionHandler &h); + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;}; }; diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp index c13b068..583641e 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////////////////////////////////// -static KviKvsObject * objectClassCreateInstance(KviKvsObjectClass *pClass,KviKvsObject *pParent,const QString &szName) +static KviKvsObject * objectClassCreateInstance(KviKvsObjectClass *pClass,KviKvsObject *pParent,const TQString &szName) { return new KviKvsObject(pClass,pParent,szName); } @@ -44,7 +44,7 @@ KviKvsObjectController::KviKvsObjectController() m_pTopLevelObjectList->setAutoDelete(false); m_pObjectDict = new KviPointerHashTable<void *,KviKvsObject>(101); m_pObjectDict->setAutoDelete(false); - m_pClassDict = new KviPointerHashTable<QString,KviKvsObjectClass>(31,false); + m_pClassDict = new KviPointerHashTable<TQString,KviKvsObjectClass>(31,false); m_pClassDict->setAutoDelete(false); } @@ -73,11 +73,11 @@ void KviKvsObjectController::init() m_pObjectClass->registerFunctionHandler("findChild",KVI_PTR2MEMBER(KviKvsObject::function_findChild)); m_pObjectClass->registerFunctionHandler("childCount",KVI_PTR2MEMBER(KviKvsObject::function_childCount)); m_pObjectClass->registerFunctionHandler("emit",KVI_PTR2MEMBER(KviKvsObject::function_emit)); - m_pObjectClass->registerFunctionHandler("children",KVI_PTR2MEMBER(KviKvsObject::function_children)); + m_pObjectClass->registerFunctionHandler("tqchildren",KVI_PTR2MEMBER(KviKvsObject::function_tqchildren)); m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender)); m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName)); m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor)); - m_pObjectClass->registerFunctionHandler("parent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); + m_pObjectClass->registerFunctionHandler("tqparent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); m_pObjectClass->registerFunctionHandler("property",KVI_PTR2MEMBER(KviKvsObject::function_property)); m_pObjectClass->registerFunctionHandler("setProperty",KVI_PTR2MEMBER(KviKvsObject::function_setProperty)); m_pObjectClass->registerFunctionHandler("listProperties",KVI_PTR2MEMBER(KviKvsObject::function_listProperties)); @@ -104,7 +104,7 @@ void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass) void KviKvsObjectController::clearUserClasses() { flushUserClasses(); - KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict); + KviPointerHashTableIterator<TQString,KviKvsObjectClass> it(*m_pClassDict); KviPointerList<KviKvsObjectClass> l; l.setAutoDelete(true); while(it.current()) @@ -145,28 +145,28 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass *pClass) void KviKvsObjectController::registerObject(KviKvsObject *pObject) { m_pObjectDict->insert(pObject->handle(),pObject); - if(pObject->parent() == 0)m_pTopLevelObjectList->append(pObject); + if(pObject->tqparent() == 0)m_pTopLevelObjectList->append(pObject); } void KviKvsObjectController::unregisterObject(KviKvsObject *pObject) { m_pObjectDict->remove(pObject->handle()); - if(pObject->parent() == 0)m_pTopLevelObjectList->removeRef(pObject); + if(pObject->tqparent() == 0)m_pTopLevelObjectList->removeRef(pObject); } void KviKvsObjectController::flushUserClasses() { - KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict); + KviPointerHashTableIterator<TQString,KviKvsObjectClass> it(*m_pClassDict); while(KviKvsObjectClass * c = it.current()) { if(!c->isBuiltin()) { if(c->isDirty()) { - QString szPath; - QString szFileName = c->name().lower(); + TQString szPath; + TQString szFileName = c->name().lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(c->save(szPath)) c->clearDirtyFlag(); @@ -178,9 +178,9 @@ void KviKvsObjectController::flushUserClasses() } } -KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,bool bBuiltinOnly) +KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,bool bBuiltinOnly) { - KviKvsObjectClass * pC = m_pClassDict->find(szClass); + KviKvsObjectClass * pC = m_pClassDict->tqfind(szClass); if(!pC) { // maybe we need to load the object library ? @@ -189,21 +189,21 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b { debug("ops...something wrong with the libkviobjects module!"); return 0; - } else pC = m_pClassDict->find(szClass); + } else pC = m_pClassDict->tqfind(szClass); if(!pC) { if(bBuiltinOnly)return 0; // maybe we need to load it from permanent storage... - QString szPath; - QString szFileName = szClass.lower(); + TQString szPath; + TQString szFileName = szClass.lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath)) g_pApp->getGlobalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath))return 0; if(!KviKvsObjectClass::load(szPath))return 0; - pC = m_pClassDict->find(szClass); + pC = m_pClassDict->tqfind(szClass); if(pC)pC->clearDirtyFlag(); // just loaded from disk: no need to sync it } } else { @@ -218,10 +218,10 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass) { - QString szPath; - QString szFileName = pClass->name().lower(); + TQString szPath; + TQString szFileName = pClass->name().lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); KviFileUtils::removeFile(szPath); delete pClass; diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h index 3df0daa..28b9ae5 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.h +++ b/src/kvirc/kvs/kvi_kvs_object_controller.h @@ -46,7 +46,7 @@ public: protected: KviPointerList<KviKvsObject> * m_pTopLevelObjectList; KviPointerHashTable<void *,KviKvsObject> * m_pObjectDict; - KviPointerHashTable<QString,KviKvsObjectClass> * m_pClassDict; + KviPointerHashTable<TQString,KviKvsObjectClass> * m_pClassDict; KviKvsObjectClass * m_pObjectClass; //base class protected: // the classes and the objects register themselves with the controller @@ -61,10 +61,10 @@ public: void clearUserClasses(); void flushUserClasses(); void killAllObjectsWithClass(KviKvsObjectClass * pClass); - KviKvsObjectClass * lookupClass(const QString &szClass,bool bBuiltinOnly = false); - KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->find(hObject); }; + KviKvsObjectClass * lookupClass(const TQString &szClass,bool bBuiltinOnly = false); + KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->tqfind(hObject); }; KviPointerHashTable<void *,KviKvsObject> * objectDict(){ return m_pObjectDict; }; - KviPointerHashTable<QString,KviKvsObjectClass> * classDict(){ return m_pClassDict; }; + KviPointerHashTable<TQString,KviKvsObjectClass> * classDict(){ return m_pClassDict; }; }; #endif //!_KVI_KVS_OBJECT_CONTROLLER_H_ diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp index 9dbf541..2856389 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp @@ -40,9 +40,9 @@ bool KviKvsObjectFunctionHandler::isScriptHandler() return false; } -QString KviKvsObjectFunctionHandler::scriptHandlerCode() +TQString KviKvsObjectFunctionHandler::scriptHandlerCode() { - return QString::null; + return TQString(); } diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h index 6b241e2..53f8d58 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h @@ -48,7 +48,7 @@ public: unsigned int flags(){ return m_uFlags; }; protected: virtual bool isScriptHandler(); - virtual QString scriptHandlerCode(); + virtual TQString scriptHandlerCode(); virtual KviKvsObjectFunctionHandler * clone() = 0; virtual bool call(KviKvsObject * pObject,KviKvsObjectFunctionCall * pCall) = 0; }; diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp index 77c4101..c22bccc 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp @@ -104,7 +104,7 @@ bool KviKvsObjectCoreCallFunctionHandler::call(KviKvsObject * pObject,KviKvsObje /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsObjectScriptFunctionHandler::KviKvsObjectScriptFunctionHandler(const QString &szScriptContext,const QString &szCode,unsigned int uFlags) +KviKvsObjectScriptFunctionHandler::KviKvsObjectScriptFunctionHandler(const TQString &szScriptContext,const TQString &szCode,unsigned int uFlags) : KviKvsObjectFunctionHandler(uFlags) { m_pHandler = new KviKvsScript(szScriptContext,szCode,KviKvsScript::InstructionList); @@ -127,7 +127,7 @@ bool KviKvsObjectScriptFunctionHandler::isScriptHandler() return true; } -QString KviKvsObjectScriptFunctionHandler::scriptHandlerCode() +TQString KviKvsObjectScriptFunctionHandler::scriptHandlerCode() { return m_pHandler->code(); } diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h index 37f506a..e01a59f 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h @@ -57,7 +57,7 @@ class KVIRC_API KviKvsObjectScriptFunctionHandler : public KviKvsObjectFunctionH friend class KviKvsObject; friend class KviKvsObjectClass; protected: - KviKvsObjectScriptFunctionHandler(const QString &szScriptContext,const QString &szCode,unsigned int uFlags = 0); + KviKvsObjectScriptFunctionHandler(const TQString &szScriptContext,const TQString &szCode,unsigned int uFlags = 0); KviKvsObjectScriptFunctionHandler(const KviKvsObjectScriptFunctionHandler &h); public: virtual ~KviKvsObjectScriptFunctionHandler(); @@ -65,7 +65,7 @@ protected: KviKvsScript * m_pHandler; protected: virtual bool isScriptHandler(); - virtual QString scriptHandlerCode(); + virtual TQString scriptHandlerCode(); virtual KviKvsObjectFunctionHandler * clone(); virtual bool call(KviKvsObject * pObject,KviKvsObjectFunctionCall * pCall); }; diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp index fdd0639..fd62592 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp @@ -38,7 +38,7 @@ #include "kvi_pointerlist.h" -#include <qstringlist.h> +#include <tqstringlist.h> namespace KviKvsParameterProcessor { @@ -49,7 +49,7 @@ namespace KviKvsParameterProcessor { case KVS_PT_STRING: case KVS_PT_NONEMPTYSTRING: - *((QString *)(pFmtArray->pContainer)) = QString::null; + *((TQString *)(pFmtArray->pContainer)) = TQString(); break; case KVS_PT_INT: *((kvs_int_t *)(pFmtArray->pContainer)) = 0; @@ -77,10 +77,10 @@ namespace KviKvsParameterProcessor break; case KVS_PT_CSTRING: case KVS_PT_NONEMPTYCSTRING: - *((KviQCString *)(pFmtArray->pContainer)) = 0; + *((KviTQCString *)(pFmtArray->pContainer)) = 0; break; case KVS_PT_STRINGLIST: - ((QStringList *)(pFmtArray->pContainer))->clear(); + ((TQStringList *)(pFmtArray->pContainer))->clear(); break; case KVS_PT_VARIANTLIST: ((KviKvsVariantList *)(pFmtArray->pContainer))->clear(); @@ -110,28 +110,28 @@ namespace KviKvsParameterProcessor } } - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; if(v->isString()) { - QString tmp = v->string(); + TQString tmp = v->string(); if(tmp.isEmpty()) { - KviQString::appendFormatted(szError,__tr2qs("found empty string where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found empty string where type '%s' was expected"),&tmp,szExpectedType); } else { if(tmp.length() > 15) { tmp.truncate(15); tmp.append("..."); } - KviQString::appendFormatted(szError,__tr2qs("found string value \"%Q\" where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found string value \"%Q\" where type '%s' was expected"),&tmp,szExpectedType); } } else { - QString tmp; + TQString tmp; v->getTypeName(tmp); - KviQString::appendFormatted(szError,__tr2qs("found type %Q where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found type %Q where type '%s' was expected"),&tmp,szExpectedType); } pContext->error(szError); return false; @@ -150,8 +150,8 @@ namespace KviKvsParameterProcessor if(!(pFmtArray->uFlags & KVS_PF_OPTIONAL)) { // bad luck - QString szError; - KviQString::sprintf(szError,__tr2qs("Missing non-optional parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Missing non-optional parameter \"%s\""),pFmtArray->szName); pContext->error(szError); return false; } @@ -167,14 +167,14 @@ namespace KviKvsParameterProcessor switch(pFmtArray->uType) { case KVS_PT_STRING: - v->asString(*((QString *)(pFmtArray->pContainer))); + v->asString(*((TQString *)(pFmtArray->pContainer))); if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((QString *)(pFmtArray->pContainer)) += QChar(' '); - v->appendAsString(*((QString *)(pFmtArray->pContainer))); + *((TQString *)(pFmtArray->pContainer)) += TQChar(' '); + v->appendAsString(*((TQString *)(pFmtArray->pContainer))); v = pVariantList->next(); } return true; @@ -182,15 +182,15 @@ namespace KviKvsParameterProcessor break; case KVS_PT_STRINGLIST: { - ((QStringList *)(pFmtArray->pContainer))->clear(); - QString pSz; + ((TQStringList *)(pFmtArray->pContainer))->clear(); + TQString pSz; v->asString(pSz); - ((QStringList *)(pFmtArray->pContainer))->append(pSz); + ((TQStringList *)(pFmtArray->pContainer))->append(pSz); v = pVariantList->next(); while(v) { v->asString(pSz); - ((QStringList *)(pFmtArray->pContainer))->append(pSz); + ((TQStringList *)(pFmtArray->pContainer))->append(pSz); v = pVariantList->next(); } return true; @@ -212,25 +212,25 @@ namespace KviKvsParameterProcessor break; case KVS_PT_NONEMPTYSTRING: { - v->asString(*((QString *)(pFmtArray->pContainer))); + v->asString(*((TQString *)(pFmtArray->pContainer))); bool bDoReturn = false; if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((QString *)(pFmtArray->pContainer)) += QChar(' '); - v->appendAsString(*((QString *)(pFmtArray->pContainer))); + *((TQString *)(pFmtArray->pContainer)) += TQChar(' '); + v->appendAsString(*((TQString *)(pFmtArray->pContainer))); v = pVariantList->next(); } bDoReturn = true; } - if(((QString *)(pFmtArray->pContainer))->isEmpty()) + if(((TQString *)(pFmtArray->pContainer))->isEmpty()) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); + KviTQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); pContext->error(szError); return false; } @@ -239,26 +239,26 @@ namespace KviKvsParameterProcessor break; case KVS_PT_CSTRING: { - QString tmp; + TQString tmp; v->asString(tmp); if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((KviQCString *)(pFmtArray->pContainer)) += ' '; + *((KviTQCString *)(pFmtArray->pContainer)) += ' '; v->appendAsString(tmp); v = pVariantList->next(); } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); return true; } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); } break; case KVS_PT_NONEMPTYCSTRING: { - QString tmp; + TQString tmp; v->asString(tmp); bool bDoReturn = false; if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) @@ -266,20 +266,20 @@ namespace KviKvsParameterProcessor v = pVariantList->next(); while(v) { - *((KviQCString *)(pFmtArray->pContainer)) += ' '; + *((KviTQCString *)(pFmtArray->pContainer)) += ' '; v->appendAsString(tmp); v = pVariantList->next(); } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); bDoReturn = true; } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); - if(((KviQCString *)(pFmtArray->pContainer))->isEmpty()) + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + if(((KviTQCString *)(pFmtArray->pContainer))->isEmpty()) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); + KviTQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); pContext->error(szError); return false; } @@ -303,10 +303,10 @@ namespace KviKvsParameterProcessor } if(iTmp < 0) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found signed integer \"%d\" where type 'unsigned integer' was expected"),iTmp); + KviTQString::sprintf(szError,__tr2qs("found signed integer \"%d\" where type 'unsigned integer' was expected"),iTmp); pContext->error(szError); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h index 3d8483f..15b06e5 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h @@ -27,12 +27,12 @@ #include "kvi_settings.h" -// Data type: QString -// Default: QString::null +// Data type: TQString +// Default: TQString() #define KVS_PT_STRING 0 -// Data type: QString -// Default: QString::null +// Data type: TQString +// Default: TQString() #define KVS_PT_NONEMPTYSTRING 1 // Data type: kvs_int_t @@ -67,15 +67,15 @@ // default: 0 #define KVS_PT_VARIANT 8 -// Data type: QCString +// Data type: TQCString // default null string (0) #define KVS_PT_CSTRING 9 -// Data type: QCString +// Data type: TQCString // default null string (0) #define KVS_PT_NONEMPTYCSTRING 10 -// Data type: QStringList +// Data type: TQStringList // default: list cleared // This eats all the remaining params in the list! #define KVS_PT_STRINGLIST 11 diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp index 37e462c..3d439fd 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser.cpp @@ -68,7 +68,7 @@ void KviKvsParser::init() { \ KviKvsSpecialCommandParsingRoutine * r = new KviKvsSpecialCommandParsingRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsParser::__parsingRoutine); \ - pKern->registerSpecialCommandParsingRoutine(QString(__cntrlCmdName),r); \ + pKern->registerSpecialCommandParsingRoutine(TQString(__cntrlCmdName),r); \ } _REG_CNTRL_CMD("if",parseSpecialCommandIf); @@ -87,24 +87,24 @@ void KviKvsParser::init() #undef _REG_CNTRL_CMD } -void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szMsgFmt,kvi_va_list va) +void KviKvsParser::report(bool bError,const TQChar * pLocation,const TQString &szMsgFmt,kvi_va_list va) { - QString szMsg; - KviQString::vsprintf(szMsg,szMsgFmt,va); + TQString szMsg; + KviTQString::vsprintf(szMsg,szMsgFmt,va); - KviPointerList<QString> * pCodeListing = 0; - QString szLocation; + KviPointerList<TQString> * pCodeListing = 0; + TQString szLocation; if(pLocation) { - pCodeListing = new KviPointerList<QString>; + pCodeListing = new KviPointerList<TQString>; pCodeListing->setAutoDelete(true); int iLine,iCol; KviKvsReport::findLineColAndListing(m_pBuffer,pLocation,iLine,iCol,pCodeListing); - KviQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); + KviTQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); } else { szLocation = __tr2qs("beginning of input"); } @@ -115,17 +115,17 @@ void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szM KviKvsReport::report(&rep,m_pWindow); } -void KviKvsParser::errorBadChar(const QChar * pLocation,char cExpected,const char * szCommandName) +void KviKvsParser::errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName) { - if(pLocation->unicode()) - error(pLocation,__tr2qs("Found character '%q' (unicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"), - pLocation,pLocation->unicode(),cExpected,szCommandName); + if(pLocation->tqunicode()) + error(pLocation,__tr2qs("Found character '%q' (tqunicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"), + pLocation,pLocation->tqunicode(),cExpected,szCommandName); else error(pLocation,__tr2qs("Found end of input where character '%c' was expected: see \"/help %s\" for the command syntax"), cExpected,szCommandName); } -void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...) +void KviKvsParser::error(const TQChar * pLocation,const TQString &szMsgFmt,...) { m_bError = true; @@ -135,7 +135,7 @@ void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...) kvi_va_end(va); } -void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...) +void KviKvsParser::warning(const TQChar * pLocation,const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); @@ -143,7 +143,7 @@ void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...) kvi_va_end(va); } -KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parse(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -161,7 +161,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags return parseInstructionList(); } -KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -182,7 +182,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffe return new KviKvsTreeNodeExpressionReturn(pBuffer,expr); } -KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -428,10 +428,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] The line above is an example of syntax specification. All the commands are described by such syntax lines. [cmd]join[/cmd] is the command and it stands exactly - for the literal string "join" typed in a script. <channel> is in angular parenthesis + for the literal string "join" typed in a script. <channel> is in angular tqparenthesis and rappresents a mandatory parameter: you must substitute a real channel name in its place otherwise the command will fail and KVIrc will probably complain too. - [password] is still a parameter but the square parentheses indicate that it is + [password] is still a parameter but the square tqparentheses indicate that it is optional: if you specify it, then it will be interpreted as the channel password, if you don't then no password will be used. [note] @@ -701,7 +701,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer The function [fnc]$str.len[/fnc] accepts a single parameter and returns the length in characters of the parameter string. The returned value is always a string: in this case it can be also interpreted as a number.[br] - When passing an empty list you can avoid the parenthesis. + When passing an empty list you can avoid the tqparenthesis. (And you have found the "simple" functions shown above). So the followind two calls are equal:[br] [example] @@ -719,7 +719,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] If you want to place a literal '(' or ')' in the function parameters you must escape it. - A special case for when you want to use 'matching' parentheses: + A special case for when you want to use 'matching' tqparentheses: an opened '(' corresponds to a closed ')'. In this case you can omit the 'escape' character.[br] [example] @@ -1349,7 +1349,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer so the callback code is empty, but if you continue reading we will soon fill it. [/p] - [big]A typical addon layout[/big] + [big]A typical addon tqlayout[/big] [p] As stated above, the addons are usually shipped in a compressed archive. Once uncompressed, the archive will expand into a small directory tree @@ -1400,7 +1400,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/p] [p] The entries in [b]bold[/b] are directories while the other are files. - Please note that this is a general layout for a huge and rather complex + Please note that this is a general tqlayout for a huge and rather complex addon: you might not need all of these directories. Remember: the minimal addon has only an install.kvs file. Anyway, a really cool addon will probably have all of them and maybe some more. @@ -1496,7 +1496,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [p] It is a good idea to start on the KVIrc web site. There are surely several addons to look at. Pick one that seems simple and analyze its - layout and code (wow... the free software!). It will be easier to do than it was to explain it :D + tqlayout and code (wow... the free software!). It will be easier to do than it was to explain it :D [/p] [p] Have fun! :) @@ -2402,7 +2402,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar() if(!KVSP_curCharIsLetter && (KVSP_curCharUnicode != ':')) { // be flexible : allow an "alone" '%' char - return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("%"))); + return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("%"))); } // this is surely a variable or function KVSP_backChar; @@ -2412,7 +2412,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar() if(!KVSP_curCharIsFunctionStart) { // be flexible : allow an "alone" '$' char - return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("$"))); + return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("$"))); } // this is surely a variable or function KVSP_backChar; @@ -2428,7 +2428,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) KVSP_ASSERT((KVSP_curCharUnicode == '%') || (KVSP_curCharUnicode == '$') || (KVSP_curCharUnicode == '@')); KviKvsTreeNodeData * r; - const QChar * pBegin; + const TQChar * pBegin; if(KVSP_curCharUnicode == '%') { @@ -2440,8 +2440,8 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) if(!r)return 0; } else { // this is @ - static QString szStrayAtRoutineName("@"); - static QString szMightBeStrayAtOrThisRoutineName("@?"); + static TQString szStrayAtRoutineName("@"); + static TQString szMightBeStrayAtOrThisRoutineName("@?"); pBegin = KVSP_curCharPointer; @@ -2458,7 +2458,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) return r; } // we're not in object scope and cur char is either $ or % - // check for the common syntax $0!$1@$2 seen in hostmasks + // check for the common syntax $0!$1@$2 seen in hosttqmasks // @$<digit> is non valid anyway if(KVSP_curCharUnicode == '$') { @@ -2631,7 +2631,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) { KVSP_ASSERT(KVSP_curCharUnicode == '%'); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -2651,11 +2651,11 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) return 0; } - const QChar * pIdBegin = KVSP_curCharPointer; + const TQChar * pIdBegin = KVSP_curCharPointer; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_') || (KVSP_curCharUnicode == '.'))KVSP_skipChar; - QString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin); + TQString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin); //#warning "ADD A KviKvsTreeNodeBuiltinCleanupVariablesCommand on this KviKvsParser object" //#warning "KviKvsParser will append it to the script" @@ -2675,13 +2675,13 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) if(m_pGlobals) { - if(m_pGlobals->find(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); + if(m_pGlobals->tqfind(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); } if(m_iFlags & AssumeLocals) return new KviKvsTreeNodeLocalVariable(pBegin,szIdentifier); - if(pIdBegin->category() & QChar::Letter_Uppercase) + if(pIdBegin->category() & TQChar::Letter_Uppercase) { //if(m_iFlags & Pedantic) // warning(pIdBegin,__tr2qs("Declaring global variables with an uppercase letter is deprecated. Global variables should be declared with 'global'")); @@ -2724,7 +2724,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction() return parseCommand(); } else { // what the heck is this ? - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } break; @@ -2741,7 +2741,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock() KVSP_skipChar; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstructionBlock * b = new KviKvsTreeNodeInstructionBlock(pBegin - 1); @@ -2804,7 +2804,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() while(KVSP_curCharUnicode == '-') { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; bool bLong = false; @@ -2839,7 +2839,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() if(KVSP_curCharUnicode == 0) { - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); } else { error(KVSP_curCharPointer,__tr2qs("Unexpected end of script after a switch dash")); } @@ -2847,12 +2847,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() } } - const QChar * pSw = KVSP_curCharPointer; + const TQChar * pSw = KVSP_curCharPointer; KVSP_skipChar; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '-'))KVSP_skipChar; - const QChar * pSwEnd = KVSP_curCharPointer; + const TQChar * pSwEnd = KVSP_curCharPointer; skipSpaces(); @@ -2871,21 +2871,21 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() return 0; } else { // assume empty string - p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); } } skipSpaces(); if(bLong) - sw->addLong(QString(pSw,pSwEnd - pSw),p); + sw->addLong(TQString(pSw,pSwEnd - pSw),p); else - sw->addShort(pSw->lower().unicode(),p); + sw->addShort(pSw->lower().tqunicode(),p); } else { if(bLong) - sw->addLong(QString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param + sw->addLong(TQString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param else - sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param + sw->addShort(pSw->lower().tqunicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param } } @@ -2932,9 +2932,9 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList() } -KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() +KviPointerList<TQString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() { - KviPointerList<QString> * l = new KviPointerList<QString>; + KviPointerList<TQString> * l = new KviPointerList<TQString>; l->setAutoDelete(true); KVSP_skipChar; @@ -2967,7 +2967,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() default: { // anything else is a parameter - const QChar *pBegin = KVSP_curCharPointer; + const TQChar *pBegin = KVSP_curCharPointer; KviKvsTreeNodeData * p = parseCommaSeparatedParameter(); if(!p) { @@ -2976,7 +2976,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() return 0; } delete p; - QString * s = new QString(pBegin,KVSP_curCharPointer - pBegin); + TQString * s = new TQString(pBegin,KVSP_curCharPointer - pBegin); s->stripWhiteSpace(); l->append(s); @@ -3066,10 +3066,10 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList() #define LITERAL_PARAM_PARSING_FUNCTION_BEGIN(__funcname) \ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ { \ - QString szValue; \ + TQString szValue; \ \ - const QChar * pStart = KVSP_curCharPointer; \ - const QChar * pBegin = KVSP_curCharPointer; \ + const TQChar * pStart = KVSP_curCharPointer; \ + const TQChar * pBegin = KVSP_curCharPointer; \ int iLen = 0; \ int iNestedTerminators = 0; \ \ @@ -3095,7 +3095,7 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ iNestedTerminators--; \ iLen++; \ } else { \ - if(iLen > 0)szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \ { \ bool bOk; \ kvs_int_t iVal = szValue.toLong(&bOk); \ @@ -3108,11 +3108,11 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ break; #define LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END \ - if(iLen > 0) szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0) szValue.append(TQString(pBegin,iLen)); \ return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(szValue)); \ break; \ case '\\': \ - if(iLen > 0)szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \ KVSP_skipChar; \ switch(KVSP_curCharUnicode) \ { \ @@ -3129,19 +3129,19 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ case 'r': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\r')); \ + szValue.append(TQChar('\r')); \ iLen = 0; \ break; \ case 'n': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\n')); \ + szValue.append(TQChar('\n')); \ iLen = 0; \ break; \ case 't': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\t')); \ + szValue.append(TQChar('\t')); \ iLen = 0; \ break; \ default: \ @@ -3264,7 +3264,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; //KVSP_skipChar; @@ -3300,7 +3300,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() error(KVSP_curCharPointer,__tr2qs("Unexpected end of line in array index (missing ']' character or unescaped newline)")); break; default: - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); break; } return 0; @@ -3373,7 +3373,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; //KVSP_skipChar; @@ -3400,7 +3400,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey() if(KVSP_curCharUnicode != '}') { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_the_hash_key; } @@ -3481,7 +3481,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -3516,7 +3516,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter() if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ',')) { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_function_parameter; } @@ -3568,7 +3568,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -3606,7 +3606,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis() if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ',')) { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_function_parameter; } @@ -3659,7 +3659,7 @@ KviKvsTreeNodeData * KviKvsParser::parseStringParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -3728,7 +3728,7 @@ end_of_the_string: } else { // no parameters at all.. return straight empty string (no need to cast) delete l; - return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new QString())); + return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new TQString())); } } // never reached @@ -3742,7 +3742,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommandParameter(bool bPreferNumeric) bool bGotLiteral = false; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h index be98e96..70e353a 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.h +++ b/src/kvirc/kvs/kvi_kvs_parser.h @@ -61,14 +61,14 @@ public: KviKvsParser(KviKvsScript * pScript,KviWindow * pOutputWindow); ~KviKvsParser(); private: - const QChar * m_pBuffer; // the local pointer to the beginning of the buffer - const QChar * m_ptr; // the parsing pointer + const TQChar * m_pBuffer; // the local pointer to the beginning of the buffer + const TQChar * m_ptr; // the parsing pointer // parsing state - KviPointerHashTable<QString,QString> * m_pGlobals; // the dict of the vars declared with global in this script + KviPointerHashTable<TQString,TQString> * m_pGlobals; // the dict of the vars declared with global in this script int m_iFlags; // the current parsing flags bool m_bError; // error(..) was called ? // this stuff is used only for reporting errors and warnings - KviKvsScript * m_pScript; // parent script + KviKvsScript * m_pScript; // tqparent script KviWindow * m_pWindow; // output window public: // public interface enum Flags { AssumeLocals = 1, Pedantic = 2 }; @@ -77,9 +77,9 @@ public: // public interface // parses the buffer pointed by pBuffer and returns // a syntax tree or 0 in case of failure // if the parsing fails, the error code can be retrieved by calling error() - KviKvsTreeNodeInstruction * parse(const QChar * pBuffer,int iFlags = 0); - KviKvsTreeNodeInstruction * parseAsExpression(const QChar * pBuffer,int iFlags = 0); - KviKvsTreeNodeInstruction * parseAsParameter(const QChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parse(const TQChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parseAsExpression(const TQChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parseAsParameter(const TQChar * pBuffer,int iFlags = 0); private: // parsing helpers // generic void skipSpaces(); // skips only spaces and tabs (eventually with \) @@ -90,9 +90,9 @@ private: // parsing helpers // dedicated to parseSpecialCommandFor() : in kvi_kvs_parser_specialcommands.cpp bool skipToEndOfForControlBlock(); // error handlers - void error(const QChar * pLocation,const QString &szMsgFmt,...); - void warning(const QChar * pLocation,const QString &szMsgFmt,...); - void errorBadChar(const QChar * pLocation,char cExpected,const char * szCommandName); + void error(const TQChar * pLocation,const TQString &szMsgFmt,...); + void warning(const TQChar * pLocation,const TQString &szMsgFmt,...); + void errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName); protected: // this is called by KviKvsKernel to register the parsing routines @@ -121,7 +121,7 @@ private: // if started in the middle of the list returns only the remaining // parameters. KviKvsTreeNodeDataList * parseCommaSeparatedParameterList(); - KviPointerList<QString> * parseCommaSeparatedParameterListNoTree(); + KviPointerList<TQString> * parseCommaSeparatedParameterListNoTree(); // returns 0 in case of error or if it starts on a terminating character (null parameter) // check error() to see if there was an error condition (unless you already know that // there was a valid first character) @@ -294,7 +294,7 @@ private: KviKvsTreeNodeExpression * parseExpressionOperandCore(char terminator); bool parseExpressionMightPointToOperator(); - void report(bool bError,const QChar * pLocation,const QString &szMsgFmt,kvi_va_list va); + void report(bool bError,const TQChar * pLocation,const TQString &szMsgFmt,kvi_va_list va); }; #endif //!_KVI_KVS_PARSER_H_ diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp index bd50d23..094fc30 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp @@ -46,13 +46,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() KVSP_ASSERT(KVSP_curCharIsLetter || (KVSP_curCharUnicode == '_')); - const QChar * pIdentifier = KVSP_curCharPointer; + const TQChar * pIdentifier = KVSP_curCharPointer; while(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '_'))KVSP_skipChar; int iIdentifierLen = KVSP_curCharPointer - pIdentifier; - const QChar * pSecondPart = 0; + const TQChar * pSecondPart = 0; int iSecondPartLen = 0; bool bHasNamespaceSoMustBeAlias = false; @@ -107,7 +107,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() iIdentifierLen = KVSP_curCharPointer - pIdentifier; } - QString szIdentifier(pIdentifier,iIdentifierLen); + TQString szIdentifier(pIdentifier,iIdentifierLen); skipSpaces(); @@ -139,14 +139,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // perl.begin has a *really* half special parsing routine if(iIdentifierLen == 4) { - if(pIdentifier->lower().unicode() == 'p') + if(pIdentifier->lower().tqunicode() == 'p') { - if(KviQString::equalCI(szIdentifier,"perl")) + if(KviTQString::equalCI(szIdentifier,"perl")) { if(pSecondPart) { - QString szSecondPart(pSecondPart,iSecondPartLen); - if(KviQString::equalCI(szSecondPart,"begin")) + TQString szSecondPart(pSecondPart,iSecondPartLen); + if(KviTQString::equalCI(szSecondPart,"begin")) { // yep, that's perl.begin cmd = parseSpecialCommandPerlBegin(); @@ -229,7 +229,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() return 0; } - const QChar * pClbkBegin = KVSP_curCharPointer; + const TQChar * pClbkBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * ins = parseInstruction(); if(!ins) @@ -260,17 +260,17 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // of the other context. } - QString szCallbackName = szIdentifier; + TQString szCallbackName = szIdentifier; szCallbackName += " callback"; - QString szBlock(pClbkBegin,KVSP_curCharPointer - pClbkBegin); + TQString szBlock(pClbkBegin,KVSP_curCharPointer - pClbkBegin); KviCommandFormatter::bufferFromBlock(szBlock); KviKvsScript * clbk = new KviKvsScript(szCallbackName,szBlock); if(pSecondPart) { - cmd = new KviKvsTreeNodeModuleCallbackCommand(pIdentifier,szIdentifier,QString(pSecondPart,iSecondPartLen),dl,clbk); + cmd = new KviKvsTreeNodeModuleCallbackCommand(pIdentifier,szIdentifier,TQString(pSecondPart,iSecondPartLen),dl,clbk); } else { KviKvsCoreCallbackCommandExecRoutine * r = KviKvsKernel::instance()->findCoreCallbackCommandExecRoutine(szIdentifier); if(r) @@ -313,7 +313,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() } else { if(pSecondPart) { - cmd = new KviKvsTreeNodeModuleSimpleCommand(pIdentifier,szIdentifier,QString(pSecondPart,iSecondPartLen),pl); + cmd = new KviKvsTreeNodeModuleSimpleCommand(pIdentifier,szIdentifier,TQString(pSecondPart,iSecondPartLen),pl); } else { KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szIdentifier); if(r) diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp index e731e2b..18fbbbe 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp @@ -59,7 +59,7 @@ KviKvsTreeNode * KviKvsParser::parseComment() break; case '*': { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; // c style , multiline KVSP_skipChar; for(;;) @@ -85,7 +85,7 @@ KviKvsTreeNode * KviKvsParser::parseComment() } break; default: - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; break; } diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp index 0f304bd..a1f4c56 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp @@ -42,15 +42,15 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) { KVSP_ASSERT(KVSP_curCharUnicode == '$'); - const QChar * pDollarBegin = KVSP_curCharPointer; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pDollarBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; if(!KVSP_curCharIsFunctionStart) { if(KVSP_curCharUnicode == 0)warning(KVSP_curCharPointer,__tr2qs("Unexpected end of script after '$' function call prefix")); - else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode); + else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode); error(KVSP_curCharPointer,__tr2qs("Syntax error after '$' function call prefix. If you want to use a plain '$' in the code you need to escape it")); return 0; } @@ -107,7 +107,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) while(KVSP_curCharIsNumber) KVSP_skipChar; - QString szNum1(pBegin,KVSP_curCharPointer - pBegin); + TQString szNum1(pBegin,KVSP_curCharPointer - pBegin); bool bOk; int iNum1 = szNum1.toInt(&bOk); if(!bOk)debug("Ops... a non-number made by numbers ?"); @@ -138,7 +138,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) while(KVSP_curCharIsNumber) KVSP_skipChar; - QString szNum2(pBegin,KVSP_curCharPointer - pBegin); + TQString szNum2(pBegin,KVSP_curCharPointer - pBegin); int iNum2 = szNum2.toInt(&bOk); if(!bOk)debug("Ops... a non-number made by numbers (2) ?"); @@ -201,9 +201,9 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) } } - QString szIdentifier1(pBegin,KVSP_curCharPointer - pBegin); + TQString szIdentifier1(pBegin,KVSP_curCharPointer - pBegin); - const QChar * pId2 = 0; + const TQChar * pId2 = 0; int iId2Len = 0; bool bModuleFunctionCall = false; @@ -229,12 +229,12 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) // object scope, check for "class name" namespace // the class name namespace has the format "<namespace>::<namespace>::..::<classname> // so the last :: is the delimiter of the function name - const QChar * pOriginalEndOfId1 = KVSP_curCharPointer; - const QChar * pEndOfId1 = pOriginalEndOfId1; + const TQChar * pOriginalEndOfId1 = KVSP_curCharPointer; + const TQChar * pEndOfId1 = pOriginalEndOfId1; while(KVSP_curCharUnicode == ':') { - const QChar * pEndOfId1 = KVSP_curCharPointer; + const TQChar * pEndOfId1 = KVSP_curCharPointer; // base class function call ? KVSP_skipChar; if(KVSP_curCharUnicode == ':') @@ -297,16 +297,16 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) } else if(bModuleFunctionCall) { // module function call - return new KviKvsTreeNodeModuleFunctionCall(pDollarBegin,szIdentifier1,QString(pId2,iId2Len),l); + return new KviKvsTreeNodeModuleFunctionCall(pDollarBegin,szIdentifier1,TQString(pId2,iId2Len),l); } else { if(bInObjScope) { - // object function call (our parent will be a scope operator) + // object function call (our tqparent will be a scope operator) if(pId2) { // base class object function call - return new KviKvsTreeNodeBaseObjectFunctionCall(pDollarBegin,szIdentifier1,QString(pId2,iId2Len),l); + return new KviKvsTreeNodeBaseObjectFunctionCall(pDollarBegin,szIdentifier1,TQString(pId2,iId2Len),l); } else { // plain object function call return new KviKvsTreeNodeThisObjectFunctionCall(pDollarBegin,szIdentifier1,l); diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp index 832a814..adeef3d 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp @@ -355,9 +355,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina KviPointerList<KviKvsTreeNodeData> * pDataList = new KviPointerList<KviKvsTreeNodeData>; pDataList->setAutoDelete(true); - static QString szStaticSingleSpace(" "); + static TQString szStaticSingleSpace(" "); - const QChar * pOperandBegin = KVSP_curCharPointer; + const TQChar * pOperandBegin = KVSP_curCharPointer; bool bHaveVariable = false; @@ -410,9 +410,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina // literal ? if(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '.') || (KVSP_curCharUnicode == '_')) { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '.') || (KVSP_curCharUnicode == '_'))KVSP_skipChar; - QString tmp(pBegin,KVSP_curCharPointer - pBegin); + TQString tmp(pBegin,KVSP_curCharPointer - pBegin); bool bOk; kvs_int_t iVal = tmp.toLong(&bOk); if(bOk) @@ -420,14 +420,14 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina pDataList->append(new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(iVal))); } else { // bOk is false - if(pBegin->unicode() == '0') + if(pBegin->tqunicode() == '0') { if(tmp.length() > 2) { if((tmp[1] == 'x') || (tmp[1] == 'X')) { // hexadecimal constant ? - QString hex = tmp.right(tmp.length() - 2); + TQString hex = tmp.right(tmp.length() - 2); iVal = hex.toLong(&bOk,16); if(bOk) { @@ -448,7 +448,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina } } } else { - error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode); delete pDataList; return 0; } @@ -501,7 +501,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) KviKvsTreeNodeExpression * left = parseExpressionOperand(terminator); if(!left)return 0; - QString sz; + TQString sz; left->contextDescription(sz); skipSpaces(); @@ -577,7 +577,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) // incomplete has GREATER precedence than aux and thus aux should be done first incompleteOperator->setRight(operand); //right tree complete // go up until we find an operator with lower precedence than auxOperator (>=) - KviKvsTreeNodeExpression * tempOperator = incompleteOperator->parentWithPrecedenceLowerThan(auxOperator->precedence()); + KviKvsTreeNodeExpression * tempOperator = incompleteOperator->tqparentWithPrecedenceLowerThan(auxOperator->precedence()); if(tempOperator == 0) { auxOperator->setLeft(curTopOperator); diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp index c986956..d6437c7 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp @@ -156,14 +156,14 @@ [b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br] where <search pattern> is an extended regular expression to be matched in the <left_operand> and <replacement string> is a special pattern that will replace any occurence found.[br] - <search pattern> may contain parentheses to capture parts of the matched text. + <search pattern> may contain tqparentheses to capture parts of the matched text. <replacement string> can contain the escape sequences \\N where N is a number between 1 and 9 to be replaced by the captured text.[br] (We use \\N because KVIrc will first unquote the string when parsing...)[br] \\0 is a special escape that will be replaced by the entire match (is always valid!).[br] WARNING: the "capture-text" feature is not available if KVIrc has been compiled with qt older than 3.0.0. You can find out if the feature is available by - looking for the string "Qt3" in the array returned by [fnc]$features[/fnc].[br] + looking for the string "TQt3" in the array returned by [fnc]$features[/fnc].[br] [flags] may be a combination of the letters 'g','i' and 'w'.[br] 'g' causes the search to be global and not stop after the first occurence of <search pattern>.[br] 'i' causes the search to be case insensitive.[br] @@ -229,12 +229,12 @@ [example] %var << Pragma [/example] - %var now contains "Ciao ciao Pragma"[br] + %var now tqcontains "Ciao ciao Pragma"[br] Append a '!' character [example] %var <+ ! [/example] - %var now contains "Ciao ciao Pragma!" + %var now tqcontains "Ciao ciao Pragma!" Now reset it. [example] %var = @@ -245,7 +245,7 @@ %var = Pragma,Diabl0,Arter|o %var <, MalboroLi [/example] - %var now contains "Pragma,Diabl0,Arter|o,MalboroLi"[br] + %var now tqcontains "Pragma,Diabl0,Arter|o,MalboroLi"[br] [br] Now a longer example. [example] @@ -274,7 +274,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric) KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -298,7 +298,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric) } else { // separate by single spaces bPreferNumeric = false; // this can't be a number - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } break; default: @@ -331,7 +331,7 @@ end_of_the_param: } else { // empty (this should NEVER happen anyway) delete l; - return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(QString(""))); + return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(TQString(""))); } } // never reached @@ -662,7 +662,7 @@ end_of_the_param: [b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br] where <search pattern> is an extended regular expression to be matched in the <left_operand> and <replacement string> is a special pattern that will replace any occurence found.[br] - <search pattern> may contain parentheses to capture parts of the matched text. + <search pattern> may contain tqparentheses to capture parts of the matched text. <replacement string> can contain the escape sequences \\N where N is a number between 1 and 9 to be replaced by the captured text.[br] (We use \\N because KVIrc will first unquote the string when parsing...)[br] @@ -747,7 +747,7 @@ KviKvsTreeNodeData * KviKvsParser::parseBindingOperationParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -805,7 +805,7 @@ end_of_function_parameter: l->setAutoDelete(false); KviKvsTreeNodeData * p = l->first(); delete l; - if(!p)p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + if(!p)p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); return p; } // never reached @@ -818,17 +818,17 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() { // t or tr or y // s - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; - QString szOp = QString(pBegin,KVSP_curCharPointer - pBegin).lower(); + TQString szOp = TQString(pBegin,KVSP_curCharPointer - pBegin).lower(); skipSpaces(); if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -846,7 +846,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pFirst; return 0; } @@ -869,7 +869,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pFirst; return 0; } @@ -886,7 +886,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() return 0; } - pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); } while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; @@ -910,7 +910,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() KviKvsTreeNodeOperation * KviKvsParser::parseOperation() { // find the operator - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; switch(KVSP_curCharUnicode) { @@ -1135,7 +1135,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation() { KVSP_ASSERT((KVSP_curCharUnicode == '$') || (KVSP_curCharUnicode == '%') || (KVSP_curCharUnicode == '@')); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeData * r = parsePercentOrDollar(); @@ -1173,10 +1173,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation() // must be followed by the end of a command if(r->isFunctionCall()) { - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode); } else { warning(pBegin,__tr2qs("Unexpected (and senseless) read-only data evaluation")); - warning(pBegin,__tr2qs("Unexpected character '%q' (unicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode); + warning(pBegin,__tr2qs("Unexpected character '%q' (tqunicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode); error(KVSP_curCharPointer,__tr2qs("Syntax error: confused by earlier errors: bailing out")); } delete r; diff --git a/src/kvirc/kvs/kvi_kvs_parser_macros.h b/src/kvirc/kvs/kvi_kvs_parser_macros.h index 8de1f47..e727e4a 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_macros.h +++ b/src/kvirc/kvs/kvi_kvs_parser_macros.h @@ -29,15 +29,15 @@ #define KVSP_backChar m_ptr-- #define KVSP_backNChars(n) m_ptr -= n -#define KVSP_curCharUnicode (m_ptr->unicode()) +#define KVSP_curCharUnicode (m_ptr->tqunicode()) #define KVSP_curCharPointer m_ptr #define KVSP_curCharIsLetter (m_ptr->isLetter()) #define KVSP_curCharIsNumber (m_ptr->isNumber()) #define KVSP_curCharIsLetterOrNumber (m_ptr->isLetterOrNumber()) -#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->unicode() == '(') || (m_ptr->unicode() == '{') || (m_ptr->unicode() == '$')) -#define KVSP_curCharIsEndOfCommand ((m_ptr->unicode() == ';') || (m_ptr->unicode() == 0) || (m_ptr->unicode() == '\n') || (m_ptr->unicode() == '\r')) -#define KVSP_curCharIsEndOfBuffer (m_ptr->unicode() == 0) +#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->tqunicode() == '(') || (m_ptr->tqunicode() == '{') || (m_ptr->tqunicode() == '$')) +#define KVSP_curCharIsEndOfCommand ((m_ptr->tqunicode() == ';') || (m_ptr->tqunicode() == 0) || (m_ptr->tqunicode() == '\n') || (m_ptr->tqunicode() == '\r')) +#define KVSP_curCharIsEndOfBuffer (m_ptr->tqunicode() == 0) #define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 0dbc781..0014743 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -52,7 +52,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() // perl.begin(context) <perl code> perl.end // - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; skipSpaces(); KviKvsTreeNodeDataList * dl; @@ -84,11 +84,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() } } - const QChar * pPerlBegin = KVSP_curCharPointer; + const TQChar * pPerlBegin = KVSP_curCharPointer; // now look for perl.end[terminator] - static QString szPerlEnd("perl.end"); - const QChar * pPerlEnd; + static TQString szPerlEnd("perl.end"); + const TQChar * pPerlEnd; for(;;) { while(KVSP_curCharUnicode && (KVSP_curCharUnicode != 'p') && (KVSP_curCharUnicode != 'P')) @@ -100,13 +100,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() return 0; } pPerlEnd = KVSP_curCharPointer; - if(KviQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8)) + if(KviTQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8)) { KVSP_skipNChars(8); if(KVSP_curCharIsEndOfCommand || (KVSP_curCharUnicode == ' ') || (KVSP_curCharUnicode == '\t')) { // yeah! - QString szPerl(pPerlBegin,pPerlEnd - pPerlBegin); + TQString szPerl(pPerlBegin,pPerlEnd - pPerlBegin); dl->prependItem(new KviKvsTreeNodeConstantData(pPerlBegin,new KviKvsVariant(szPerl))); while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; @@ -140,7 +140,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandBreak() If called outside an iteration loop , will act just like [cmd]halt[/cmd] has been called but has no additional semantics for events.[br] */ - const QChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd + const TQChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd skipSpaces(); if(!KVSP_curCharIsEndOfCommand) { @@ -183,7 +183,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() [/example] */ - const QChar * pCmdBegin = KVSP_curCharPointer; + const TQChar * pCmdBegin = KVSP_curCharPointer; KviPointerList<KviKvsTreeNodeVariable> * pVarList = new KviPointerList<KviKvsTreeNodeVariable>; pVarList->setAutoDelete(true); @@ -207,7 +207,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() if(!KVSP_curCharIsEndOfCommand) { warning(KVSP_curCharPointer,__tr2qs("The 'unset' command needs a variable list")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -251,19 +251,19 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() while(KVSP_curCharUnicode == '%') { KVSP_skipChar; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_'))KVSP_skipChar; - QString szIdentifier(pBegin,KVSP_curCharPointer - pBegin); + TQString szIdentifier(pBegin,KVSP_curCharPointer - pBegin); if(!m_pGlobals) { - m_pGlobals = new KviPointerHashTable<QString,QString>(17,false); + m_pGlobals = new KviPointerHashTable<TQString,TQString>(17,false); m_pGlobals->setAutoDelete(true); } - m_pGlobals->replace(szIdentifier,new QString()); + m_pGlobals->tqreplace(szIdentifier,new TQString()); skipSpaces(); @@ -277,7 +277,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() if(!KVSP_curCharIsEndOfCommand) { warning(KVSP_curCharPointer,__tr2qs("The 'global' command needs a variable list")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -329,10 +329,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() that can be used to sign the parameters that the function expects; it acts as a programmer reminder or comment and it has no other meaning in KVIrc scripting. The <parameter reminder> respects the syntax - of an expression, so it is terminated by a closed parenthesis. + of an expression, so it is terminated by a closed tqparenthesis. It's rather dangerous to use this command inside an object function handler: if the class definition <class> was already - existing and it is a parent of the object's class, you might + existing and it is a tqparent of the object's class, you might end up executing "inexisting" code.[br] As a thumb rule, use this command only outside object function handlers.[br] [br][br] @@ -376,11 +376,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharUnicode != '(') { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeDataList * l = parseCommaSeparatedParameterList(); if(!l)return 0; @@ -426,7 +426,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() continue; } - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; if(KVSP_curCharIsLetter) { @@ -443,12 +443,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); unsigned int uHandlerFlags = 0; @@ -471,11 +471,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); } } @@ -498,11 +498,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); } } @@ -560,10 +560,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() } delete pInstruction; int iLen = KVSP_curCharPointer - pBegin; - QString szInstruction; + TQString szInstruction; if(iLen > 0) { - szInstruction = QString(pBegin,KVSP_curCharPointer - pBegin); + szInstruction = TQString(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); } @@ -627,12 +627,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in parenthesis")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in tqparenthesis")); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -714,7 +714,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() [cmd]while[/cmd] */ - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * i = parseInstruction(); if(!i) @@ -740,7 +740,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() if(KVSP_curCharIsEndOfBuffer) error(KVSP_curCharPointer,__tr2qs("Unexpected end of command after the 'do' command block: expected 'while' keyword")); else - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); if(i)delete i; return 0; } @@ -756,7 +756,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"do"); if(i)delete i; return 0; @@ -822,12 +822,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"if"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -867,7 +867,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf() return 0; } - const QChar * pElse = KVSP_curCharPointer; + const TQChar * pElse = KVSP_curCharPointer; if((KVSP_curCharUnicode != 'e') && (KVSP_curCharUnicode != 'E')) return new KviKvsTreeNodeSpecialCommandIf(pBegin,e,i,0); @@ -967,7 +967,7 @@ bool KviKvsParser::skipToEndOfForControlBlock() return false; break; //case '\n': - // that's ok.. it may have a parenthesis on the next line + // that's ok.. it may have a tqparenthesis on the next line //KVSP_skipChar; //break; default: @@ -1012,12 +1012,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"for"); return 0; } - const QChar * pForBegin = KVSP_curCharPointer; + const TQChar * pForBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1045,7 +1045,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() // skip to the first non matching ')' that is not in a string - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; if(!skipToEndOfForControlBlock()) { @@ -1061,10 +1061,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK // KVSP_curCharPointer is const! // we shouldn't be able to modify it - QChar cSave = *(KVSP_curCharPointer); + TQChar cSave = *(KVSP_curCharPointer); - QChar * pHack = (QChar *)KVSP_curCharPointer; - *pHack = QChar('\n'); + TQChar * pHack = (TQChar *)KVSP_curCharPointer; + *pHack = TQChar('\n'); KVSP_curCharPointer = pBegin; @@ -1089,7 +1089,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(KVSP_curCharUnicode != ')') { - error(KVSP_curCharPointer,__tr2qs("Found char %q (unicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found char %q (tqunicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode); if(i1)delete i1; if(e)delete e; if(i2)delete i2; @@ -1178,12 +1178,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"foreach"); return 0; } - const QChar * pForeachBegin = KVSP_curCharPointer; + const TQChar * pForeachBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1193,7 +1193,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() if((KVSP_curCharUnicode != '%') && (KVSP_curCharUnicode != '$') && (KVSP_curCharUnicode != '@')) { warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command expects a writeable iteration variable as first parameter")); - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -1235,7 +1235,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() return 0; } - const QChar * pLoopBegin = KVSP_curCharPointer; + const TQChar * pLoopBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * loop = parseInstruction(); if(!loop) @@ -1362,12 +1362,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"switch"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1407,7 +1407,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() { // look for a 'case','match','default' or 'regexpr' label - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; if(KVSP_curCharIsEndOfBuffer) @@ -1419,13 +1419,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pSwitch; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); - QString szLabelLow = szLabel.lower(); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabelLow = szLabel.lower(); bool bNeedParam = true; @@ -1554,7 +1554,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma while(KVSP_curCharUnicode != '}') { // look for 'label', 'prologue', 'epilogue', 'popup', 'item', 'separator' or 'extpopup' label - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; if(KVSP_curCharIsEndOfBuffer) @@ -1566,17 +1566,17 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pPopup; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); - QString szLabelLow = szLabel.lower(); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabelLow = szLabel.lower(); - KviPointerList<QString> * pParameters = 0; + KviPointerList<TQString> * pParameters = 0; - QString szCondition; + TQString szCondition; #define EXTRACT_POPUP_LABEL_PARAMETERS \ @@ -1603,7 +1603,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma } \ if(KVSP_curCharUnicode == '(') \ { \ - const QChar * pBegin = KVSP_curCharPointer; \ + const TQChar * pBegin = KVSP_curCharPointer; \ KVSP_skipChar; \ KviKvsTreeNodeExpression * pExpression = parseExpression(')'); \ if(!pExpression) \ @@ -1648,7 +1648,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma return 0; } } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * pInstruction = parseInstruction(); if(pInstruction) { @@ -1672,10 +1672,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma int iLen = KVSP_curCharPointer - pBegin; if(iLen > 0) { - QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); + TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); - QString * pItemName = pParameters ? pParameters->first() : 0; - QString szItemName = pItemName ? *pItemName : QString::null; + TQString * pItemName = pParameters ? pParameters->first() : 0; + TQString szItemName = pItemName ? *pItemName : TQString(); if(bPrologue) pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(pLabelBegin,szInstruction,szItemName)); else @@ -1688,7 +1688,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma ///////////////////////////////////////////////////////////////////////////////////////////////// EXTRACT_POPUP_LABEL_CONDITION if(KVSP_curCharUnicode == ';')KVSP_skipChar; - QString szItemName = "dummySeparator"; // <------- FIXME! + TQString szItemName = "dummySeparator"; // <------- FIXME! pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(pLabelBegin,szCondition,szItemName)); } else if(szLabelLow == "label") @@ -1697,7 +1697,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in label parameters. See /help defpopup for the syntax")); @@ -1705,10 +1705,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); + TQString * pIcon = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; - QString * pItemName = pParameters->next(); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,pItemName ? *pItemName : QString::null)); + TQString * pItemName = pParameters->next(); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),pItemName ? *pItemName : TQString())); delete pParameters; } else if(szLabelLow == "popup") { @@ -1716,7 +1716,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1724,8 +1724,8 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pSubPopup = parseSpecialCommandDefpopupLabelPopup(); if(!pSubPopup) @@ -1737,7 +1737,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma pSubPopup->setCondition(szCondition); pSubPopup->setText(*pText); - pSubPopup->setItemName(pItemName ? *pItemName : QString::null); + pSubPopup->setItemName(pItemName ? *pItemName : TQString()); if(pIcon)pSubPopup->setIcon(*pIcon); pPopup->addLabel(pSubPopup); delete pParameters; @@ -1747,7 +1747,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1755,10 +1755,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * pInstruction = parseInstruction(); if(pInstruction) { @@ -1779,14 +1779,14 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma int iLen = KVSP_curCharPointer - pBegin; if(iLen > 0) { - QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); + TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString())); } else { // zero length instruction, but still add the item - QString szInstruction = ""; + TQString szInstruction = ""; KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString())); } delete pParameters; } else if(szLabelLow == "extpopup") @@ -1795,7 +1795,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1803,7 +1803,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pName = pParameters->next(); + TQString * pName = pParameters->next(); if(!pName) { error(pLabelBegin,__tr2qs("Unexpected empty <name> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1811,10 +1811,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,*pName,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),*pName,pItemName ? *pItemName : TQString())); delete pParameters; } else { ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -1928,12 +1928,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"defpopup"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1968,15 +1968,15 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp() skipSpaces(); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; - QString tmp(pBegin,KVSP_curCharPointer - pBegin); + TQString tmp(pBegin,KVSP_curCharPointer - pBegin); tmp.stripWhiteSpace(); - const QString szHelpName("help"); + const TQString szHelpName("help"); KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szHelpName); if(!r)return 0; // <--- internal error! diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp index f0d0674..d8c3dff 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp @@ -33,7 +33,7 @@ KviKvsPopupManager * KviKvsPopupManager::m_pInstance = 0; KviKvsPopupManager::KviKvsPopupManager() { m_pInstance = this; - m_pPopupDict = new KviPointerHashTable<QString,KviKvsPopupMenu>(17,false); + m_pPopupDict = new KviPointerHashTable<TQString,KviKvsPopupMenu>(17,false); m_pPopupDict->setAutoDelete(true); } @@ -62,7 +62,7 @@ void KviKvsPopupManager::done() delete KviKvsPopupManager::instance(); } -KviKvsPopupMenu * KviKvsPopupManager::get(const QString &szPopupName) +KviKvsPopupMenu * KviKvsPopupManager::get(const TQString &szPopupName) { KviKvsPopupMenu * m = lookup(szPopupName); if(!m) @@ -73,23 +73,23 @@ KviKvsPopupMenu * KviKvsPopupManager::get(const QString &szPopupName) return m; } -void KviKvsPopupManager::load(const QString &szFileName) +void KviKvsPopupManager::load(const TQString &szFileName) { m_pPopupDict->clear(); KviConfig cfg(szFileName,KviConfig::Read); KviConfigIterator it(*(cfg.dict())); - KviPointerList<QString> l; + KviPointerList<TQString> l; l.setAutoDelete(true); while(it.current()) { - l.append(new QString(it.currentKey())); + l.append(new TQString(it.currentKey())); ++it; } - for(QString * s = l.first();s;s = l.next()) + for(TQString * s = l.first();s;s = l.next()) { cfg.setGroup(*s); KviKvsPopupMenu * m = new KviKvsPopupMenu(*s); @@ -99,12 +99,12 @@ void KviKvsPopupManager::load(const QString &szFileName) } } -void KviKvsPopupManager::save(const QString &szFileName) +void KviKvsPopupManager::save(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*m_pPopupDict); + KviPointerHashTableIterator<TQString,KviKvsPopupMenu> it(*m_pPopupDict); while(it.current()) { cfg.setGroup(it.current()->popupName()); diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h index c9135b2..2b7a52e 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmanager.h +++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h @@ -33,7 +33,7 @@ protected: // can only be created by init/done KviKvsPopupManager(); ~KviKvsPopupManager(); protected: - KviPointerHashTable<QString,KviKvsPopupMenu> * m_pPopupDict; + KviPointerHashTable<TQString,KviKvsPopupMenu> * m_pPopupDict; static KviKvsPopupManager * m_pInstance; public: static KviKvsPopupManager * instance(){ return m_pInstance; }; @@ -41,16 +41,16 @@ public: static void done(); int popupCount(){ return m_pPopupDict->count(); }; - KviPointerHashTable<QString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; }; + KviPointerHashTable<TQString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; }; - KviKvsPopupMenu * lookup(const QString &szPopupName){ return m_pPopupDict->find(szPopupName); }; - KviKvsPopupMenu * get(const QString &szPopupName); - void add(const QString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->replace(szPopupName,pPopup); }; - void remove(const QString &szPopupName){ m_pPopupDict->remove(szPopupName); }; + KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->tqfind(szPopupName); }; + KviKvsPopupMenu * get(const TQString &szPopupName); + void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->tqreplace(szPopupName,pPopup); }; + void remove(const TQString &szPopupName){ m_pPopupDict->remove(szPopupName); }; void clear(){ m_pPopupDict->clear(); }; - void save(const QString & filename); - void load(const QString & filename); + void save(const TQString & filename); + void load(const TQString & filename); }; diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index 10a2698..5b592ad 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -45,7 +45,7 @@ // rootname.labelX : child labels -KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const QString &szCondition) +KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const TQString &szItemName,const TQString &szCondition) { m_szItemName = szItemName; m_eType = t; @@ -54,13 +54,13 @@ KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const // true by default m_pKvsCondition = 0; } else { - QString szName = "condition callback for "; + TQString szName = "condition callback for "; szName += szItemName; m_pKvsCondition = new KviKvsScript(szName,szCondition,KviKvsScript::Expression); } } -KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const KviKvsScript * pCondition) +KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const TQString &szItemName,const KviKvsScript * pCondition) { m_szItemName = szItemName; m_eType = t; @@ -119,12 +119,12 @@ bool KviKvsPopupMenuItem::evaluateCondition(KviKvsPopupMenuTopLevelData * pData) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString &szItemName,const QString &szCondition) +KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const TQString &szItemName,const TQString &szCondition) : KviKvsPopupMenuItem(KviKvsPopupMenuItem::Separator,szItemName,szCondition) { } -KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString &szItemName,const KviKvsScript * pCondition) +KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const TQString &szItemName,const KviKvsScript * pCondition) : KviKvsPopupMenuItem(KviKvsPopupMenuItem::Separator,szItemName,pCondition) { } @@ -148,10 +148,10 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemSeparator::clone() const ///////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItem(t,szItemName,szCondition) { - QString szName = "text callback for "; + TQString szName = "text callback for "; szName += szItemName; m_pKvsText = new KviKvsScript(szName,szText,KviKvsScript::Parameter); @@ -165,7 +165,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop } } -KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItem(t,szItemName,pCondition) { if(pText) @@ -173,7 +173,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop m_pKvsText = new KviKvsScript(*pText); } else { // hum.. this should never happen anyway - QString szName = "text callback for "; + TQString szName = "text callback for "; szName += szItemName; m_pKvsText = new KviKvsScript(szName,"",KviKvsScript::Parameter); } @@ -204,7 +204,7 @@ KviKvsScript * KviKvsPopupMenuItemWithTextAndIcon::kvsText() return m_pKvsText; } -QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData) +TQPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData) { if(KVI_OPTION_BOOL(KviOption_boolDisablePopupIcons))return 0; if(!m_pKvsIcon)return 0; @@ -221,17 +221,17 @@ QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLev return 0; } - QString szRet; + TQString szRet; vRet.asString(szRet); - QPixmap * p = g_pIconManager->getImage(szRet); + TQPixmap * p = g_pIconManager->getImage(szRet); if(!p)pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs("Can't find the icon \"%Q\": ignoring"),&szRet); return p; } -QString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevelData *pData) +TQString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevelData *pData) { - QString szRet; + TQString szRet; if(!m_pKvsText)return szRet; KviKvsVariant vRet; if(!m_pKvsText->run(pData->window(), @@ -252,7 +252,7 @@ QString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevel KviKvsPopupMenuItemLabelHelper::KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuItemLabel * pItem) -: QObject() +: TQObject() { m_pItem = pItem; } @@ -266,14 +266,14 @@ void KviKvsPopupMenuItemLabelHelper::labelDestroyed() m_pItem->labelDestroyed(); } -KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label,szItemName,szText,szIcon,szCondition) { m_pLabel = 0; m_pSignalRelay = new KviKvsPopupMenuItemLabelHelper(this); } -KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label,szItemName,pText,pIcon,pCondition) { m_pLabel = 0; @@ -285,7 +285,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel() { if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; } delete m_pSignalRelay; @@ -306,7 +306,7 @@ void KviKvsPopupMenuItemLabel::clear() { if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; m_pLabel = 0; } @@ -315,35 +315,35 @@ void KviKvsPopupMenuItemLabel::clear() void KviKvsPopupMenuItemLabel::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; } - m_pLabel = new QLabel(szText,pMenu); - QObject::connect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + m_pLabel = new TQLabel(szText,pMenu); + TQObject::connect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); #ifndef COMPILE_USE_QT4 - // FIXME: QT4 Seems to not allow widgets as QMenu items + // FIXME: QT4 Seems to not allow widgets as TQMenu items pMenu->insertItem(m_pLabel); #endif - m_pLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + m_pLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); if(pPix)m_pLabel->setPixmap(*pPix); } //////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Item,szItemName,szText,szIcon,szCondition) { - QString szName = "click callback for "; + TQString szName = "click callback for "; szName += szItemName; m_pKvsCode = new KviKvsScript(szName,szCode); } -KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const QString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const TQString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Item,szItemName,pText,pIcon,pCondition) { m_pKvsCode = new KviKvsScript(*pCode); @@ -358,8 +358,8 @@ KviKvsPopupMenuItemItem::~KviKvsPopupMenuItemItem() void KviKvsPopupMenuItemItem::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); int id; if(pPix)id = pMenu->insertItem(*pPix,szText); else id = pMenu->insertItem(szText); @@ -379,13 +379,13 @@ KviKvsScript * KviKvsPopupMenuItemItem::kvsCode() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Menu,szItemName,szText,szIcon,szCondition) { m_pMenu = pMenu; } -KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Menu,szItemName,pText,pIcon,pCondition) { m_pMenu = pMenu; @@ -408,8 +408,8 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemMenu::clone() const void KviKvsPopupMenuItemMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); int id; m_pMenu->setParentPopup(pMenu); if(pPix)id = pMenu->insertItem(*pPix,szText,m_pMenu); @@ -427,7 +427,7 @@ void KviKvsPopupMenuItemMenu::clear() //////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu,szItemName,szText,szIcon,szCondition) { m_szMenuName = szMenuName; @@ -439,7 +439,7 @@ KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName m_pMenu = 0; } -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu,szItemName,pText,pIcon,pCondition) { m_szMenuName = szMenuName; @@ -475,8 +475,8 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemExtMenu::clone() const void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); KviKvsPopupMenu * source = KviKvsPopupManager::instance()->lookup(m_szMenuName); if(source) @@ -486,8 +486,8 @@ void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTop pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs("Recursive definition detected for popup '%Q': ignoring"),&(pMenu->popupName())); return; } - QString tmp; - KviQString::sprintf(tmp,"%Q.%Q",&(pMenu->popupName()),&m_szMenuName); + TQString tmp; + KviTQString::sprintf(tmp,"%Q.%Q",&(pMenu->popupName()),&m_szMenuName); if(m_pMenu)delete m_pMenu; m_pMenu = new KviKvsPopupMenu(tmp); m_pMenu->copyFrom(source); @@ -527,7 +527,7 @@ KviKvsPopupMenuTopLevelData::~KviKvsPopupMenuTopLevelData() -KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName) +KviKvsPopupMenu::KviKvsPopupMenu(const TQString &szName) :KviTalPopupMenu(0,szName) { m_szName = szName; @@ -541,8 +541,8 @@ KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName) m_pTopLevelData = 0; m_pTempTopLevelData = 0; m_bSetupDone = false; - connect(this,SIGNAL(activated(int)),this,SLOT(itemClicked(int))); - connect(this,SIGNAL(aboutToShow()),this,SLOT(setupMenuContents())); + connect(this,TQT_SIGNAL(activated(int)),this,TQT_SLOT(itemClicked(int))); + connect(this,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMenuContents())); } @@ -578,37 +578,37 @@ void KviKvsPopupMenu::copyFrom(const KviKvsPopupMenu * src) } } -void KviKvsPopupMenu::addPrologue(const QString &szItemName,const QString &szCode) +void KviKvsPopupMenu::addPrologue(const TQString &szItemName,const TQString &szCode) { // FIXME: translate this or not ? - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"prologue_%u_for_%Q",m_pPrologues->count(),&m_szName); + KviTQString::sprintf(szName,"prologue_%u_for_%Q",m_pPrologues->count(),&m_szName); m_pPrologues->append(new KviKvsScript(szName,szCode)); } -void KviKvsPopupMenu::addEpilogue(const QString &szItemName,const QString &szCode) +void KviKvsPopupMenu::addEpilogue(const TQString &szItemName,const TQString &szCode) { // FIXME: translate this or not ? - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"epilogue_%u_for_%Q",m_pPrologues->count(),&m_szName); + KviTQString::sprintf(szName,"epilogue_%u_for_%Q",m_pPrologues->count(),&m_szName); m_pEpilogues->append(new KviKvsScript(szName,szCode)); } KviKvsPopupMenuTopLevelData * KviKvsPopupMenu::topLevelData() { - if(parentPopup())return parentPopup()->topLevelData(); + if(tqparentPopup())return tqparentPopup()->topLevelData(); return m_pTopLevelData; } -bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive) +bool KviKvsPopupMenu::removeItemByName(const TQString &szItemName,bool bRecursive) { KviKvsScript * se; for(se = m_pEpilogues->first();se;se = m_pEpilogues->next()) { - if(KviQString::equalCI(szItemName,se->name())) + if(KviTQString::equalCI(szItemName,se->name())) { m_pEpilogues->removeRef(se); return true; @@ -617,7 +617,7 @@ bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive for(se = m_pPrologues->first();se;se = m_pPrologues->next()) { - if(KviQString::equalCI(szItemName,se->name())) + if(KviTQString::equalCI(szItemName,se->name())) { m_pPrologues->removeRef(se); return true; @@ -626,7 +626,7 @@ bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next()) { - if(KviQString::equalCI(szItemName,it->name())) + if(KviTQString::equalCI(szItemName,it->name())) { m_pItemList->removeRef(it); // bye :) return true; @@ -661,52 +661,52 @@ bool KviKvsPopupMenu::isLocked() KviKvsPopupMenu * KviKvsPopupMenu::topLevelPopup() { - if(parentPopup())return parentPopup(); + if(tqparentPopup())return tqparentPopup(); return this; } -KviKvsPopupMenu * KviKvsPopupMenu::addPopup(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenu * KviKvsPopupMenu::addPopup(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.subpopup%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.subpopup%d",&m_szName,m_pItemList->count()); KviKvsPopupMenu * pNew = new KviKvsPopupMenu(szName); pNew->setParentPopup(this); addItemInternal(new KviKvsPopupMenuItemMenu(szName,pNew,szText,szIcon,szCondition)); return pNew; } -void KviKvsPopupMenu::addSeparator(const QString &szItemName,const QString &szCondition) +void KviKvsPopupMenu::addSeparator(const TQString &szItemName,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.separator%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.separator%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemSeparator(szName,szCondition)); } -void KviKvsPopupMenu::addLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.label%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.label%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemLabel(szName,szText,szIcon,szCondition)); } -void KviKvsPopupMenu::addItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.item%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.item%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemItem(szName,szCode,szText,szIcon,szCondition)); } -void KviKvsPopupMenu::addExtPopup(const QString &szItemName,const QString &szPopupName,const QString szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addExtPopup(const TQString &szItemName,const TQString &szPopupName,const TQString szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.%Q",&m_szName,&szName); + KviTQString::sprintf(szName,"%Q.%Q",&m_szName,&szName); addItemInternal(new KviKvsPopupMenuItemExtMenu(szName,szPopupName,szText,szIcon,szCondition)); } @@ -717,7 +717,7 @@ void KviKvsPopupMenu::addItemInternal(KviKvsPopupMenuItem * it) m_pItemList->append(it); } -void KviKvsPopupMenu::doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode) +void KviKvsPopupMenu::doPopup(const TQPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode) { // This might be a compat problem later :((((( // it is also an ugly trick @@ -782,7 +782,7 @@ void KviKvsPopupMenu::lock(bool bLock) void KviKvsPopupMenu::setupMenuContents() { // This might be a compat problem later :(((( - if(parentPopup() == 0) + if(tqparentPopup() == 0) { if(m_pTempTopLevelData == 0) { @@ -806,7 +806,7 @@ void KviKvsPopupMenu::setupMenuContents() m_bSetupDone = true; - // HACK...this is to remove the separator inserted by Qt when popup() is called and the popup is empty + // HACK...this is to remove the separator inserted by TQt when popup() is called and the popup is empty clear(); KviKvsPopupMenuTopLevelData * d = topLevelData(); @@ -901,21 +901,21 @@ void KviKvsPopupMenu::itemClicked(int itemId) } else debug("oops....clicked something that is not an item at position %d",param); // FIXME: #warning "Maybe tell that the window has changed" } else debug("oops....no menu item at position %d",param); - // UGLY Qt 3.0.0.... we can't clear menu contents here :( -//#if QT_VERSION < 300 + // UGLY TQt 3.0.0.... we can't clear menu contents here :( +//#if [[[TQT_VERSION IS DEPRECATED]]] < 300 // topLevelPopup()->clearMenuContents(); //#endif } -void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) +void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) { doClear(); int cnt; int idx; - QString tmp = prefix; + TQString tmp = prefix; tmp.append("_PrologueCount"); cnt = cfg->readIntEntry(tmp,0); @@ -924,114 +924,114 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) { for(idx = 0;idx < cnt;idx++) { - KviQString::sprintf(tmp,"%Q_Prologue%d",&(prefix),idx); - QString pr = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); - QString itemName = cfg->readQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Prologue%d",&(prefix),idx); + TQString pr = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + TQString itemName = cfg->readTQStringEntry(tmp,""); if(!pr.isEmpty())addPrologue(itemName,pr); } } else { // Might be old version! - KviQString::sprintf(tmp,"%Q_Prologue",&(prefix)); - QString pr = cfg->readQStringEntry(tmp,""); - if(!pr.isEmpty())addPrologue(QString::null,pr); + KviTQString::sprintf(tmp,"%TQ_Prologue",&(prefix)); + TQString pr = cfg->readTQStringEntry(tmp,""); + if(!pr.isEmpty())addPrologue(TQString(),pr); } - KviQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); cnt = cfg->readIntEntry(tmp,0); if(cnt > 0) { for(idx = 0;idx < cnt;idx++) { - KviQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); - QString ep = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); - QString itemName = cfg->readQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); + TQString ep = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + TQString itemName = cfg->readTQStringEntry(tmp,""); if(!ep.isEmpty())addEpilogue(itemName,ep); } } else { // Might be old version! - KviQString::sprintf(tmp,"%Q_Epilogue",&prefix); - QString ep = cfg->readQStringEntry(tmp,""); - if(!ep.isEmpty())addEpilogue(QString::null,ep); + KviTQString::sprintf(tmp,"%TQ_Epilogue",&prefix); + TQString ep = cfg->readTQStringEntry(tmp,""); + if(!ep.isEmpty())addEpilogue(TQString(),ep); } - KviQString::sprintf(tmp,"%Q_Count",&prefix); + KviTQString::sprintf(tmp,"%TQ_Count",&prefix); cnt = cfg->readIntEntry(tmp,0); for(idx = 0;idx < cnt;idx++) { - QString pre; - KviQString::sprintf(pre,"%Q_%d",&prefix,idx); + TQString pre; + KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); - KviQString::sprintf(tmp,"%Q_Id",&pre); - QString itemName = cfg->readQStringEntry(tmp,QString::null); - KviQString::sprintf(tmp,"%Q_Type",&pre); + KviTQString::sprintf(tmp,"%TQ_Id",&pre); + TQString itemName = cfg->readTQStringEntry(tmp,TQString()); + KviTQString::sprintf(tmp,"%TQ_Type",&pre); int type = cfg->readIntEntry(tmp,3); switch(type) { case 0: // separator { - QString expr; - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString expr; + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addSeparator(itemName,expr); } break; case 1: // item { - QString text,icon,code,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Code",&pre); - code = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,code,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Code",&pre); + code = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addItem(itemName,code,text,icon,expr); } break; case 2: // menu { - QString text,icon,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); KviKvsPopupMenu * pop = addPopup(itemName,text,icon,expr); pop->load(pre,cfg); } break; case 3: // label { - QString text,icon,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addLabel(itemName,text,icon,expr); } break; case 4: // extmenu { - QString text,icon,code,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_ExtName",&pre); - code = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,code,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); + code = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addExtPopup(itemName,code,text,icon,expr); } break; @@ -1044,49 +1044,49 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) // FIXME: #warning "NOBODY EDITS THE POPUPS IN THE CONFIG!...A binary config would be faster and work better for sure here" -void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) +void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) { int idx; KviKvsScript * s; - QString tmp; + TQString tmp; - KviQString::sprintf(tmp,"%Q_PrologueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_PrologueCount",&prefix); cfg->writeEntry(tmp,m_pPrologues->count()); idx = 0; for(s = m_pPrologues->first();s;s = m_pPrologues->next()) { - KviQString::sprintf(tmp,"%Q_Prologue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Prologue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); cfg->writeEntry(tmp,m_pEpilogues->count()); idx = 0; for(s = m_pEpilogues->first();s;s = m_pEpilogues->next()) { - KviQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviQString::sprintf(tmp,"%Q_EpilogueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_EpilogueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviQString::sprintf(tmp,"%Q_Count",&prefix); + KviTQString::sprintf(tmp,"%TQ_Count",&prefix); cfg->writeEntry(tmp,m_pItemList->count()); idx = 0; for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next()) { - QString pre; - KviQString::sprintf(pre,"%Q_%d",&prefix,idx); - KviQString::sprintf(tmp,"%Q_Type",&pre); + TQString pre; + KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Type",&pre); int typeCode = 0; switch(it->type()) { @@ -1099,34 +1099,34 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) cfg->writeEntry(tmp,typeCode); - KviQString::sprintf(tmp,"%Q_Id",&pre); + KviTQString::sprintf(tmp,"%TQ_Id",&pre); cfg->writeEntry(tmp,it->name()); s = it->kvsCondition(); if(s) { - KviQString::sprintf(tmp,"%Q_Expr",&pre); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsIcon(); if(s) { - KviQString::sprintf(tmp,"%Q_Icon",&pre); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsText(); if(s) { - KviQString::sprintf(tmp,"%Q_Text",&pre); + KviTQString::sprintf(tmp,"%TQ_Text",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsCode(); if(s) { - KviQString::sprintf(tmp,"%Q_Code",&pre); + KviTQString::sprintf(tmp,"%TQ_Code",&pre); cfg->writeEntry(tmp,s->code()); } @@ -1135,7 +1135,7 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) ((KviKvsPopupMenuItemMenu *)it)->menu()->save(pre,cfg); } else if(it->isExtMenu()) { - KviQString::sprintf(tmp,"%Q_ExtName",&pre); + KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); cfg->writeEntry(tmp,((KviKvsPopupMenuItemExtMenu *)it)->extName()); } @@ -1143,10 +1143,10 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) } } -void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) +void KviKvsPopupMenu::generateDefPopupCore(TQString &buffer) { - QString tmp; + TQString tmp; buffer = ""; @@ -1167,9 +1167,9 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) switch(it->type()) { case KviKvsPopupMenuItem::Item: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"item(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"item(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"item(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"item(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n"); tmp = it->kvsCode()->code(); KviCommandFormatter::blockFromBuffer(tmp); @@ -1177,9 +1177,9 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) buffer.append("\n"); break; case KviKvsPopupMenuItem::Menu: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"popup(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"popup(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"popup(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"popup(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n"); ((KviKvsPopupMenuItemMenu *)it)->menu()->generateDefPopupCore(tmp); KviCommandFormatter::blockFromBuffer(tmp); @@ -1187,19 +1187,19 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) buffer.append("\n"); break; case KviKvsPopupMenuItem::Separator: - if(it->kvsCondition())KviQString::appendFormatted(buffer,"separator(%Q)\n\n",&(it->kvsCondition()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer,"separator(%Q)\n\n",&(it->kvsCondition()->code())); else buffer.append("separator\n\n"); break; case KviKvsPopupMenuItem::Label: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"label(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"label(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"label(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"label(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n\n"); break; case KviKvsPopupMenuItem::ExtMenu: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"extpopup(%Q,%Q,%Q)",&(it->kvsText()->code()),&(((KviKvsPopupMenuItemExtMenu *)it)->extName()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"extpopup(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"extpopup(%Q,%Q,%Q)",&(it->kvsText()->code()),&(((KviKvsPopupMenuItemExtMenu *)it)->extName()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"extpopup(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n\n"); break; } @@ -1217,10 +1217,10 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) } -void KviKvsPopupMenu::generateDefPopup(QString &buffer) +void KviKvsPopupMenu::generateDefPopup(TQString &buffer) { - KviQString::sprintf(buffer,"defpopup(%s)\n",name()); - QString core; + KviTQString::sprintf(buffer,"defpopup(%s)\n",name()); + TQString core; generateDefPopupCore(core); KviCommandFormatter::blockFromBuffer(core); diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h index e658495..11ca648 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.h +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h @@ -33,8 +33,8 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_tal_popupmenu.h" -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> class KviKvsPopupMenu; @@ -69,12 +69,12 @@ class KVIRC_API KviKvsPopupMenuItem public: enum Type { Item , Menu , Label , Separator , ExtMenu }; protected: - KviKvsPopupMenuItem(Type t,const QString &szItemName,const QString &szCondition); - KviKvsPopupMenuItem(Type t,const QString &szItemName,const KviKvsScript * pCondition); + KviKvsPopupMenuItem(Type t,const TQString &szItemName,const TQString &szCondition); + KviKvsPopupMenuItem(Type t,const TQString &szItemName,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItem(); protected: - QString m_szItemName; + TQString m_szItemName; Type m_eType; KviKvsScript * m_pKvsCondition; public: @@ -83,7 +83,7 @@ public: KviKvsPopupMenuItem::Type type(){ return m_eType; }; - const QString & name(){ return m_szItemName; }; + const TQString & name(){ return m_szItemName; }; bool isItem(){ return m_eType == Item; }; bool isSeparator(){ return m_eType == Separator; }; @@ -107,8 +107,8 @@ class KVIRC_API KviKvsPopupMenuItemSeparator : public KviKvsPopupMenuItem { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemSeparator(const QString &szItemName,const QString &szCondition); - KviKvsPopupMenuItemSeparator(const QString &szItemName,const KviKvsScript * pCondition); + KviKvsPopupMenuItemSeparator(const TQString &szItemName,const TQString &szCondition); + KviKvsPopupMenuItemSeparator(const TQString &szItemName,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemSeparator(); public: @@ -120,8 +120,8 @@ public: class KVIRC_API KviKvsPopupMenuItemWithTextAndIcon : public KviKvsPopupMenuItem { protected: - KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemWithTextAndIcon(); protected: @@ -131,17 +131,18 @@ public: virtual KviKvsScript * kvsIcon(); virtual KviKvsScript * kvsText(); // this just returns a string , eventually empty - QString evaluateText(KviKvsPopupMenuTopLevelData * pData); + TQString evaluateText(KviKvsPopupMenuTopLevelData * pData); // this just returns the icon , eventually - QPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData); + TQPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData); }; class KviKvsPopupMenuItemLabel; // this acts as signal relay -class KVIRC_API KviKvsPopupMenuItemLabelHelper : public QObject +class KVIRC_API KviKvsPopupMenuItemLabelHelper : public TQObject { Q_OBJECT + TQ_OBJECT friend class KviKvsPopupMenuItemLabel; protected: KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuItemLabel * pItem); @@ -157,12 +158,12 @@ class KVIRC_API KviKvsPopupMenuItemLabel : public KviKvsPopupMenuItemWithTextAnd friend class KviKvsPopupMenuItemLabelHelper; friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemLabel(const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemLabel(const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemLabel(); protected: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviKvsPopupMenuItemLabelHelper * m_pSignalRelay; public: virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx); @@ -177,8 +178,8 @@ class KVIRC_API KviKvsPopupMenuItemItem : public KviKvsPopupMenuItemWithTextAndI { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemItem(const QString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemItem(const TQString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemItem(); protected: @@ -194,8 +195,8 @@ class KVIRC_API KviKvsPopupMenuItemMenu : public KviKvsPopupMenuItemWithTextAndI { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemMenu(); protected: @@ -211,15 +212,15 @@ class KVIRC_API KviKvsPopupMenuItemExtMenu : public KviKvsPopupMenuItemWithTextA { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemExtMenu(); protected: - QString m_szMenuName; + TQString m_szMenuName; KviKvsPopupMenu * m_pMenu; // owned! public: - const QString & extName(){ return m_szMenuName; }; + const TQString & extName(){ return m_szMenuName; }; virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx); virtual void clear(); virtual KviKvsPopupMenuItem * clone() const; @@ -241,13 +242,14 @@ class KVIRC_API KviKvsPopupMenu : public KviTalPopupMenu friend class KviKvsPopupManager; friend class KviSinglePopupEditor; Q_OBJECT + TQ_OBJECT public: - KviKvsPopupMenu(const QString &szName); + KviKvsPopupMenu(const TQString &szName); ~KviKvsPopupMenu(); protected: KviPointerList<KviKvsPopupMenuItem> * m_pItemList; private: - QString m_szName; + TQString m_szName; KviKvsPopupMenu * m_pParentPopup; KviPointerList<KviKvsScript> * m_pPrologues; KviPointerList<KviKvsScript> * m_pEpilogues; @@ -256,36 +258,36 @@ private: KviKvsPopupMenuTopLevelData * m_pTempTopLevelData; bool m_bSetupDone; public: - const QString & popupName(){ return m_szName; }; - void setPopupName(const QString &szName){ m_szName = szName; }; + const TQString & popupName(){ return m_szName; }; + void setPopupName(const TQString &szName){ m_szName = szName; }; void copyFrom(const KviKvsPopupMenu * src); KviKvsPopupMenuTopLevelData * topLevelData(); KviKvsPopupMenu * topLevelPopup(); bool isLocked(); void lock(bool bLock); - KviKvsPopupMenu * addPopup(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - void addSeparator(const QString &szItemName,const QString &szCondition); - void addLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - void addItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition); - void addExtPopup(const QString &szItemName,const QString &szPopupName,const QString szText,const QString &szIcon,const QString &szCondition); - void doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false); + KviKvsPopupMenu * addPopup(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addSeparator(const TQString &szItemName,const TQString &szCondition); + void addLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addExtPopup(const TQString &szItemName,const TQString &szPopupName,const TQString szText,const TQString &szIcon,const TQString &szCondition); + void doPopup(const TQPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false); bool isEmpty(){ return m_pItemList->isEmpty() && m_pPrologues->isEmpty() && m_pEpilogues->isEmpty(); }; void doClear(); - void addPrologue(const QString &szItemName,const QString &szCode); - void addEpilogue(const QString &szItemName,const QString &szCode); - bool removeItemByName(const QString &szItemName,bool bRecursive); + void addPrologue(const TQString &szItemName,const TQString &szCode); + void addEpilogue(const TQString &szItemName,const TQString &szCode); + bool removeItemByName(const TQString &szItemName,bool bRecursive); KviPointerList<KviKvsScript> * epilogues(){ return m_pEpilogues; }; KviPointerList<KviKvsScript> * prologues(){ return m_pPrologues; }; - KviKvsPopupMenu * parentPopup(){ return m_pParentPopup; }; - void generateDefPopup(QString &buffer); + KviKvsPopupMenu * tqparentPopup(){ return m_pParentPopup; }; + void generateDefPopup(TQString &buffer); void setParentPopup(KviKvsPopupMenu * par){ m_pParentPopup = par; }; - void generateDefPopupCore(QString &buffer); + void generateDefPopupCore(TQString &buffer); protected: void addItemInternal(KviKvsPopupMenuItem * it); void executePrologues(KviKvsPopupMenuTopLevelData * pData); void executeEpilogues(KviKvsPopupMenuTopLevelData * pData); - void load(const QString &prefix,KviConfig * cfg); - void save(const QString &prefix,KviConfig * cfg); + void load(const TQString &prefix,KviConfig * cfg); + void save(const TQString &prefix,KviConfig * cfg); private slots: void setupMenuContents(); protected: diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index 2c397c5..a7aeacb 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -32,7 +32,7 @@ #include "kvi_app.h" #include "kvi_console.h" #include "kvi_kvs_script.h" -//#include <QSysInfo> +//#include <TQSysInfo> KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptorData * d) : KviKvsAsyncOperation(d->pWnd) @@ -51,7 +51,7 @@ KviKvsProcessAsyncOperation::~KviKvsProcessAsyncOperation() if(m_pRunTimeTimer)delete m_pRunTimeTimer; if(m_pProcess) { - QObject::disconnect(m_pProcess,0,this,0); + TQObject::disconnect(m_pProcess,0,this,0); m_pProcess->kill(); delete m_pProcess; } @@ -63,25 +63,25 @@ KviKvsProcessAsyncOperation::~KviKvsProcessAsyncOperation() bool KviKvsProcessAsyncOperation::start() { - QStringList args; + TQStringList args; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_NOSHELL) { - args = QStringList::split(" ",m_pData->szCommandline); + args = TQStringList::split(" ",m_pData->szCommandline); } else { - QString szShell = m_pData->szShell; + TQString szShell = m_pData->szShell; if(szShell.isEmpty()) { #ifdef COMPILE_ON_WINDOWS - // [01:26:00] <PragmaOff> btw, what is qt_winunicode ? - // [01:26:12] <kode54> Qt export specific to win32 + // [01:26:00] <PragmaOff> btw, what is qt_wintqunicode ? + // [01:26:12] <kode54> TQt export specific to win32 // [01:26:27] <kode54> bool which indicates whether system is Unicode (NT) or not // [01:26:58] <kode54> not sure if that's documented, but it is a public export // - // [02:50:21] <kode54> if ( QApplication::winVersion() & Qt::WV_NT_based ) + // [02:50:21] <kode54> if ( TQApplication::winVersion() & TQt::WV_NT_based ) // [02:50:41] <kode54> I see another implementation using that, maybe it is the official way of detecting that :[ #ifdef COMPILE_USE_QT4 - szShell = !(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) ? "cmd.exe /c" : "command.com /c"; + szShell = !(TQSysInfo::WindowsVersion & TQSysInfo::WV_DOS_based) ? "cmd.exe /c" : "command.com /c"; #else szShell = "command.com /c"; #endif @@ -91,7 +91,7 @@ bool KviKvsProcessAsyncOperation::start() szShell = "sh -c"; #endif } - args = QStringList::split(" ",szShell); + args = TQStringList::split(" ",szShell); args.append(m_pData->szCommandline); } @@ -100,19 +100,19 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT) { - connect(m_pProcess,SIGNAL(readyReadStdout()),this,SLOT(readStdout())); + connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readStdout())); c |= KviProcess::Stdout; } if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR) { - connect(m_pProcess,SIGNAL(readyReadStderr()),this,SLOT(readStderr())); + connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(readStderr())); c |= KviProcess::Stderr; } m_pProcess->setCommunication(c); - connect(m_pProcess,SIGNAL(processExited()),this,SLOT(processExited())); + connect(m_pProcess,TQT_SIGNAL(processExited()),this,TQT_SLOT(processExited())); if(!m_pProcess->start()) { @@ -121,7 +121,7 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED) { - QString szPid; + TQString szPid; szPid.setNum((int)(m_pProcess->processIdentifier())); if(trigger(EventStarted,szPid)) { @@ -132,15 +132,15 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iMaxRunTime > 0) { - m_pRunTimeTimer = new QTimer(this); - connect(m_pRunTimeTimer,SIGNAL(timeout()),this,SLOT(maxRunTimeExpired())); + m_pRunTimeTimer = new TQTimer(this); + connect(m_pRunTimeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(maxRunTimeExpired())); m_pRunTimeTimer->start(m_pData->iMaxRunTime); } if(m_pData->iPingTimeout > 0) { - m_pPingTimer = new QTimer(this); - connect(m_pPingTimer,SIGNAL(timeout()),this,SLOT(ping())); + m_pPingTimer = new TQTimer(this); + connect(m_pPingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(ping())); m_pPingTimer->start(m_pData->iPingTimeout); } @@ -149,7 +149,7 @@ bool KviKvsProcessAsyncOperation::start() void KviKvsProcessAsyncOperation::ping() { - if(trigger(EventPing,QString::null)) + if(trigger(EventPing,TQString())) { triggerSelfDelete(); } @@ -159,7 +159,7 @@ void KviKvsProcessAsyncOperation::triggerSelfDelete() { if(m_bDeletePending)return; m_bDeletePending = true; - QTimer::singleShot(m_pData->iMaxRunTime,this,SLOT(selfDelete())); + TQTimer::singleShot(m_pData->iMaxRunTime,this,TQT_SLOT(selfDelete())); } void KviKvsProcessAsyncOperation::selfDelete() @@ -173,7 +173,7 @@ void KviKvsProcessAsyncOperation::maxRunTimeExpired() triggerSelfDelete(); } -bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) +bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const TQString &szData) { if(m_bDeletePending)return false; @@ -194,19 +194,19 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) switch(e) { case EventStdout: - params.append(new KviKvsVariant(QString("stdout"))); + params.append(new KviKvsVariant(TQString("stdout"))); break; case EventStderr: - params.append(new KviKvsVariant(QString("stderr"))); + params.append(new KviKvsVariant(TQString("stderr"))); break; case EventTerminated: - params.append(new KviKvsVariant(QString("terminated"))); + params.append(new KviKvsVariant(TQString("terminated"))); break; case EventStarted: - params.append(new KviKvsVariant(QString("started"))); + params.append(new KviKvsVariant(TQString("started"))); break; case EventPing: - params.append(new KviKvsVariant(QString("ping"))); + params.append(new KviKvsVariant(TQString("ping"))); break; default: debug("Ops... unknown trigger() CallbackEvent parameter in KviProcessDescriptor::trigger()"); @@ -228,7 +228,7 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) if(!retVal.isNothing()) { - QString sz; + TQString sz; retVal.asString(sz); m_pProcess->writeToStdin(sz); } @@ -248,11 +248,11 @@ void KviKvsProcessAsyncOperation::readStdout() if(m_bDeletePending)return; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS) { - QByteArray a = m_pProcess->readStdout(); + TQByteArray a = m_pProcess->readStdout(); if(a.size() > 0) - m_szStdoutBuffer += QString(a); + m_szStdoutBuffer += TQString(a); } else { - QString l = m_pProcess->readLineStdout(); + TQString l = m_pProcess->readLineStdout(); bool bBreak = false; while((!l.isNull()) && (!bBreak)) { @@ -275,11 +275,11 @@ void KviKvsProcessAsyncOperation::readStderr() if(m_bDeletePending)return; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS) { - QByteArray a = m_pProcess->readStderr(); + TQByteArray a = m_pProcess->readStderr(); if(a.size() > 0) - m_szStderrBuffer += QString(a); + m_szStderrBuffer += TQString(a); } else { - QString l = m_pProcess->readLineStderr(); + TQString l = m_pProcess->readLineStderr(); bool bBreak = false; while((!l.isNull()) && (!bBreak)) { @@ -329,8 +329,8 @@ void KviKvsProcessAsyncOperation::processExited() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED) { - QString szRetVal; - szRetVal.setNum(m_pProcess->exitStatus()); + TQString szRetVal; + szRetVal.setNum(m_pProcess->exitqStatus()); trigger(EventTerminated,szRetVal); } @@ -341,7 +341,7 @@ void KviKvsProcessAsyncOperation::processExited() /* KviKvsProcessManager::KviKvsProcessManager() -: QObject() +: TQObject() { } diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h index 50e52ac..6fa343f 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.h +++ b/src/kvirc/kvs/kvi_kvs_processmanager.h @@ -40,7 +40,7 @@ #include "kvi_process.h" -#include <qtimer.h> +#include <tqtimer.h> #define KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT 1 #define KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR 2 @@ -57,8 +57,8 @@ class KviKvsVariant; typedef struct _KviKvsProcessDescriptorData { - QString szShell; - QString szCommandline; + TQString szShell; + TQString szCommandline; KviKvsScript * pCallback; KviKvsVariant * pMagic; KviWindow * pWnd; @@ -73,6 +73,7 @@ class KVIRC_API KviKvsProcessAsyncOperation : public KviKvsAsyncOperation { friend class KviKvsProcessManager; Q_OBJECT + TQ_OBJECT public: KviKvsProcessAsyncOperation(KviKvsProcessDescriptorData * d); ~KviKvsProcessAsyncOperation(); @@ -81,11 +82,11 @@ protected: private: KviProcess * m_pProcess; KviKvsExtendedRunTimeData * m_pExtendedRunTimeData; - QString m_szStdoutBuffer; - QString m_szStderrBuffer; + TQString m_szStdoutBuffer; + TQString m_szStderrBuffer; KviKvsProcessDescriptorData * m_pData; - QTimer * m_pPingTimer; - QTimer * m_pRunTimeTimer; + TQTimer * m_pPingTimer; + TQTimer * m_pRunTimeTimer; bool m_bDeletePending; public: bool start(); @@ -97,7 +98,7 @@ private slots: void processExited(); void selfDelete(); private: - bool trigger(CallbackEvent e,const QString &szData); + bool trigger(CallbackEvent e,const TQString &szData); void triggerSelfDelete(); }; diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp index ea05ba3..9953591 100644 --- a/src/kvirc/kvs/kvi_kvs_report.cpp +++ b/src/kvirc/kvs/kvi_kvs_report.cpp @@ -33,7 +33,7 @@ #include "kvi_debugwindow.h" #include "kvi_options.h" -KviKvsReport::KviKvsReport(Type t,const QString &szContext,const QString &szMessage,const QString &szLocation,KviWindow * pWindow) +KviKvsReport::KviKvsReport(Type t,const TQString &szContext,const TQString &szMessage,const TQString &szLocation,KviWindow * pWindow) : m_eType(t), m_szContext(szContext), m_szMessage(szMessage), m_szLocation(szLocation), m_pWindow(pWindow) { #ifdef COMPILE_NEW_KVS @@ -50,17 +50,17 @@ KviKvsReport::~KviKvsReport() #endif } -void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol) +void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol) { #ifdef COMPILE_NEW_KVS iLine = 1; - const QChar * pBufferBegin = pBegin; + const TQChar * pBufferBegin = pBegin; - const QChar * pPrevLine = 0; - const QChar * pLineBegin = pBegin; + const TQChar * pPrevLine = 0; + const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->unicode(); + unsigned short us = pBegin->tqunicode(); while(us && (pBegin < pPoint)) { @@ -73,7 +73,7 @@ void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int } else { pBegin++; } - us = pBegin->unicode(); + us = pBegin->tqunicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -82,17 +82,17 @@ void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int -void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing) +void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol,KviPointerList<TQString> * pListing) { #ifdef COMPILE_NEW_KVS iLine = 1; - const QChar * pBufferBegin = pBegin; + const TQChar * pBufferBegin = pBegin; - const QChar * pPrevLine = 0; - const QChar * pLineBegin = pBegin; + const TQChar * pPrevLine = 0; + const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->unicode(); + unsigned short us = pBegin->tqunicode(); while(us && (pBegin < pPoint)) { @@ -105,7 +105,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi } else { pBegin++; } - us = pBegin->unicode(); + us = pBegin->tqunicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -116,34 +116,34 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi // there would be yet another line before if(pPrevLine > pBufferBegin) { - QString * pListingStrZ = new QString(); - KviQString::sprintf(*pListingStrZ,"%d ...",iLine - 2); + TQString * pListingStrZ = new TQString(); + KviTQString::sprintf(*pListingStrZ,"%d ...",iLine - 2); pListing->append(pListingStrZ); } - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ",iLine - 1); - *pListingStr += QString(pPrevLine,pLineBegin - pPrevLine); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ",iLine - 1); + *pListingStr += TQString(pPrevLine,pLineBegin - pPrevLine); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } // current line pBegin = pLineBegin; - us = pBegin->unicode(); + us = pBegin->tqunicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->unicode(); + us = pBegin->tqunicode(); } if(us)pBegin++; { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine); - *pListingStr += QString(pLineBegin,pBegin - pLineBegin); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine); + *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } @@ -152,27 +152,27 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi // next line pLineBegin = pBegin; - us = pBegin->unicode(); + us = pBegin->tqunicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->unicode(); + us = pBegin->tqunicode(); } if(us)pBegin++; { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ",iLine + 1); - *pListingStr += QString(pLineBegin,pBegin - pLineBegin); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ",iLine + 1); + *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } // there would be yet another line if(us) { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ...",iLine + 2); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ...",iLine + 2); pListing->append(pListingStr); } } @@ -227,11 +227,11 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) if(pOutput == KviDebugWindow::instance()) { - KviPointerList<QString> * l; + KviPointerList<TQString> * l; if(l = r->codeListing()) { pOutput->outputNoFmt(out,__tr2qs("[KVS] Code listing:")); - for(QString * s = l->first();s;s = l->next()) + for(TQString * s = l->first();s;s = l->next()) pOutput->output(out,"[KVS] %Q",s); } @@ -244,7 +244,7 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) if(l = r->callStack()) { pOutput->outputNoFmt(out,__tr2qs("[KVS] Call stack:")); - for(QString * s = l->first();s;s = l->next()) + for(TQString * s = l->first();s;s = l->next()) pOutput->output(out,"[KVS] %Q",s); } diff --git a/src/kvirc/kvs/kvi_kvs_report.h b/src/kvirc/kvs/kvi_kvs_report.h index 335733e..c0581cf 100644 --- a/src/kvirc/kvs/kvi_kvs_report.h +++ b/src/kvirc/kvs/kvi_kvs_report.h @@ -35,39 +35,39 @@ class KVIRC_API KviKvsReport public: enum Type { RunTimeError, RunTimeWarning, ParserError, ParserWarning }; public: - KviKvsReport(Type t,const QString &szContext,const QString &szMessage,const QString &szLocation,KviWindow * pWindow); + KviKvsReport(Type t,const TQString &szContext,const TQString &szMessage,const TQString &szLocation,KviWindow * pWindow); ~KviKvsReport(); protected: Type m_eType; // mandatory - QString m_szContext; // context name (script name, usually) - QString m_szMessage; // report message, always present - QString m_szLocation; // line and col description (may be some thing like "at end of input") + TQString m_szContext; // context name (script name, usually) + TQString m_szMessage; // report message, always present + TQString m_szLocation; // line and col description (may be some thing like "at end of input") KviWindow * m_pWindow; // the window that the script was attacched to // optional - KviPointerList<QString> * m_pCodeListing; // code listing, if present, it is owned - KviPointerList<QString> * m_pCallStack; // call stack, if present, it is owned + KviPointerList<TQString> * m_pCodeListing; // code listing, if present, it is owned + KviPointerList<TQString> * m_pCallStack; // call stack, if present, it is owned public: Type type() const { return m_eType; }; KviWindow * window(){ return m_pWindow; }; - const QString & context(){ return m_szContext; }; - const QString & message(){ return m_szMessage; }; - const QString & location(){ return m_szLocation; }; - KviPointerList<QString> * codeListing(){ return m_pCodeListing; }; - KviPointerList<QString> * callStack(){ return m_pCallStack; }; + const TQString & context(){ return m_szContext; }; + const TQString & message(){ return m_szMessage; }; + const TQString & location(){ return m_szLocation; }; + KviPointerList<TQString> * codeListing(){ return m_pCodeListing; }; + KviPointerList<TQString> * callStack(){ return m_pCallStack; }; - void setContext(const QString &szContext){ m_szContext = szContext; }; - void setMessage(const QString &szMessage){ m_szMessage = szMessage; }; - void setLocation(const QString &szLocation){ m_szLocation = szLocation; }; - void setCodeListing(KviPointerList<QString> * pListing){ m_pCodeListing = pListing; }; - void setCallStack(KviPointerList<QString> * pStack){ m_pCallStack = pStack; }; + void setContext(const TQString &szContext){ m_szContext = szContext; }; + void setMessage(const TQString &szMessage){ m_szMessage = szMessage; }; + void setLocation(const TQString &szLocation){ m_szLocation = szLocation; }; + void setCodeListing(KviPointerList<TQString> * pListing){ m_pCodeListing = pListing; }; + void setCallStack(KviPointerList<TQString> * pStack){ m_pCallStack = pStack; }; - static void findLineAndCol(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol); - static void findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing); + static void findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol); + static void findLineColAndListing(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol,KviPointerList<TQString> * pListing); static void report(KviKvsReport * r,KviWindow * pOutput); }; diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp index faae03a..91cadc4 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_runtimecall.h" -void KviKvsRunTimeCall::warning(const QString &szFmt,...) +void KviKvsRunTimeCall::warning(const TQString &szFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szFmt); @@ -35,7 +35,7 @@ void KviKvsRunTimeCall::warning(const QString &szFmt,...) kvi_va_end(va); } -bool KviKvsRunTimeCall::error(const QString &szFmt,...) +bool KviKvsRunTimeCall::error(const TQString &szFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szFmt); @@ -44,7 +44,7 @@ bool KviKvsRunTimeCall::error(const QString &szFmt,...) return false; } -bool KviKvsRunTimeCall::getParameterCode(unsigned int /*uParamIdx*/,QString & /*szParamBuffer*/) +bool KviKvsRunTimeCall::getParameterCode(unsigned int /*uParamIdx*/,TQString & /*szParamBuffer*/) { return false; } diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.h b/src/kvirc/kvs/kvi_kvs_runtimecall.h index 3ead6c3..674c4e3 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecall.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecall.h @@ -61,7 +61,7 @@ public: // where a special parsing routine can not be implemented // but parameter code is needed for later evaluation. (see /addon.register for example) // Returns false if the parameter code cannot be extracted and true otherwise. - virtual bool getParameterCode(unsigned int uParamIdx,QString &szParamBuffer); + virtual bool getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer); // forwarders from the context // this MUST be called before any blocking call that might return to the main event loop @@ -75,8 +75,8 @@ public: bool leaveBlockingSection(){ return m_pContext->leaveBlockingSection(); }; // forwarders for context: they ease the porting - void warning(const QString &szFmt,...); - bool error(const QString &szFmt,...); // this ALWAYS returns false + void warning(const TQString &szFmt,...); + bool error(const TQString &szFmt,...); // this ALWAYS returns false }; #endif //!_KVI_KVS_RUNTIMECALL_H_ diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp index 47916f9..5442aa2 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp @@ -87,58 +87,58 @@ KviKvsVariant * KviKvsRunTimeContext::swapReturnValuePointer(KviKvsVariant * pNe return pAux; } -void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QString &szMsgFmt,kvi_va_list va) +void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const TQString &szMsgFmt,kvi_va_list va) { - QString szMsg; - KviQString::vsprintf(szMsg,szMsgFmt,va); + TQString szMsg; + KviTQString::vsprintf(szMsg,szMsgFmt,va); - KviPointerList<QString> * pCodeListing = 0; - KviPointerList<QString> * pCallStack = 0; - QString szLocation; + KviPointerList<TQString> * pCodeListing = 0; + KviPointerList<TQString> * pCallStack = 0; + TQString szLocation; if(pNode) { if(pNode->location() && m_pScript) { - pCodeListing = new KviPointerList<QString>; + pCodeListing = new KviPointerList<TQString>; pCodeListing->setAutoDelete(true); int iLine,iCol; KviKvsReport::findLineColAndListing(m_pScript->buffer(),pNode->location(),iLine,iCol,pCodeListing); - KviQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); + KviTQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); } // create the call stack int iFrame = 0; - pCallStack = new KviPointerList<QString>; + pCallStack = new KviPointerList<TQString>; pCallStack->setAutoDelete(true); while(pNode && (iFrame < 12)) { - QString * pString = new QString(); - QString szTmp; + TQString * pString = new TQString(); + TQString szTmp; pNode->contextDescription(szTmp); - KviQString::sprintf(*pString,"#%d %Q",iFrame,&szTmp); + KviTQString::sprintf(*pString,"#%d %Q",iFrame,&szTmp); if(pNode->location()) { int iLine,iCol; KviKvsReport::findLineAndCol(m_pScript->buffer(),pNode->location(),iLine,iCol); - QString tmpi; - KviQString::sprintf(tmpi," [line %d, near character %d]",iLine,iCol); + TQString tmpi; + KviTQString::sprintf(tmpi," [line %d, near character %d]",iLine,iCol); *pString += tmpi; } pCallStack->append(pString); iFrame++; - pNode = pNode->parent(); + pNode = pNode->tqparent(); } if(pNode) - pCallStack->append(new QString("#12 ...")); + pCallStack->append(new TQString("#12 ...")); } - QString szContext = m_pScript ? m_pScript->name() : "kvirc core code"; + TQString szContext = m_pScript ? m_pScript->name() : "kvirc core code"; KviKvsReport rep(bError ? KviKvsReport::RunTimeError : KviKvsReport::RunTimeWarning,szContext,szMsg,szLocation,m_pWindow); if(pCodeListing)rep.setCodeListing(pCodeListing); if(pCallStack)rep.setCallStack(pCallStack); @@ -146,7 +146,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QStri KviKvsReport::report(&rep,m_pWindow); } -void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const QString &szMsgFmt,...) +void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...) { m_bError = true; @@ -156,7 +156,7 @@ void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const QString &szMsgFmt, kvi_va_end(va); } -void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const QString &szMsgFmt,...) +void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); @@ -164,7 +164,7 @@ void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const QString &szMsgFm kvi_va_end(va); } -void KviKvsRunTimeContext::error(const QString &szMsgFmt,...) +void KviKvsRunTimeContext::error(const TQString &szMsgFmt,...) { m_bError = true; @@ -174,7 +174,7 @@ void KviKvsRunTimeContext::error(const QString &szMsgFmt,...) kvi_va_end(va); } -void KviKvsRunTimeContext::warning(const QString &szMsgFmt,...) +void KviKvsRunTimeContext::warning(const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h index 68fa8eb..50ee147 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h @@ -48,7 +48,7 @@ protected: KviKvsHash * m_pExtendedScopeVariables; // extended scope vars, shallow, may be 0 KviKvsSwitchList * m_pAliasSwitchList; // switches for the aliases, shallow, may be 0 KviKvsObject * m_pThisObject; // the current object for object function calls - QString * m_pScriptFilePath; // the current script file path, shallow, may be 0 + TQString * m_pScriptFilePath; // the current script file path, shallow, may be 0 bool m_bAutoDelete; public: // all shallow data, all may be 0 @@ -80,7 +80,7 @@ public: m_pScriptFilePath(0), m_bAutoDelete(autoDelete) {}; - KviKvsExtendedRunTimeData(QString * pScriptFilePath,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(TQString * pScriptFilePath,bool autoDelete=FALSE) : m_pExtendedScopeVariables(0), m_pAliasSwitchList(0), m_pThisObject(0), @@ -92,7 +92,7 @@ public: KviKvsHash * extendedScopeVariables(){ return m_pExtendedScopeVariables; }; KviKvsSwitchList * aliasSwitchList(){ return m_pAliasSwitchList; }; KviKvsObject * thisObject(){ return m_pThisObject; }; - QString * scriptFilePath(){ return m_pScriptFilePath; }; + TQString * scriptFilePath(){ return m_pScriptFilePath; }; }; @@ -153,7 +153,7 @@ public: KviKvsVariantList * parameterList() { return m_pParameterList; }; - // parent script, may be 0! + // tqparent script, may be 0! KviKvsScript * script() { return m_pScript; }; @@ -172,7 +172,7 @@ public: { return m_pExtendedData ? m_pExtendedData->aliasSwitchList() : 0; }; KviKvsObject * thisObject() { return m_pExtendedData ? m_pExtendedData->thisObject() : 0; }; - QString * scriptFilePath() + TQString * scriptFilePath() { return m_pExtendedData ? m_pExtendedData->scriptFilePath() : 0; }; // this MUST be called before any blocking call that might return to the main event loop @@ -190,10 +190,10 @@ public: // was error(...) ever called ? bool error() const { return m_bError; }; - void error(KviKvsTreeNode * pNode,const QString &szMsgFmt,...); - void warning(KviKvsTreeNode * pNode,const QString &szMsgFmt,...); - void error(const QString &szMsgFmt,...); - void warning(const QString &szMsgFmt,...); + void error(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...); + void warning(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...); + void error(const TQString &szMsgFmt,...); + void warning(const TQString &szMsgFmt,...); void setDefaultReportLocation(KviKvsTreeNode * pNode); bool errorNoIrcContext(); bool warningNoIrcConnection(); @@ -249,7 +249,7 @@ public: { m_bError = false; }; protected: - void report(bool bError,KviKvsTreeNode * pNode,const QString &szMsgFmt,kvi_va_list va); + void report(bool bError,KviKvsTreeNode * pNode,const TQString &szMsgFmt,kvi_va_list va); }; diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp index d51588f..e40e461 100644 --- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp +++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp @@ -51,7 +51,7 @@ KviKvsArrayElement::~KviKvsArrayElement() if(m_pParent)delete m_pParent; } -KviKvsHashElement::KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const QString &szKey) +KviKvsHashElement::KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const TQString &szKey) : KviKvsRWEvaluationResult(pParent,pVariant) { m_pHash = pHash; diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h index 9d91a1b..8eabc15 100644 --- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h +++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h @@ -30,7 +30,7 @@ class KVIRC_API KviKvsRWEvaluationResult { public: - // this result becomes the owner of the parent result!!!! + // this result becomes the owner of the tqparent result!!!! KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant); // the destructor must do (in order): // check if variant is empty and if it is then remove it from the container (destroy it) @@ -60,11 +60,11 @@ class KviKvsHash; class KVIRC_API KviKvsHashElement : public KviKvsRWEvaluationResult { public: - KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const QString &szKey); + KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const TQString &szKey); ~KviKvsHashElement(); protected: KviKvsHash * m_pHash; - QString m_szKey; + TQString m_szKey; }; #endif //!_KVI_KVS_RWEVALUATIONRESULT_H_ diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp index e7a2bd6..c9c4f4f 100644 --- a/src/kvirc/kvs/kvi_kvs_script.cpp +++ b/src/kvirc/kvs/kvi_kvs_script.cpp @@ -44,9 +44,9 @@ class KVIRC_API KviKvsScriptData protected: unsigned int m_uRefs; // Reference count for this structure - QString m_szName; // script context name - QString m_szBuffer; // NEVER TOUCH THIS - const QChar * m_pBuffer; // this points to m_szBuffer: use it to extract string data + TQString m_szName; // script context name + TQString m_szBuffer; // NEVER TOUCH THIS + const TQChar * m_pBuffer; // this points to m_szBuffer: use it to extract string data KviKvsScript::ScriptType m_eType; // the type of the code in m_szBuffer @@ -56,7 +56,7 @@ protected: //#warning "THERE IS SOME MESS WITH m_szBuffer and m_pBuffer : with some script copying we may get errors with negative char indexes!" -KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,ScriptType eType) +KviKvsScript::KviKvsScript(const TQString &szName,const TQString &szBuffer,ScriptType eType) { m_pData = new KviKvsScriptData; m_pData->m_uRefs = 1; @@ -64,13 +64,13 @@ KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,ScriptT m_pData->m_eType = eType; m_pData->m_szBuffer = szBuffer; if(m_pData->m_szBuffer.isNull())m_pData->m_szBuffer = ""; - //KviQString::detach(*(m_pData->m_pszBuffer)); - m_pData->m_pBuffer = KviQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 + //KviTQString::detach(*(m_pData->m_pszBuffer)); + m_pData->m_pBuffer = KviTQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 m_pData->m_uLock = 0; m_pData->m_pTree = 0; } -KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType) +KviKvsScript::KviKvsScript(const TQString &szName,const TQString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType) { m_pData = new KviKvsScriptData; m_pData->m_uRefs = 1; @@ -78,8 +78,8 @@ KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsT m_pData->m_szBuffer = szBuffer; m_pData->m_eType = eType; if(m_pData->m_szBuffer.isNull())m_pData->m_szBuffer = ""; - //KviQString::detach(*(m_pData->m_pszBuffer)); - m_pData->m_pBuffer = KviQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 + //KviTQString::detach(*(m_pData->m_pszBuffer)); + m_pData->m_pBuffer = KviTQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 m_pData->m_uLock = 0; m_pData->m_pTree = pPreparsedTree; } @@ -102,18 +102,18 @@ KviKvsScript::~KviKvsScript() } } -void KviKvsScript::setName(const QString &szName) +void KviKvsScript::setName(const TQString &szName) { if(m_pData->m_uRefs > 1)detach(); m_pData->m_szName = szName; } -const QString & KviKvsScript::name() const +const TQString & KviKvsScript::name() const { return m_pData->m_szName; } -const QString & KviKvsScript::code() const +const TQString & KviKvsScript::code() const { return m_pData->m_szBuffer; } @@ -138,33 +138,33 @@ void KviKvsScript::detach() d->m_eType = m_pData->m_eType; d->m_szBuffer = m_pData->m_szBuffer; if(d->m_szBuffer.isNull())d->m_szBuffer = ""; - KviQString::detach(d->m_szBuffer); - d->m_pBuffer = KviQString::nullTerminatedArray(d->m_szBuffer); // never 0 + KviTQString::detach(d->m_szBuffer); + d->m_pBuffer = KviTQString::nullTerminatedArray(d->m_szBuffer); // never 0 d->m_uLock = 0; d->m_pTree = 0; m_pData = d; } -const QChar * KviKvsScript::buffer() const +const TQChar * KviKvsScript::buffer() const { return m_pData->m_pBuffer; } -int KviKvsScript::run(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +int KviKvsScript::run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // static helper KviKvsScript s("kvirc::corecall(run)",szCode); return s.run(pWindow,pParams,pRetVal,PreserveParams); } -int KviKvsScript::evaluate(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +int KviKvsScript::evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // static helper KviKvsScript s("kvirc::corecall(evalutate)",szCode,Parameter); return s.run(pWindow,pParams,pRetVal,PreserveParams); } -int KviKvsScript::evaluateAsString(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,QString &szRetVal) +int KviKvsScript::evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal) { // static helper KviKvsVariant ret; @@ -174,7 +174,7 @@ int KviKvsScript::evaluateAsString(const QString &szCode,KviWindow * pWindow,Kvi return iRet; } -int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,QString &szRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) +int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,TQString &szRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) { KviKvsVariant retVal; int iRet = run(pWnd,pParams,&retVal,iRunFlags,pExtData); @@ -293,22 +293,22 @@ int KviKvsScript::executeInternal(KviKvsRunTimeContext * pContext) // lock this script m_pData->m_uLock++; - int iRunStatus = Success; + int iRuntqStatus = Success; if(!m_pData->m_pTree->execute(pContext)) { - if(pContext->error())iRunStatus = Error; + if(pContext->error())iRuntqStatus = Error; else { // else just a halt, return or sth like that if(pContext->haltCalled()) - iRunStatus |= HaltEncountered; + iRuntqStatus |= HaltEncountered; } } // we can't block any longer: unlock m_pData->m_uLock--; - return iRunStatus; + return iRuntqStatus; } int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVariant * pRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) @@ -343,13 +343,13 @@ int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVar if(iRunFlags & Quiet) ctx.disableReporting(); - int iRunStatus = executeInternal(&ctx); + int iRuntqStatus = executeInternal(&ctx); // don't forget to delete the params if(bDeleteParams)delete pParams; if(bDeleteRetVal)delete pRetVal; pParams = 0; pRetVal = 0; - return iRunStatus; + return iRuntqStatus; } diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h index b924387..2bfd6b8 100644 --- a/src/kvirc/kvs/kvi_kvs_script.h +++ b/src/kvirc/kvs/kvi_kvs_script.h @@ -52,7 +52,7 @@ class KVIRC_API KviKvsScript : public KviHeapObject friend class KviKvsParser; friend class KviKvsRunTimeContext; public: - enum RunStatus { + enum RuntqStatus { // the script returned an error Error = 0, // the script ran succesfully @@ -70,21 +70,21 @@ public: }; protected: // the name parameter is the name of the script context! - KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType = InstructionList); + KviKvsScript(const TQString &szName,const TQString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType = InstructionList); public: // shallow copy of the script data // useful when a script can be destroyed while running (like in timers) KviKvsScript(const KviKvsScript &src); - KviKvsScript(const QString &szName,const QString &szBuffer,ScriptType eType=InstructionList); + KviKvsScript(const TQString &szName,const TQString &szBuffer,ScriptType eType=InstructionList); ~KviKvsScript(); private: KviKvsScriptData * m_pData; public: - const QString & name() const; - const QString & code() const; + const TQString & name() const; + const TQString & code() const; bool locked() const; - void setName(const QString &szName); + void setName(const TQString &szName); enum RunFlags { // do not delete the eventual parameters passed (only execute() and run()) @@ -97,7 +97,7 @@ public: Quiet = 8 }; // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int run(KviWindow * pWnd, // window that the command has to be bound to KviKvsVariantList * pParams = 0, // parameter list (0 if you don't pass params) ownership transferred if PreserverParams is not used KviKvsVariant * pRetVal = 0, // return value buffer (0 if you ignore it) @@ -105,29 +105,29 @@ public: KviKvsExtendedRunTimeData * pExtData = 0); // extended data (usually 0) (if you need to pass extended scope variables or alias switch lists...) // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success // this is probably used only in /eval int run(KviKvsRunTimeContext * pContext,int iRunFlags = 0); - // same as run above, but gets a QString parameter as return buffer + // same as run above, but gets a TQString parameter as return buffer // this is probably useful only for evaluating InstructionList scripts int run(KviWindow * pWnd, KviKvsVariantList * pParams, - QString &szRetVal, + TQString &szRetVal, int iRunFlags = 0, KviKvsExtendedRunTimeData * pExtData = 0); // static helpers for quick running - // returns a combination of RunStatus flags (nonzero on no error) + // returns a combination of RuntqStatus flags (nonzero on no error) // does NOT take params ownership - static int run(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); + static int run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); // static helper for quick evaluating parameters - // returns a combination of RunStatus flags (nonzero on no error) + // returns a combination of RuntqStatus flags (nonzero on no error) // does NOT take params ownership // pRetVal CAN'T be zero here since we're evaluating stuff here - static int evaluate(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); - static int evaluateAsString(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,QString &szRetVal); + static int evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); + static int evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal); public: void dump(const char * prefix); protected: @@ -137,16 +137,16 @@ protected: bool parse(KviWindow * pOutput = 0, int iRunFlags = 0); // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int execute(KviWindow * pWnd, KviKvsVariantList * pParams = 0, KviKvsVariant * pRetVal = 0, int iRunFlags = 0, KviKvsExtendedRunTimeData * pExtData = 0); // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int executeInternal(KviKvsRunTimeContext * pContext); - const QChar * buffer() const; + const TQChar * buffer() const; // detaches this script from any other shallow copies void detach(); }; diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index aee138d..23f6ade 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -36,12 +36,12 @@ KviKvsScriptAddonManager * KviKvsScriptAddonManager::m_pInstance = 0; KviKvsScriptAddon::KviKvsScriptAddon( - const QString &szName, - const QString &szVersion, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szUninstallCallbackCode, - const QString &szIconId + const TQString &szName, + const TQString &szVersion, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szUninstallCallbackCode, + const TQString &szIconId ) : KviHeapObject(), m_szName(szName), m_szVersion(szVersion), m_szIconId(szIconId) { allocateScripts(szVisibleNameCode,szDescriptionCode,szUninstallCallbackCode); @@ -55,11 +55,11 @@ KviKvsScriptAddon::KviKvsScriptAddon(const KviKvsScriptAddon &a) m_szName = a.m_szName; m_szVersion = a.m_szVersion; m_szIconId = a.m_szIconId; - allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : QString::null); + allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : TQString()); m_pConfigureCallback = 0; - setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : QString::null); + setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : TQString()); m_pHelpCallback = 0; - setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : QString::null); + setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : TQString()); } KviKvsScriptAddon::KviKvsScriptAddon() @@ -81,75 +81,75 @@ KviKvsScriptAddon::~KviKvsScriptAddon() if(m_pHelpCallback)delete m_pHelpCallback; } -QPixmap * KviKvsScriptAddon::icon() +TQPixmap * KviKvsScriptAddon::icon() { - return g_pIconManager->getBigIcon(m_szIconId.isEmpty() ? QString(KVI_BIGICON_KVS) : m_szIconId); + return g_pIconManager->getBigIcon(m_szIconId.isEmpty() ? TQString(KVI_BIGICON_KVS) : m_szIconId); } -const QString & KviKvsScriptAddon::visibleName() +const TQString & KviKvsScriptAddon::visibleName() { if(!m_pVisibleNameScript)return m_szVisibleName; if(!m_pVisibleNameScript->run(g_pActiveWindow,0,m_szVisibleName))m_szVisibleName = m_pVisibleNameScript->code(); return m_szVisibleName; } -const QString & KviKvsScriptAddon::description() +const TQString & KviKvsScriptAddon::description() { if(!m_pDescriptionScript)return m_szDescription; if(!m_pDescriptionScript->run(g_pActiveWindow,0,m_szDescription))m_szDescription = m_pDescriptionScript->code(); return m_szDescription; } -const QString & KviKvsScriptAddon::visibleNameCode() +const TQString & KviKvsScriptAddon::visibleNameCode() { return m_pVisibleNameScript->code(); } -const QString & KviKvsScriptAddon::descriptionCode() +const TQString & KviKvsScriptAddon::descriptionCode() { return m_pDescriptionScript->code(); } -const QString & KviKvsScriptAddon::uninstallCallbackCode() +const TQString & KviKvsScriptAddon::uninstallCallbackCode() { return m_pUninstallCallback->code(); } -const QString & KviKvsScriptAddon::configureCallbackCode() +const TQString & KviKvsScriptAddon::configureCallbackCode() { if(m_pConfigureCallback)return m_pConfigureCallback->code(); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviKvsScriptAddon::helpCallbackCode() +const TQString & KviKvsScriptAddon::helpCallbackCode() { if(m_pHelpCallback)return m_pHelpCallback->code(); - return KviQString::empty; + return KviTQString::empty; } -bool KviKvsScriptAddon::load(KviConfig * cfg,const QString &szName) +bool KviKvsScriptAddon::load(KviConfig * cfg,const TQString &szName) { m_szName = szName; cfg->setGroup(m_szName); - m_szVersion = cfg->readQStringEntry("Version"); - m_szIconId = cfg->readQStringEntry("IconId"); + m_szVersion = cfg->readTQStringEntry("Version"); + m_szIconId = cfg->readTQStringEntry("IconId"); if(m_szVersion.isEmpty())return false; - QString tmp1,tmp2,tmp3; - tmp1 = cfg->readQStringEntry("VisibleNameCode"); - tmp2 = cfg->readQStringEntry("DescriptionCode"); - tmp3 = cfg->readQStringEntry("UninstallCallback"); + TQString tmp1,tmp2,tmp3; + tmp1 = cfg->readTQStringEntry("VisibleNameCode"); + tmp2 = cfg->readTQStringEntry("DescriptionCode"); + tmp3 = cfg->readTQStringEntry("UninstallCallback"); if(tmp1.isEmpty())return false; allocateScripts(tmp1,tmp2,tmp3); - tmp1 = cfg->readQStringEntry("ConfigureCallback"); + tmp1 = cfg->readTQStringEntry("ConfigureCallback"); if(!tmp1.isEmpty()) setConfigureCallback(tmp1); - tmp1 = cfg->readQStringEntry("HelpCallback"); + tmp1 = cfg->readTQStringEntry("HelpCallback"); if(!tmp1.isEmpty()) setHelpCallback(tmp1); return true; } -void KviKvsScriptAddon::setConfigureCallback(const QString &szConfigureCallbackCode) +void KviKvsScriptAddon::setConfigureCallback(const TQString &szConfigureCallbackCode) { if(m_pConfigureCallback)delete m_pConfigureCallback; if(szConfigureCallbackCode.isEmpty()) @@ -158,17 +158,17 @@ void KviKvsScriptAddon::setConfigureCallback(const QString &szConfigureCallbackC return; } - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::configure"; m_pConfigureCallback = new KviKvsScript(szTmp,szConfigureCallbackCode,KviKvsScript::InstructionList); } -void KviKvsScriptAddon::setHelpCallback(const QString &szHelpCallbackCode) +void KviKvsScriptAddon::setHelpCallback(const TQString &szHelpCallbackCode) { if(m_pHelpCallback)delete m_pHelpCallback; if(szHelpCallbackCode.isEmpty()) @@ -177,22 +177,22 @@ void KviKvsScriptAddon::setHelpCallback(const QString &szHelpCallbackCode) return; } - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::help"; m_pHelpCallback = new KviKvsScript(szTmp,szHelpCallbackCode,KviKvsScript::InstructionList); } -void KviKvsScriptAddon::allocateScripts(const QString &szVisibleNameCode,const QString &szDescriptionCode,const QString &szUninstallCallbackCode) +void KviKvsScriptAddon::allocateScripts(const TQString &szVisibleNameCode,const TQString &szDescriptionCode,const TQString &szUninstallCallbackCode) { - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::name"; @@ -243,7 +243,7 @@ KviKvsScriptAddonManager::KviKvsScriptAddonManager() { m_pInstance = this; m_bLoaded = false; - m_pAddonDict = new KviPointerHashTable<QString,KviKvsScriptAddon>(17,false); + m_pAddonDict = new KviPointerHashTable<TQString,KviKvsScriptAddon>(17,false); m_pAddonDict->setAutoDelete(true); } @@ -272,7 +272,7 @@ void KviKvsScriptAddonManager::done() delete KviKvsScriptAddonManager::instance(); } -void KviKvsScriptAddonManager::load(const QString &szFileName) +void KviKvsScriptAddonManager::load(const TQString &szFileName) { // in fact we implement delayed loading // so this function only stores the filename @@ -284,7 +284,7 @@ void KviKvsScriptAddonManager::load(const QString &szFileName) m_bLoaded = false; } -void KviKvsScriptAddonManager::save(const QString &szFileName) +void KviKvsScriptAddonManager::save(const TQString &szFileName) { if(!m_bLoaded)return; // nothing to store anyway // we're stored here from now on... @@ -294,7 +294,7 @@ void KviKvsScriptAddonManager::save(const QString &szFileName) cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*m_pAddonDict); + KviPointerHashTableIterator<TQString,KviKvsScriptAddon> it(*m_pAddonDict); while(KviKvsScriptAddon * a = it.current()) { @@ -315,23 +315,23 @@ void KviKvsScriptAddonManager::delayedLoad() KviConfig cfg(m_szFileName,KviConfig::Read); - KviPointerHashTable<QString,KviConfigGroup> * d = cfg.dict(); + KviPointerHashTable<TQString,KviConfigGroup> * d = cfg.dict(); if(!d)return; - KviPointerHashTableIterator<QString,KviConfigGroup> it(*d); + KviPointerHashTableIterator<TQString,KviConfigGroup> it(*d); while(it.current()) { - QString szName = it.currentKey(); + TQString szName = it.currentKey(); KviKvsScriptAddon * a = new KviKvsScriptAddon(); if(a->load(&cfg,szName)) - m_pAddonDict->replace(szName,a); + m_pAddonDict->tqreplace(szName,a); else delete a; ++it; } } -KviPointerHashTable<QString,KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict() +KviPointerHashTable<TQString,KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict() { if(!m_bLoaded)delayedLoad(); return m_pAddonDict; @@ -351,17 +351,17 @@ bool KviKvsScriptAddonManager::registerAddon(KviKvsScriptAddonRegistrationData * d->szDescriptionScript, d->szUninstallCallbackScript, d->szIconId); - m_pAddonDict->replace(d->szName,a); + m_pAddonDict->tqreplace(d->szName,a); return true; } -KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const QString &szName) +KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const TQString &szName) { if(!m_bLoaded)delayedLoad(); - return m_pAddonDict->find(szName); + return m_pAddonDict->tqfind(szName); } -bool KviKvsScriptAddonManager::unregisterAddon(const QString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback) +bool KviKvsScriptAddonManager::unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback) { KviKvsScriptAddon * a = findAddon(szName); if(!a)return false; diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h index 428ba58..b05adde 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h @@ -33,7 +33,7 @@ class KviConfig; class KviKvsScript; class KviWindow; -class QPixmap; +class TQPixmap; class KVIRC_API KviKvsScriptAddon : public KviHeapObject { @@ -41,61 +41,61 @@ class KVIRC_API KviKvsScriptAddon : public KviHeapObject protected: KviKvsScriptAddon(); KviKvsScriptAddon( - const QString &szName, - const QString &szVersion, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szUninstallCallbackCode, - const QString &szIconId + const TQString &szName, + const TQString &szVersion, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szUninstallCallbackCode, + const TQString &szIconId ); public: KviKvsScriptAddon(const KviKvsScriptAddon &a); public: // KviDict wants that... how to restrict the deletion to KviKvsScriptAddonManager only ? ~KviKvsScriptAddon(); protected: - QString m_szName; // the short name of the addon - QString m_szVersion; // x.y.z + TQString m_szName; // the short name of the addon + TQString m_szVersion; // x.y.z KviKvsScript * m_pVisibleNameScript; // the visible name, possibly translated KviKvsScript * m_pDescriptionScript; // the description, possibly translated KviKvsScript * m_pUninstallCallback; // uninstall callback KviKvsScript * m_pConfigureCallback; // configure callback KviKvsScript * m_pHelpCallback; // help callback - QString m_szDescription; // parsed description - QString m_szVisibleName; // parsed visible name - QString m_szIconId; + TQString m_szDescription; // parsed description + TQString m_szVisibleName; // parsed visible name + TQString m_szIconId; public: - const QString &name() const { return m_szName; }; - const QString &version() const { return m_szVersion; }; - const QString &visibleName(); - const QString &description(); - const QString &visibleNameCode(); - const QString &descriptionCode(); - const QString &uninstallCallbackCode(); - const QString &configureCallbackCode(); - const QString &helpCallbackCode(); - const QString &iconId(){ return m_szIconId; }; - QPixmap * icon(); - void setConfigureCallback(const QString &szConfigureCallbackCode); - void setHelpCallback(const QString &szHelpCallbackCode); + const TQString &name() const { return m_szName; }; + const TQString &version() const { return m_szVersion; }; + const TQString &visibleName(); + const TQString &description(); + const TQString &visibleNameCode(); + const TQString &descriptionCode(); + const TQString &uninstallCallbackCode(); + const TQString &configureCallbackCode(); + const TQString &helpCallbackCode(); + const TQString &iconId(){ return m_szIconId; }; + TQPixmap * icon(); + void setConfigureCallback(const TQString &szConfigureCallbackCode); + void setHelpCallback(const TQString &szHelpCallbackCode); void executeConfigureCallback(KviWindow * pWnd); void executeHelpCallback(KviWindow * pWnd); protected: - bool load(KviConfig * cfg,const QString &szName); + bool load(KviConfig * cfg,const TQString &szName); void save(KviConfig * cfg); void executeUninstallCallback(KviWindow * pWnd); // this assumes that the script pointers are clean (i.e. not needing to be freed!) - void allocateScripts(const QString &sVisibleNameCode,const QString &szDescriptionCode,const QString &szUninstallCallbackCode); + void allocateScripts(const TQString &sVisibleNameCode,const TQString &szDescriptionCode,const TQString &szUninstallCallbackCode); }; class KVIRC_API KviKvsScriptAddonRegistrationData { public: - QString szName; // the addon name - QString szVersion; // the addon version in form x.y.z - QString szVisibleNameScript; // the code that evaluates to the visible name, possibly translated - QString szDescriptionScript; // the code that evaluates to the description, possibly translated - QString szUninstallCallbackScript; // the uninstall callback code, will be executed at uninstallation - QString szIconId; // the icon identifier (scaled to 32x32 atm) + TQString szName; // the addon name + TQString szVersion; // the addon version in form x.y.z + TQString szVisibleNameScript; // the code that evaluates to the visible name, possibly translated + TQString szDescriptionScript; // the code that evaluates to the description, possibly translated + TQString szUninstallCallbackScript; // the uninstall callback code, will be executed at uninstallation + TQString szIconId; // the icon identifier (scaled to 32x32 atm) }; class KVIRC_API KviKvsScriptAddonManager @@ -106,22 +106,22 @@ public: protected: static KviKvsScriptAddonManager * m_pInstance; // this class implements delayed loading - QString m_szFileName; // the file name that we will load from + TQString m_szFileName; // the file name that we will load from bool m_bLoaded; // have we loaded stuff from disk yet ? - KviPointerHashTable<QString,KviKvsScriptAddon> * m_pAddonDict; // all the registered addons + KviPointerHashTable<TQString,KviKvsScriptAddon> * m_pAddonDict; // all the registered addons public: static KviKvsScriptAddonManager * instance(){ return m_pInstance; }; static void init(); // called by KviKvs::init() static void done(); // called by KviKvs::done() bool registerAddon(KviKvsScriptAddonRegistrationData * d); - KviKvsScriptAddon * findAddon(const QString &szName); - bool unregisterAddon(const QString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback = true); - KviPointerHashTable<QString,KviKvsScriptAddon> * addonDict(); + KviKvsScriptAddon * findAddon(const TQString &szName); + bool unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback = true); + KviPointerHashTable<TQString,KviKvsScriptAddon> * addonDict(); void clear(); - void load(const QString &szFileName); // called in the KviKvs namespace - void save(const QString &szFileName); // called in the KViKvs namespace + void load(const TQString &szFileName); // called in the KviKvs namespace + void save(const TQString &szFileName); // called in the KViKvs namespace protected: void delayedLoad(); }; diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp index aa4ebdb..7c56c85 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp @@ -60,16 +60,16 @@ void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVarian m_pShortSwitchDict = new KviPointerHashTable<unsigned short,KviKvsVariant>(11); m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->replace(uShortKey,pVariant); + m_pShortSwitchDict->tqreplace(uShortKey,pVariant); } -void KviKvsSwitchList::addLong(const QString &szLongKey,KviKvsVariant * pVariant) +void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVariant) { if(!m_pLongSwitchDict) { - m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsVariant>(11); + m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsVariant>(11); m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->replace(szLongKey,pVariant); + m_pLongSwitchDict->tqreplace(szLongKey,pVariant); } diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h index ea496b3..b660569 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_switchlist.h @@ -38,43 +38,43 @@ public: ~KviKvsSwitchList(); protected: KviPointerHashTable<unsigned short,KviKvsVariant> * m_pShortSwitchDict; - KviPointerHashTable<QString,KviKvsVariant> * m_pLongSwitchDict; + KviPointerHashTable<TQString,KviKvsVariant> * m_pLongSwitchDict; public: void clear(); void addShort(unsigned short uShortKey,KviKvsVariant * pVariant); - void addLong(const QString &szLongKey,KviKvsVariant * pVariant); + void addLong(const TQString &szLongKey,KviKvsVariant * pVariant); bool isEmpty(){ return ((m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0)); }; - KviKvsVariant * find(const QChar &c) + KviKvsVariant * tqfind(const TQChar &c) { - return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.unicode()) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind(c.tqunicode()) : 0; }; - KviKvsVariant * find(unsigned short uShortKey) + KviKvsVariant * tqfind(unsigned short uShortKey) { - return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; }; - KviKvsVariant * find(const QString &szLongKey) + KviKvsVariant * tqfind(const TQString &szLongKey) { - return m_pLongSwitchDict ? m_pLongSwitchDict->find(szLongKey) : 0; + return m_pLongSwitchDict ? m_pLongSwitchDict->tqfind(szLongKey) : 0; }; - KviKvsVariant * find(unsigned short uShortKey,const QString &szLongKey) + KviKvsVariant * tqfind(unsigned short uShortKey,const TQString &szLongKey) { if(m_pLongSwitchDict) { KviKvsVariant * t; - t = m_pLongSwitchDict->find(szLongKey); + t = m_pLongSwitchDict->tqfind(szLongKey); if(t)return t; } - return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; }; - bool getAsStringIfExisting(unsigned short uShortKey,const QString &szLongKey,QString &szBuffer) + bool getAsStringIfExisting(unsigned short uShortKey,const TQString &szLongKey,TQString &szBuffer) { - KviKvsVariant * v = find(uShortKey,szLongKey); + KviKvsVariant * v = tqfind(uShortKey,szLongKey); if(v) { v->asString(szBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 91af693..3bd4301 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp @@ -38,7 +38,7 @@ #include "kvi_out.h" -KviKvsTimer::KviKvsTimer(const QString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams) +KviKvsTimer::KviKvsTimer(const TQString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams) { m_szName = szName; m_eLifetime = l; @@ -68,11 +68,11 @@ KviKvsTimerManager * KviKvsTimerManager::m_pInstance = 0; KviKvsTimerManager::KviKvsTimerManager() -: QObject() +: TQObject() { m_pTimerDictById = new KviPointerHashTable<int,KviKvsTimer>(17); m_pTimerDictById->setAutoDelete(false); - m_pTimerDictByName = new KviPointerHashTable<QString,KviKvsTimer>(17,false); + m_pTimerDictByName = new KviPointerHashTable<TQString,KviKvsTimer>(17,false); m_pTimerDictByName->setAutoDelete(false); m_pKilledTimerList = 0; m_iAssassinTimer = 0; @@ -108,7 +108,7 @@ void KviKvsTimerManager::done() KviKvsTimerManager::m_pInstance = 0; } -bool KviKvsTimerManager::addTimer(const QString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams) +bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams) { int iId = startTimer(iDelay); @@ -122,16 +122,16 @@ bool KviKvsTimerManager::addTimer(const QString &szName,KviKvsTimer::Lifetime l, } KviKvsTimer * t = new KviKvsTimer(szName,l,pWnd,iDelay,iId,pCallback,pParams); - KviKvsTimer * old = m_pTimerDictByName->find(szName); + KviKvsTimer * old = m_pTimerDictByName->tqfind(szName); if(old)deleteTimer(old->id()); m_pTimerDictByName->insert(szName,t); m_pTimerDictById->insert(t->id(),t); return true; } -bool KviKvsTimerManager::deleteTimer(const QString &szName) +bool KviKvsTimerManager::deleteTimer(const TQString &szName) { - KviKvsTimer * t = m_pTimerDictByName->find(szName); + KviKvsTimer * t = m_pTimerDictByName->tqfind(szName); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -142,7 +142,7 @@ bool KviKvsTimerManager::deleteTimer(const QString &szName) bool KviKvsTimerManager::deleteTimer(int iId) { - KviKvsTimer * t = m_pTimerDictById->find(iId); + KviKvsTimer * t = m_pTimerDictById->tqfind(iId); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -189,7 +189,7 @@ void KviKvsTimerManager::scheduleKill(KviKvsTimer *t) } -void KviKvsTimerManager::timerEvent(QTimerEvent *e) +void KviKvsTimerManager::timerEvent(TQTimerEvent *e) { int iId = e->timerId(); @@ -206,7 +206,7 @@ void KviKvsTimerManager::timerEvent(QTimerEvent *e) return; } - KviKvsTimer * t = m_pTimerDictById->find(iId); + KviKvsTimer * t = m_pTimerDictById->tqfind(iId); if(!t) { debug("Internal error: got an nonexistant timer event"); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h index f8e20f1..e316118 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.h +++ b/src/kvirc/kvs/kvi_kvs_timermanager.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" #include "kvi_pointerhashtable.h" #include "kvi_pointerlist.h" @@ -58,13 +58,13 @@ class KVIRC_API KviKvsTimer public: enum Lifetime { SingleShot, WindowLifetime, Persistent }; protected: - KviKvsTimer(const QString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams); + KviKvsTimer(const TQString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams); public: ~KviKvsTimer(); protected: Lifetime m_eLifetime; // the type of this timer KviWindow * m_pWnd; // the window that this timer is (currently) bound to - QString m_szName; // this timer name + TQString m_szName; // this timer name KviKvsScript * m_pCallback; // callback to be executed at timer shots int m_iDelay; // the timer delay in msecs int m_iId; // the system id of this timer @@ -72,7 +72,7 @@ protected: KviKvsVariantList * m_pParameterList; // parameter list public: KviWindow * window(){ return m_pWnd; }; - const QString & name(){ return m_szName; }; + const TQString & name(){ return m_szName; }; const KviKvsScript * callback(){ return m_pCallback; }; Lifetime lifetime(){ return m_eLifetime; }; int delay(){ return m_iDelay; }; @@ -85,15 +85,16 @@ protected: }; -class KVIRC_API KviKvsTimerManager : public QObject +class KVIRC_API KviKvsTimerManager : public TQObject { Q_OBJECT + TQ_OBJECT protected: // it only can be created and destroyed by KviKvsTimerManager::init()/done() KviKvsTimerManager(); ~KviKvsTimerManager(); private: KviPointerHashTable<int,KviKvsTimer> * m_pTimerDictById; // stored by id - KviPointerHashTable<QString,KviKvsTimer> * m_pTimerDictByName; // stored by name + KviPointerHashTable<TQString,KviKvsTimer> * m_pTimerDictByName; // stored by name static KviKvsTimerManager * m_pInstance; // the one and only timer manager instance KviPointerList<KviKvsTimer> * m_pKilledTimerList; // list of timers for that killing has been scheduled int m_iAssassinTimer; // assassin timer id @@ -103,20 +104,20 @@ public: static void init(); static void done(); // the pCallback and pParams are owned by the timer: they WILL be deleted - bool addTimer(const QString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams); - bool deleteTimer(const QString &szName); + bool addTimer(const TQString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams); + bool deleteTimer(const TQString &szName); bool deleteTimer(int iId); // the timer manager does not trigger timers concurrently // this means that if this is called from a timer handler // the current timer will be unique bool deleteCurrentTimer(); void deleteAllTimers(); - bool timerExists(const QString &szName){ return m_pTimerDictByName->find(szName); }; - KviPointerHashTable<QString,KviKvsTimer> * timerDict() + bool timerExists(const TQString &szName){ return m_pTimerDictByName->tqfind(szName); }; + KviPointerHashTable<TQString,KviKvsTimer> * timerDict() { return m_pTimerDictByName; }; protected: void scheduleKill(KviKvsTimer * t); - virtual void timerEvent(QTimerEvent *e); + virtual void timerEvent(TQTimerEvent *e); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp index f864cea..d8a9ca4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp @@ -30,7 +30,7 @@ #include "kvi_locale.h" #include "kvi_qstring.h" -KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const QChar * pLocation,const QString &szAliasName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szAliasName,pParams) { @@ -40,9 +40,9 @@ KviKvsTreeNodeAliasFunctionCall::~KviKvsTreeNodeAliasFunctionCall() { } -void KviKvsTreeNodeAliasFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeAliasFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Alias Function Call \"%Q\"",&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Alias Function Call \"%Q\"",&m_szFunctionName); } @@ -51,7 +51,7 @@ void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h index 04ca50a..af0770f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h @@ -34,11 +34,11 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeAliasFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeAliasFunctionCall(const QChar * pLocation,const QString &szAliasName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeAliasFunctionCall(); public: virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 974ae94..192d344 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -37,7 +37,7 @@ #include "kvi_out.h" -KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { } @@ -47,9 +47,9 @@ KviKvsTreeNodeAliasSimpleCommand::~KviKvsTreeNodeAliasSimpleCommand() { } -void KviKvsTreeNodeAliasSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeAliasSimpleCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix) @@ -75,13 +75,13 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) { if(KVI_OPTION_BOOL(KviOption_boolSendUnknownCommandsAsRaw)) { - QString szAll; + TQString szAll; l.allAsString(szAll); if(!szAll.isEmpty())szAll.prepend(" "); szAll.prepend(m_szCmdName); - KviQCString szData; + KviTQCString szData; if(!c->window()->context()) goto no_way_to_send_as_raw; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h index 0247e9b..34a1a24 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeAliasSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeAliasSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeAliasSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeAliasSimpleCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp index 1479fef..7caab06 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -40,7 +40,7 @@ KviKvsTreeNodeArrayCount::~KviKvsTreeNodeArrayCount() { } -void KviKvsTreeNodeArrayCount::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayCount::contextDescription(TQString &szBuffer) { szBuffer = "Array Count Operator"; } @@ -67,7 +67,7 @@ bool KviKvsTreeNodeArrayCount::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kvi { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the array count '#' operator didn't evaluate to an array: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h index deae258..87ce721 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h @@ -35,10 +35,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeArrayCount : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayCount(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayCount(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp index ada9fd8..e3cd668 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_array.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayElement::KviKvsTreeNodeArrayElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex) +KviKvsTreeNodeArrayElement::KviKvsTreeNodeArrayElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex) : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource) { #ifdef COMPILE_NEW_KVS @@ -47,7 +47,7 @@ KviKvsTreeNodeArrayElement::~KviKvsTreeNodeArrayElement() #endif } -void KviKvsTreeNodeArrayElement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayElement::contextDescription(TQString &szBuffer) { szBuffer = "Array Element Evaluation"; } @@ -56,7 +56,7 @@ void KviKvsTreeNodeArrayElement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ArrayElement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSource->dump(tmp.utf8().data()); m_pIndex->dump(tmp.utf8().data()); @@ -101,7 +101,7 @@ bool KviKvsTreeNodeArrayElement::evaluateReadOnlyInObjectScope(KviKvsObject * o, { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the [] subscript didn't evaluate to an array: automatic conversion from %Q supplied"),&szType); } @@ -137,7 +137,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject // convert to hash in some way if(!result->result()->isNothing()) { - QString szType; + TQString szType; result->result()->getTypeName(szType); c->warning(this,__tr2qs("The argument of the [] subscript didn't evaluate to an array: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h index 9b23926..1d47203 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeArrayElement : public KviKvsTreeNodeArrayOrHashElement { public: - KviKvsTreeNodeArrayElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex); + KviKvsTreeNodeArrayElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex); ~KviKvsTreeNodeArrayElement(); protected: KviKvsTreeNodeExpression * m_pIndex; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp index d15d197..5106ace 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_arrayorhashelement.h" -KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h index 4f5d679..a790a24 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h @@ -32,7 +32,7 @@ class KVIRC_API KviKvsTreeNodeArrayOrHashElement : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayOrHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayOrHashElement(); public: virtual bool isReadOnly(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 698b95c..0d52c07 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -45,7 +45,7 @@ bool KviKvsTreeNodeArrayReferenceAssert::isReadOnly() return m_pSource->isReadOnly(); } -void KviKvsTreeNodeArrayReferenceAssert::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayReferenceAssert::contextDescription(TQString &szBuffer) { szBuffer = "Array Reference Assert"; } @@ -72,7 +72,7 @@ bool KviKvsTreeNodeArrayReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObj { if(!pBuffer->isNothing()) { - QString szType; + TQString szType; pBuffer->getTypeName(szType); c->error(this,__tr2qs("Array reference assert failed: the variable evaluated to type '%Q'"),&szType); return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h index 8827cf2..663068a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h @@ -36,13 +36,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeArrayReferenceAssert : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayReferenceAssert(); protected: public: virtual bool isReadOnly(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp index ee19dd8..64b71c0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_base.h" -KviKvsTreeNode::KviKvsTreeNode(const QChar * pLocation) +KviKvsTreeNode::KviKvsTreeNode(const TQChar * pLocation) { #ifdef COMPILE_NEW_KVS m_pParent = 0; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h index 6f0178f..2057e38 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h @@ -31,21 +31,21 @@ class KVIRC_API KviKvsTreeNode { friend class KviKvsParser; public: - KviKvsTreeNode(const QChar * pLocation); + KviKvsTreeNode(const TQChar * pLocation); virtual ~KviKvsTreeNode(){}; protected: KviKvsTreeNode * m_pParent; - const QChar * m_pLocation; + const TQChar * m_pLocation; public: void setParent(KviKvsTreeNode * p){ m_pParent = p; }; protected: // this is called only by KviKvsParser - void setLocation(const QChar * pLocation){ m_pLocation = pLocation; }; + void setLocation(const TQChar * pLocation){ m_pLocation = pLocation; }; public: - KviKvsTreeNode * parent(){ return m_pParent; }; - const QChar * location(){ return m_pLocation; }; + KviKvsTreeNode * tqparent(){ return m_pParent; }; + const TQChar * location(){ return m_pLocation; }; virtual void dump(const char * prefix) = 0; - virtual void contextDescription(QString &szBuffer) = 0; + virtual void contextDescription(TQString &szBuffer) = 0; }; #endif //!_KVI_KVS_TREENODE_BASE_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp index 75feafc..f004549 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_object.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const QChar * pLocation,const QString &szBaseClass,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const TQChar * pLocation,const TQString &szBaseClass,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeObjectFunctionCall(pLocation,szFncName,pParams) { #ifdef COMPILE_NEW_KVS @@ -41,16 +41,16 @@ KviKvsTreeNodeBaseObjectFunctionCall::~KviKvsTreeNodeBaseObjectFunctionCall() { } -void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); } void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h index d679c40..1b8df69 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeBaseObjectFunctionCall : public KviKvsTreeNodeObjectFunctionCall { public: - KviKvsTreeNodeBaseObjectFunctionCall(const QChar * pLocation,const QString &szBaseClass,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeBaseObjectFunctionCall(const TQChar * pLocation,const TQString &szBaseClass,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeBaseObjectFunctionCall(); protected: - QString m_szBaseClass; + TQString m_szBaseClass; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp index cf4c549..18f2906 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp @@ -31,7 +31,7 @@ -KviKvsTreeNodeCallbackCommand::KviKvsTreeNodeCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) +KviKvsTreeNodeCallbackCommand::KviKvsTreeNodeCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) : KviKvsTreeNodeCommandWithParameters(pLocation,szCmdName,params) { #ifdef COMPILE_NEW_KVS @@ -47,9 +47,9 @@ KviKvsTreeNodeCallbackCommand::~KviKvsTreeNodeCallbackCommand() #endif } -void KviKvsTreeNodeCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCallbackCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); } void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) @@ -65,7 +65,7 @@ void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) void KviKvsTreeNodeCallbackCommand::dumpCallback(const char * prefix) { #ifdef COMPILE_NEW_KVS - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pCallback->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h index dc061f6..73b125b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h @@ -34,12 +34,12 @@ class KviKvsScript; class KVIRC_API KviKvsTreeNodeCallbackCommand : public KviKvsTreeNodeCommandWithParameters { public: - KviKvsTreeNodeCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); + KviKvsTreeNodeCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); ~KviKvsTreeNodeCallbackCommand(); protected: KviKvsScript * m_pCallback; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpCallback(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp index 4da19df..2a3c860 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_command.h" #include "kvi_kvs_treenode_switchlist.h" -KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const QChar * pLocation,const QString &szCmdName) +KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const TQChar * pLocation,const TQString &szCmdName) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,10 +45,10 @@ KviKvsTreeNodeCommand::~KviKvsTreeNodeCommand() //#warning "All the dump() functions could be killed (or moved to print on the kvirc windows)" -void KviKvsTreeNodeCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS - KviQString::sprintf(szBuffer,"Command \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Command \"%s\"",&m_szCmdName); #endif } @@ -64,7 +64,7 @@ void KviKvsTreeNodeCommand::dumpSwitchList(const char * prefix) { #ifdef COMPILE_NEW_KVS if(!m_pSwitches)return; - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSwitches->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/kvi_kvs_treenode_command.h index cf58774..aff3f55 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.h @@ -36,16 +36,16 @@ class KVIRC_API KviKvsTreeNodeCommand : public KviKvsTreeNodeInstruction // never instantiated friend class KviKvsParser; public: - KviKvsTreeNodeCommand(const QChar * pLocation,const QString &szCmdName); + KviKvsTreeNodeCommand(const TQChar * pLocation,const TQString &szCmdName); ~KviKvsTreeNodeCommand(); protected: - QString m_szCmdName; // command visible name + TQString m_szCmdName; // command visible name KviKvsTreeNodeSwitchList * m_pSwitches; // MAY BE 0! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpSwitchList(const char * prefix); - const QString & commandName(){ return m_szCmdName; }; + const TQString & commandName(){ return m_szCmdName; }; protected: void setSwitchList(KviKvsTreeNodeSwitchList * sw); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp index 1fc5b80..e2e71ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeCommandEvaluation::KviKvsTreeNodeCommandEvaluation(const QChar * pLocation,KviKvsTreeNodeInstruction * pInstruction) +KviKvsTreeNodeCommandEvaluation::KviKvsTreeNodeCommandEvaluation(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInstruction) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h index 3ff7155..cb8efb3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h @@ -35,7 +35,7 @@ class KviKvsVariant; class KviKvsTreeNodeCommandEvaluation : public KviKvsTreeNodeData { public: - KviKvsTreeNodeCommandEvaluation(const QChar * pLocation,KviKvsTreeNodeInstruction * pInstruction); + KviKvsTreeNodeCommandEvaluation(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInstruction); ~KviKvsTreeNodeCommandEvaluation(); protected: KviKvsTreeNodeInstruction * m_pInstruction; // owned, never 0 diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp index dd0544f..3efef2a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_commandwithparameters.h" #include "kvi_kvs_treenode_datalist.h" -KviKvsTreeNodeCommandWithParameters::KviKvsTreeNodeCommandWithParameters(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeCommandWithParameters::KviKvsTreeNodeCommandWithParameters(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeCommand(pLocation,szCmdName) { m_pParams = params; @@ -39,10 +39,10 @@ KviKvsTreeNodeCommandWithParameters::~KviKvsTreeNodeCommandWithParameters() delete m_pParams; } -void KviKvsTreeNodeCommandWithParameters::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCommandWithParameters::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS - KviQString::sprintf(szBuffer,"Command With Parameters \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Command With Parameters \"%s\"",&m_szCmdName); #endif } @@ -59,7 +59,7 @@ void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix) void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const char * prefix) { #ifdef COMPILE_NEW_KVS - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h index 769e72f..f8991fe 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h @@ -35,13 +35,13 @@ class KVIRC_API KviKvsTreeNodeCommandWithParameters : public KviKvsTreeNodeComma // never instantiated public: // params can't be 0! - KviKvsTreeNodeCommandWithParameters(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeCommandWithParameters(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeCommandWithParameters(); protected: KviKvsTreeNodeDataList * m_pParams; // never 0 public: KviKvsTreeNodeDataList * params(){ return m_pParams; }; - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpParameterList(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index aae8a9c..c303ceb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -30,11 +30,11 @@ #define DEBUGME -KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData) +KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData) : KviKvsTreeNodeData(pLocation) { #ifdef DEBUGME - if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two children!"); + if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two tqchildren!"); #endif m_pSubData = pSubData; m_pSubData->setAutoDelete(true); @@ -50,7 +50,7 @@ KviKvsTreeNodeCompositeData::~KviKvsTreeNodeCompositeData() bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { - QString * pS = new QString(); + TQString * pS = new TQString(); pBuffer->setString(pS); @@ -68,7 +68,7 @@ bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviK return true; } -void KviKvsTreeNodeCompositeData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCompositeData::contextDescription(TQString &szBuffer) { szBuffer = "Composite Data Evaluation (Implicit String Cast)"; } @@ -76,7 +76,7 @@ void KviKvsTreeNodeCompositeData::contextDescription(QString &szBuffer) void KviKvsTreeNodeCompositeData::dump(const char * prefix) { debug("%s CompositeData",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h index b9b549b..065a4a7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h @@ -33,13 +33,13 @@ class KVIRC_API KviKvsTreeNodeCompositeData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData); + KviKvsTreeNodeCompositeData(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData); ~KviKvsTreeNodeCompositeData(); protected: KviPointerList<KviKvsTreeNodeData> * m_pSubData; public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp index a52930e..703cb40 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_constantdata.h" -KviKvsTreeNodeConstantData::KviKvsTreeNodeConstantData(const QChar * pLocation,KviKvsVariant * v) +KviKvsTreeNodeConstantData::KviKvsTreeNodeConstantData(const TQChar * pLocation,KviKvsVariant * v) : KviKvsTreeNodeData(pLocation) { m_pValue = v; @@ -39,7 +39,7 @@ KviKvsTreeNodeConstantData::~KviKvsTreeNodeConstantData() delete m_pValue; } -void KviKvsTreeNodeConstantData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeConstantData::contextDescription(TQString &szBuffer) { szBuffer = "Constant Data Evaluation"; } @@ -68,7 +68,7 @@ bool KviKvsTreeNodeConstantData::convertStringConstantToNumeric() void KviKvsTreeNodeConstantData::dump(const char * prefix) { debug("%s ConstantData",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.prepend(" "); m_pValue->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h index 4cb0f94..489caac 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h @@ -33,13 +33,13 @@ class KVIRC_API KviKvsTreeNodeConstantData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeConstantData(const QChar * pLocation,KviKvsVariant * v); + KviKvsTreeNodeConstantData(const TQChar * pLocation,KviKvsVariant * v); ~KviKvsTreeNodeConstantData(); protected: KviKvsVariant * m_pValue; // literal value of the parameter public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant *pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp index 191a0f6..d71f9eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback) +KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback) : KviKvsTreeNodeCallbackCommand(pLocation,szCmdName,params,pCallback) { m_pExecRoutine = r; @@ -41,9 +41,9 @@ KviKvsTreeNodeCoreCallbackCommand::~KviKvsTreeNodeCoreCallbackCommand() { } -void KviKvsTreeNodeCoreCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreCallbackCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h index fb51415..499db2b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h @@ -37,12 +37,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreCallbackCommand : public KviKvsTreeNodeCallbackCommand { public: - KviKvsTreeNodeCoreCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback); + KviKvsTreeNodeCoreCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback); ~KviKvsTreeNodeCoreCallbackCommand(); protected: KviKvsCoreCallbackCommandExecRoutine * m_pExecRoutine; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp index 713aa39..3c623f7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_corefunctioncall.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { m_pExecRoutine = r; @@ -37,16 +37,16 @@ KviKvsTreeNodeCoreFunctionCall::~KviKvsTreeNodeCoreFunctionCall() { } -void KviKvsTreeNodeCoreFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Function Call \"%Q\"",&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Core Function Call \"%Q\"",&m_szFunctionName); } void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix) { debug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h index 88d1f0d..9cbf18d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h @@ -35,12 +35,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeCoreFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeCoreFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeCoreFunctionCall(); protected: KviKvsCoreFunctionExecRoutine * m_pExecRoutine; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp index 55fcfc3..1897322 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_treenode_switchlist.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r) +KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { m_pExecRoutine = r; @@ -40,9 +40,9 @@ KviKvsTreeNodeCoreSimpleCommand::~KviKvsTreeNodeCoreSimpleCommand() { } -void KviKvsTreeNodeCoreSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreSimpleCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h index 764914e..290b0cf 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h @@ -35,12 +35,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeCoreSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r); + KviKvsTreeNodeCoreSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r); ~KviKvsTreeNodeCoreSimpleCommand(); private: KviKvsCoreSimpleCommandExecRoutine * m_pExecRoutine; // shallow pointer! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp index 6d5ad63..e7b68c5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp @@ -28,7 +28,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeData::KviKvsTreeNodeData(const QChar * pLocation) +KviKvsTreeNodeData::KviKvsTreeNodeData(const TQChar * pLocation) : KviKvsTreeNode(pLocation), m_pEndingLocation(0) { } @@ -38,7 +38,7 @@ KviKvsTreeNodeData::~KviKvsTreeNodeData() { } -void KviKvsTreeNodeData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeData::contextDescription(TQString &szBuffer) { szBuffer = "Data Evaluation"; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h index dd1e3c6..18d8d7b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h @@ -34,13 +34,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeData : public KviKvsTreeNode { public: - KviKvsTreeNodeData(const QChar * pLocation); + KviKvsTreeNodeData(const TQChar * pLocation); ~KviKvsTreeNodeData(); protected: - const QChar * m_pEndingLocation; // note that this MIGHT be not set (it's set for sure for anything parsed by parseCommaSeparatedParameter() + const TQChar * m_pEndingLocation; // note that this MIGHT be not set (it's set for sure for anything parsed by parseCommaSeparatedParameter() public: - void setEndingLocation(const QChar * pEndingLocation){ m_pEndingLocation = pEndingLocation; }; - const QChar * endingLocation(){ return m_pEndingLocation; }; + void setEndingLocation(const TQChar * pEndingLocation){ m_pEndingLocation = pEndingLocation; }; + const TQChar * endingLocation(){ return m_pEndingLocation; }; virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); // error by default @@ -48,7 +48,7 @@ public: virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); // error by default virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); // error by default - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool isReadOnly(); // true by default diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp index 18da828..68a6770 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp @@ -29,7 +29,7 @@ #include "kvi_qstring.h" -KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const QChar * pLocation) +KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pDataList = new KviPointerList<KviKvsTreeNodeData>(); @@ -60,7 +60,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeDataList::item(unsigned int uIdx) } -void KviKvsTreeNodeDataList::contextDescription(QString &szBuffer) +void KviKvsTreeNodeDataList::contextDescription(TQString &szBuffer) { szBuffer = "Data List Evaluation"; } @@ -68,7 +68,7 @@ void KviKvsTreeNodeDataList::contextDescription(QString &szBuffer) void KviKvsTreeNodeDataList::dump(const char * prefix) { debug("%s DataList",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h index 1a370a4..50c2f64 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h @@ -38,7 +38,7 @@ class KVIRC_API KviKvsTreeNodeDataList : public KviKvsTreeNode { friend class KviKvsParser; public: - KviKvsTreeNodeDataList(const QChar * pLocation); + KviKvsTreeNodeDataList(const TQChar * pLocation); ~KviKvsTreeNodeDataList(); protected: KviPointerList<KviKvsTreeNodeData> * m_pDataList; @@ -49,7 +49,7 @@ public: KviKvsTreeNodeData * item(unsigned int uIdx); KviKvsTreeNodeData * releaseFirst(); bool evaluate(KviKvsRunTimeContext * c,KviKvsVariantList * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp index ae3ec45..837ef84 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp @@ -29,7 +29,7 @@ #include <math.h> -KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation) +KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const TQChar * pLocation) : KviKvsTreeNodeData(pLocation) { m_pParentExpression = 0; @@ -40,7 +40,7 @@ KviKvsTreeNodeExpression::~KviKvsTreeNodeExpression() } -void KviKvsTreeNodeExpression::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer) { szBuffer = "Expression Evaluation"; } @@ -77,11 +77,11 @@ void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *) debug("KviKvsTreeNodeExpression::setRight() : should never end up here!"); } -KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec) +KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::tqparentWithPrecedenceLowerThan(int iPrec) { if(precedence() > iPrec)return this; - if(!parentExpression())return 0; - return parentExpression()->parentWithPrecedenceLowerThan(iPrec); + if(!tqparentExpression())return 0; + return tqparentExpression()->tqparentWithPrecedenceLowerThan(iPrec); } int KviKvsTreeNodeExpression::firstBinaryOperator() @@ -93,7 +93,7 @@ int KviKvsTreeNodeExpression::firstBinaryOperator() /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const QChar * pLocation,KviKvsTreeNodeData * pData) +KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const TQChar * pLocation,KviKvsTreeNodeData * pData) : KviKvsTreeNodeExpression(pLocation) { m_pData = pData; @@ -105,7 +105,7 @@ KviKvsTreeNodeExpressionVariableOperand::~KviKvsTreeNodeExpressionVariableOperan delete m_pData; } -void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuffer) { szBuffer = "Expression Variable Operand Evaluation"; } @@ -113,7 +113,7 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuff void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix) { debug("%s ExpressionVariableOperand",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); } @@ -126,7 +126,7 @@ bool KviKvsTreeNodeExpressionVariableOperand::evaluateReadOnly(KviKvsRunTimeCont /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const QChar * pLocation,KviKvsVariant * pConstant) +KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const TQChar * pLocation,KviKvsVariant * pConstant) : KviKvsTreeNodeExpression(pLocation) { #ifdef COMPILE_NEW_KVS @@ -141,7 +141,7 @@ KviKvsTreeNodeExpressionConstantOperand::~KviKvsTreeNodeExpressionConstantOperan #endif } -void KviKvsTreeNodeExpressionConstantOperand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Constant Operand Evaluation"; @@ -153,7 +153,7 @@ void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionConstantOperand",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pConstant->dump(tmp.utf8().data()); #endif @@ -170,7 +170,7 @@ bool KviKvsTreeNodeExpressionConstantOperand::evaluateReadOnly(KviKvsRunTimeCont /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const QChar * pLocation) +KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const TQChar * pLocation) : KviKvsTreeNodeExpression(pLocation) { } @@ -179,7 +179,7 @@ KviKvsTreeNodeExpressionOperator::~KviKvsTreeNodeExpressionOperator() { } -void KviKvsTreeNodeExpressionOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Operator Evaluation"; @@ -199,7 +199,7 @@ void KviKvsTreeNodeExpressionOperator::dump(const char * prefix) /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionOperator(pLocation) { #ifdef COMPILE_NEW_KVS @@ -216,7 +216,7 @@ KviKvsTreeNodeExpressionUnaryOperator::~KviKvsTreeNodeExpressionUnaryOperator() #endif } -void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Evaluation"; @@ -230,7 +230,7 @@ void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -254,7 +254,7 @@ bool KviKvsTreeNodeExpressionUnaryOperator::evaluateOperand(KviKvsRunTimeContext /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -264,7 +264,7 @@ KviKvsTreeNodeExpressionUnaryOperatorNegate::~KviKvsTreeNodeExpressionUnaryOpera } -void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Negate"; @@ -276,7 +276,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorNegate",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -301,7 +301,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorNegate::evaluateReadOnly(KviKvsRunTime /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -310,7 +310,7 @@ KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::~KviKvsTreeNodeExpressionUnaryO { } -void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Bitwise Not"; @@ -321,7 +321,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorBitwiseNot",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -346,7 +346,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::evaluateReadOnly(KviKvsRun /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -355,7 +355,7 @@ KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::~KviKvsTreeNodeExpressionUnaryO { } -void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Logical Not"; @@ -366,7 +366,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorLogicalNot",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -393,7 +393,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::evaluateReadOnly(KviKvsRun /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation) +KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const TQChar * pLocation) : KviKvsTreeNodeExpressionOperator(pLocation) { m_pLeft = 0; @@ -457,13 +457,13 @@ void KviKvsTreeNodeExpressionBinaryOperator::setRight(KviKvsTreeNodeExpression * void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const char * prefix) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pLeft)m_pLeft->dump(tmp.utf8().data()); if(m_pRight)m_pRight->dump(tmp.utf8().data()); } -void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuffer) { szBuffer = "Expression Binary Operator"; } @@ -478,11 +478,11 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) #define PREIMPLEMENT_BINARY_OPERATOR(__name,__stringname,__contextdescription,__precedence) \ - __name::__name(const QChar * pLocation) \ + __name::__name(const TQChar * pLocation) \ : KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \ __name::~__name(){} \ void __name::dump(const char * prefix){ debug("%s " __stringname,prefix); dumpOperands(prefix); } \ - void __name::contextDescription(QString &szBuffer){ szBuffer = __contextdescription; } \ + void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \ int __name::precedence(){ return __precedence; }; PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorSum,"ExpressionBinaryOperatorSum","Expression Binary Operator \"+\"",PREC_OP_SUM) @@ -726,7 +726,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorGreaterThan::evaluateReadOnly(KviKvsR return true; } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWEROREQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWERORETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { @@ -738,7 +738,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviK return true; } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATEROREQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATERORETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { @@ -763,7 +763,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorEqualTo::evaluateReadOnly(KviKvsRunTi } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTEQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h index 948066d..3ab8fd5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h @@ -56,10 +56,10 @@ #define PREC_OP_EQUALTO 12 /* == */ /* Case sensitive comparison for strings or normal comp.fr numbers */ -#define PREC_OP_GREATEROREQUALTO 14 /* >= */ /* Case sensitive (normal for numbers) */ -#define PREC_OP_LOWEROREQUALTO 14 /* <= */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_GREATERORETQUALTO 14 /* >= */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_LOWERORETQUALTO 14 /* <= */ /* Case sensitive (normal for numbers) */ -#define PREC_OP_NOTEQUALTO 15 /* != */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_NOTETQUALTO 15 /* != */ /* Case sensitive (normal for numbers) */ #define PREC_OP_AND 16 /* && */ #define PREC_OP_OR 17 /* || */ @@ -71,12 +71,12 @@ class KVIRC_API KviKvsTreeNodeExpression : public KviKvsTreeNodeData { // this class is never instantiated public: - KviKvsTreeNodeExpression(const QChar * pLocation); + KviKvsTreeNodeExpression(const TQChar * pLocation); ~KviKvsTreeNodeExpression(); protected: KviKvsTreeNodeExpression * m_pParentExpression; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual int precedence(); virtual KviKvsTreeNodeExpression * left(); @@ -84,21 +84,21 @@ public: virtual void setLeft(KviKvsTreeNodeExpression * pLeft); virtual void setRight(KviKvsTreeNodeExpression * pRight); virtual int firstBinaryOperator(); - KviKvsTreeNodeExpression * parentExpression(){ return m_pParentExpression; }; + KviKvsTreeNodeExpression * tqparentExpression(){ return m_pParentExpression; }; void setParentExpression(KviKvsTreeNodeExpression * pParent){ m_pParentExpression = pParent; }; - virtual KviKvsTreeNodeExpression * parentWithPrecedenceLowerThan(int iPrec); + virtual KviKvsTreeNodeExpression * tqparentWithPrecedenceLowerThan(int iPrec); }; class KVIRC_API KviKvsTreeNodeExpressionVariableOperand : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionVariableOperand(const QChar * pLocation,KviKvsTreeNodeData * pData); + KviKvsTreeNodeExpressionVariableOperand(const TQChar * pLocation,KviKvsTreeNodeData * pData); ~KviKvsTreeNodeExpressionVariableOperand(); protected: KviKvsTreeNodeData * m_pData; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -107,12 +107,12 @@ public: class KVIRC_API KviKvsTreeNodeExpressionConstantOperand : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionConstantOperand(const QChar * pLocation,KviKvsVariant * pConstant); + KviKvsTreeNodeExpressionConstantOperand(const TQChar * pLocation,KviKvsVariant * pConstant); ~KviKvsTreeNodeExpressionConstantOperand(); public: KviKvsVariant * m_pConstant; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -132,23 +132,23 @@ public: class KVIRC_API KviKvsTreeNodeExpressionOperator : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionOperator(const QChar * pLocation); + KviKvsTreeNodeExpressionOperator(const TQChar * pLocation); ~KviKvsTreeNodeExpressionOperator(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; class KVIRC_API KviKvsTreeNodeExpressionUnaryOperator : public KviKvsTreeNodeExpressionOperator { public: - KviKvsTreeNodeExpressionUnaryOperator(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperator(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperator(); protected: KviKvsTreeNodeExpression * m_pData; // can't be null! KviKvsNumber m_nData; // result of the number evaluation public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); bool evaluateOperand(KviKvsRunTimeContext * c); }; @@ -156,11 +156,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorNegate : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorNegate(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorNegate(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorNegate(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -168,11 +168,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -180,11 +180,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorLogicalNot : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -192,7 +192,7 @@ public: class KVIRC_API KviKvsTreeNodeExpressionBinaryOperator : public KviKvsTreeNodeExpressionOperator { public: - KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation); + KviKvsTreeNodeExpressionBinaryOperator(const TQChar * pLocation); ~KviKvsTreeNodeExpressionBinaryOperator(); protected: KviKvsTreeNodeExpression * m_pLeft; // can be zero only during parsing (and thus when deleting) @@ -207,7 +207,7 @@ public: virtual int firstBinaryOperator(); public: void dumpOperands(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); protected: bool evaluateOperands(KviKvsRunTimeContext * c); @@ -217,10 +217,10 @@ protected: class KVIRC_API __name : public KviKvsTreeNodeExpressionBinaryOperator \ { \ public: \ - __name(const QChar * pLocation); \ + __name(const TQChar * pLocation); \ ~__name(); \ public: \ - virtual void contextDescription(QString &szBuffer); \ + virtual void contextDescription(TQString &szBuffer); \ virtual void dump(const char * prefix); \ virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); \ virtual int precedence(); \ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp index 28c41b1..1825093 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression) +KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const TQChar * pLocation,KviKvsTreeNodeExpression * pExpression) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,7 +45,7 @@ KviKvsTreeNodeExpressionReturn::~KviKvsTreeNodeExpressionReturn() } -void KviKvsTreeNodeExpressionReturn::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionReturn::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Return Evaluation"; @@ -56,7 +56,7 @@ void KviKvsTreeNodeExpressionReturn::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionReturn",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pExpression->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h index 8622da0..7654c53 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h @@ -32,12 +32,12 @@ class KviKvsTreeNodeExpression; class KVIRC_API KviKvsTreeNodeExpressionReturn : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression); + KviKvsTreeNodeExpressionReturn(const TQChar * pLocation,KviKvsTreeNodeExpression * pExpression); ~KviKvsTreeNodeExpressionReturn(); protected: KviKvsTreeNodeExpression * m_pExpression; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 4990674..74f5829 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -37,7 +37,7 @@ KviKvsTreeNodeExtendedScopeVariable::~KviKvsTreeNodeExtendedScopeVariable() { } -void KviKvsTreeNodeExtendedScopeVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExtendedScopeVariable::contextDescription(TQString &szBuffer) { szBuffer = "Extended Scope Variable \""; szBuffer += m_szIdentifier; @@ -57,7 +57,7 @@ bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext return false; } - KviKvsVariant * v = c->extendedScopeVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->extendedScopeVariables()->tqfind(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h index 06fba6e..84fadc8 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeExtendedScopeVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeExtendedScopeVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeExtendedScopeVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp index 1f8403e..81be2cd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_functioncall.h" -KviKvsTreeNodeFunctionCall::KviKvsTreeNodeFunctionCall(const QChar * pLocation,const QString &szFunctionName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeFunctionCall::KviKvsTreeNodeFunctionCall(const TQChar * pLocation,const TQString &szFunctionName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeData(pLocation) { m_szFunctionName = szFunctionName; @@ -40,7 +40,7 @@ KviKvsTreeNodeFunctionCall::~KviKvsTreeNodeFunctionCall() delete m_pParams; } -void KviKvsTreeNodeFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeFunctionCall::contextDescription(TQString &szBuffer) { szBuffer = "Function Call"; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h index 88d8250..c437810 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h @@ -31,13 +31,13 @@ class KVIRC_API KviKvsTreeNodeFunctionCall : public KviKvsTreeNodeData { public: - KviKvsTreeNodeFunctionCall(const QChar * pLocation,const QString &szFunctionName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeFunctionCall(const TQChar * pLocation,const TQString &szFunctionName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeFunctionCall(); protected: - QString m_szFunctionName; + TQString m_szFunctionName; KviKvsTreeNodeDataList * m_pParams; // never 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateToObjectReference(); // yes virtual bool isFunctionCall(); // yes diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp index ea6bd03..a74ebc0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_globalvariable.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeGlobalVariable::~KviKvsTreeNodeGlobalVariable() { } -void KviKvsTreeNodeGlobalVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeGlobalVariable::contextDescription(TQString &szBuffer) { szBuffer = "Global Variable \""; szBuffer += m_szIdentifier; @@ -51,7 +51,7 @@ void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) bool KviKvsTreeNodeGlobalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { - KviKvsVariant * v = c->globalVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->globalVariables()->tqfind(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); return true; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h index 9f6bcf0..a30430a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeGlobalVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeGlobalVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeGlobalVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeGlobalVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp index 3ecfaf5..9e1a3c0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -40,7 +40,7 @@ KviKvsTreeNodeHashCount::~KviKvsTreeNodeHashCount() { } -void KviKvsTreeNodeHashCount::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashCount::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Count Operator"; @@ -69,7 +69,7 @@ bool KviKvsTreeNodeHashCount::evaluateReadOnlyInObjectScope(KviKvsObject *o,KviK { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the hash count '#' operator didn't evaluate to a hash: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h index b59cf37..9119bde 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h @@ -35,10 +35,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashCount : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeHashCount(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeHashCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeHashCount(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp index 645478f..196b992 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_hash.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeHashElement::KviKvsTreeNodeHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pKey) +KviKvsTreeNodeHashElement::KviKvsTreeNodeHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pKey) : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource) { #ifdef COMPILE_NEW_KVS @@ -47,7 +47,7 @@ KviKvsTreeNodeHashElement::~KviKvsTreeNodeHashElement() #endif } -void KviKvsTreeNodeHashElement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashElement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Element Evaluation"; @@ -58,7 +58,7 @@ void KviKvsTreeNodeHashElement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s HashElement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSource->dump(tmp.utf8().data()); m_pKey->dump(tmp.utf8().data()); @@ -72,7 +72,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv KviKvsVariant key; if(!m_pKey->evaluateReadOnly(c,&key))return false; - QString szKey; + TQString szKey; key.asString(szKey); if(szKey.isEmpty()) @@ -94,7 +94,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the {} subscript didn't evaluate to a hash: automatic conversion from type '%Q' supplied"),&szType); } @@ -102,7 +102,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv return true; } - KviKvsVariant * v = val.hash()->find(szKey); + KviKvsVariant * v = val.hash()->tqfind(szKey); if(!v) { pBuffer->setNothing(); @@ -120,7 +120,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS KviKvsVariant key; if(!m_pKey->evaluateReadOnly(c,&key))return 0; - QString szKey; + TQString szKey; key.asString(szKey); if(szKey.isEmpty()) @@ -139,7 +139,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS //#warning "Supply a *real* conversion from other types to array ?" if(!result->result()->isNothing()) { - QString szType; + TQString szType; result->result()->getTypeName(szType); c->warning(this,__tr2qs("The argument of the {} subscript didn't evaluate to a hash automatic conversion from %Q supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h index 5b46a7e..ce36d12 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h @@ -35,12 +35,12 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashElement : public KviKvsTreeNodeArrayOrHashElement { public: - KviKvsTreeNodeHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pIndex); + KviKvsTreeNodeHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pIndex); ~KviKvsTreeNodeHashElement(); protected: KviKvsTreeNodeData * m_pKey; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 799cc1e..954e221 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_variant.h" #include "kvi_locale.h" -KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -44,7 +44,7 @@ bool KviKvsTreeNodeHashReferenceAssert::isReadOnly() return m_pSource->isReadOnly(); } -void KviKvsTreeNodeHashReferenceAssert::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashReferenceAssert::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Reference Assert"; @@ -72,7 +72,7 @@ bool KviKvsTreeNodeHashReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObje { if(!pBuffer->isNothing()) { - QString szType; + TQString szType; pBuffer->getTypeName(szType); c->error(this,__tr2qs("Hash reference assert failed: the variable evaluated to type '%Q'"),&szType); return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h index 43cb57c..e97de6d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h @@ -36,13 +36,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashReferenceAssert : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeHashReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeHashReferenceAssert(); protected: public: virtual bool isReadOnly(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp index 285c9d9..bd57336 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_indirectdata.h" -KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeData(pLocation) { m_pSource = pSource; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h index 31a9410..f244bb0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h @@ -31,7 +31,7 @@ class KVIRC_API KviKvsTreeNodeIndirectData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeIndirectData(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeIndirectData(); protected: KviKvsTreeNodeData * m_pSource; // can't be null! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp index 37cb3d0..8f1b2eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_instruction.h" -void KviKvsTreeNodeInstruction::contextDescription(QString &szBuffer) +void KviKvsTreeNodeInstruction::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Instruction"; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h index 1e0c09c..8326b2e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h @@ -33,11 +33,11 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeInstruction : public KviKvsTreeNode { public: - KviKvsTreeNodeInstruction(const QChar * pLocation) + KviKvsTreeNodeInstruction(const TQChar * pLocation) : KviKvsTreeNode(pLocation){}; ~KviKvsTreeNodeInstruction(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); // execute() is the main entry point to the tree visit diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp index 75afd45..1a49ec1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_treenode_instructionblock.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const QChar * pLocation) +KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const TQChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) { m_pInstructionList = new KviPointerList<KviKvsTreeNodeInstruction>; @@ -40,7 +40,7 @@ KviKvsTreeNodeInstructionBlock::~KviKvsTreeNodeInstructionBlock() delete m_pInstructionList; } -void KviKvsTreeNodeInstructionBlock::contextDescription(QString &szBuffer) +void KviKvsTreeNodeInstructionBlock::contextDescription(TQString &szBuffer) { szBuffer = "Instruction Block"; } @@ -48,7 +48,7 @@ void KviKvsTreeNodeInstructionBlock::contextDescription(QString &szBuffer) void KviKvsTreeNodeInstructionBlock::dump(const char * prefix) { debug("%s InstructionBlock",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h index f4aa32f..659aab5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h @@ -36,7 +36,7 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeInstructionBlock : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeInstructionBlock(const QChar * pLocation); + KviKvsTreeNodeInstructionBlock(const TQChar * pLocation); ~KviKvsTreeNodeInstructionBlock(); protected: KviPointerList<KviKvsTreeNodeInstruction> * m_pInstructionList; @@ -44,7 +44,7 @@ public: unsigned int instructionCount(){ return m_pInstructionList->count(); }; void addInstruction(KviKvsTreeNodeInstruction * i); KviKvsTreeNodeInstruction * releaseFirst(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp index 95221ca..f98dfb4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_localvariable.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeLocalVariable::~KviKvsTreeNodeLocalVariable() { } -void KviKvsTreeNodeLocalVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeLocalVariable::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Local Variable \""; @@ -55,7 +55,7 @@ void KviKvsTreeNodeLocalVariable::dump(const char * prefix) bool KviKvsTreeNodeLocalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = c->localVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->localVariables()->tqfind(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h index 9f6998d..4200fbc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeLocalVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeLocalVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeLocalVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeLocalVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index bc6b9c5..0914ccd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_moduleinterface.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) +KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) : KviKvsTreeNodeCallbackCommand(pLocation,szCmdName,params,pCallback) { m_szModuleName = szModuleName; @@ -44,7 +44,7 @@ KviKvsTreeNodeModuleCallbackCommand::~KviKvsTreeNodeModuleCallbackCommand() { } -void KviKvsTreeNodeModuleCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleCallbackCommand::contextDescription(TQString &szBuffer) { szBuffer = "Module Callback Command \""; szBuffer += m_szModuleName; @@ -67,7 +67,7 @@ bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module command call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h index cc484f9..c24f1c5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeModuleCallbackCommand : public KviKvsTreeNodeCallbackCommand { public: - KviKvsTreeNodeModuleCallbackCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); + KviKvsTreeNodeModuleCallbackCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); ~KviKvsTreeNodeModuleCallbackCommand(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); bool execute(KviKvsRunTimeContext* c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index e7f0a46..54172d6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const QChar * pLocation,const QString &szModuleName,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const TQChar * pLocation,const TQString &szModuleName,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { m_szModuleName = szModuleName; @@ -43,7 +43,7 @@ KviKvsTreeNodeModuleFunctionCall::~KviKvsTreeNodeModuleFunctionCall() { } -void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleFunctionCall::contextDescription(TQString &szBuffer) { szBuffer = "Module Function Call \""; szBuffer += m_szModuleName; @@ -55,7 +55,7 @@ void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString &szBuffer) void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) { debug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); } @@ -66,7 +66,7 @@ bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module function call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h index 9581d03..86dde62 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h @@ -35,12 +35,12 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeModuleFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeModuleFunctionCall(const QChar * pLocation,const QString &szModuleName,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeModuleFunctionCall(const TQChar * pLocation,const TQString &szModuleName,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeModuleFunctionCall(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp index 78b6f02..408d7fd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_moduleinterface.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { m_szModuleName = szModuleName; @@ -44,7 +44,7 @@ KviKvsTreeNodeModuleSimpleCommand::~KviKvsTreeNodeModuleSimpleCommand() { } -void KviKvsTreeNodeModuleSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleSimpleCommand::contextDescription(TQString &szBuffer) { szBuffer = "Module Callback Command \""; szBuffer += m_szModuleName; @@ -66,7 +66,7 @@ bool KviKvsTreeNodeModuleSimpleCommand::execute(KviKvsRunTimeContext * c) KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module command call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h index 2a6ee96..5396cc5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeModuleSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeModuleSimpleCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeModuleSimpleCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeModuleSimpleCommand(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp index 405575d..4c877ca 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_variant.h" -KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdentifier(const QChar * pLocation,int iStart,int iEnd) +KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdentifier(const TQChar * pLocation,int iStart,int iEnd) : KviKvsTreeNodeData(pLocation) { m_iStart = iStart; @@ -40,11 +40,11 @@ KviKvsTreeNodeMultipleParameterIdentifier::~KviKvsTreeNodeMultipleParameterIdent { } -void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(QString &szBuffer) +void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(TQString &szBuffer) { szBuffer = "Multiple Parameter Identifier \"$"; - if(m_iEnd < m_iStart)KviQString::appendFormatted(szBuffer,"%d-",m_iStart); - else KviQString::appendFormatted(szBuffer,"%d-%d",m_iStart,m_iEnd); + if(m_iEnd < m_iStart)KviTQString::appendFormatted(szBuffer,"%d-",m_iStart); + else KviTQString::appendFormatted(szBuffer,"%d-%d",m_iStart,m_iEnd); szBuffer += "\""; } @@ -63,7 +63,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo return true; } - QString sz; + TQString sz; v->asString(sz); if(m_iEnd >= m_iStart) @@ -72,7 +72,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo int idx = m_iStart; for(v = c->parameterList()->next();v && (idx < m_iEnd);v = c->parameterList()->next()) { - sz += QChar(' '); + sz += TQChar(' '); v->appendAsString(sz); idx++; } @@ -80,7 +80,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo // all up to the end of the list for(v = c->parameterList()->next();v;v = c->parameterList()->next()) { - sz += QChar(' '); + sz += TQChar(' '); v->appendAsString(sz); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h index ad3edbd..54d86ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h @@ -34,13 +34,13 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeMultipleParameterIdentifier : public KviKvsTreeNodeData { public: - KviKvsTreeNodeMultipleParameterIdentifier(const QChar * pLocation,int iStart,int iEnd); + KviKvsTreeNodeMultipleParameterIdentifier(const TQChar * pLocation,int iStart,int iEnd); ~KviKvsTreeNodeMultipleParameterIdentifier(); protected: int m_iStart; int m_iEnd; // the index of the last parameter wanted (may be -1: in that case all up to the end) public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp index 6ac81b9..f0e4957 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_object.h" #include "kvi_kvs_hash.h" -KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -38,7 +38,7 @@ KviKvsTreeNodeObjectField::~KviKvsTreeNodeObjectField() { } -void KviKvsTreeNodeObjectField::contextDescription(QString &szBuffer) +void KviKvsTreeNodeObjectField::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Object Field \""; @@ -62,7 +62,7 @@ bool KviKvsTreeNodeObjectField::canEvaluateInObjectScope() bool KviKvsTreeNodeObjectField::evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = o->dataContainer()->find(m_szIdentifier); + KviKvsVariant * v = o->dataContainer()->tqfind(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h index ef56ca1..607a69f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h @@ -34,10 +34,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeObjectField : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeObjectField(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeObjectField(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeObjectField(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateInObjectScope(); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pResult); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp index d9d5f23..9cf06be 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_objectfunctioncall.h" -KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { } @@ -35,7 +35,7 @@ KviKvsTreeNodeObjectFunctionCall::~KviKvsTreeNodeObjectFunctionCall() { } -void KviKvsTreeNodeObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeObjectFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Object Function Call \""; @@ -48,7 +48,7 @@ void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h index c1e8063..5588a02 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h @@ -33,10 +33,10 @@ class KVIRC_API KviKvsTreeNodeObjectFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeObjectFunctionCall(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateInObjectScope(); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index 179d50e..e8c50b9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -29,12 +29,12 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> #include <math.h> -KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const QChar * pLocation) +KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const TQChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) { //m_pTargetData = 0; no need to set it @@ -51,7 +51,7 @@ void KviKvsTreeNodeOperation::setTargetVariableReference(KviKvsTreeNodeData * r) m_pTargetData->setParent(this); } -void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer) { szBuffer = "Operation"; } @@ -59,7 +59,7 @@ void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperation::dump(const char * prefix) { debug("%s Operation",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); } @@ -68,7 +68,7 @@ void KviKvsTreeNodeOperation::dump(const char * prefix) -KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -80,7 +80,7 @@ KviKvsTreeNodeOperationAssignment::~KviKvsTreeNodeOperationAssignment() delete m_pRightSide; } -void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer) { szBuffer = "Assignment"; } @@ -89,7 +89,7 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) { debug("%s OperationAssignment",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -113,7 +113,7 @@ bool KviKvsTreeNodeOperationAssignment::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const QChar * pLocation) +KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -122,7 +122,7 @@ KviKvsTreeNodeOperationDecrement::~KviKvsTreeNodeOperationDecrement() { } -void KviKvsTreeNodeOperationDecrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"--\""; @@ -134,7 +134,7 @@ void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationDecrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -176,7 +176,7 @@ bool KviKvsTreeNodeOperationDecrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const QChar * pLocation) +KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -185,7 +185,7 @@ KviKvsTreeNodeOperationIncrement::~KviKvsTreeNodeOperationIncrement() { } -void KviKvsTreeNodeOperationIncrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"++\""; @@ -197,7 +197,7 @@ void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationIncrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -235,7 +235,7 @@ bool KviKvsTreeNodeOperationIncrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -251,7 +251,7 @@ KviKvsTreeNodeOperationSelfAnd::~KviKvsTreeNodeOperationSelfAnd() #endif } -void KviKvsTreeNodeOperationSelfAnd::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"&=\""; @@ -263,7 +263,7 @@ void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfAnd",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -305,7 +305,7 @@ bool KviKvsTreeNodeOperationSelfAnd::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -321,7 +321,7 @@ KviKvsTreeNodeOperationSelfDivision::~KviKvsTreeNodeOperationSelfDivision() #endif } -void KviKvsTreeNodeOperationSelfDivision::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"/=\""; @@ -333,7 +333,7 @@ void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfDivision",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -399,7 +399,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c) return true; } -KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -415,7 +415,7 @@ KviKvsTreeNodeOperationSelfModulus::~KviKvsTreeNodeOperationSelfModulus() #endif } -void KviKvsTreeNodeOperationSelfModulus::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"Self Modulo\""; @@ -427,7 +427,7 @@ void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfModulus",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -494,7 +494,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -510,7 +510,7 @@ KviKvsTreeNodeOperationSelfMultiplication::~KviKvsTreeNodeOperationSelfMultiplic #endif } -void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"*=\""; @@ -522,7 +522,7 @@ void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfMultiplication",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -573,7 +573,7 @@ bool KviKvsTreeNodeOperationSelfMultiplication::execute(KviKvsRunTimeContext * c -KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -589,7 +589,7 @@ KviKvsTreeNodeOperationSelfOr::~KviKvsTreeNodeOperationSelfOr() #endif } -void KviKvsTreeNodeOperationSelfOr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"|=\""; @@ -601,7 +601,7 @@ void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfOr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -643,7 +643,7 @@ bool KviKvsTreeNodeOperationSelfOr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -659,7 +659,7 @@ KviKvsTreeNodeOperationSelfShl::~KviKvsTreeNodeOperationSelfShl() #endif } -void KviKvsTreeNodeOperationSelfShl::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<<=\""; @@ -671,7 +671,7 @@ void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShl",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -715,7 +715,7 @@ bool KviKvsTreeNodeOperationSelfShl::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -731,7 +731,7 @@ KviKvsTreeNodeOperationSelfShr::~KviKvsTreeNodeOperationSelfShr() #endif } -void KviKvsTreeNodeOperationSelfShr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \">>=\""; @@ -743,7 +743,7 @@ void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -793,7 +793,7 @@ bool KviKvsTreeNodeOperationSelfShr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -809,7 +809,7 @@ KviKvsTreeNodeOperationSelfSubtraction::~KviKvsTreeNodeOperationSelfSubtraction( #endif } -void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"-=\""; @@ -821,7 +821,7 @@ void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSubtraction",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -876,7 +876,7 @@ bool KviKvsTreeNodeOperationSelfSubtraction::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -892,7 +892,7 @@ KviKvsTreeNodeOperationSelfSum::~KviKvsTreeNodeOperationSelfSum() #endif } -void KviKvsTreeNodeOperationSelfSum::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"+=\""; @@ -904,7 +904,7 @@ void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSum",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -961,7 +961,7 @@ bool KviKvsTreeNodeOperationSelfSum::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -977,7 +977,7 @@ KviKvsTreeNodeOperationSelfXor::~KviKvsTreeNodeOperationSelfXor() #endif } -void KviKvsTreeNodeOperationSelfXor::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"^=\""; @@ -989,7 +989,7 @@ void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfXor",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1035,7 +1035,7 @@ bool KviKvsTreeNodeOperationSelfXor::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1047,7 +1047,7 @@ KviKvsTreeNodeOperationStringAppend::~KviKvsTreeNodeOperationStringAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<<\""; } @@ -1056,7 +1056,7 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) { debug("%s OperationStringAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1069,7 +1069,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); v.appendAsString(sz1); target->result()->setString(sz1); @@ -1082,7 +1082,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1094,7 +1094,7 @@ KviKvsTreeNodeOperationArrayAppend::~KviKvsTreeNodeOperationArrayAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<+\""; } @@ -1103,7 +1103,7 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) { debug("%s OperationArrayAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1165,7 +1165,7 @@ bool KviKvsTreeNodeOperationArrayAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1181,7 +1181,7 @@ KviKvsTreeNodeOperationStringAppendWithComma::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<,\""; @@ -1193,7 +1193,7 @@ void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithComma",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1208,15 +1208,15 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(','); + sz1 += TQChar(','); sz1 += sz2; } target->result()->setString(sz1); @@ -1230,7 +1230,7 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1246,7 +1246,7 @@ KviKvsTreeNodeOperationStringAppendWithSpace::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<+\""; @@ -1258,7 +1258,7 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithSpace",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1273,15 +1273,15 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(' '); + sz1 += TQChar(' '); sz1 += sz2; } target->result()->setString(sz1); @@ -1298,7 +1298,7 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1321,7 +1321,7 @@ KviKvsTreeNodeOperationStringTransliteration::~KviKvsTreeNodeOperationStringTran } -void KviKvsTreeNodeOperationStringTransliteration::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator tr///"; @@ -1333,7 +1333,7 @@ void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringTransliteration",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1355,15 +1355,15 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); //vf.asString(szF); - QString sz1; + TQString sz1; target->result()->asString(sz1); - KviQString::transliterate(sz1,szL,szR); + KviTQString::transliterate(sz1,szL,szR); target->result()->setString(sz1); delete target; #endif @@ -1379,7 +1379,7 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1402,7 +1402,7 @@ KviKvsTreeNodeOperationStringSubstitution::~KviKvsTreeNodeOperationStringSubstit } -void KviKvsTreeNodeOperationStringSubstitution::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator s///"; @@ -1414,7 +1414,7 @@ void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringSubstitution",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1434,19 +1434,19 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); vf.asString(szF); - QString str; + TQString str; target->result()->asString(str); - bool bGlobal = szF.find('g',false) != -1; + bool bGlobal = szF.tqfind('g',false) != -1; - QRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1); - re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ? + TQRegExp re(szL,szF.tqfind('i',false) == -1,szF.tqfind('w',false) != -1); + re.setMinimal(szF.tqfind('m',false) != -1); // greedy or minimal ? int idx = 0; @@ -1464,24 +1464,24 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c } str.remove(idx,len); - QString szReplaced; - const QChar * p2 = KviQString::nullTerminatedArray(szR); - const QChar * begin = p2; - while(p2->unicode()) + TQString szReplaced; + const TQChar * p2 = KviTQString::nullTerminatedArray(szR); + const TQChar * begin = p2; + while(p2->tqunicode()) { - if(p2->unicode() == '\\') + if(p2->tqunicode() == '\\') { p2++; - if(p2->unicode() >= '0' && p2->unicode() <= '9') + if(p2->tqunicode() >= '0' && p2->tqunicode() <= '9') { - szReplaced.append(QString(begin,(p2 - begin) - 1)); - szReplaced.append(re.cap(p2->unicode() - '0')); + szReplaced.append(TQString(begin,(p2 - begin) - 1)); + szReplaced.append(re.cap(p2->tqunicode() - '0')); p2++; begin = p2; - } else if(p2->unicode())p2++; + } else if(p2->tqunicode())p2++; } else p2++; } - if(begin != p2)szReplaced.append(QString(begin,p2 - begin)); + if(begin != p2)szReplaced.append(TQString(begin,p2 - begin)); str.insert(idx,szReplaced); idx += szReplaced.length(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/kvi_kvs_treenode_operation.h index e4a4463..cc57df0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.h @@ -35,25 +35,25 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeOperation : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeOperation(const QChar * pLocation); + KviKvsTreeNodeOperation(const TQChar * pLocation); ~KviKvsTreeNodeOperation(); protected: KviKvsTreeNodeData * m_pTargetData; // can't be null public: void setTargetVariableReference(KviKvsTreeNodeData * r); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; class KviKvsTreeNodeOperationAssignment : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationAssignment(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationAssignment(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationAssignment(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -61,10 +61,10 @@ public: class KviKvsTreeNodeOperationDecrement : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationDecrement(const QChar * pLocation); + KviKvsTreeNodeOperationDecrement(const TQChar * pLocation); ~KviKvsTreeNodeOperationDecrement(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -72,10 +72,10 @@ public: class KviKvsTreeNodeOperationIncrement : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationIncrement(const QChar * pLocation); + KviKvsTreeNodeOperationIncrement(const TQChar * pLocation); ~KviKvsTreeNodeOperationIncrement(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -83,12 +83,12 @@ public: class KviKvsTreeNodeOperationSelfAnd : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfAnd(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfAnd(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfAnd(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -96,12 +96,12 @@ public: class KviKvsTreeNodeOperationSelfDivision : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfDivision(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfDivision(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfDivision(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -109,12 +109,12 @@ public: class KviKvsTreeNodeOperationSelfModulus : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfModulus(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfModulus(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfModulus(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -122,12 +122,12 @@ public: class KviKvsTreeNodeOperationSelfMultiplication : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfMultiplication(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfMultiplication(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfMultiplication(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -135,12 +135,12 @@ public: class KviKvsTreeNodeOperationSelfOr : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfOr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfOr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfOr(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -148,12 +148,12 @@ public: class KviKvsTreeNodeOperationSelfShl : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfShl(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfShl(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfShl(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -161,12 +161,12 @@ public: class KviKvsTreeNodeOperationSelfShr : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfShr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfShr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfShr(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -174,12 +174,12 @@ public: class KviKvsTreeNodeOperationSelfSubtraction : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfSubtraction(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfSubtraction(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfSubtraction(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -187,12 +187,12 @@ public: class KviKvsTreeNodeOperationSelfSum : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfSum(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfSum(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfSum(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -200,12 +200,12 @@ public: class KviKvsTreeNodeOperationSelfXor : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfXor(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfXor(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfXor(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -213,12 +213,12 @@ public: class KviKvsTreeNodeOperationStringAppend : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppend(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -226,12 +226,12 @@ public: class KviKvsTreeNodeOperationArrayAppend : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationArrayAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationArrayAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationArrayAppend(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -239,12 +239,12 @@ public: class KviKvsTreeNodeOperationStringAppendWithComma : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppendWithComma(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppendWithComma(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppendWithComma(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -252,12 +252,12 @@ public: class KviKvsTreeNodeOperationStringAppendWithSpace : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppendWithSpace(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppendWithSpace(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppendWithSpace(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -265,14 +265,14 @@ public: class KviKvsTreeNodeOperationStringTransliteration : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringTransliteration(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); + KviKvsTreeNodeOperationStringTransliteration(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); ~KviKvsTreeNodeOperationStringTransliteration(); protected: KviKvsTreeNodeData * m_pLeft; // can't be 0 KviKvsTreeNodeData * m_pRight; // can't be 0 KviKvsTreeNodeData * m_pFlags; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -280,14 +280,14 @@ public: class KviKvsTreeNodeOperationStringSubstitution : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringSubstitution(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); + KviKvsTreeNodeOperationStringSubstitution(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); ~KviKvsTreeNodeOperationStringSubstitution(); protected: KviKvsTreeNodeData * m_pLeft; // can't be 0 KviKvsTreeNodeData * m_pRight; // can't be 0 KviKvsTreeNodeData * m_pFlags; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp index e4a1634..694d733 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_variantlist.h" #include "kvi_locale.h" -KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList) +KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const TQChar * pLocation,KviKvsTreeNodeDataList * pDataList) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,7 +45,7 @@ KviKvsTreeNodeParameterReturn::~KviKvsTreeNodeParameterReturn() #endif } -void KviKvsTreeNodeParameterReturn::contextDescription(QString &szBuffer) +void KviKvsTreeNodeParameterReturn::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Parameter Return Evaluation"; @@ -57,7 +57,7 @@ void KviKvsTreeNodeParameterReturn::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ParameterReturn",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pDataList->dump(tmp.utf8().data()); #endif @@ -79,7 +79,7 @@ bool KviKvsTreeNodeParameterReturn::execute(KviKvsRunTimeContext * c) return true; } - QString all; + TQString all; lBuffer.allAsString(all); c->returnValue()->setString(all); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h index 4bd3127..da65b6d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h @@ -32,12 +32,12 @@ class KviKvsTreeNodeDataList; class KVIRC_API KviKvsTreeNodeParameterReturn : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList); + KviKvsTreeNodeParameterReturn(const TQChar * pLocation,KviKvsTreeNodeDataList * pDataList); ~KviKvsTreeNodeParameterReturn(); protected: KviKvsTreeNodeDataList * m_pDataList; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp index 64e7769..0ca02a9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand) +KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const TQChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand) : KviKvsTreeNodeCommand(pLocation,pChildCommand->commandName()) { m_pTargetWindow = pTargetWindow; @@ -47,7 +47,7 @@ KviKvsTreeNodeRebindingSwitch::~KviKvsTreeNodeRebindingSwitch() } -void KviKvsTreeNodeRebindingSwitch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeRebindingSwitch::contextDescription(TQString &szBuffer) { szBuffer = "Window Rebinding Switch"; } @@ -55,13 +55,13 @@ void KviKvsTreeNodeRebindingSwitch::contextDescription(QString &szBuffer) void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix) { debug("%sRebindingSwitch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pTargetWindow->dump(tmp.utf8().data()); m_pChildCommand->dump(tmp.utf8().data()); } -const QString & KviKvsTreeNodeRebindingSwitch::commandName() +const TQString & KviKvsTreeNodeRebindingSwitch::commandName() { return m_pChildCommand->commandName(); } @@ -73,7 +73,7 @@ bool KviKvsTreeNodeRebindingSwitch::execute(KviKvsRunTimeContext * c) KviWindow * pNewWindow; - QString szWinId; + TQString szWinId; vWindow.asString(szWinId); if(szWinId.isEmpty()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h index c81dcd9..b71945e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h @@ -34,15 +34,15 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeRebindingSwitch : public KviKvsTreeNodeCommand { public: - KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand); + KviKvsTreeNodeRebindingSwitch(const TQChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand); ~KviKvsTreeNodeRebindingSwitch(); protected: KviKvsTreeNodeData * m_pTargetWindow; KviKvsTreeNodeCommand * m_pChildCommand; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); - const QString & commandName(); + const TQString & commandName(); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp index 0d12761..85b2f29 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp @@ -36,7 +36,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeScopeOperator::KviKvsTreeNodeScopeOperator(const QChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData) +KviKvsTreeNodeScopeOperator::KviKvsTreeNodeScopeOperator(const TQChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData) : KviKvsTreeNodeData(pLocation) { m_pObjectReference = pObject; @@ -51,7 +51,7 @@ KviKvsTreeNodeScopeOperator::~KviKvsTreeNodeScopeOperator() delete m_pRightSide; } -void KviKvsTreeNodeScopeOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeScopeOperator::contextDescription(TQString &szBuffer) { szBuffer = "Scope Operator"; } @@ -60,7 +60,7 @@ void KviKvsTreeNodeScopeOperator::contextDescription(QString &szBuffer) void KviKvsTreeNodeScopeOperator::dump(const char * prefix) { debug("%s ScopeOperator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pObjectReference->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h index 3042726..c132a43 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h @@ -32,13 +32,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeScopeOperator : public KviKvsTreeNodeData { public: - KviKvsTreeNodeScopeOperator(const QChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData); + KviKvsTreeNodeScopeOperator(const TQChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData); ~KviKvsTreeNodeScopeOperator(); public: KviKvsTreeNodeData * m_pObjectReference; // can't be null KviKvsTreeNodeData * m_pRightSide; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool isReadOnly(); // gets the m_pRightSide read only state virtual bool canEvaluateToObjectReference(); // gets the m_pRightSide result diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp index dd055b9..e30a005 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_simplecommand.h" #include "kvi_kvs_treenode_datalist.h" -KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeCommandWithParameters(pLocation,szCmdName,params) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeSimpleCommand::~KviKvsTreeNodeSimpleCommand() { } -void KviKvsTreeNodeSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSimpleCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Simple Command \""; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h index d9aec78..3636c5e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h @@ -32,10 +32,10 @@ class KviKvsTreeNodeDataList; class KVIRC_API KviKvsTreeNodeSimpleCommand : public KviKvsTreeNodeCommandWithParameters { public: - KviKvsTreeNodeSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeSimpleCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp index d67c82b..984ad7a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier(const QChar * pLocation,int iStart) +KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier(const TQChar * pLocation,int iStart) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS @@ -40,11 +40,11 @@ KviKvsTreeNodeSingleParameterIdentifier::~KviKvsTreeNodeSingleParameterIdentifie { } -void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Single Parameter Identifier \"$"; - KviQString::appendFormatted(szBuffer,"%d",m_iStart); + KviTQString::appendFormatted(szBuffer,"%d",m_iStart); szBuffer += "\""; #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h index fb7590c..0a9f802 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h @@ -34,12 +34,12 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeSingleParameterIdentifier : public KviKvsTreeNodeData { public: - KviKvsTreeNodeSingleParameterIdentifier(const QChar * pLocation,int iStart); + KviKvsTreeNodeSingleParameterIdentifier(const TQChar * pLocation,int iStart); ~KviKvsTreeNodeSingleParameterIdentifier(); protected: int m_iStart; // the index of the parameter wanted (always >= 0) public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateToObjectReference(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp index bfca30a..6573b98 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_specialcommand.h" -KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const QChar * pLocation,const QString &szCmdName) +KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const TQChar * pLocation,const TQString &szCmdName) : KviKvsTreeNodeCommand(pLocation,szCmdName) { } @@ -35,7 +35,7 @@ KviKvsTreeNodeSpecialCommand::~KviKvsTreeNodeSpecialCommand() { } -void KviKvsTreeNodeSpecialCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \""; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h index 9ac8867..c7d1153 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h @@ -31,10 +31,10 @@ class KVIRC_API KviKvsTreeNodeSpecialCommand : public KviKvsTreeNodeCommand { public: - KviKvsTreeNodeSpecialCommand(const QChar * pLocation,const QString &szCmdName); + KviKvsTreeNodeSpecialCommand(const TQChar * pLocation,const TQString &szCmdName); ~KviKvsTreeNodeSpecialCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp index ad75040..851c111 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommand(pLocation,"break") { } @@ -37,7 +37,7 @@ KviKvsTreeNodeSpecialCommandBreak::~KviKvsTreeNodeSpecialCommandBreak() { } -void KviKvsTreeNodeSpecialCommandBreak::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandBreak::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"break\""; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h index a4b061e..44cdac6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandBreak : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandBreak(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandBreak(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 05d35ed..0ec0f27 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_object_controller.h" #include "kvi_kvs_object_class.h" -KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const QChar * pLocation,const QString &szName,const QString &szBuffer,unsigned int uHandlerFlags) +KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const TQChar * pLocation,const TQString &szName,const TQString &szBuffer,unsigned int uHandlerFlags) : KviKvsTreeNode(pLocation) { m_uHandlerFlags = uHandlerFlags; @@ -45,12 +45,12 @@ void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * pref debug("%s (command buffer with %d characters)",prefix,m_szBuffer.length()); } -void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Object Member Function Definition \"%Q\"",&m_szName); + KviTQString::sprintf(szBuffer,"Object Member Function Definition \"%Q\"",&m_szName); } -KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const QChar * pLocation,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const TQChar * pLocation,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeSpecialCommand(pLocation,"class") { m_pParams = pParams; @@ -72,7 +72,7 @@ void KviKvsTreeNodeSpecialCommandClass::addFunctionDefinition(KviKvsTreeNodeSpec } -void KviKvsTreeNodeSpecialCommandClass::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandClass::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"class\""; } @@ -80,7 +80,7 @@ void KviKvsTreeNodeSpecialCommandClass::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) { debug("%s SpecialCommandClass",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); for(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * d = m_pFunctions->first();d;d = m_pFunctions->next()) @@ -100,8 +100,8 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) } KviKvsVariant * pBaseClassName = l.next(); - QString szClassName; - QString szBaseClassName; + TQString szClassName; + TQString szBaseClassName; pClassName->asString(szClassName); if(pBaseClassName) pBaseClassName->asString(szBaseClassName); @@ -115,7 +115,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) if(szBaseClassName.isEmpty())szBaseClassName = "object"; // avoid infinite recursion in loading the base class - if(KviQString::equalCI(szBaseClassName,szClassName)) + if(KviTQString::equalCI(szBaseClassName,szClassName)) { c->error(__tr2qs("A class can't be a subclass of itself")); return false; @@ -132,12 +132,12 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) KviKvsObjectClass * pClass = pBaseClass; while(pClass) { - if(KviQString::equalCI(pClass->name(),szClassName)) + if(KviTQString::equalCI(pClass->name(),szClassName)) { c->error(this,__tr2qs("Detected a loop in the inheritance tree of the base class \"%Q\": redefine that class first"),&szBaseClassName); return false; } - pClass = pClass->parentClass(); + pClass = pClass->tqparentClass(); } KviKvsObjectClass * pActualClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName,true); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h index 0a8a69b..592c454 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h @@ -35,17 +35,17 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandClassFunctionDefinition : public KviKvsTreeNode { public: - KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const QChar * pLocation,const QString &szName,const QString &szBuffer,unsigned int uHandlerFlags); + KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const TQChar * pLocation,const TQString &szName,const TQString &szBuffer,unsigned int uHandlerFlags); virtual ~KviKvsTreeNodeSpecialCommandClassFunctionDefinition(){}; protected: - QString m_szName; - QString m_szBuffer; + TQString m_szName; + TQString m_szBuffer; unsigned int m_uHandlerFlags; public: unsigned int handlerFlags(){ return m_uHandlerFlags; }; - const QString & name(){ return m_szName; }; - const QString & buffer(){ return m_szBuffer; }; - virtual void contextDescription(QString &szBuffer); + const TQString & name(){ return m_szName; }; + const TQString & buffer(){ return m_szBuffer; }; + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; @@ -54,14 +54,14 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandClass : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandClass(const QChar * pLocation,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeSpecialCommandClass(const TQChar * pLocation,KviKvsTreeNodeDataList * pParams); virtual ~KviKvsTreeNodeSpecialCommandClass(); protected: KviKvsTreeNodeDataList * m_pParams; KviPointerList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition> * m_pFunctions; public: void addFunctionDefinition(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * pDef); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index eea02bd..7462130 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_popupmenu.h" #include "kvi_kvs_script.h" -void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"extpopup\" For Special Command \"defpopup\""; @@ -44,9 +44,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelExtpopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -74,7 +74,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::execute(KviKvsRunTimeCon } -void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"item\" For Special Command \"defpopup\""; @@ -86,9 +86,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelItem",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -115,7 +115,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelItem::execute(KviKvsRunTimeContext return true; } -void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"label\" For Special Command \"defpopup\""; @@ -127,9 +127,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelLabel",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -155,7 +155,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::execute(KviKvsRunTimeContex -void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"separator\" For Special Command \"defpopup\""; @@ -167,7 +167,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefi { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelSeparator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" CONDITION:"); tmp.append(m_szCondition); debug("%s",tmp.utf8().data()); @@ -184,7 +184,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::execute(KviKvsRunTimeCo -void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"epilogue\" For Special Command \"defpopup\""; @@ -196,7 +196,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelEpilogue",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; debug("%s",tmp.utf8().data()); @@ -212,7 +212,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::execute(KviKvsRunTimeCon } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"prologue\" For Special Command \"defpopup\""; @@ -225,7 +225,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelPrologue",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; debug("%s",tmp.utf8().data()); @@ -248,8 +248,8 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::execute(KviKvsRunTimeCon -KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation) -: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,QString::null,QString::null,QString::null,QString::null) +KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const TQChar * pLocation) +: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,TQString(),TQString(),TQString(),TQString()) { #ifdef COMPILE_NEW_KVS m_pLabels = new KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel>; @@ -264,7 +264,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::~KviKvsTreeNodeSpecialCommandDef #endif } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"popup\" For Special Command \"defpopup\""; @@ -276,9 +276,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelPopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug(x.utf8().data()); @@ -332,7 +332,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::fill(KviKvsRunTimeContext* -KviKvsTreeNodeSpecialCommandDefpopup::KviKvsTreeNodeSpecialCommandDefpopup(const QChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup) +KviKvsTreeNodeSpecialCommandDefpopup::KviKvsTreeNodeSpecialCommandDefpopup(const TQChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup) : KviKvsTreeNodeSpecialCommand(pLocation,"defpopup") { #ifdef COMPILE_NEW_KVS @@ -351,7 +351,7 @@ KviKvsTreeNodeSpecialCommandDefpopup::~KviKvsTreeNodeSpecialCommandDefpopup() #endif } -void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"defpopup\""; @@ -363,7 +363,7 @@ void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pPopupName->dump(tmp.utf8().data()); m_pMainPopup->dump(tmp.utf8().data()); @@ -375,7 +375,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) #ifdef COMPILE_NEW_KVS KviKvsVariant v; if(!m_pPopupName->evaluateReadOnly(c,&v))return false; - QString szName; + TQString szName; v.asString(szName); KviKvsSwitchList swl; @@ -410,7 +410,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) } // we want to (re)create it - if(!swl.find('m',"--merge"))pPopup->doClear(); + if(!swl.tqfind('m',"--merge"))pPopup->doClear(); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h index 53a02fb..b55b1fb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h @@ -39,36 +39,36 @@ class KviKvsPopupMenu; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabel : public KviKvsTreeNode { public: - QString m_szItemName; + TQString m_szItemName; public: - KviKvsTreeNodeSpecialCommandDefpopupLabel(const QChar * pLocation,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabel(const TQChar * pLocation,const TQString &szItemName) : KviKvsTreeNode(pLocation), m_szItemName(szItemName) {}; ~KviKvsTreeNodeSpecialCommandDefpopupLabel(){}; public: - void setItemName(const QString &szItemName){ m_szItemName = szItemName; }; + void setItemName(const TQString &szItemName){ m_szItemName = szItemName; }; virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p) = 0; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szCondition; // may be null! + TQString m_szCondition; // may be null! public: - KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(const QChar * pLocation,const QString &szCondition,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(const TQChar * pLocation,const TQString &szCondition,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szCondition(szCondition) {}; ~KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(){}; public: - void setCondition(const QString &szCondition){ m_szCondition = szCondition; }; + void setCondition(const TQString &szCondition){ m_szCondition = szCondition; }; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(const QChar * pLocation,const QString &szCondition,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(const TQChar * pLocation,const TQString &szCondition,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(pLocation,szCondition,szItemName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -76,27 +76,27 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel { protected: - QString m_szText; - QString m_szIcon; + TQString m_szText; + TQString m_szIcon; public: - KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(pLocation,szCondition,szItemName), m_szText(szText), m_szIcon(szIcon){}; ~KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(){}; public: - void setText(const QString &szText){ m_szText = szText; }; - void setIcon(const QString &szIcon){ m_szIcon = szIcon; }; + void setText(const TQString &szText){ m_szText = szText; }; + void setIcon(const TQString &szIcon){ m_szIcon = szIcon; }; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { protected: - QString m_szName; + TQString m_szName; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szName,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szName,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName), m_szName(szName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -104,13 +104,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelItem : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelItem(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelItem(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName), m_szInstruction(szInstruction) {}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelItem(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -119,11 +119,11 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelLabel : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -133,13 +133,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(const QChar * pLocation,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(const TQChar * pLocation,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szInstruction(szInstruction){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -147,13 +147,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(const QChar * pLocation,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(const TQChar * pLocation,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szInstruction(szInstruction){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -162,14 +162,14 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelPopup : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(); protected: KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel> * m_pLabels; public: bool isEmpty(){ return m_pLabels->isEmpty(); }; void addLabel(KviKvsTreeNodeSpecialCommandDefpopupLabel * pLabel); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); bool fill(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); @@ -179,13 +179,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopup : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandDefpopup(const QChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup); + KviKvsTreeNodeSpecialCommandDefpopup(const TQChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup); ~KviKvsTreeNodeSpecialCommandDefpopup(); private: KviKvsTreeNodeData * m_pPopupName; // can't be zero KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * m_pMainPopup; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp index 5b083c8..012b0e7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) +KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) : KviKvsTreeNodeSpecialCommand(pLocation,"do") { m_pExpression = e; @@ -46,7 +46,7 @@ KviKvsTreeNodeSpecialCommandDo::~KviKvsTreeNodeSpecialCommandDo() if(m_pInstruction)delete m_pInstruction; } -void KviKvsTreeNodeSpecialCommandDo::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDo::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"do\""; } @@ -54,7 +54,7 @@ void KviKvsTreeNodeSpecialCommandDo::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) { debug("%s SpecialCommandDo",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pInstruction)m_pInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h index dde8d00..834d0ea 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h @@ -36,13 +36,13 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandDo : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); + KviKvsTreeNodeSpecialCommandDo(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); ~KviKvsTreeNodeSpecialCommandDo(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp index 82526bc..e608988 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop) +KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop) : KviKvsTreeNodeSpecialCommand(pLocation,"for") { m_pInitialization = pInit; @@ -51,7 +51,7 @@ KviKvsTreeNodeSpecialCommandFor::~KviKvsTreeNodeSpecialCommandFor() if(m_pLoop)delete m_pLoop; } -void KviKvsTreeNodeSpecialCommandFor::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandFor::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"for\""; } @@ -59,7 +59,7 @@ void KviKvsTreeNodeSpecialCommandFor::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix) { debug("%s SpecialCommandFor",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data()); if(m_pCondition)m_pCondition->dump(tmp.utf8().data()); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h index 4c53f2c..3800c95 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h @@ -36,7 +36,7 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandFor : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop); + KviKvsTreeNodeSpecialCommandFor(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop); ~KviKvsTreeNodeSpecialCommandFor(); private: KviKvsTreeNodeInstruction * m_pInitialization; // can be 0 @@ -44,7 +44,7 @@ private: KviKvsTreeNodeInstruction * m_pUpdate; // can be 0 KviKvsTreeNodeInstruction * m_pLoop; // can be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index db98e39..90e0d1c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -32,7 +32,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop) +KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const TQChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop) : KviKvsTreeNodeSpecialCommand(pLocation,"foreach") { m_pIterationVariable = pVar; @@ -50,7 +50,7 @@ KviKvsTreeNodeSpecialCommandForeach::~KviKvsTreeNodeSpecialCommandForeach() delete m_pLoop; } -void KviKvsTreeNodeSpecialCommandForeach::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandForeach::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"foreach\""; } @@ -58,7 +58,7 @@ void KviKvsTreeNodeSpecialCommandForeach::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix) { debug("%s SpecialCommandForeach",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pIterationVariable->dump(tmp.utf8().data()); m_pIterationData->dump(tmp.utf8().data()); @@ -84,7 +84,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) if(!(m_pSwitches->evaluate(c,&swl)))return false; } - bool bIncludeEmptyScalars = swl.find('a',"all") != 0; + bool bIncludeEmptyScalars = swl.tqfind('a',"all") != 0; for(KviKvsVariant * pArg = l.first();pArg;pArg = l.next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h index 9f2e765..d3b8ff2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h @@ -37,14 +37,14 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandForeach : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop); + KviKvsTreeNodeSpecialCommandForeach(const TQChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop); ~KviKvsTreeNodeSpecialCommandForeach(); private: KviKvsTreeNodeData * m_pIterationVariable; // can't be zero! KviKvsTreeNodeDataList * m_pIterationData; // can't be zero! KviKvsTreeNodeInstruction * m_pLoop; // can't be zero! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp index bc9e31d..2c17022 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse) +KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse) : KviKvsTreeNodeSpecialCommand(pLocation,"if") { #ifdef COMPILE_NEW_KVS @@ -52,7 +52,7 @@ KviKvsTreeNodeSpecialCommandIf::~KviKvsTreeNodeSpecialCommandIf() #endif } -void KviKvsTreeNodeSpecialCommandIf::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandIf::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"if\""; @@ -63,7 +63,7 @@ void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandIf",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pIfInstruction)m_pIfInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h index bc89af4..856b895 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h @@ -35,14 +35,14 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandIf : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse); + KviKvsTreeNodeSpecialCommandIf(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse); ~KviKvsTreeNodeSpecialCommandIf(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pIfInstruction; // may be 0 KviKvsTreeNodeInstruction * m_pElseInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp index 28b7b1f..d24efa0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp @@ -30,9 +30,9 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> -KviKvsTreeNodeSpecialCommandSwitchLabel::KviKvsTreeNodeSpecialCommandSwitchLabel(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabel::KviKvsTreeNodeSpecialCommandSwitchLabel(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pParameter = 0; @@ -64,7 +64,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabel::setInstruction(KviKvsTreeNodeInstr -KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchLabelCase(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchLabelCase(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -73,7 +73,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitch { } -void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(TQString &szBuffer) { szBuffer = "Label \"case\" For Special Command \"switch\""; } @@ -81,7 +81,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString &sz void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelCase",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -115,10 +115,10 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * } } else { // string comparision, case insensitive - QString reg; + TQString reg; v.asString(reg); - QString val; + TQString val; pRealParameter->asString(val); if(reg.lower() != val.lower())return true; @@ -139,7 +139,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * -KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -148,7 +148,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitc { } -void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(TQString &szBuffer) { szBuffer = "Label \"match\" For Special Command \"switch\""; } @@ -157,7 +157,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString &s void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelMatch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -168,12 +168,12 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext KviKvsVariant v; if(!m_pParameter->evaluateReadOnly(c,&v))return false; - QString reg; + TQString reg; v.asString(reg); - QRegExp rx(reg,false,true); + TQRegExp rx(reg,false,true); - QString val; + TQString val; pRealParameter->asString(val); if(!rx.exactMatch(val))return true; // no match @@ -193,7 +193,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext -KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -202,7 +202,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwit { } -void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(TQString &szBuffer) { szBuffer = "Label \"regexp\" For Special Command \"switch\""; } @@ -211,7 +211,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString & void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelRegexp",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -222,12 +222,12 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext KviKvsVariant v; if(!m_pParameter->evaluateReadOnly(c,&v))return false; - QString reg; + TQString reg; v.asString(reg); - QRegExp rx(reg,false,false); + TQRegExp rx(reg,false,false); - QString val; + TQString val; pRealParameter->asString(val); if(!rx.exactMatch(val))return true; // no match @@ -249,7 +249,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext -KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -258,7 +258,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwi { } -void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(TQString &szBuffer) { szBuffer = "Label \"default\" For Special Command \"switch\""; } @@ -267,7 +267,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelDefault",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); } @@ -289,7 +289,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelDefault::execute(KviKvsRunTimeContex -KviKvsTreeNodeSpecialCommandSwitch::KviKvsTreeNodeSpecialCommandSwitch(const QChar * pLocation,KviKvsTreeNodeExpression * e) +KviKvsTreeNodeSpecialCommandSwitch::KviKvsTreeNodeSpecialCommandSwitch(const TQChar * pLocation,KviKvsTreeNodeExpression * e) : KviKvsTreeNodeSpecialCommand(pLocation,"switch") { m_pExpression = e; @@ -310,7 +310,7 @@ void KviKvsTreeNodeSpecialCommandSwitch::addLabel(KviKvsTreeNodeSpecialCommandSw l->setParent(this); } -void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"switch\""; } @@ -319,7 +319,7 @@ void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix) { debug("%s SpecialCommandSwitch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp.utf8().data()); for(KviKvsTreeNodeSpecialCommandSwitchLabel * l = m_pLabels->first();l;l = m_pLabels->next()) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h index ecad6e2..aa5473b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h @@ -37,7 +37,7 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabel : public KviKvsTreeNode { public: - KviKvsTreeNodeSpecialCommandSwitchLabel(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabel(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabel(); protected: KviKvsTreeNodeData * m_pParameter; @@ -54,10 +54,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelCase : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelCase(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelCase(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelCase(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -66,10 +66,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelMatch : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelMatch(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -77,10 +77,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelRegexp : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -88,11 +88,11 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelDefault : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelDefault(); public: virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -101,7 +101,7 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitch : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandSwitch(const QChar * pLocation,KviKvsTreeNodeExpression * e); + KviKvsTreeNodeSpecialCommandSwitch(const TQChar * pLocation,KviKvsTreeNodeExpression * e); ~KviKvsTreeNodeSpecialCommandSwitch(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 @@ -109,7 +109,7 @@ private: public: void addLabel(KviKvsTreeNodeSpecialCommandSwitchLabel * l); bool isEmpty(){ return m_pLabels->isEmpty(); }; - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp index be7c5df..a37cef6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_rwevaluationresult.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList) +KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList) : KviKvsTreeNodeSpecialCommand(pLocation,"unset") { m_pVariableList = pVariableList; @@ -44,7 +44,7 @@ KviKvsTreeNodeSpecialCommandUnset::~KviKvsTreeNodeSpecialCommandUnset() delete m_pVariableList; } -void KviKvsTreeNodeSpecialCommandUnset::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandUnset::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"unset\""; } @@ -52,7 +52,7 @@ void KviKvsTreeNodeSpecialCommandUnset::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix) { debug("%s SpecialCommandUnset",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h index 3d12506..9d36517 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandUnset : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVarList); + KviKvsTreeNodeSpecialCommandUnset(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVarList); ~KviKvsTreeNodeSpecialCommandUnset(); private: KviPointerList<KviKvsTreeNodeVariable> * m_pVariableList; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp index 377921d..d1378d9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) +KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) : KviKvsTreeNodeSpecialCommand(pLocation,"while") { #ifdef COMPILE_NEW_KVS @@ -49,7 +49,7 @@ KviKvsTreeNodeSpecialCommandWhile::~KviKvsTreeNodeSpecialCommandWhile() #endif } -void KviKvsTreeNodeSpecialCommandWhile::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandWhile::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"while\""; @@ -60,7 +60,7 @@ void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandWhile",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pInstruction)m_pInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h index 87b3b90..38c4907 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h @@ -36,13 +36,13 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandWhile : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); + KviKvsTreeNodeSpecialCommandWhile(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); ~KviKvsTreeNodeSpecialCommandWhile(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp index 8c4f76c..630d646 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_stringcast.h" #include "kvi_qstring.h" -KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData) +KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const TQChar * pLocation,KviKvsTreeNodeData * pChildData) : KviKvsTreeNodeData(pLocation) { m_pChildData = pChildData; @@ -45,14 +45,14 @@ bool KviKvsTreeNodeStringCast::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsV if(!m_pChildData->evaluateReadOnly(c,pBuffer))return false; if(!pBuffer->isString()) { - QString tmp; + TQString tmp; pBuffer->asString(tmp); pBuffer->setString(tmp); } return true; } -void KviKvsTreeNodeStringCast::contextDescription(QString &szBuffer) +void KviKvsTreeNodeStringCast::contextDescription(TQString &szBuffer) { szBuffer = "String Cast"; } @@ -60,7 +60,7 @@ void KviKvsTreeNodeStringCast::contextDescription(QString &szBuffer) void KviKvsTreeNodeStringCast::dump(const char * prefix) { debug("%s StringCast",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pChildData->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h index af537f9..3cc3de6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h @@ -30,13 +30,13 @@ class KVIRC_API KviKvsTreeNodeStringCast : public KviKvsTreeNodeData { public: - KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData); + KviKvsTreeNodeStringCast(const TQChar * pLocation,KviKvsTreeNodeData * pChildData); ~KviKvsTreeNodeStringCast(); protected: KviKvsTreeNodeData * m_pChildData; public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index c821529..32018c2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_switchlist.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const QChar * pLocation) +KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pShortSwitchDict = 0; @@ -40,7 +40,7 @@ KviKvsTreeNodeSwitchList::~KviKvsTreeNodeSwitchList() if(m_pLongSwitchDict)delete m_pLongSwitchDict; } -void KviKvsTreeNodeSwitchList::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSwitchList::contextDescription(TQString &szBuffer) { szBuffer = "Switch List Evaluation"; } @@ -54,9 +54,9 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict); while(it.current()) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" Sw("); - QChar c((unsigned short)it.currentKey()); + TQChar c((unsigned short)it.currentKey()); tmp.append(c); tmp.append("): "); it.current()->dump(tmp.utf8().data()); @@ -65,10 +65,10 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) } if(m_pLongSwitchDict) { - KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); + KviPointerHashTableIterator<TQString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); while(it.current()) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" Sw("); tmp.append(it.currentKey()); tmp.append("): "); @@ -86,19 +86,19 @@ void KviKvsTreeNodeSwitchList::addShort(int iShortKey,KviKvsTreeNodeData * p) m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->replace(iShortKey,p); + m_pShortSwitchDict->tqreplace(iShortKey,p); p->setParent(this); } -void KviKvsTreeNodeSwitchList::addLong(const QString &szLongKey,KviKvsTreeNodeData * p) +void KviKvsTreeNodeSwitchList::addLong(const TQString &szLongKey,KviKvsTreeNodeData * p) { if(!m_pLongSwitchDict) { - m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsTreeNodeData>(11); + m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsTreeNodeData>(11); m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->replace(szLongKey,p); + m_pLongSwitchDict->tqreplace(szLongKey,p); p->setParent(this); } @@ -124,7 +124,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis } if(m_pLongSwitchDict) { - KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); + KviPointerHashTableIterator<TQString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); while(KviKvsTreeNodeData * d = it.current()) { KviKvsVariant * v = new KviKvsVariant(); @@ -145,7 +145,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() KviKvsTreeNodeData * d; if(m_pShortSwitchDict) { - d = m_pShortSwitchDict->find('r'); + d = m_pShortSwitchDict->tqfind('r'); if(d) { m_pShortSwitchDict->setAutoDelete(false); @@ -156,7 +156,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() } if(m_pLongSwitchDict) { - d = m_pLongSwitchDict->find("rebind"); + d = m_pLongSwitchDict->tqfind("rebind"); if(d) { m_pLongSwitchDict->setAutoDelete(false); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h index 9e6510a..0bc6855 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h @@ -39,17 +39,17 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSwitchList : public KviKvsTreeNode { public: - KviKvsTreeNodeSwitchList(const QChar * pLocation); + KviKvsTreeNodeSwitchList(const TQChar * pLocation); ~KviKvsTreeNodeSwitchList(); public: KviPointerHashTable<int,KviKvsTreeNodeData> * m_pShortSwitchDict; - KviPointerHashTable<QString,KviKvsTreeNodeData> *m_pLongSwitchDict; + KviPointerHashTable<TQString,KviKvsTreeNodeData> *m_pLongSwitchDict; public: void addShort(int iShortKey,KviKvsTreeNodeData * p); - void addLong(const QString &szLongKey,KviKvsTreeNodeData * p); + void addLong(const TQString &szLongKey,KviKvsTreeNodeData * p); bool isEmpty(){ return (m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0); }; virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); KviKvsTreeNodeData * getStandardRebindingSwitch(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp index 6f3e757..128daba 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_object.h" -KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeObjectFunctionCall(pLocation,szFncName,pParams) { } @@ -37,7 +37,7 @@ KviKvsTreeNodeThisObjectFunctionCall::~KviKvsTreeNodeThisObjectFunctionCall() { } -void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "\"This\" Object Function Call \""; @@ -50,7 +50,7 @@ void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif @@ -64,7 +64,7 @@ bool KviKvsTreeNodeThisObjectFunctionCall::evaluateReadOnlyInObjectScope(KviKvsO if(!m_pParams->evaluate(c,&l))return false; pBuffer->setNothing(); c->setDefaultReportLocation(this); - return o->callFunction(c->thisObject(),m_szFunctionName,QString::null,c,pBuffer,&l); + return o->callFunction(c->thisObject(),m_szFunctionName,TQString(),c,pBuffer,&l); #else return false; #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h index 2b245f5..b31f9eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h @@ -37,10 +37,10 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeThisObjectFunctionCall : public KviKvsTreeNodeObjectFunctionCall { public: - KviKvsTreeNodeThisObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeThisObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeThisObjectFunctionCall(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp index 2d0f56e..3c6ab78 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_variable.h" -KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.h b/src/kvirc/kvs/kvi_kvs_treenode_variable.h index 7368e68..a4098fc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_variable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeVariable : public KviKvsTreeNodeData { public: - KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeVariable(); protected: - QString m_szIdentifier; + TQString m_szIdentifier; protected: virtual bool isReadOnly(); virtual bool canEvaluateInObjectScope(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp index 0a788ef..c5215cd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_voidfunctioncall.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeVoidFunctionCall::KviKvsTreeNodeVoidFunctionCall(const QChar * pLocation,KviKvsTreeNodeFunctionCall * r) +KviKvsTreeNodeVoidFunctionCall::KviKvsTreeNodeVoidFunctionCall(const TQChar * pLocation,KviKvsTreeNodeFunctionCall * r) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -42,7 +42,7 @@ KviKvsTreeNodeVoidFunctionCall::~KviKvsTreeNodeVoidFunctionCall() #endif } -void KviKvsTreeNodeVoidFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeVoidFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Void Function Call"; @@ -53,7 +53,7 @@ void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s VoidFunctionCall",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pFunctionCall->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h index 13b08ba..584034d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeVoidFunctionCall : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeVoidFunctionCall(const QChar * pLocation,KviKvsTreeNodeFunctionCall * r); + KviKvsTreeNodeVoidFunctionCall(const TQChar * pLocation,KviKvsTreeNodeFunctionCall * r); ~KviKvsTreeNodeVoidFunctionCall(); protected: KviKvsTreeNodeFunctionCall * m_pFunctionCall; // may be scope operator or direct function call public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 47a342a..01ad59e 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -33,24 +33,24 @@ #include "kvi_window.h" #include "kvi_cmdformatter.h" -KviKvsUserAction::KviKvsUserAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +KviKvsUserAction::KviKvsUserAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) : KviKvsAction(pParent,szName,szScriptCode,szVisibleNameCode,szDescriptionCode,0,szBigIcon,0,uFlags,szKeySequence) { m_szSmallIcon = szSmallIcon; - QString szKvsName = "action::"; + TQString szKvsName = "action::"; szKvsName += szName; - QString szTmp = szKvsName; + TQString szTmp = szKvsName; szTmp += "::description"; m_pDescriptionScript = new KviKvsScript(szTmp,szDescriptionCode,KviKvsScript::Parameter); @@ -63,8 +63,8 @@ KviKvsUserAction::KviKvsUserAction(QObject * pParent, } -KviKvsUserAction::KviKvsUserAction(QObject * pParent) - : KviKvsAction(pParent,QString::null,QString::null,QString::null,QString::null) +KviKvsUserAction::KviKvsUserAction(TQObject * pParent) + : KviKvsAction(pParent,TQString(),TQString(),TQString(),TQString()) { // needs loading! m_pDescriptionScript = 0; @@ -77,36 +77,36 @@ KviKvsUserAction::~KviKvsUserAction() if(m_pVisibleNameScript)delete m_pVisibleNameScript; } -KviKvsUserAction * KviKvsUserAction::createInstance(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +KviKvsUserAction * KviKvsUserAction::createInstance(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) { return new KviKvsUserAction(pParent,szName,szScriptCode,szVisibleNameCode,szDescriptionCode,szCategory,szBigIcon,szSmallIcon,uFlags,szKeySequence); } -void KviKvsUserAction::exportToKvs(QString &szBuffer) +void KviKvsUserAction::exportToKvs(TQString &szBuffer) { exportToKvs(szBuffer,m_szName,scriptCode(),visibleNameCode(),descriptionCode(),m_szCategory,m_szBigIcon,m_szSmallIcon,m_uFlags,m_szKeySequence); } -void KviKvsUserAction::exportToKvs(QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +void KviKvsUserAction::exportToKvs(TQString &szBuffer, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) { szBuffer += "action.create"; if(uFlags & NeedsContext) @@ -120,7 +120,7 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, } if(uFlags & InternalWindowMask) { - QString szWins; + TQString szWins; if(uFlags & WindowConsole)szWins += "x"; if(uFlags & WindowChannel)szWins += "c"; if(uFlags & WindowQuery)szWins += "q"; @@ -147,24 +147,24 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, szBuffer += " (\""; szBuffer += szName; szBuffer += "\","; - QString tmp = szVisibleName; - if(tmp.contains('$')) + TQString tmp = szVisibleName; + if(tmp.tqcontains('$')) { szBuffer += tmp; szBuffer += ","; } else { - tmp.replace("\"","\\\""); + tmp.tqreplace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\","; } tmp = szDescription; - if(tmp.contains('$')) + if(tmp.tqcontains('$')) { szBuffer += tmp; szBuffer += ",\""; } else { - tmp.replace("\"","\\\""); + tmp.tqreplace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\",\""; @@ -182,33 +182,33 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, // FIXME: Cache this stuff ?? -const QString & KviKvsUserAction::visibleName() +const TQString & KviKvsUserAction::visibleName() { if(!m_pVisibleNameScript)return m_szVisibleName; if(!m_pVisibleNameScript->run(g_pActiveWindow,0,m_szVisibleName))m_szVisibleName = m_pVisibleNameScript->code(); return m_szVisibleName; } -const QString & KviKvsUserAction::description() +const TQString & KviKvsUserAction::description() { if(!m_pDescriptionScript)return m_szDescription; if(!m_pDescriptionScript->run(g_pActiveWindow,0,m_szDescription))m_szDescription = m_pDescriptionScript->code(); return m_szDescription; } -const QString & KviKvsUserAction::visibleNameCode() +const TQString & KviKvsUserAction::visibleNameCode() { if(!m_pVisibleNameScript)return m_szVisibleName; return m_pVisibleNameScript->code(); } -const QString & KviKvsUserAction::descriptionCode() +const TQString & KviKvsUserAction::descriptionCode() { if(!m_pDescriptionScript)return m_szDescription; return m_pDescriptionScript->code(); } -QPixmap * KviKvsUserAction::smallIcon() +TQPixmap * KviKvsUserAction::smallIcon() { return g_pIconManager->getImage(m_szSmallIcon.utf8().data()); } @@ -222,18 +222,18 @@ bool KviKvsUserAction::load(KviConfig * cfg) { m_szName = cfg->group(); if(m_szName.isEmpty())return false; - m_szVisibleName = cfg->readQStringEntry("VisibleName"); + m_szVisibleName = cfg->readTQStringEntry("VisibleName"); if(m_szVisibleName.isEmpty())return false; - QString szKvsName = "action::"; + TQString szKvsName = "action::"; szKvsName += m_szName; - QString szTmp = szKvsName; + TQString szTmp = szKvsName; szTmp += "::label"; if(m_pVisibleNameScript)delete m_pVisibleNameScript; m_pVisibleNameScript = new KviKvsScript(szTmp,m_szVisibleName,KviKvsScript::Parameter); if(m_szVisibleName.isEmpty())return false; - m_szDescription = cfg->readQStringEntry("Description"); + m_szDescription = cfg->readTQStringEntry("Description"); szTmp = szKvsName; szTmp += "::description"; @@ -241,18 +241,18 @@ bool KviKvsUserAction::load(KviConfig * cfg) m_pDescriptionScript = new KviKvsScript(szTmp,m_szDescription,KviKvsScript::Parameter); - m_szBigIcon = cfg->readQStringEntry("BigIcon"); - m_szSmallIcon = cfg->readQStringEntry("SmallIcon"); - m_szKeySequence = cfg->readQStringEntry("KeySequence"); - m_szCategory = cfg->readQStringEntry("Category"); + m_szBigIcon = cfg->readTQStringEntry("BigIcon"); + m_szSmallIcon = cfg->readTQStringEntry("SmallIcon"); + m_szKeySequence = cfg->readTQStringEntry("KeySequence"); + m_szCategory = cfg->readTQStringEntry("Category"); m_pCategory = KviActionManager::instance()->category(m_szCategory); m_uFlags = cfg->readUIntEntry("Flags",0); - QString szCode = cfg->readQStringEntry("Code"); + TQString szCode = cfg->readTQStringEntry("Code"); if(szCode.isEmpty())return false; if(m_pScript)delete m_pScript; - QString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; + TQString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; tmp += m_szName; m_pScript = new KviKvsScript(tmp,szCode); diff --git a/src/kvirc/kvs/kvi_kvs_useraction.h b/src/kvirc/kvs/kvi_kvs_useraction.h index 2edd033..7d1cf59 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.h +++ b/src/kvirc/kvs/kvi_kvs_useraction.h @@ -34,38 +34,39 @@ class KVIRC_API KviKvsUserAction : public KviKvsAction { friend class KviActionManager; Q_OBJECT + TQ_OBJECT public: - KviKvsUserAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + KviKvsUserAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); - KviKvsUserAction(QObject * pParent); + const TQString &szKeySequence = TQString()); + KviKvsUserAction(TQObject * pParent); ~KviKvsUserAction(); // Static allocator function. // This MUST be used by the modules to allocate action structures // instead of the new operator. // See kvi_heapobject.cpp for an explaination. - static KviKvsUserAction * createInstance(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + static KviKvsUserAction * createInstance(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); + const TQString &szKeySequence = TQString()); void suicide() { delete this; }; protected: - QString m_szSmallIcon; - QString m_szCategory; + TQString m_szSmallIcon; + TQString m_szCategory; KviKvsScript * m_pDescriptionScript; KviKvsScript * m_pVisibleNameScript; protected: @@ -73,24 +74,24 @@ protected: bool load(KviConfig * cfg); void save(KviConfig * cfg); public: - virtual const QString & visibleName(); - virtual const QString & description(); - const QString & visibleNameCode(); - const QString & descriptionCode(); - virtual QPixmap * smallIcon(); - const QString & category(){ return m_szCategory; }; - const QString & smallIconString(){ return m_szSmallIcon; }; - static void exportToKvs(QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + virtual const TQString & visibleName(); + virtual const TQString & description(); + const TQString & visibleNameCode(); + const TQString & descriptionCode(); + virtual TQPixmap * smallIcon(); + const TQString & category(){ return m_szCategory; }; + const TQString & smallIconString(){ return m_szSmallIcon; }; + static void exportToKvs(TQString &szBuffer, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence); - void exportToKvs(QString &szBuffer); + const TQString &szKeySequence); + void exportToKvs(TQString &szBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index b21fd95..492bd26 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -36,7 +36,7 @@ KviKvsVariant::KviKvsVariant() m_pData = 0; } -KviKvsVariant::KviKvsVariant(QString * pString) +KviKvsVariant::KviKvsVariant(TQString * pString) { m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; @@ -44,12 +44,12 @@ KviKvsVariant::KviKvsVariant(QString * pString) m_pData->m_u.pString = pString; } -KviKvsVariant::KviKvsVariant(const QString &szString) +KviKvsVariant::KviKvsVariant(const TQString &szString) { m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; m_pData->m_uRefs = 1; - m_pData->m_u.pString = new QString(szString); + m_pData->m_u.pString = new TQString(szString); } KviKvsVariant::KviKvsVariant(const char * szString) @@ -57,7 +57,7 @@ KviKvsVariant::KviKvsVariant(const char * szString) m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; m_pData->m_uRefs = 1; - m_pData->m_u.pString = new QString(QString::fromUtf8(szString)); + m_pData->m_u.pString = new TQString(TQString::fromUtf8(szString)); } @@ -167,18 +167,18 @@ KviKvsVariant::~KviKvsVariant() DETACH_CONTENTS } -void KviKvsVariant::setString(QString * pString) +void KviKvsVariant::setString(TQString * pString) { RENEW_VARIANT_DATA m_pData->m_eType = KviKvsVariantData::String; m_pData->m_u.pString = pString; } -void KviKvsVariant::setString(const QString &szString) +void KviKvsVariant::setString(const TQString &szString) { RENEW_VARIANT_DATA m_pData->m_eType = KviKvsVariantData::String; - m_pData->m_u.pString = new QString(szString); + m_pData->m_u.pString = new TQString(szString); } void KviKvsVariant::setReal(kvs_real_t dReal) @@ -272,7 +272,7 @@ bool KviKvsVariant::asBoolean() const if(m_pData->m_u.pString->isEmpty())return false; // check integer or real values bool bOk; - kvs_int_t iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + kvs_int_t iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); if(bOk)return iVal; kvs_real_t dVal = m_pData->m_u.pString->toDouble(&bOk); if(bOk)return (dVal != 0.0); @@ -413,7 +413,7 @@ void KviKvsVariant::castToArray(KviKvsArrayCast *c) const break; case KviKvsVariantData::Hash: { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); KviKvsArray * a = new KviKvsArray(); kvs_int_t idx = 0; while(KviKvsVariant * v = it.current()) @@ -451,7 +451,7 @@ void KviKvsVariant::convertToArray() break; case KviKvsVariantData::Hash: { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); KviKvsArray * a = new KviKvsArray(); kvs_int_t idx = 0; while(KviKvsVariant * v = it.current()) @@ -486,7 +486,7 @@ bool KviKvsVariant::asInteger(kvs_int_t &iVal) const case KviKvsVariantData::String: { bool bOk; - iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); return bOk; } break; @@ -530,7 +530,7 @@ void KviKvsVariant::castToInteger(kvs_int_t &iVal) const case KviKvsVariantData::String: { bool bOk; - iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); if(bOk)return; iVal = m_pData->m_u.pString->length(); } @@ -581,24 +581,24 @@ bool KviKvsVariant::asReal(kvs_real_t & dVal) const return false; } -void KviKvsVariant::asString(QString &szBuffer) const +void KviKvsVariant::asString(TQString &szBuffer) const { if(!m_pData) { - szBuffer = QString::null; + szBuffer = TQString(); return; } switch(m_pData->m_eType) { case KviKvsVariantData::String: szBuffer = *(m_pData->m_u.pString); break; - case KviKvsVariantData::Array: szBuffer = QString::null; m_pData->m_u.pArray->appendAsString(szBuffer); break; - case KviKvsVariantData::Hash: szBuffer = QString::null; m_pData->m_u.pHash->appendAsString(szBuffer); break; + case KviKvsVariantData::Array: szBuffer = TQString(); m_pData->m_u.pArray->appendAsString(szBuffer); break; + case KviKvsVariantData::Hash: szBuffer = TQString(); m_pData->m_u.pHash->appendAsString(szBuffer); break; case KviKvsVariantData::Integer: szBuffer.setNum(m_pData->m_u.iInteger); break; case KviKvsVariantData::Real: szBuffer.setNum(*(m_pData->m_u.pReal)); break; case KviKvsVariantData::Boolean: szBuffer.setNum(m_pData->m_u.bBoolean ? 1 : 0); break; case KviKvsVariantData::HObject: if(m_pData->m_u.hObject) - KviQString::sprintf(szBuffer,"object[%lx]",m_pData->m_u.hObject); + KviTQString::sprintf(szBuffer,"object[%lx]",m_pData->m_u.hObject); else szBuffer = "null-object"; break; @@ -606,7 +606,7 @@ void KviKvsVariant::asString(QString &szBuffer) const } } -void KviKvsVariant::appendAsString(QString &szBuffer) const +void KviKvsVariant::appendAsString(TQString &szBuffer) const { if(!m_pData)return; switch(m_pData->m_eType) @@ -614,9 +614,9 @@ void KviKvsVariant::appendAsString(QString &szBuffer) const case KviKvsVariantData::String: szBuffer.append(*(m_pData->m_u.pString)); break; case KviKvsVariantData::Array: m_pData->m_u.pArray->appendAsString(szBuffer); break; case KviKvsVariantData::Hash: m_pData->m_u.pHash->appendAsString(szBuffer); break; - case KviKvsVariantData::Integer: KviQString::appendNumber(szBuffer,m_pData->m_u.iInteger); break; - case KviKvsVariantData::Real: KviQString::appendNumber(szBuffer,*(m_pData->m_u.pReal)); break; - case KviKvsVariantData::Boolean: KviQString::appendNumber(szBuffer,m_pData->m_u.bBoolean ? 1 : 0); break; + case KviKvsVariantData::Integer: KviTQString::appendNumber(szBuffer,m_pData->m_u.iInteger); break; + case KviKvsVariantData::Real: KviTQString::appendNumber(szBuffer,*(m_pData->m_u.pReal)); break; + case KviKvsVariantData::Boolean: KviTQString::appendNumber(szBuffer,m_pData->m_u.bBoolean ? 1 : 0); break; case KviKvsVariantData::HObject: szBuffer.append(m_pData->m_u.hObject ? "object" : "null-object"); break; default: /* make gcc happy */ break; } @@ -671,7 +671,7 @@ void KviKvsVariant::takeFrom(KviKvsVariant &v) v.m_pData = 0; } -void KviKvsVariant::getTypeName(QString &szBuffer) const +void KviKvsVariant::getTypeName(TQString &szBuffer) const { if(!m_pData) { @@ -752,9 +752,9 @@ public: return CMP_OTHERGREATER; } // compare as strings instead - QString szString; + TQString szString; v1->asString(szString); - return -1 * KviQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); } static inline int compare_integer_real(const KviKvsVariant * v1,const KviKvsVariant * v2) @@ -813,9 +813,9 @@ public: return CMP_OTHERGREATER; } // compare as strings instead - QString szString; + TQString szString; v1->asString(szString); - return -1 * KviQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); } static inline int compare_real_boolean(const KviKvsVariant * v1,const KviKvsVariant * v2) @@ -929,21 +929,21 @@ public: } }; -void KviKvsVariant::serializeString(QString& buffer) +void KviKvsVariant::serializeString(TQString& buffer) { - buffer.replace('\\',"\\\\"); - buffer.replace('\n',"\\n"); - buffer.replace('\r',"\\r"); - buffer.replace('\b',"\\b"); - buffer.replace('\t',"\\t"); - buffer.replace('\f',"\\f"); - buffer.replace('/',"\\/"); - buffer.replace('"',"\\\""); + buffer.tqreplace('\\',"\\\\"); + buffer.tqreplace('\n',"\\n"); + buffer.tqreplace('\r',"\\r"); + buffer.tqreplace('\b',"\\b"); + buffer.tqreplace('\t',"\\t"); + buffer.tqreplace('\f',"\\f"); + buffer.tqreplace('/',"\\/"); + buffer.tqreplace('"',"\\\""); buffer.prepend('"'); buffer.append('"'); } -void KviKvsVariant::serialize(QString& result) +void KviKvsVariant::serialize(TQString& result) { switch(m_pData->m_eType) { @@ -977,9 +977,9 @@ void KviKvsVariant::serialize(QString& result) } } -KviKvsVariant* KviKvsVariant::unserializeTrue(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeTrue(const TQChar** aux) { - if(KviQString::equalCIN(QString("true"),*aux,4)) + if(KviTQString::equalCIN(TQString("true"),*aux,4)) { (*aux)+=4; return new KviKvsVariant(true); @@ -987,9 +987,9 @@ KviKvsVariant* KviKvsVariant::unserializeTrue(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeFalse(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeFalse(const TQChar** aux) { - if(KviQString::equalCIN(QString("false"),*aux,5)) + if(KviTQString::equalCIN(TQString("false"),*aux,5)) { (*aux)+=5; return new KviKvsVariant(false); @@ -997,9 +997,9 @@ KviKvsVariant* KviKvsVariant::unserializeFalse(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeNull(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeNull(const TQChar** aux) { - if(KviQString::equalCIN(QString("null"),*aux,4)) + if(KviTQString::equalCIN(TQString("null"),*aux,4)) { (*aux)+=4; return new KviKvsVariant(); @@ -1007,10 +1007,10 @@ KviKvsVariant* KviKvsVariant::unserializeNull(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux) { - QString data; - if((*aux)->unicode() == '-') + TQString data; + if((*aux)->tqunicode() == '-') { data.append('-'); (*aux)++; @@ -1024,16 +1024,16 @@ KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const QChar** aux) data.append(**aux); (*aux)++; } - if((*aux)->unicode()=='.') + if((*aux)->tqunicode()=='.') { return unserializeReal(aux,data); } return unserializeInteger(aux,data); } -KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) +KviKvsVariant* KviKvsVariant::unserializeReal(const TQChar** aux,TQString& data) { - QString exponent; + TQString exponent; (*aux)++; //skip . data.append('.'); while((*aux)->isDigit()) @@ -1042,15 +1042,15 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) (*aux)++; } - if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') + if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') { (*aux)++; - if((*aux)->unicode() == '-') + if((*aux)->tqunicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->unicode() == '+') + if((*aux)->tqunicode() == '+') { exponent.append('+'); (*aux)++; @@ -1074,20 +1074,20 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) return new KviKvsVariant(value); } -KviKvsVariant* KviKvsVariant::unserializeInteger(const QChar** aux,QString& data) +KviKvsVariant* KviKvsVariant::unserializeInteger(const TQChar** aux,TQString& data) { - QString exponent; + TQString exponent; - if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') + if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') { (*aux)++; - if((*aux)->unicode() == '-') + if((*aux)->tqunicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->unicode() == '+') + if((*aux)->tqunicode() == '+') { exponent.append('+'); (*aux)++; @@ -1109,22 +1109,22 @@ KviKvsVariant* KviKvsVariant::unserializeInteger(const QChar** aux,QString& data return new KviKvsVariant(value); } -KviKvsVariant* KviKvsVariant::unserializeString(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeString(const TQChar** aux) { - QString buffer; + TQString buffer; unserializeString(aux,buffer); return new KviKvsVariant(buffer); } -void KviKvsVariant::unserializeString(const QChar** aux,QString& data) +void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data) { data=""; - QString hex; //temp var + TQString hex; //temp var //skip leading " (*aux)++; - while((*aux)->unicode()) + while((*aux)->tqunicode()) { - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case '"': //EOF @@ -1134,7 +1134,7 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) case '\\': //Special (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case 't': data.append('\t'); @@ -1159,11 +1159,11 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) //4 hexadecmical digits pending... hex=""; (*aux)++; - for(int k=0;k<4 && (*aux)->unicode(); k++) + for(int k=0;k<4 && (*aux)->tqunicode(); k++) { if((*aux)->isDigit() || - ((*aux)->unicode() >='A' && (*aux)->unicode() <='F')|| //ABCDEF - ((*aux)->unicode() >='a' && (*aux)->unicode() <='f')) //abcdef + ((*aux)->tqunicode() >='A' && (*aux)->tqunicode() <='F')|| //ABCDEF + ((*aux)->tqunicode() >='a' && (*aux)->tqunicode() <='f')) //abcdef { hex.append(**aux); (*aux)++; @@ -1172,7 +1172,7 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) } } (*aux)--; - data.append(QChar(hex.toUInt(0,16))); + data.append(TQChar(hex.toUInt(0,16))); break; default: //Fallback; incorrect escape @@ -1189,10 +1189,10 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) } } -KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux) { KviKvsHash* pHash = new KviKvsHash(); - QString szKey; + TQString szKey; KviKvsVariant* pElement = 0; //skip leading '{' (*aux)++; @@ -1203,7 +1203,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for starting of string - if((*aux)->unicode()!='\"') + if((*aux)->tqunicode()!='\"') { //strange characters delete pHash; @@ -1221,7 +1221,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for name-value delimeter - if((*aux)->unicode()!=':') + if((*aux)->tqunicode()!=':') { //strange characters delete pHash; @@ -1238,7 +1238,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case ',': //goto next @@ -1263,7 +1263,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeArray(const TQChar** aux) { KviKvsArray* pArray = new KviKvsArray(); KviKvsVariant* pElement = 0; @@ -1278,7 +1278,7 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case ',': //goto next @@ -1303,14 +1303,14 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserialize(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserialize(const TQChar** aux) { KviKvsVariant* pResult = 0; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case 't': //true @@ -1361,19 +1361,19 @@ KviKvsVariant* KviKvsVariant::unserialize(const QChar** aux) return pResult; } -KviKvsVariant* KviKvsVariant::unserialize(const QString& data) +KviKvsVariant* KviKvsVariant::unserialize(const TQString& data) { KviKvsVariant* pResult = 0; #ifdef COMPILE_USE_QT4 - const QChar * aux = (const QChar *)data.constData(); + const TQChar * aux = (const TQChar *)data.constData(); #else - const QChar * aux = (const QChar *)data.ucs2(); + const TQChar * aux = (const TQChar *)data.ucs2(); #endif pResult = unserialize(&aux); - if(aux->unicode()) + if(aux->tqunicode()) { //strange extra characters? if(pResult) delete pResult; @@ -1507,7 +1507,7 @@ int KviKvsVariant::compare(const KviKvsVariant * pOther,bool bPreferNumeric) con } } } - return -1 * KviQString::cmpCI(*(m_pData->m_u.pString),*(pOther->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(*(m_pData->m_u.pString),*(pOther->m_pData->m_u.pString)); case KviKvsVariantData::Real: return -1 * KviKvsVariantComparison::compare_real_string(pOther,this); case KviKvsVariantData::Integer: diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h index 99b6471..234bbc7 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.h +++ b/src/kvirc/kvs/kvi_kvs_variant.h @@ -61,7 +61,7 @@ class KviKvsVariantData public: enum Type { Nothing = 0, // m_pData not initialized - String = 1, // QString (scalar) + String = 1, // TQString (scalar) Integer = 2, // long int (scalar) Real = 4, // double (scalar) Array = 8, // KviKvsArray @@ -75,7 +75,7 @@ public: union { kvs_int_t iInteger; kvs_real_t * pReal; - QString * pString; + TQString * pString; KviKvsArray * pArray; KviKvsHash * pHash; bool bBoolean; @@ -95,9 +95,9 @@ public: KviKvsVariant(kvs_real_t dReal); KviKvsVariant(kvs_real_t * pReal); KviKvsVariant(bool bBoolean); - KviKvsVariant(const QString &szString); - KviKvsVariant(const char * szString); // without this gcc chooses the conversion (const char *)->(void *) instead of (const char *)->(QString) and obviously calls the wrong constructor - KviKvsVariant(QString * pString); + KviKvsVariant(const TQString &szString); + KviKvsVariant(const char * szString); // without this gcc chooses the conversion (const char *)->(void *) instead of (const char *)->(TQString) and obviously calls the wrong constructor + KviKvsVariant(TQString * pString); KviKvsVariant(KviKvsArray * pArray); KviKvsVariant(KviKvsHash * pHash); KviKvsVariant(kvs_hobject_t hObject); @@ -111,8 +111,8 @@ public: void setReal(kvs_real_t dReal); void setReal(kvs_real_t * pReal); void setInteger(kvs_int_t iInteger); - void setString(const QString &szString); - void setString(QString * pString); + void setString(const TQString &szString); + void setString(TQString * pString); void setArray(KviKvsArray * pArray); void setHash(KviKvsHash * pHash); void setBoolean(bool bBoolean); @@ -120,7 +120,7 @@ public: void setNothing(); //void unset(){ setNothing(); }; - void getTypeName(QString &szBuffer) const; + void getTypeName(TQString &szBuffer) const; bool isNothing() const { return !m_pData; }; bool isInteger() const { return m_pData ? (m_pData->m_eType == KviKvsVariantData::Integer) : false; }; @@ -149,8 +149,8 @@ public: // evaluates to an object handle bool asHObject(kvs_hobject_t &hObject) const; // evaluates anything to a string - void asString(QString &szBuffer) const; - void appendAsString(QString &szBuffer) const; + void asString(TQString &szBuffer) const; + void appendAsString(TQString &szBuffer) const; // always evaluates to some number... void castToNumber(KviKvsNumber &n) const; @@ -163,7 +163,7 @@ public: kvs_int_t integer() const { return m_pData ? m_pData->m_u.iInteger : 0; }; kvs_real_t real() const { return m_pData ? *(m_pData->m_u.pReal) : 0.0; }; - const QString & string() const { return m_pData ? *(m_pData->m_u.pString) : KviQString::empty; }; + const TQString & string() const { return m_pData ? *(m_pData->m_u.pString) : KviTQString::empty; }; KviKvsArray * array() const { return m_pData ? m_pData->m_u.pArray : 0; }; KviKvsHash * hash() const { return m_pData ? m_pData->m_u.pHash : 0; }; bool boolean() const { return m_pData ? m_pData->m_u.bBoolean : false; }; @@ -184,21 +184,21 @@ public: void operator = (const KviKvsVariant &v){ copyFrom(v); }; //JSON serialization - void serialize(QString& result); - static void serializeString(QString& buffer); - static KviKvsVariant* unserialize(const QString& buffer); + void serialize(TQString& result); + static void serializeString(TQString& buffer); + static KviKvsVariant* unserialize(const TQString& buffer); private: - static KviKvsVariant* unserialize(const QChar** aux); - static KviKvsVariant* unserializeTrue(const QChar** aux); - static KviKvsVariant* unserializeFalse(const QChar** aux); - static KviKvsVariant* unserializeNull(const QChar** aux); - static KviKvsVariant* unserializeArray(const QChar** aux); - static KviKvsVariant* unserializeHash(const QChar** aux); - static void unserializeString(const QChar** aux,QString& buffer); - static KviKvsVariant* unserializeString(const QChar** aux); - static KviKvsVariant* unserializeRealOrInteger(const QChar** aux); - static KviKvsVariant* unserializeReal(const QChar** aux,QString& data); - static KviKvsVariant* unserializeInteger(const QChar** aux,QString& data); + static KviKvsVariant* unserialize(const TQChar** aux); + static KviKvsVariant* unserializeTrue(const TQChar** aux); + static KviKvsVariant* unserializeFalse(const TQChar** aux); + static KviKvsVariant* unserializeNull(const TQChar** aux); + static KviKvsVariant* unserializeArray(const TQChar** aux); + static KviKvsVariant* unserializeHash(const TQChar** aux); + static void unserializeString(const TQChar** aux,TQString& buffer); + static KviKvsVariant* unserializeString(const TQChar** aux); + static KviKvsVariant* unserializeRealOrInteger(const TQChar** aux); + static KviKvsVariant* unserializeReal(const TQChar** aux,TQString& data); + static KviKvsVariant* unserializeInteger(const TQChar** aux,TQString& data); }; #include "kvi_kvs_array.h" diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp index 6c10a2a..2fe00fb 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp @@ -102,14 +102,14 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv m_pList->append(v7); } -KviKvsVariantList::KviKvsVariantList(QString * s1) +KviKvsVariantList::KviKvsVariantList(TQString * s1) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); m_pList->append(new KviKvsVariant(s1)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -117,7 +117,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2) m_pList->append(new KviKvsVariant(s2)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -126,7 +126,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3) m_pList->append(new KviKvsVariant(s3)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -136,7 +136,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr m_pList->append(new KviKvsVariant(s4)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -147,7 +147,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr m_pList->append(new KviKvsVariant(s5)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5,TQString * s6) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -170,9 +170,9 @@ void KviKvsVariantList::setAutoDelete(bool bAutoDelete) m_pList->setAutoDelete(bAutoDelete); } -void KviKvsVariantList::allAsString(QString &szBuffer) +void KviKvsVariantList::allAsString(TQString &szBuffer) { - szBuffer = QString::null; + szBuffer = TQString(); bool bFirst = true; for(KviKvsVariant * v = first();v;v = next()) { @@ -182,7 +182,7 @@ void KviKvsVariantList::allAsString(QString &szBuffer) } } -bool KviKvsVariantList::firstAsString(QString &szBuffer) +bool KviKvsVariantList::firstAsString(TQString &szBuffer) { KviKvsVariant * v = first(); if(!v)return false; @@ -190,7 +190,7 @@ bool KviKvsVariantList::firstAsString(QString &szBuffer) return true; } -bool KviKvsVariantList::nextAsString(QString &szBuffer) +bool KviKvsVariantList::nextAsString(TQString &szBuffer) { KviKvsVariant * v = next(); if(!v)return false; diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h index 09a2498..77b7a46 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.h +++ b/src/kvirc/kvs/kvi_kvs_variantlist.h @@ -41,12 +41,12 @@ public: KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5); KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6); KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6,KviKvsVariant * v7); - KviKvsVariantList(QString * s1); - KviKvsVariantList(QString * s1,QString * s2); - KviKvsVariantList(QString * s1,QString * s2,QString * s3); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6); + KviKvsVariantList(TQString * s1); + KviKvsVariantList(TQString * s1,TQString * s2); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5,TQString * s6); ~KviKvsVariantList(); protected: KviPointerList<KviKvsVariant> * m_pList; @@ -58,7 +58,7 @@ public: void clear(){ m_pList->clear(); }; - void append(const QString &szParam){ m_pList->append(new KviKvsVariant(szParam)); }; + void append(const TQString &szParam){ m_pList->append(new KviKvsVariant(szParam)); }; void append(kvs_int_t iInteger){ m_pList->append(new KviKvsVariant(iInteger)); }; void append(kvs_real_t dReal){ m_pList->append(new KviKvsVariant(dReal)); }; void append(bool bBoolean){ m_pList->append(new KviKvsVariant(bBoolean)); }; @@ -71,11 +71,11 @@ public: void setAutoDelete(bool bAutoDelete); // this is TRUE by default - void allAsString(QString &szBuffer); + void allAsString(TQString &szBuffer); // returns true if there was a first parameter at all - bool firstAsString(QString &szBuffer); + bool firstAsString(TQString &szBuffer); // returns true if there was a next parameter at all - bool nextAsString(QString &szBuffer); + bool nextAsString(TQString &szBuffer); }; #endif //!_KVI_KVS_VARIANTLIST_H_ diff --git a/src/kvirc/kvs/moc_kvi_kvs_action.cpp b/src/kvirc/kvs/moc_kvi_kvs_action.cpp index 25fafd8..b5cc8fa 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_action.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_action.cpp @@ -2,21 +2,21 @@ ** KviKvsAction meta object code from reading C++ file 'kvi_kvs_action.h' ** ** Created: Mon Feb 25 00:11:56 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_action.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAction::className() const @@ -24,69 +24,69 @@ const char *KviKvsAction::className() const return "KviKvsAction"; } -QMetaObject *KviKvsAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAction( "KviKvsAction", &KviKvsAction::staticMetaObject ); +TQMetaObject *KviKvsAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAction( "KviKvsAction", &KviKvsAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAction::staticMetaObject() +TQMetaObject* KviKvsAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsAction", parentObject, + TQMetaObject* tqparentObject = KviAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAction.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAction::qt_cast( const char* clname ) +void* KviKvsAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAction" ) ) return this; - return KviAction::qt_cast( clname ); + return KviAction::tqqt_cast( clname ); } -bool KviKvsAction::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAction::qt_invoke( int _id, TQUObject* _o ) { return KviAction::qt_invoke(_id,_o); } -bool KviKvsAction::qt_emit( int _id, QUObject* _o ) +bool KviKvsAction::qt_emit( int _id, TQUObject* _o ) { return KviAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAction::qt_property( int id, int f, QVariant* v) +bool KviKvsAction::qt_property( int id, int f, TQVariant* v) { return KviAction::qt_property( id, f, v); } -bool KviKvsAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp index 0c436dd..ca87397 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp @@ -2,21 +2,21 @@ ** KviKvsAsyncDnsOperation meta object code from reading C++ file 'kvi_kvs_asyncdnsoperation.h' ** ** Created: Mon Feb 25 00:11:58 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_asyncdnsoperation.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAsyncDnsOperation::className() const @@ -24,67 +24,67 @@ const char *KviKvsAsyncDnsOperation::className() const return "KviKvsAsyncDnsOperation"; } -QMetaObject *KviKvsAsyncDnsOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAsyncDnsOperation( "KviKvsAsyncDnsOperation", &KviKvsAsyncDnsOperation::staticMetaObject ); +TQMetaObject *KviKvsAsyncDnsOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAsyncDnsOperation( "KviKvsAsyncDnsOperation", &KviKvsAsyncDnsOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAsyncDnsOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAsyncDnsOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncDnsOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncDnsOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAsyncDnsOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAsyncDnsOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncDnsOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncDnsOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAsyncDnsOperation::staticMetaObject() +TQMetaObject* KviKvsAsyncDnsOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAsyncOperation::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { 0, &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = KviKvsAsyncOperation::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { 0, &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_0 = {"lookupTerminated", 1, param_slot_0 }; - static const QUMethod slot_1 = {"dnsStartFailed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "lookupTerminated(KviDns*)", &slot_0, QMetaData::Protected }, - { "dnsStartFailed()", &slot_1, QMetaData::Protected } + static const TQUMethod slot_0 = {"lookupTerminated", 1, param_slot_0 }; + static const TQUMethod slot_1 = {"dnsStartFailed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "lookupTerminated(KviDns*)", &slot_0, TQMetaData::Protected }, + { "dnsStartFailed()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsAsyncDnsOperation", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsAsyncDnsOperation", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAsyncDnsOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAsyncDnsOperation::qt_cast( const char* clname ) +void* KviKvsAsyncDnsOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAsyncDnsOperation" ) ) return this; - return KviKvsAsyncOperation::qt_cast( clname ); + return KviKvsAsyncOperation::tqqt_cast( clname ); } -bool KviKvsAsyncDnsOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAsyncDnsOperation::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: lookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: lookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; case 1: dnsStartFailed(); break; default: return KviKvsAsyncOperation::qt_invoke( _id, _o ); @@ -92,16 +92,16 @@ bool KviKvsAsyncDnsOperation::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviKvsAsyncDnsOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsAsyncDnsOperation::qt_emit( int _id, TQUObject* _o ) { return KviKvsAsyncOperation::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAsyncDnsOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsAsyncDnsOperation::qt_property( int id, int f, TQVariant* v) { return KviKvsAsyncOperation::qt_property( id, f, v); } -bool KviKvsAsyncDnsOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAsyncDnsOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp index 72b75b2..256ec05 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp @@ -2,21 +2,21 @@ ** KviKvsAsyncOperation meta object code from reading C++ file 'kvi_kvs_asyncoperation.h' ** ** Created: Mon Feb 25 00:12:00 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_asyncoperation.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAsyncOperation::className() const @@ -24,69 +24,69 @@ const char *KviKvsAsyncOperation::className() const return "KviKvsAsyncOperation"; } -QMetaObject *KviKvsAsyncOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAsyncOperation( "KviKvsAsyncOperation", &KviKvsAsyncOperation::staticMetaObject ); +TQMetaObject *KviKvsAsyncOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAsyncOperation( "KviKvsAsyncOperation", &KviKvsAsyncOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAsyncOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAsyncOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAsyncOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAsyncOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAsyncOperation::staticMetaObject() +TQMetaObject* KviKvsAsyncOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsAsyncOperation", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsAsyncOperation", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAsyncOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAsyncOperation::qt_cast( const char* clname ) +void* KviKvsAsyncOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAsyncOperation" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsAsyncOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAsyncOperation::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviKvsAsyncOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsAsyncOperation::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAsyncOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsAsyncOperation::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsAsyncOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAsyncOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp index 2728412..00b1990 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp @@ -2,21 +2,21 @@ ** KviKvsDnsManager meta object code from reading C++ file 'kvi_kvs_dnsmanager.h' ** ** Created: Mon Feb 25 00:12:02 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_dnsmanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsDnsManager::className() const @@ -24,81 +24,81 @@ const char *KviKvsDnsManager::className() const return "KviKvsDnsManager"; } -QMetaObject *KviKvsDnsManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsDnsManager( "KviKvsDnsManager", &KviKvsDnsManager::staticMetaObject ); +TQMetaObject *KviKvsDnsManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsDnsManager( "KviKvsDnsManager", &KviKvsDnsManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsDnsManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsDnsManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsDnsManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsDnsManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsDnsManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsDnsManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsDnsManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsDnsManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsDnsManager::staticMetaObject() +TQMetaObject* KviKvsDnsManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { "pDns", &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { "pDns", &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_0 = {"dnsLookupTerminated", 1, param_slot_0 }; - static const QMetaData slot_tbl[] = { - { "dnsLookupTerminated(KviDns*)", &slot_0, QMetaData::Protected } + static const TQUMethod slot_0 = {"dnsLookupTerminated", 1, param_slot_0 }; + static const TQMetaData slot_tbl[] = { + { "dnsLookupTerminated(KviDns*)", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsDnsManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsDnsManager", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsDnsManager.setMetaObject( metaObj ); return metaObj; } -void* KviKvsDnsManager::qt_cast( const char* clname ) +void* KviKvsDnsManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsDnsManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsDnsManager::qt_invoke( int _id, QUObject* _o ) +bool KviKvsDnsManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: dnsLookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: dnsLookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsDnsManager::qt_emit( int _id, QUObject* _o ) +bool KviKvsDnsManager::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsDnsManager::qt_property( int id, int f, QVariant* v) +bool KviKvsDnsManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsDnsManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsDnsManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_object.cpp b/src/kvirc/kvs/moc_kvi_kvs_object.cpp index a578edc..e43ea65 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_object.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_object.cpp @@ -2,21 +2,21 @@ ** KviKvsObject meta object code from reading C++ file 'kvi_kvs_object.h' ** ** Created: Mon Feb 25 00:12:06 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_object.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsObject::className() const @@ -24,81 +24,81 @@ const char *KviKvsObject::className() const return "KviKvsObject"; } -QMetaObject *KviKvsObject::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsObject( "KviKvsObject", &KviKvsObject::staticMetaObject ); +TQMetaObject *KviKvsObject::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsObject( "KviKvsObject", &KviKvsObject::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsObject::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsObject::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsObject", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsObject", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsObject::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsObject::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsObject", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsObject", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsObject::staticMetaObject() +TQMetaObject* KviKvsObject::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"delayedDie", 0, 0 }; - static const QUMethod slot_1 = {"objectDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "delayedDie()", &slot_0, QMetaData::Protected }, - { "objectDestroyed()", &slot_1, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"delayedDie", 0, 0 }; + static const TQUMethod slot_1 = {"objectDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "delayedDie()", &slot_0, TQMetaData::Protected }, + { "objectDestroyed()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsObject", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsObject", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsObject.setMetaObject( metaObj ); return metaObj; } -void* KviKvsObject::qt_cast( const char* clname ) +void* KviKvsObject::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsObject" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsObject::qt_invoke( int _id, QUObject* _o ) +bool KviKvsObject::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: delayedDie(); break; case 1: objectDestroyed(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsObject::qt_emit( int _id, QUObject* _o ) +bool KviKvsObject::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsObject::qt_property( int id, int f, QVariant* v) +bool KviKvsObject::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsObject::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsObject::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp index d69f722..6fd559b 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp @@ -2,21 +2,21 @@ ** KviKvsPopupMenuItemLabelHelper meta object code from reading C++ file 'kvi_kvs_popupmenu.h' ** ** Created: Mon Feb 25 00:12:08 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_popupmenu.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsPopupMenuItemLabelHelper::className() const @@ -24,81 +24,81 @@ const char *KviKvsPopupMenuItemLabelHelper::className() const return "KviKvsPopupMenuItemLabelHelper"; } -QMetaObject *KviKvsPopupMenuItemLabelHelper::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsPopupMenuItemLabelHelper( "KviKvsPopupMenuItemLabelHelper", &KviKvsPopupMenuItemLabelHelper::staticMetaObject ); +TQMetaObject *KviKvsPopupMenuItemLabelHelper::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsPopupMenuItemLabelHelper( "KviKvsPopupMenuItemLabelHelper", &KviKvsPopupMenuItemLabelHelper::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsPopupMenuItemLabelHelper::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsPopupMenuItemLabelHelper::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsPopupMenuItemLabelHelper::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsPopupMenuItemLabelHelper::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsPopupMenuItemLabelHelper::staticMetaObject() +TQMetaObject* KviKvsPopupMenuItemLabelHelper::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"labelDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "labelDestroyed()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"labelDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "labelDestroyed()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsPopupMenuItemLabelHelper", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsPopupMenuItemLabelHelper", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsPopupMenuItemLabelHelper.setMetaObject( metaObj ); return metaObj; } -void* KviKvsPopupMenuItemLabelHelper::qt_cast( const char* clname ) +void* KviKvsPopupMenuItemLabelHelper::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsPopupMenuItemLabelHelper" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsPopupMenuItemLabelHelper::qt_invoke( int _id, QUObject* _o ) +bool KviKvsPopupMenuItemLabelHelper::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: labelDestroyed(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsPopupMenuItemLabelHelper::qt_emit( int _id, QUObject* _o ) +bool KviKvsPopupMenuItemLabelHelper::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsPopupMenuItemLabelHelper::qt_property( int id, int f, QVariant* v) +bool KviKvsPopupMenuItemLabelHelper::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsPopupMenuItemLabelHelper::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsPopupMenuItemLabelHelper::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviKvsPopupMenu::className() const @@ -106,112 +106,112 @@ const char *KviKvsPopupMenu::className() const return "KviKvsPopupMenu"; } -QMetaObject *KviKvsPopupMenu::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsPopupMenu( "KviKvsPopupMenu", &KviKvsPopupMenu::staticMetaObject ); +TQMetaObject *KviKvsPopupMenu::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsPopupMenu( "KviKvsPopupMenu", &KviKvsPopupMenu::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsPopupMenu::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsPopupMenu::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenu", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenu", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsPopupMenu::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsPopupMenu::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenu", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenu", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsPopupMenu::staticMetaObject() +TQMetaObject* KviKvsPopupMenu::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalPopupMenu::staticMetaObject(); - static const QUMethod slot_0 = {"setupMenuContents", 0, 0 }; - static const QUParameter param_slot_1[] = { - { "itemId", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviTalPopupMenu::staticMetaObject(); + static const TQUMethod slot_0 = {"setupMenuContents", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { "itemId", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"itemClicked", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "setupMenuContents()", &slot_0, QMetaData::Private }, - { "itemClicked(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"itemClicked", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "setupMenuContents()", &slot_0, TQMetaData::Private }, + { "itemClicked(int)", &slot_1, TQMetaData::Protected } }; - static const QUParameter param_signal_0[] = { - { "it", &static_QUType_ptr, "KviKvsPopupMenuItem", QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "it", &static_TQUType_ptr, "KviKvsPopupMenuItem", TQUParameter::In } }; - static const QUMethod signal_0 = {"testModeItemClicked", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "testModeItemClicked(KviKvsPopupMenuItem*)", &signal_0, QMetaData::Protected } + static const TQUMethod signal_0 = {"testModeItemClicked", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "testModeItemClicked(KviKvsPopupMenuItem*)", &signal_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsPopupMenu", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsPopupMenu", tqparentObject, slot_tbl, 2, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsPopupMenu.setMetaObject( metaObj ); return metaObj; } -void* KviKvsPopupMenu::qt_cast( const char* clname ) +void* KviKvsPopupMenu::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsPopupMenu" ) ) return this; - return KviTalPopupMenu::qt_cast( clname ); + return KviTalPopupMenu::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL testModeItemClicked +// TQT_SIGNAL testModeItemClicked void KviKvsPopupMenu::testModeItemClicked( KviKvsPopupMenuItem* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -bool KviKvsPopupMenu::qt_invoke( int _id, QUObject* _o ) +bool KviKvsPopupMenu::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: setupMenuContents(); break; - case 1: itemClicked((int)static_QUType_int.get(_o+1)); break; + case 1: itemClicked((int)static_TQUType_int.get(_o+1)); break; default: return KviTalPopupMenu::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsPopupMenu::qt_emit( int _id, QUObject* _o ) +bool KviKvsPopupMenu::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: testModeItemClicked((KviKvsPopupMenuItem*)static_QUType_ptr.get(_o+1)); break; + case 0: testModeItemClicked((KviKvsPopupMenuItem*)static_TQUType_ptr.get(_o+1)); break; default: return KviTalPopupMenu::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsPopupMenu::qt_property( int id, int f, QVariant* v) +bool KviKvsPopupMenu::qt_property( int id, int f, TQVariant* v) { return KviTalPopupMenu::qt_property( id, f, v); } -bool KviKvsPopupMenu::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsPopupMenu::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp index 6afd668..38cc563 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp @@ -2,21 +2,21 @@ ** KviKvsProcessAsyncOperation meta object code from reading C++ file 'kvi_kvs_processmanager.h' ** ** Created: Mon Feb 25 00:12:10 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_processmanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsProcessAsyncOperation::className() const @@ -24,69 +24,69 @@ const char *KviKvsProcessAsyncOperation::className() const return "KviKvsProcessAsyncOperation"; } -QMetaObject *KviKvsProcessAsyncOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsProcessAsyncOperation( "KviKvsProcessAsyncOperation", &KviKvsProcessAsyncOperation::staticMetaObject ); +TQMetaObject *KviKvsProcessAsyncOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsProcessAsyncOperation( "KviKvsProcessAsyncOperation", &KviKvsProcessAsyncOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsProcessAsyncOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsProcessAsyncOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsProcessAsyncOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsProcessAsyncOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsProcessAsyncOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsProcessAsyncOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsProcessAsyncOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsProcessAsyncOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsProcessAsyncOperation::staticMetaObject() +TQMetaObject* KviKvsProcessAsyncOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAsyncOperation::staticMetaObject(); - static const QUMethod slot_0 = {"maxRunTimeExpired", 0, 0 }; - static const QUMethod slot_1 = {"ping", 0, 0 }; - static const QUMethod slot_2 = {"readStdout", 0, 0 }; - static const QUMethod slot_3 = {"readStderr", 0, 0 }; - static const QUMethod slot_4 = {"processExited", 0, 0 }; - static const QUMethod slot_5 = {"selfDelete", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "maxRunTimeExpired()", &slot_0, QMetaData::Private }, - { "ping()", &slot_1, QMetaData::Private }, - { "readStdout()", &slot_2, QMetaData::Private }, - { "readStderr()", &slot_3, QMetaData::Private }, - { "processExited()", &slot_4, QMetaData::Private }, - { "selfDelete()", &slot_5, QMetaData::Private } + TQMetaObject* tqparentObject = KviKvsAsyncOperation::staticMetaObject(); + static const TQUMethod slot_0 = {"maxRunTimeExpired", 0, 0 }; + static const TQUMethod slot_1 = {"ping", 0, 0 }; + static const TQUMethod slot_2 = {"readStdout", 0, 0 }; + static const TQUMethod slot_3 = {"readStderr", 0, 0 }; + static const TQUMethod slot_4 = {"processExited", 0, 0 }; + static const TQUMethod slot_5 = {"selfDelete", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "maxRunTimeExpired()", &slot_0, TQMetaData::Private }, + { "ping()", &slot_1, TQMetaData::Private }, + { "readStdout()", &slot_2, TQMetaData::Private }, + { "readStderr()", &slot_3, TQMetaData::Private }, + { "processExited()", &slot_4, TQMetaData::Private }, + { "selfDelete()", &slot_5, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsProcessAsyncOperation", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsProcessAsyncOperation", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsProcessAsyncOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsProcessAsyncOperation::qt_cast( const char* clname ) +void* KviKvsProcessAsyncOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsProcessAsyncOperation" ) ) return this; - return KviKvsAsyncOperation::qt_cast( clname ); + return KviKvsAsyncOperation::tqqt_cast( clname ); } -bool KviKvsProcessAsyncOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsProcessAsyncOperation::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: maxRunTimeExpired(); break; @@ -101,16 +101,16 @@ bool KviKvsProcessAsyncOperation::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviKvsProcessAsyncOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsProcessAsyncOperation::qt_emit( int _id, TQUObject* _o ) { return KviKvsAsyncOperation::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsProcessAsyncOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsProcessAsyncOperation::qt_property( int id, int f, TQVariant* v) { return KviKvsAsyncOperation::qt_property( id, f, v); } -bool KviKvsProcessAsyncOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsProcessAsyncOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp index 05f81bc..8375d94 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp @@ -2,21 +2,21 @@ ** KviKvsTimerManager meta object code from reading C++ file 'kvi_kvs_timermanager.h' ** ** Created: Mon Feb 25 00:12:04 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_timermanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsTimerManager::className() const @@ -24,69 +24,69 @@ const char *KviKvsTimerManager::className() const return "KviKvsTimerManager"; } -QMetaObject *KviKvsTimerManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsTimerManager( "KviKvsTimerManager", &KviKvsTimerManager::staticMetaObject ); +TQMetaObject *KviKvsTimerManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsTimerManager( "KviKvsTimerManager", &KviKvsTimerManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsTimerManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsTimerManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsTimerManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsTimerManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsTimerManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsTimerManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsTimerManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsTimerManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsTimerManager::staticMetaObject() +TQMetaObject* KviKvsTimerManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsTimerManager", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsTimerManager", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsTimerManager.setMetaObject( metaObj ); return metaObj; } -void* KviKvsTimerManager::qt_cast( const char* clname ) +void* KviKvsTimerManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsTimerManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsTimerManager::qt_invoke( int _id, QUObject* _o ) +bool KviKvsTimerManager::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviKvsTimerManager::qt_emit( int _id, QUObject* _o ) +bool KviKvsTimerManager::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsTimerManager::qt_property( int id, int f, QVariant* v) +bool KviKvsTimerManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsTimerManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsTimerManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp b/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp index b2bd5c6..76c6514 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp @@ -2,21 +2,21 @@ ** KviKvsUserAction meta object code from reading C++ file 'kvi_kvs_useraction.h' ** ** Created: Mon Feb 25 00:12:12 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_useraction.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsUserAction::className() const @@ -24,69 +24,69 @@ const char *KviKvsUserAction::className() const return "KviKvsUserAction"; } -QMetaObject *KviKvsUserAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsUserAction( "KviKvsUserAction", &KviKvsUserAction::staticMetaObject ); +TQMetaObject *KviKvsUserAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsUserAction( "KviKvsUserAction", &KviKvsUserAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsUserAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsUserAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsUserAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsUserAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsUserAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsUserAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsUserAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsUserAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsUserAction::staticMetaObject() +TQMetaObject* KviKvsUserAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsUserAction", parentObject, + TQMetaObject* tqparentObject = KviKvsAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsUserAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsUserAction.setMetaObject( metaObj ); return metaObj; } -void* KviKvsUserAction::qt_cast( const char* clname ) +void* KviKvsUserAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsUserAction" ) ) return this; - return KviKvsAction::qt_cast( clname ); + return KviKvsAction::tqqt_cast( clname ); } -bool KviKvsUserAction::qt_invoke( int _id, QUObject* _o ) +bool KviKvsUserAction::qt_invoke( int _id, TQUObject* _o ) { return KviKvsAction::qt_invoke(_id,_o); } -bool KviKvsUserAction::qt_emit( int _id, QUObject* _o ) +bool KviKvsUserAction::qt_emit( int _id, TQUObject* _o ) { return KviKvsAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsUserAction::qt_property( int id, int f, QVariant* v) +bool KviKvsUserAction::qt_property( int id, int f, TQVariant* v) { return KviKvsAction::qt_property( id, f, v); } -bool KviKvsUserAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsUserAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES |