TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent c6611272c2
commit 32a249baae
154 changed files with 484 additions and 484 deletions
Show Stats Download Patch File Download Diff File

2
data/deftheme/silverirc/themedata.kvc
Unescape View File

@ -163,7 +163,7 @@ iccolor1=0,0,0
mirccolor12=15,15,255
mirccolor5=150,0,0
msgtypeChanAdmin=242,3,100,1,1
msgtypeGenerictqStatus=133,14,100,1,1
msgtypeGenericStatus=133,14,100,1,1
msgtypeHalfOp=174,3,100,1,1
msgtypeDevoice=63,3,100,1,1
msgtypeJoin=39,14,100,1,2

2
data/doctemplates/rfc2812.template
Unescape View File

@ -23,7 +23,7 @@ Category: Informational
[/td][/tr]
[tr][td]
[b]tqStatus of this Memo[/b]
[b]Status of this Memo[/b]
[/td][/tr]
[tr][td]

6
src/kvilib/ext/kvi_stringconversion.cpp
Unescape View File

@ -234,17 +234,17 @@ namespace KviStringConversion
bool fromString(const TQString & szValue,TQFont &buffer)
{
KviStr str = szValue;
KviStr family,pointSize,tqstyleHint,weight,options;
KviStr family,pointSize,styleHint,weight,options;
str.getToken(family,',');
str.getToken(pointSize,',');
str.getToken(tqstyleHint,',');
str.getToken(styleHint,',');
str.getToken(weight,',');
if(!family.isEmpty())buffer.setFamily(family.ptr());
int i;
bool bOk;
i = pointSize.toInt(&bOk);
if(bOk && (i > 0))buffer.setPointSize(i);
i = tqstyleHint.toInt(&bOk);
i = styleHint.toInt(&bOk);
if(bOk && (i >= 0))buffer.setStyleHint((TQFont::StyleHint)i);
i = weight.toInt(&bOk);
if(bOk && (i >= 0))buffer.setWeight(i);

58
src/kvilib/net/kvi_http.cpp
Unescape View File

@ -55,24 +55,24 @@ KviHttpRequest::KviHttpRequest()
m_bHeaderProcessed = false;
m_pBuffer = new KviDataBuffer();
resettqStatus();
resetStatus();
resetData();
}
KviHttpRequest::~KviHttpRequest()
{
resetInternaltqStatus();
resetInternalStatus();
delete m_pBuffer;
}
void KviHttpRequest::abort()
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Aborted");
emit terminated(false);
}
void KviHttpRequest::resetInternaltqStatus()
void KviHttpRequest::resetInternalStatus()
{
if(m_pThread)delete m_pThread;
if(m_pDns)delete m_pDns;
@ -91,7 +91,7 @@ void KviHttpRequest::resetInternaltqStatus()
KviThreadManager::killPendingEvents(this);
}
void KviHttpRequest::resettqStatus()
void KviHttpRequest::resetStatus()
{
m_szLastError = __tr2qs("No request");
m_uTotalSize = 0;
@ -114,9 +114,9 @@ void KviHttpRequest::resetData()
void KviHttpRequest::reset()
{
resettqStatus();
resetStatus();
resetData();
resetInternaltqStatus();
resetInternalStatus();
}
bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFileName)
@ -131,8 +131,8 @@ bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFile
bool KviHttpRequest::start()
{
// ensure that the file is closed
resetInternaltqStatus();
resettqStatus();
resetInternalStatus();
resetStatus();
if(m_eProcessingType == StoreToFile)
{
@ -156,14 +156,14 @@ bool KviHttpRequest::start()
if(m_url.host().isEmpty())
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Invalid URL: Missing hostname");
return false;
}
if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr());
return false;
}
@ -185,7 +185,7 @@ bool KviHttpRequest::startDnsLookup()
if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Unable to start the DNS lookup");
return false;
}
@ -212,7 +212,7 @@ void KviHttpRequest::dnsLookupDone(KviDns *d)
haveServerIp();
} else {
int iErr = d->error();
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = KviError::getDescription(iErr);
emit terminated(false);
}
@ -242,7 +242,7 @@ void KviHttpRequest::haveServerIp()
if(!m_pThread->start())
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Unable to start the request slave thread");
emit terminated(false);
return;
@ -318,7 +318,7 @@ bool KviHttpRequest::event(TQEvent *e)
// nothing... just make gcc happy
break;
}
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Success");
emit terminated(true);
return true;
@ -328,7 +328,7 @@ bool KviHttpRequest::event(TQEvent *e)
KviStr * err = ((KviThreadDataEvent<KviStr> *)e)->getData();
m_szLastError = __tr2qs_no_xgettext(err->ptr());
delete err;
resetInternaltqStatus();
resetInternalStatus();
emit terminated(false);
return true;
}
@ -425,7 +425,7 @@ bool KviHttpRequest::openFile()
if(!d.rename(m_szFileName,tmp))
{
// fail :(
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Failed to rename the existing file, please rename manually and retry");
emit terminated(false);
return false;
@ -443,7 +443,7 @@ bool KviHttpRequest::openFile()
if(!m_pFile->openForWriting(bAppend))
{
resetInternaltqStatus();
resetInternalStatus();
KviTQString::sprintf(m_szLastError,__tr2qs("Can't open file \"%Q\" for writing"),&m_szFileName);
emit terminated(false);
return false;
@ -473,7 +473,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
bool bValid = false;
unsigned int utqStatus = 0;
unsigned int uStatus = 0;
// check the response value
if(kvi_strEqualCSN(szResponse.ptr(),"HTTP",4))
@ -486,14 +486,14 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
if(idx != -1)szNumber = szR.left(idx);
else szNumber = szR;
bool bOk;
utqStatus = szNumber.toUInt(&bOk);
uStatus = szNumber.toUInt(&bOk);
if(bOk)bValid = true;
}
if(!bValid)
{
// the response is invalid ?
resetInternaltqStatus();
resetInternalStatus();
m_szLastError=__tr2qs("Invalid HTTP response: %s").tqarg(szResponse.ptr());
emit terminated(false);
return false;
@ -608,14 +608,14 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
// case 504: // Gateway timeout
// case 505: // HTTP Version not supported
if((utqStatus != 200) && (utqStatus != 206))
if((uStatus != 200) && (uStatus != 206))
{
// this is not "OK" and not "Partial content"
// Error , redirect or something confusing
if(m_eProcessingType != HeadersOnly)
{
// this is an error then
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = szResponse.ptr();
emit terminated(false);
return false;
@ -624,7 +624,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
if((m_uMaxContentLength > 0) && (m_uTotalSize > ((unsigned int)m_uMaxContentLength)))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError=__tr2qs("Stream exceeding maximum length");
emit terminated(false);
return false;
@ -657,7 +657,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
// header not complete
if(m_pBuffer->size() > 4096)
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Header too long: exceeded 4096 bytes");
emit terminated(false);
}
@ -706,7 +706,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError=__tr2qs("Stream exceeded expected length");
emit terminated(false);
}
@ -794,7 +794,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
m_uRemainingChunkSize = szHexHeader.toLong(&bOk,16);
if(!bOk)
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Protocol error: invalid chunk size");
emit terminated(false);
return;
@ -814,7 +814,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
// chunk header not complete
if(m_pBuffer->size() > 4096)
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Chunk header too long: exceeded 4096 bytes");
emit terminated(false);
return;
@ -848,7 +848,7 @@ check_stream_length:
if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError=__tr2qs("Stream exceeded expected length");
emit terminated(false);
}

4
src/kvilib/net/kvi_http.h
Unescape View File

@ -104,9 +104,9 @@ protected:
bool openFile();
void emitLines(KviDataBuffer * pDataBuffer);
void resettqStatus();
void resetStatus();
void resetData();
void resetInternaltqStatus();
void resetInternalStatus();
protected slots:
void dnsLookupDone(KviDns *d);
void haveServerIp();

22
src/kvilib/tal/kvi_tal_listview.cpp
Unescape View File

@ -479,7 +479,7 @@
return;
TQPoint pos;
int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (activatedPos(pos)) {
bool parentControl = false;
if (parent() && parent()->rtti() == 1 &&
@ -652,7 +652,7 @@
int h = height();
KviTalListView *lv = listView();
if (lv)
h = qMax(lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
h = qMax(lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
h);
h = qMax(h, TQApplication::globalStrut().height());
setHeight(h);
@ -666,7 +666,7 @@
if (myType == RadioButtonController && pixmap(0)) {
// r += 0;
} else {
r += lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
r += lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
}
}
return qMax(r, TQApplication::globalStrut().width());
@ -700,7 +700,7 @@
parentControl = true;
TQFontMetrics fm(lv->fontMetrics());
int boxsize = lv->tqstyle()->tqpixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
int boxsize = lv->tqstyle()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
TQStyle::PM_CheckListButtonSize, 0, lv);
int marg = lv->itemMargin();
int r = marg;
@ -782,7 +782,7 @@
(lv->rootIsDecorated() || myType == RadioButton ||
(myType == CheckBox && parentControl))) {
TQRect rect;
int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (lv->columnAlignment(0) == TQt::AlignCenter) {
TQFontMetrics fm(lv->font());
int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
@ -1216,7 +1216,7 @@
return;
TQPoint pos;
int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( activatedPos( pos ) ) {
bool parentControl = FALSE;
if ( parent() && parent()->rtti() == 1 &&
@ -1388,7 +1388,7 @@
int h = height();
KviTalListView *lv = listView();
if ( lv )
h = TQMAX( lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv),
h = TQMAX( lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv),
h );
h = TQMAX( h, TQApplication::globalStrut().height() );
setHeight( h );
@ -1402,7 +1402,7 @@
if ( myType == RadioButtonController && pixmap( 0 ) ) {
// r += 0;
} else {
r += lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
r += lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
}
}
return TQMAX( r, TQApplication::globalStrut().width() );
@ -1420,7 +1420,7 @@
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@ -1437,7 +1437,7 @@
parentControl = TRUE;
TQFontMetrics fm( lv->fontMetrics() );
int boxsize = lv->tqstyle().tqpixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
int boxsize = lv->tqstyle().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@ -1519,7 +1519,7 @@
(lv->rootIsDecorated() || myType == RadioButton ||
(myType == CheckBox && parentControl) ) ) {
TQRect rect;
int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( lv->columnAlignment(0) == AlignCenter ) {
TQFontMetrics fm( lv->font() );
int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;

2
src/kvilib/tal/kvi_tal_wizard.cpp
Unescape View File

@ -184,7 +184,7 @@ KviTalWizard::KviTalWizard(TQWidget * pParent)
#endif
m_p->pStepsLabel = new TQLabel(this);
m_p->pStepsLabel->setMinimumWidth(80);
m_p->pStepsLabel->tqsetAlignment(TQt::AlignRight);
m_p->pStepsLabel->setAlignment(TQt::AlignRight);
#ifdef COMPILE_USE_QT4
m_p->pLayout->addWidget(m_p->pStepsLabel,0,4,1,3);
#else

8
src/kvirc/kernel/kvi_app.cpp
Unescape View File

@ -228,7 +228,7 @@ void KviApp::setup()
//need to load image plugins:(
TQString szPluginsDir;
getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/");
tqsetLibraryPaths(TQStringList(szPluginsDir));
setLibraryPaths(TQStringList(szPluginsDir));
//KviMessageBox::information(libraryPaths().join(";"));
//debug("%1",loader.isLoaded());
#endif
@ -696,11 +696,11 @@ void KviApp::contextSensitiveHelp()
#ifndef COMPILE_USE_QT4
// the F1 Key has been pressed
// try to pass it to the active widget or one of its parents
TQWidget * w = g_pApp->tqfocusWidget();
TQWidget * w = g_pApp->focusWidget();
while(w)
{
//TQVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG
TQMetaObject * o = w->tqmetaObject();
TQMetaObject * o = w->metaObject();
if(o)
{
int i = o->findProperty("contextSensitiveHelp",true);
@ -1368,7 +1368,7 @@ void KviApp::updateApplicationFont()
if(KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont))
{
if(font() != KVI_OPTION_FONT(KviOption_fontApplication))
tqsetFont(KVI_OPTION_FONT(KviOption_fontApplication),true);
setFont(KVI_OPTION_FONT(KviOption_fontApplication),true);
}
// FIXME: #warning "And what if this option is turned off ?...a reboot only"
}

2
src/kvirc/kernel/kvi_app_fs.cpp
Unescape View File

@ -228,7 +228,7 @@ bool KviApp::trashFile(const char *filename)
KviStr lastPart = filename;
lastPart.cutToLast(KVI_PATH_SEPARATOR_CHAR); // need only the filename
lastPart.append(".bak_");
TQDateTime tm(TQDateTime::tqcurrentDateTime());
TQDateTime tm(TQDateTime::currentDateTime());
lastPart.append(tm.toString());
lastPart.replaceAll(' ',"_");
// Ok...have lastPart.bak_Dec_11_31_1999

8
src/kvirc/kernel/kvi_ircconnection.cpp
Unescape View File

@ -981,10 +981,10 @@ void KviIrcConnection::loginToIrcServer()
if(KVI_OPTION_BOOL(KviOption_boolPrependGenderInfoToRealname) && !KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).isEmpty())
{
szGenderTag.append(KVI_TEXT_COLOR);
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false))
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false))
{
szGenderTag.append("1");
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false))
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false))
{
szGenderTag.append("2");
}
@ -1017,9 +1017,9 @@ void KviIrcConnection::loginToIrcServer()
}
} // else buuug
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){
e->setGender(KviIrcUserEntry::Male);
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){
e->setGender(KviIrcUserEntry::Female);
}

6
src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
Unescape View File

@ -70,7 +70,7 @@ KviIrcConnectionTargetResolver::KviIrcConnectionTargetResolver(KviIrcConnection
m_pServerDns = 0;
m_eState = Idle;
m_etqStatus = Success;
m_eStatus = Success;
m_iLastError = KviError_success;
}
@ -544,12 +544,12 @@ void KviIrcConnectionTargetResolver::haveServerIp()
terminate(Success,KviError_success);
}
void KviIrcConnectionTargetResolver::terminate(tqStatus s,int iLastError)
void KviIrcConnectionTargetResolver::terminate(Status s,int iLastError)
{
__ASSERT(m_eState != Terminated);
cleanup(); // do a cleanup anyway
m_eState = Terminated;
m_etqStatus = s;
m_eStatus = s;
m_iLastError = iLastError;
emit terminated();
}

8
src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
Unescape View File

@ -44,13 +44,13 @@ protected:
KviIrcConnectionTargetResolver(KviIrcConnection * pConnection);
~KviIrcConnectionTargetResolver();
public:
enum tqStatus { Success, Error };
enum Status { Success, Error };
enum State { Idle, Running, Terminated };
private:
KviIrcConnection * m_pConnection; // shallow, never null
KviIrcConnectionTarget * m_pTarget; // shallow, never null
KviConsole * m_pConsole; // shallow, never null
tqStatus m_etqStatus;
Status m_eStatus;
State m_eState;
// Auxiliary stuff
@ -66,7 +66,7 @@ private:
public:
void start(KviIrcConnectionTarget * t);
// valid only after the terminated() signal
tqStatus status(){ return m_etqStatus; };
Status status(){ return m_eStatus; };
int lastError(){ return m_iLastError; };
// causes the resolver to terminate with iLastError == KviError_operationAborted
// the terminated() signal is emitted.
@ -81,7 +81,7 @@ private:
void lookupServerHostname();
void haveServerIp();
bool validateLocalAddress(const TQString &szAddress,TQString &szBuffer);
void terminate(tqStatus s,int iLastError);
void terminate(Status s,int iLastError);
signals:
void terminated();
};

2
src/kvirc/kernel/kvi_main.cpp
Unescape View File

@ -367,7 +367,7 @@ int main(int argc,char ** argv)
bool bLocked = false;
if(inf.exists())
{
iLocked = inf.lastModified().secsTo(TQDateTime::tqcurrentDateTime());
iLocked = inf.lastModified().secsTo(TQDateTime::currentDateTime());
}
*/

2
src/kvirc/kvs/kvi_kvs_callbackobject.cpp
Unescape View File

@ -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)

4
src/kvirc/kvs/kvi_kvs_callbackobject.h
Unescape View File

@ -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);
};

20
src/kvirc/kvs/kvi_kvs_object.cpp
Unescape View File

@ -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 = &prop;
#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 = &prop;
#else
const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true);
const TQMetaProperty * p = m_pObject->metaObject()->property(idx,true);
#endif
if(!p)
{

2
src/kvirc/kvs/kvi_kvs_processmanager.cpp
Unescape View File

@ -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);
}

12
src/kvirc/kvs/kvi_kvs_script.cpp
Unescape View File

@ -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;
}

14
src/kvirc/kvs/kvi_kvs_script.h
Unescape View File

@ -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

6
src/kvirc/sparser/kvi_sp_ctcp.cpp
Unescape View File

@ -1331,7 +1331,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg)
{
if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime))
{
replyCtcp(msg,TQDateTime::tqcurrentDateTime().toString());
replyCtcp(msg,TQDateTime::currentDateTime().toString());
} else msg->bIgnored = true;
}
@ -1491,9 +1491,9 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpAvatar))
{
TQString szGenderTag=" ";
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){
if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){
szGenderTag.append("M");
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){
} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){
szGenderTag.append("F");
} else {
szGenderTag.append("?");

4
src/kvirc/sparser/kvi_sp_literal.cpp
Unescape View File

@ -1402,7 +1402,7 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
chan->topicWidget()->setTopic(szTopic);
chan->topicWidget()->setTopicSetBy(szNick);
TQString tmp = TQDateTime::tqcurrentDateTime().toString();
TQString tmp = TQDateTime::currentDateTime().toString();
chan->topicWidget()->setTopicSetAt(tmp);
chan->userAction(szNick,szUser,szHost,KVI_USERACTION_TOPIC);
@ -1800,7 +1800,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
#define CHANNEL_MODE(__modefl,__evmeset,__evmeunset,__evset,__evunset,__icomeset,__icomeunset,__icoset,__icounset) \
case __modefl: \
aParam = msg->connection()->decodeText(msg->safeParam(curParam++)); \
chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),TQDateTime::tqcurrentDateTime().toTime_t()); \
chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),TQDateTime::currentDateTime().toTime_t()); \
auxMask = new KviIrcMask(aParam); \
bIsMe = auxMask->matchesFixed( \
msg->connection()->userInfo()->nickName(), \

18
src/kvirc/ui/kvi_channel.cpp
Unescape View File

@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging();
applyOptions();
m_joinTime = TQDateTime::tqcurrentDateTime();
m_joinTime = TQDateTime::currentDateTime();
m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t();
@ -547,23 +547,23 @@ void KviChannel::resizeEvent(TQResizeEvent *e)
{
#ifdef COMPILE_USE_QT4
int hght = m_pInput->heightHint();
int hght2 = m_pTopicWidget->tqsizeHint().height();
int hght2 = m_pTopicWidget->sizeHint().height();
m_pButtonBox->setGeometry(0,0,width(),hght2);
m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
m_pInput->setGeometry(0,height() - hght,width(),hght);
#else
int hght = m_pInput->heightHint();
int hght2 = m_pButtonBox->tqsizeHint().height();
int hght2 = m_pButtonBox->sizeHint().height();
m_pButtonBox->setGeometry(0,0,width(),hght2);
m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
m_pInput->setGeometry(0,height() - hght,width(),hght);
#endif
}
TQSize KviChannel::tqsizeHint() const
TQSize KviChannel::sizeHint() const
{
TQSize ret(m_pSplitter->tqsizeHint().width(),
m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height());
TQSize ret(m_pSplitter->sizeHint().width(),
m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height());
return ret;
}
@ -655,7 +655,7 @@ void KviChannel::setAliveChan()
m_iStateFlags = 0;
setType(KVI_WINDOW_TYPE_CHANNEL);
m_pUserListView->setUserDataBase(connection()->userDataBase());
m_joinTime = TQDateTime::tqcurrentDateTime();
m_joinTime = TQDateTime::currentDateTime();
context()->unregisterDeadChannel(this);
connection()->registerChannel(this);
// Update log file name
@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA
if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
{
if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
{
// we can't exactly estimate
if(dSpan < 60.0)dSpan = 60.0;
@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
{
if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
{
// we can't exactly estimate
s->bStatsInaccurate = true;

2
src/kvirc/ui/kvi_channel.h
Unescape View File

@ -233,7 +233,7 @@ public:
void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); };
char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); };
bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); };
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); };
KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0)
{ return m_pUserListView->join(nick,user,host,iFlags); };

6
src/kvirc/ui/kvi_console.cpp
Unescape View File

@ -1087,15 +1087,15 @@ void KviConsole::applyOptions()
void KviConsole::resizeEvent(TQResizeEvent *e)
{
int hght = m_pInput->heightHint();
int hght2 = m_pButtonBox->tqsizeHint().height();
int hght2 = m_pButtonBox->sizeHint().height();
m_pButtonBox->setGeometry(0,0,width(),hght2);
m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
m_pInput->setGeometry(0,height() - hght,width(),hght);
}
TQSize KviConsole::tqsizeHint() const
TQSize KviConsole::sizeHint() const
{
TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
TQSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
return ret;
}

4
src/kvirc/ui/kvi_console.h
Unescape View File

@ -101,7 +101,7 @@ protected:
virtual void getBaseLogFileName(TQString &buffer);
virtual void getTaskBarTipText(TQString &buffer);
virtual void fillContextPopup(KviTalPopupMenu * p);
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
virtual void applyOptions();
virtual void triggerCreationEvents();
void fillStatusString();
@ -181,7 +181,7 @@ public:
void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0);
// tqStatus string (usermode + nick) (connection related too)
// Status string (usermode + nick) (connection related too)
const TQString & statusString(){ return m_szStatusString; };
// forwarders from KviIrcConnection

4
src/kvirc/ui/kvi_cryptcontroller.cpp
Unescape View File

@ -107,9 +107,9 @@
m_pDescriptionLabel = new TQLabel(this);
m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel);
#ifdef COMPILE_USE_QT4
m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
#else
m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
#endif
g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3);

2
src/kvirc/ui/kvi_ctcppagedialog.cpp
Unescape View File

@ -103,7 +103,7 @@ void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,co
TQLabel * l = new TQLabel(this);
l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
//l->setMaximumWidth(600);
TQString date = TQDateTime::tqcurrentDateTime().toString();
TQString date = TQDateTime::currentDateTime().toString();
TQString tmp = "<center>";
tmp += __tr2qs("You have been paged by");

12
src/kvirc/ui/kvi_customtoolbar.cpp
Unescape View File

@ -62,17 +62,17 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c
m_pToolBar = pParent;
setBackgroundMode(pParent->backgroundMode());
setBackgroundOrigin(ParentOrigin);
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
}
TQSize KviCustomToolBarSeparator::tqsizeHint() const
TQSize KviCustomToolBarSeparator::sizeHint() const
{
#ifdef COMPILE_USE_QT4
TQStyleOption opt;
opt.initFrom(this);
int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
int extent = tqstyle()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
#else
int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
int extent = tqstyle().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
#endif
if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0);
else return TQSize(0,extent);
@ -88,7 +88,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *)
#else
TQStyle::SFlags flags = TQStyle::Style_Default;
if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags);
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
#endif
}
@ -293,7 +293,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e)
boxLayout()->insertWidget(idx,m_pDraggedChild);
#ifdef COMPILE_KDE_SUPPORT
// bleah ://///
insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx);
insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx);
#endif
#endif
TQEvent ev(TQEvent::LayoutHint);

2
src/kvirc/ui/kvi_customtoolbar.h
Unescape View File

@ -41,7 +41,7 @@ class KviCustomToolBarSeparator : public TQWidget
TQ_OBJECT
public:
KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name);
TQSize tqsizeHint() const;
TQSize sizeHint() const;
protected:
KviCustomToolBar * m_pToolBar;
protected:

4
src/kvirc/ui/kvi_debugwindow.cpp
Unescape View File

@ -124,9 +124,9 @@ void KviDebugWindow::resizeEvent(TQResizeEvent *e)
m_pInput->setGeometry(0,height() - hght,width(),hght);
}
TQSize KviDebugWindow::tqsizeHint() const
TQSize KviDebugWindow::sizeHint() const
{
TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
return ret;
}

2
src/kvirc/ui/kvi_debugwindow.h
Unescape View File

@ -49,7 +49,7 @@ protected:
virtual void loadProperties(KviConfig * cfg);
virtual void saveProperties(KviConfig * cfg);
virtual void getBaseLogFileName(TQString &buffer);
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
};
#endif //_KVI_DEBUGWINDOW_H_

4
src/kvirc/ui/kvi_frame.cpp
Unescape View File

@ -879,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd)
if(wnd->isMaximized() && wnd->mdiParent())updateCaption();
m_pTaskBar->setActiveItem(wnd->taskBarItem());
//wnd->gainedActiveWindowtqStatus(); // <-- atm unused
//wnd->gainedActiveWindowStatus(); // <-- atm unused
if(g_pActiveWindow->view())
g_pActiveWindow->view()->clearUnreaded();
@ -1165,7 +1165,7 @@ void KviFrame::toolbarsPopupSelected(int id)
bool KviFrame::focusNextPrevChild(bool next)
{
//debug("FOCUS NEXT PREV CHILD");
TQWidget * w = tqfocusWidget();
TQWidget * w = focusWidget();
if(w)
{
#ifdef COMPILE_USE_QT4

4
src/kvirc/ui/kvi_imagedialog.cpp
Unescape View File

@ -67,7 +67,7 @@ void KviImageDialogItem::paint(TQPainter * p)
p->drawRect(3,3,pm->width() + 4,pm->height() + 4);
}
TQRect daRect(listBox()->tqitemRect(this));
TQRect daRect(listBox()->itemRect(this));
p->setPen(TQt::black);
p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2);
@ -361,7 +361,7 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
{
KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt);
if(!it)return;
TQRect r = m_pListBox->tqitemRect(it);
TQRect r = m_pListBox->itemRect(it);
KviImageDialogItem * i = (KviImageDialogItem *)it;
m_pTip->tip(r,i->tipText());
}

10
src/kvirc/ui/kvi_input.cpp
Unescape View File

@ -299,10 +299,10 @@ void KviInputEditor::dropEvent(TQDropEvent *e)
int KviInputEditor::heightHint() const
{
return tqsizeHint().height();
return sizeHint().height();
}
TQSize KviInputEditor::tqsizeHint() const
TQSize KviInputEditor::sizeHint() const
{
//grabbed from qlineedit.cpp
constPolish();
@ -2335,7 +2335,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
m_pButtonContainer->setSpacing(0);
#ifdef COMPILE_USE_QT4
m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
// if(m_pButtonContainer->tqlayout())
// m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize);