diff options
Diffstat (limited to 'src/kvirc/kvs')
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_callbackobject.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_callbackobject.h | 4 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_object.cpp | 20 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_processmanager.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_script.cpp | 12 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_script.h | 14 |
6 files changed, 27 insertions, 27 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp index 7222f05..9abb9a7 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp @@ -55,7 +55,7 @@ KviKvsCallbackObject::~KviKvsCallbackObject() delete m_pMagicParams; } -KviKvsCallbackObject::CallbacktqStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +KviKvsCallbackObject::CallbackStatus 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 c45ec1b..fca4f89 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 CallbacktqStatus { + enum CallbackStatus { // succesfull execution Success, // error in command @@ -76,7 +76,7 @@ protected: unsigned int m_uFlags; protected: // the parameter list is always shallow! - CallbacktqStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); + CallbackStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); }; diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 677095d..eaae3fd 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -1042,7 +1042,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) kvs_int_t cnt = 0; if(m_pObject) { - const TQMetaObject *o = m_pObject->tqmetaObject(); + const TQMetaObject *o = m_pObject->metaObject(); if(!bArray) w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for TQt class %s"),o->className()); #ifndef COMPILE_USE_QT4 @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) cnt++; } #ifndef COMPILE_USE_QT4 - o = o->tqsuperClass(); + o = o->superClass(); } #endif @@ -1154,9 +1154,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); + int idx = m_pObject->metaObject()->indexOfProperty(szName); #else - int idx = m_pObject->tqmetaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName,true); #endif if(idx < 0) { @@ -1164,10 +1164,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } #ifdef COMPILE_USE_QT4 - TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + TQMetaProperty prop = m_pObject->metaObject()->property(idx); const TQMetaProperty * p = ∝ #else - const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->metaObject()->property(idx,true); #endif if(!p) { @@ -1385,9 +1385,9 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); + int idx = m_pObject->metaObject()->indexOfProperty(szName); #else - int idx = m_pObject->tqmetaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName,true); #endif if(idx < 0) { @@ -1400,10 +1400,10 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } #ifdef COMPILE_USE_QT4 - TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + TQMetaProperty prop = m_pObject->metaObject()->property(idx); const TQMetaProperty * p = ∝ #else - const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->metaObject()->property(idx,true); #endif if(!p) { diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index a7aeacb..2f3219c 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -330,7 +330,7 @@ void KviKvsProcessAsyncOperation::processExited() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED) { TQString szRetVal; - szRetVal.setNum(m_pProcess->exitqStatus()); + szRetVal.setNum(m_pProcess->exiStatus()); trigger(EventTerminated,szRetVal); } diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp index c9c4f4f..d77919d 100644 --- a/src/kvirc/kvs/kvi_kvs_script.cpp +++ b/src/kvirc/kvs/kvi_kvs_script.cpp @@ -293,22 +293,22 @@ int KviKvsScript::executeInternal(KviKvsRunTimeContext * pContext) // lock this script m_pData->m_uLock++; - int iRuntqStatus = Success; + int iRunStatus = Success; if(!m_pData->m_pTree->execute(pContext)) { - if(pContext->error())iRuntqStatus = Error; + if(pContext->error())iRunStatus = Error; else { // else just a halt, return or sth like that if(pContext->haltCalled()) - iRuntqStatus |= HaltEncountered; + iRunStatus |= HaltEncountered; } } // we can't block any longer: unlock m_pData->m_uLock--; - return iRuntqStatus; + return iRunStatus; } 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 iRuntqStatus = executeInternal(&ctx); + int iRunStatus = executeInternal(&ctx); // don't forget to delete the params if(bDeleteParams)delete pParams; if(bDeleteRetVal)delete pRetVal; pParams = 0; pRetVal = 0; - return iRuntqStatus; + return iRunStatus; } diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h index 2bfd6b8..60e96a0 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 RuntqStatus { + enum RunStatus { // the script returned an error Error = 0, // the script ran succesfully @@ -97,7 +97,7 @@ public: Quiet = 8 }; // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RuntqStatus flags on success + // returns a nonzero combination of RunStatus 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,7 +105,7 @@ 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 RuntqStatus flags on success + // returns a nonzero combination of RunStatus flags on success // this is probably used only in /eval int run(KviKvsRunTimeContext * pContext,int iRunFlags = 0); @@ -118,12 +118,12 @@ public: KviKvsExtendedRunTimeData * pExtData = 0); // static helpers for quick running - // returns a combination of RuntqStatus flags (nonzero on no error) + // returns a combination of RunStatus flags (nonzero on no error) // does NOT take params ownership static int run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); // static helper for quick evaluating parameters - // returns a combination of RuntqStatus flags (nonzero on no error) + // returns a combination of RunStatus 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 TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); @@ -137,14 +137,14 @@ protected: bool parse(KviWindow * pOutput = 0, int iRunFlags = 0); // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RuntqStatus flags on success + // returns a nonzero combination of RunStatus 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 RuntqStatus flags on success + // returns a nonzero combination of RunStatus flags on success int executeInternal(KviKvsRunTimeContext * pContext); const TQChar * buffer() const; // detaches this script from any other shallow copies |