diff options
Diffstat (limited to 'src/kvirc')
101 files changed, 613 insertions, 613 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 30f26dc..ad1772c 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -94,9 +94,9 @@ #include <tq3mimefactory.h> #endif #include "kvi_tal_listbox.h" -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmessagebox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqmetaobject.h> #ifdef COMPILE_SSL_SUPPORT @@ -112,7 +112,7 @@ #ifdef COMPILE_USE_QT4 #include <TQTextDocument> #else - #include <tqstylesheet.h> + #include <stylesheet.h> #endif KVIRC_API KviApp * g_pApp = 0; // global application pointer @@ -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); @@ -916,8 +916,8 @@ TQString KviApp::getClipboardText() return buffer; */ - TQString buffer = tqclipboard()->text(TQClipboard::Clipboard); - if(buffer.isEmpty())return tqclipboard()->text(TQClipboard::Selection); + TQString buffer = clipboard()->text(TQClipboard::Clipboard); + if(buffer.isEmpty())return clipboard()->text(TQClipboard::Selection); return buffer; } @@ -945,8 +945,8 @@ void KviApp::setClipboardText(const TQString &str) #if [[[TQT_VERSION IS DEPRECATED]]] >= 300 } #endif*/ - tqclipboard()->setText(str,TQClipboard::Clipboard); - tqclipboard()->setText(str,TQClipboard::Selection); + clipboard()->setText(str,TQClipboard::Clipboard); + clipboard()->setText(str,TQClipboard::Selection); } void KviApp::setClipboardText(const KviStr &str) @@ -1038,7 +1038,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co if(szNick.isEmpty()) szMsg = __tr2qs("File download failed"); else - szMsg = __tr2qs("File download from %1 failed").tqarg(szNick); + szMsg = __tr2qs("File download from %1 failed").arg(szNick); szMsg += ": "; szMsg += szError; szMsg += " ("; @@ -1049,7 +1049,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co if(szNick.isEmpty()) szMsg = __tr2qs("File download successfully complete"); else - szMsg = __tr2qs("File download from %1 successfully complete").tqarg(szNick); + szMsg = __tr2qs("File download from %1 successfully complete").arg(szNick); szMsg += " ("; szMsg += szLocalFileName; szMsg += ")"; @@ -1117,7 +1117,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co #endif rinfo.activate(); - TQString name = TQString("DESKTOP%1").tqarg(rinfo.currentDesktop()); + TQString name = TQString("DESKTOP%1").arg(rinfo.currentDesktop()); g_pKdeDesktopBackground = new KSharedPixmap(); connect(g_pKdeDesktopBackground,TQT_SIGNAL(done(bool)),this,TQT_SLOT(kdeRootPixmapDownloadComplete(bool))); @@ -1141,7 +1141,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co return; } - if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").tqarg(rinfo.currentDesktop()))) + if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").arg(rinfo.currentDesktop()))) { debug("Can't load the KDE root background image..."); delete g_pKdeDesktopBackground; @@ -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" } diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 6a9ad8a..ad8ce5a 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -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 diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index de8b1a1..27d70a2 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -27,7 +27,7 @@ //#define _KVI_DEBUG_CHECK_RANGE_ //#include "kvi_debug.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include "kvi_settings.h" #include "kvi_defaults.h" @@ -63,7 +63,7 @@ #endif //COMPILE_ON_WINDOWS #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 4051d21..fb6fa04 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -958,7 +958,7 @@ void KviChangeUserModeAction::popupAboutToShow() { TQChar ccc = szModes[0]; szModes.remove(0,1); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),TQString("+%1 Mode").tqarg(ccc)); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),TQString("+%1 Mode").arg(ccc)); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode(ccc.latin1())); } } diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp index 2e3b8fa..8bf97f4 100644 --- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp +++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp @@ -127,7 +127,7 @@ void KviCustomToolBarDescriptor::fillToolBar() { if(m_pActions->count() == 0) { - // force tqlayout of the toolbar + // force layout of the toolbar TQApplication::postEvent(m_pToolBar,new TQEvent(TQEvent::LayoutHint)); } else { KviPointerList<TQString> dying; diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 3f39398..d3d4114 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -186,5 +186,5 @@ int KviFileTransfer::displayHeight(int iLineSpacing) void KviFileTransfer::displayUpdate() { - if(m_pDisplayItem)m_pDisplayItem->tqrepaint(); + if(m_pDisplayItem)m_pDisplayItem->repaint(); } diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index db36287..60b0dbb 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -36,7 +36,7 @@ #include "kvi_fileutils.h" #include "kvi_options.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #ifndef COMPILE_USE_QT4 diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index da6246a..2487617 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -108,21 +108,21 @@ } Window root,parent; - Window * tqchildren; + Window * children; unsigned int nChildren; - if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&tqchildren,&nChildren)) + if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&children,&nChildren)) { - if(tqchildren)XFree((char *)tqchildren); + if(children)XFree((char *)children); return 0; } Window found = 0; for(int i=nChildren-1;(!found) && (i >= 0);i--) - found = kvi_x11_findIpcSentinel(tqchildren[i]); + found = kvi_x11_findIpcSentinel(children[i]); - if(tqchildren)XFree((char *)tqchildren); + if(children)XFree((char *)children); return found; } diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 4c91a48..5efd946 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -67,7 +67,7 @@ #include "kvi_useridentity.h" #include <tqtimer.h> -#include <tqtextcodec.h> +#include <textcodec.h> extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; @@ -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); } diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp index 9c5ef5a..0040b53 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp @@ -67,7 +67,7 @@ void KviIrcConnectionServerInfo::setSupportedChannelModes(const TQString &szSupp m_bSupportsModesIe = (szSupportedChannelModes.contains('e') && szSupportedChannelModes.contains('I')); TQChar* aux=(TQChar*)szSupportedChannelModes.ucs2(); - while(aux->tqunicode()) + while(aux->unicode()) { if(!m_szSupportedChannelModes.contains(*aux)) m_szSupportedChannelModes.append(*aux); @@ -98,7 +98,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() // Alexey: FIXED: rethinked:) // Pragma: LOL :DDDD int i=0; - while( (uPrefix = cPrefix->tqunicode()) && (uFlag = cFlag->tqunicode()) && i<m_uPrefixes*3) + while( (uPrefix = cPrefix->unicode()) && (uFlag = cFlag->unicode()) && i<m_uPrefixes*3) { m_pModePrefixTable[i]=uPrefix; m_pModePrefixTable[i+1]=uFlag; @@ -131,7 +131,7 @@ bool KviIrcConnectionServerInfo::isSupportedModePrefix(TQChar c) if(!m_pModePrefixTable) return false; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3]==c.tqunicode()) return true; + if(m_pModePrefixTable[i*3]==c.unicode()) return true; } return false; } @@ -141,7 +141,7 @@ bool KviIrcConnectionServerInfo::isSupportedModeFlag(TQChar c) if(!m_pModePrefixTable) return false; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[(i*3)+1]==c.tqunicode()) return true; + if(m_pModePrefixTable[(i*3)+1]==c.unicode()) return true; } return false; } @@ -171,7 +171,7 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(TQChar c) if(!m_pModePrefixTable) return 0; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3]==c.tqunicode()) return m_pModePrefixTable[i*3+2]; + if(m_pModePrefixTable[i*3]==c.unicode()) return m_pModePrefixTable[i*3+2]; } return 0; } @@ -181,7 +181,7 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c) if(!m_pModePrefixTable) return 0; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3+1]==c.tqunicode()) return m_pModePrefixTable[i*3+2]; + if(m_pModePrefixTable[i*3+1]==c.unicode()) return m_pModePrefixTable[i*3+2]; } return 0; } @@ -225,7 +225,7 @@ const TQString & KviBasicIrcServerInfo::getUserModeDescription(TQChar mode) const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mode) { - switch(mode.tqunicode()) + switch(mode.unicode()) { case 'o': return __tr2qs("Channel operators"); break; case 'v': return __tr2qs("Voiced users"); break; @@ -265,7 +265,7 @@ const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mo const TQString & KviBasicIrcServerInfo::getBasicUserModeDescription(TQChar mode) { - switch(mode.tqunicode()) + switch(mode.unicode()) { case 'o': return __tr2qs("o: IRC operator (OPER)"); break; case 'O': return __tr2qs("O: Local IRC operator (LOCOP)"); break; diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index f092b62..fa3ae79 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -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(); } diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h index 4d5d72c..a37f595 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h @@ -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(); }; diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp index 0dafad9..f496603 100644 --- a/src/kvirc/kernel/kvi_ircurl.cpp +++ b/src/kvirc/kernel/kvi_ircurl.cpp @@ -222,7 +222,7 @@ void KviIrcUrl::join(TQString &uri, KviIrcServer* server) uri.append("://"); uri.append(server->hostName()); - if(server->port()!=6667) uri.append(TQString(":%1").tqarg(server->port())); + if(server->port()!=6667) uri.append(TQString(":%1").arg(server->port())); uri.append("/"); } } @@ -310,7 +310,7 @@ int KviIrcUrl::run(const TQString& text,int contextSpec,KviConsole* pConsole) szCommand.append(szJoinCommand); szCommand.append("\" "); } - szCommand.append(TQString("%1 %2 ").tqarg(parts.szHost).tqarg(parts.iPort)); + szCommand.append(TQString("%1 %2 ").arg(parts.szHost).arg(parts.iPort)); if(pConsole->connection()) { KviIrcServer* server = pConsole->connection()->target()->server(); diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index 7a55ee9..05fed67 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -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()); } */ diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 2d3c1e2..45a041c 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -51,7 +51,7 @@ //!xml parser #include <zlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "kvi_fileutils.h" diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp index 6de1110..0bf241d 100644 --- a/src/kvirc/kernel/kvi_userinput.cpp +++ b/src/kvirc/kernel/kvi_userinput.cpp @@ -44,17 +44,17 @@ namespace KviUserInput if(!c)return true; // empty while(c->isSpace())c++; - if(!c->tqunicode())return true; // empty + if(!c->unicode())return true; // empty - if(c->tqunicode() == '\\') + if(c->unicode() == '\\') { c++; - if(c->tqunicode() != '/')c--; + if(c->unicode() != '/')c--; } else { - if(c->tqunicode() == '/') + if(c->unicode() == '/') { c++; - if(c->tqunicode() != '/') + if(c->unicode() != '/') { szData.remove(0,c-b); return parseCommand(szData,pWindow,szContext,bUserFriendlyCommandline); @@ -103,11 +103,11 @@ namespace KviUserInput const TQChar * beg = aux; if(!beg)return; // empty - while(aux->tqunicode()) + while(aux->unicode()) { - while(aux->tqunicode() && (aux->tqunicode() != '\n'))aux++; + while(aux->unicode() && (aux->unicode() != '\n'))aux++; TQString buf(beg,aux-beg); - if(aux->tqunicode() == '\n')aux++; + if(aux->unicode() == '\n')aux++; beg = aux; if(buf.isEmpty())buf = " "; // avoid "No text to send" (d3vah) 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_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp index 0610328..f376b58 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp @@ -47,7 +47,7 @@ namespace KviKvsCoreFunctions // a_f _REGFNC("active",active) _REGFNC("array",array) - _REGFNC("ascii",tqunicode) + _REGFNC("ascii",unicode) _REGFNC("asciiToHex",asciiToHex) _REGFNC("asciiToBase64",asciiToBase64) _REGFNC("away",away) @@ -121,7 +121,7 @@ namespace KviKvsCoreFunctions _REGFNC("true",trueCKEYWORDWORKAROUND) _REGFNC("typeof",typeofCKEYWORDWORKAROUND) _REGFNC("u",u) - _REGFNC("tqunicode",tqunicode) + _REGFNC("unicode",unicode) _REGFNC("unixtime",unixtime) _REGFNC("unserialize",unserialize) _REGFNC("username",username) diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h index 31a73b7..b902ebe 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.h +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h @@ -131,7 +131,7 @@ namespace KviKvsCoreFunctions KVSCF(trueCKEYWORDWORKAROUND); KVSCF(typeofCKEYWORDWORKAROUND); KVSCF(u); - KVSCF(tqunicode); + KVSCF(unicode); KVSCF(unixtime); KVSCF(unserialize); KVSCF(username); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index 60fbe44..096ff3c 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 $tqunicode and is present + This function has been renamed to $unicode and is present only for backward compatibility. @seealso: [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] @@ -489,24 +489,24 @@ namespace KviKvsCoreFunctions @title: $char @short: - Returns a character specified by tqunicode + Returns a character specified by unicode @syntax: - <string> $char(<tqunicode_value:integer>) + <string> $char(<unicode_value:integer>) @description: - Returns a character corresponding to the UNICODE code <tqunicode_value>.[br] + Returns a character corresponding to the UNICODE code <unicode_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 <tqunicode_code> is not a valid UNICODE code (or is 0), this function returns + If the <unicode_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]$tqunicode[/fnc] + [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$unicode[/fnc] */ KVSCF(charCKEYWORDWORKAROUND) { kvs_uint_t ac; KVSCF_PARAMETERS_BEGIN - KVSCF_PARAMETER("tqunicode_value",KVS_PT_UINT,0,ac) + KVSCF_PARAMETER("unicode_value",KVS_PT_UINT,0,ac) KVSCF_PARAMETERS_END if(ac != 0 && ac < 65536) @@ -780,15 +780,15 @@ namespace KviKvsCoreFunctions const TQChar * c = KviTQString::nullTerminatedArray(szFormat); if(c) { - while(c->tqunicode()) + while(c->unicode()) { //Check for right Characters #ifdef COMPILE_ON_WINDOWS - if (szAllowedCharacters.find((char)(c->tqunicode()),0,true) >= 0) tmpFormat += '%'; + if (szAllowedCharacters.find((char)(c->unicode()),0,true) >= 0) tmpFormat += '%'; #else if (c->isLetter()) tmpFormat += '%'; #endif - tmpFormat += (char)(c->tqunicode()); + tmpFormat += (char)(c->unicode()); c++; } } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index a5478dc..e56abbe 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -401,12 +401,12 @@ namespace KviKvsCoreFunctions if(szLongSwitch.isEmpty()) v = sl->find(szSwitch); else - v = sl->find(szSwitch[0].tqunicode(),szLongSwitch); + v = sl->find(szSwitch[0].unicode(),szLongSwitch); }else { if(szLongSwitch.isEmpty()) v = sl->find(szSwitch[0]); else - v = sl->find(szSwitch[0].tqunicode(),szLongSwitch); + v = sl->find(szSwitch[0].unicode(),szLongSwitch); } if(v)KVSCF_pRetBuffer->copyFrom(*v); @@ -842,15 +842,15 @@ namespace KviKvsCoreFunctions ///////////////////////////////////////////////////////////////////////////////////////// /* - @doc: tqunicode + @doc: unicode @type: function @title: - $tqunicode + $unicode @short: Returns the UNICODE code of a sets of characters @syntax: - <variant> $tqunicode(<char:string>) + <variant> $unicode(<char:string>) @description: If <char> is composed only of a single character then returns its UNICODE code point as an integer. @@ -860,7 +860,7 @@ namespace KviKvsCoreFunctions [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] */ - KVSCF(tqunicode) + KVSCF(unicode) { TQString sz; KVSCF_PARAMETERS_BEGIN @@ -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].tqunicode()))); + a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].unicode()))); KVSCF_pRetBuffer->setArray(a); } else { - KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].tqunicode())); + KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].unicode())); } return true; } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 0a4aa54..4f11db0 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -427,7 +427,7 @@ namespace KviKvsCoreSimpleCommands // TQChar o = tbOp.length() > 0 ? tbOp[0] : TQChar('x'); - switch(o.tqunicode()) + switch(o.unicode()) { case 't': KviTalToolTip::remove(pButton); @@ -853,7 +853,7 @@ namespace KviKvsCoreSimpleCommands { TQString szWnd; v->asString(szWnd); - //#warning "FIXME: the window database is not tqunicode! (we even could keep integer window id's at this point!)" + //#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)" pWnd = g_pApp->findWindow(szWnd.utf8().data()); if(!pWnd) { diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index acf8eec..85c6c5c 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -673,7 +673,7 @@ 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 tqunicode and thus some more exotic translations may still suffer... + is not yet fully unicode and thus some more exotic translations may still suffer... @seealso: [fnc]$tr[/fnc], [cmd]trunload[/cmd] */ diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index 55c086d..b2fc61b 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 tqchildren windows. + and the other MDI children windows. @seealso: [event:onframewindowdestroyed]OnFrameWindowDestroyed[/event] */ diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 677095d..e5ff0a5 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -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 tqchildren + 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 tqchildren objects.[br][br] + Obviously all objects can have children objects.[br][br] - When an object is destroyed , all its tqchildren are also destroyed. + When an object is destroyed , all its children 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 @@ -121,7 +121,7 @@ [example] [cmd]delete[/cmd] %myobject [/example] - If the destroyed object has tqchildren objects , these are destroyed too.[br][br] + If the destroyed object has children 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]$tqchildren[/classfnc]() function. - It returns a comma separated list of tqchildren identifiers.[br] + [classfnc:object]$children[/classfnc]() function. + It returns a comma separated list of children 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 tqchildren list is : %tmp->[classfnc:object]$tqchildren[/classfnc]() - # Destroy the object and the tqchildren + [cmd]echo[/cmd] The object's children list is : %tmp->[classfnc:object]$children[/classfnc]() + # Destroy the object and the children [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]$tqchildren[/classfnc]()) + [cmd]foreach[/cmd](%t,[fnc]$this[/fnc]->[classfnc:object]$children[/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 tqchildren. + [cmd]echo[/cmd] Just before destroying my %count children. } - # Destroy the object and the tqchildren + # Destroy the object and the children [cmd]delete[/cmd] %tmp [/example] In the example above four objects have been created. - A "parent" object named "myobject" , and three tqchildren objects. + A "parent" object named "myobject" , and three children 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 tqchildren have been counted and listed.[br] + 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 tqchildren (and conseguently trigger all the "individual" destructors).[br][br] + - destroy all the children (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]$tqchildren[/classfnc]()... + [classfnc:object]$class[/class]() , [classfnc:object]$children[/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 tqchildren objects and to lookup a child object by name or class. + through children 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. @@ -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 tqchildren + This function traverses the entire tree of children but is NOT recursive. !fn: $childCount() - Returns the number of tqchildren objects + Returns the number of children 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: $tqchildren() - Returns an array of tqchildren object identifiers. + !fn: $children() + Returns an array of children 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. @@ -955,7 +955,7 @@ bool KviKvsObject::function_destructor(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject::function_tqchildren(KviKvsObjectFunctionCall * c) +bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c) { KviKvsArray * a = new KviKvsArray(); int id=0; @@ -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_object.h b/src/kvirc/kvs/kvi_kvs_object.h index a19bd5f..f59c098 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -164,7 +164,7 @@ protected: bool function_findChild(KviKvsObjectFunctionCall *c); bool function_childCount(KviKvsObjectFunctionCall *c); bool function_emit(KviKvsObjectFunctionCall *c); - bool function_tqchildren(KviKvsObjectFunctionCall *c); + bool function_children(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_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp index b2c1c8b..4739f33 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp @@ -73,7 +73,7 @@ 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("tqchildren",KVI_PTR2MEMBER(KviKvsObject::function_tqchildren)); + m_pObjectClass->registerFunctionHandler("children",KVI_PTR2MEMBER(KviKvsObject::function_children)); 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)); diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp index fc483f5..074753e 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser.cpp @@ -117,9 +117,9 @@ void KviKvsParser::report(bool bError,const TQChar * pLocation,const TQString &s void KviKvsParser::errorBadChar(const TQChar * pLocation,char cExpected,const char * 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); + 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); else error(pLocation,__tr2qs("Found end of input where character '%c' was expected: see \"/help %s\" for the command syntax"), cExpected,szCommandName); @@ -1349,7 +1349,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe so the callback code is empty, but if you continue reading we will soon fill it. [/p] - [big]A typical addon tqlayout[/big] + [big]A typical addon layout[/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 TQChar * pBuffe [/p] [p] The entries in [b]bold[/b] are directories while the other are files. - Please note that this is a general tqlayout for a huge and rather complex + Please note that this is a general layout 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 TQChar * pBuffe [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 - tqlayout and code (wow... the free software!). It will be easier to do than it was to explain it :D + layout and code (wow... the free software!). It will be easier to do than it was to explain it :D [/p] [p] Have fun! :) @@ -2724,7 +2724,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction() return parseCommand(); } else { // what the heck is this ? - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } break; @@ -2839,7 +2839,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() if(KVSP_curCharUnicode == 0) { - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); } else { error(KVSP_curCharPointer,__tr2qs("Unexpected end of script after a switch dash")); } @@ -2880,12 +2880,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() if(bLong) sw->addLong(TQString(pSw,pSwEnd - pSw),p); else - sw->addShort(pSw->lower().tqunicode(),p); + sw->addShort(pSw->lower().unicode(),p); } else { if(bLong) sw->addLong(TQString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param else - sw->addShort(pSw->lower().tqunicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param + sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param } } @@ -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' (tqunicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); break; } return 0; diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp index 094fc30..865bf18 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp @@ -139,7 +139,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // perl.begin has a *really* half special parsing routine if(iIdentifierLen == 4) { - if(pIdentifier->lower().tqunicode() == 'p') + if(pIdentifier->lower().unicode() == 'p') { if(KviTQString::equalCI(szIdentifier,"perl")) { diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp index 18fbbbe..ea15840 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp @@ -85,7 +85,7 @@ KviKvsTreeNode * KviKvsParser::parseComment() } break; default: - 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); + 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); return 0; break; } diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp index a2d6516..b556614 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp @@ -50,7 +50,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) 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 (tqunicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode); + else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %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; } diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp index ee91df4..44ce71d 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp @@ -420,7 +420,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina pDataList->append(new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(iVal))); } else { // bOk is false - if(pBegin->tqunicode() == '0') + if(pBegin->unicode() == '0') { if(tmp.length() > 2) { @@ -448,7 +448,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina } } } else { - 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); + 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); delete pDataList; return 0; } diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp index 3733f55..bcca75d 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp @@ -828,7 +828,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %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' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %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' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pFirst; return 0; } @@ -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' (tqunicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %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' (tqunicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode); + warning(pBegin,__tr2qs("Unexpected character '%q' (unicode %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 e727e4a..8de1f47 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->tqunicode()) +#define KVSP_curCharUnicode (m_ptr->unicode()) #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->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_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_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 95eca6a..6d6ab96 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -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 (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -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 (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -376,7 +376,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharUnicode != '(') { - error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -443,7 +443,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } @@ -471,7 +471,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } @@ -498,7 +498,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } @@ -628,7 +628,7 @@ 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 (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -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 (tqunicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); if(i)delete i; return 0; } @@ -1089,7 +1089,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(KVSP_curCharUnicode != ')') { - error(KVSP_curCharPointer,__tr2qs("Found char %q (tqunicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found char %q (unicode %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; @@ -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' (tqunicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -1419,7 +1419,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pSwitch; return 0; } @@ -1566,7 +1566,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma if(KVSP_curCharPointer == pLabelBegin) { - 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); + 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); delete pPopup; return 0; } diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index a7aeacb..3748877 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -73,7 +73,7 @@ bool KviKvsProcessAsyncOperation::start() if(szShell.isEmpty()) { #ifdef COMPILE_ON_WINDOWS - // [01:26:00] <PragmaOff> btw, what is qt_wintqunicode ? + // [01:26:00] <PragmaOff> btw, what is qt_winunicode ? // [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 @@ -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_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp index aa40ef3..7618e29 100644 --- a/src/kvirc/kvs/kvi_kvs_report.cpp +++ b/src/kvirc/kvs/kvi_kvs_report.cpp @@ -60,7 +60,7 @@ void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,in const TQChar * pPrevLine = 0; const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->tqunicode(); + unsigned short us = pBegin->unicode(); while(us && (pBegin < pPoint)) { @@ -73,7 +73,7 @@ void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,in } else { pBegin++; } - us = pBegin->tqunicode(); + us = pBegin->unicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -92,7 +92,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP const TQChar * pPrevLine = 0; const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->tqunicode(); + unsigned short us = pBegin->unicode(); while(us && (pBegin < pPoint)) { @@ -105,7 +105,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP } else { pBegin++; } - us = pBegin->tqunicode(); + us = pBegin->unicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -131,11 +131,11 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP // current line pBegin = pLineBegin; - us = pBegin->tqunicode(); + us = pBegin->unicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->tqunicode(); + us = pBegin->unicode(); } if(us)pBegin++; @@ -152,11 +152,11 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP // next line pLineBegin = pBegin; - us = pBegin->tqunicode(); + us = pBegin->unicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->tqunicode(); + us = pBegin->unicode(); } if(us)pBegin++; 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 diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h index b82d93f..fc31461 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_switchlist.h @@ -48,7 +48,7 @@ public: KviKvsVariant * find(const TQChar &c) { - return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.tqunicode()) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.unicode()) : 0; }; KviKvsVariant * find(unsigned short uShortKey) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index c303ceb..42338ae 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -34,7 +34,7 @@ KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const TQChar * pLocatio : KviKvsTreeNodeData(pLocation) { #ifdef DEBUGME - if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two tqchildren!"); + if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two children!"); #endif m_pSubData = pSubData; m_pSubData->setAutoDelete(true); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index 26b05b9..bdb1310 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -1467,18 +1467,18 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c TQString szReplaced; const TQChar * p2 = KviTQString::nullTerminatedArray(szR); const TQChar * begin = p2; - while(p2->tqunicode()) + while(p2->unicode()) { - if(p2->tqunicode() == '\\') + if(p2->unicode() == '\\') { p2++; - if(p2->tqunicode() >= '0' && p2->tqunicode() <= '9') + if(p2->unicode() >= '0' && p2->unicode() <= '9') { szReplaced.append(TQString(begin,(p2 - begin) - 1)); - szReplaced.append(re.cap(p2->tqunicode() - '0')); + szReplaced.append(re.cap(p2->unicode() - '0')); p2++; begin = p2; - } else if(p2->tqunicode())p2++; + } else if(p2->unicode())p2++; } else p2++; } if(begin != p2)szReplaced.append(TQString(begin,p2 - begin)); diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index c4e457f..b2da370 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -1010,7 +1010,7 @@ KviKvsVariant* KviKvsVariant::unserializeNull(const TQChar** aux) KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux) { TQString data; - if((*aux)->tqunicode() == '-') + if((*aux)->unicode() == '-') { data.append('-'); (*aux)++; @@ -1024,7 +1024,7 @@ KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux) data.append(**aux); (*aux)++; } - if((*aux)->tqunicode()=='.') + if((*aux)->unicode()=='.') { return unserializeReal(aux,data); } @@ -1042,15 +1042,15 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const TQChar** aux,TQString& data) (*aux)++; } - if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') + if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') { (*aux)++; - if((*aux)->tqunicode() == '-') + if((*aux)->unicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->tqunicode() == '+') + if((*aux)->unicode() == '+') { exponent.append('+'); (*aux)++; @@ -1079,15 +1079,15 @@ KviKvsVariant* KviKvsVariant::unserializeInteger(const TQChar** aux,TQString& da TQString exponent; - if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') + if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') { (*aux)++; - if((*aux)->tqunicode() == '-') + if((*aux)->unicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->tqunicode() == '+') + if((*aux)->unicode() == '+') { exponent.append('+'); (*aux)++; @@ -1122,9 +1122,9 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data) TQString hex; //temp var //skip leading " (*aux)++; - while((*aux)->tqunicode()) + while((*aux)->unicode()) { - switch((*aux)->tqunicode()) + switch((*aux)->unicode()) { case '"': //EOF @@ -1134,7 +1134,7 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data) case '\\': //Special (*aux)++; - switch((*aux)->tqunicode()) + switch((*aux)->unicode()) { case 't': data.append('\t'); @@ -1159,11 +1159,11 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data) //4 hexadecmical digits pending... hex=""; (*aux)++; - for(int k=0;k<4 && (*aux)->tqunicode(); k++) + for(int k=0;k<4 && (*aux)->unicode(); k++) { if((*aux)->isDigit() || - ((*aux)->tqunicode() >='A' && (*aux)->tqunicode() <='F')|| //ABCDEF - ((*aux)->tqunicode() >='a' && (*aux)->tqunicode() <='f')) //abcdef + ((*aux)->unicode() >='A' && (*aux)->unicode() <='F')|| //ABCDEF + ((*aux)->unicode() >='a' && (*aux)->unicode() <='f')) //abcdef { hex.append(**aux); (*aux)++; @@ -1203,7 +1203,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for starting of string - if((*aux)->tqunicode()!='\"') + if((*aux)->unicode()!='\"') { //strange characters delete pHash; @@ -1221,7 +1221,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for name-value delimeter - if((*aux)->tqunicode()!=':') + if((*aux)->unicode()!=':') { //strange characters delete pHash; @@ -1238,7 +1238,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->tqunicode()) + switch((*aux)->unicode()) { case ',': //goto next @@ -1278,7 +1278,7 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const TQChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->tqunicode()) + switch((*aux)->unicode()) { case ',': //goto next @@ -1310,7 +1310,7 @@ KviKvsVariant* KviKvsVariant::unserialize(const TQChar** aux) while((*aux)->isSpace()) (*aux)++; - switch((*aux)->tqunicode()) + switch((*aux)->unicode()) { case 't': //true @@ -1373,7 +1373,7 @@ KviKvsVariant* KviKvsVariant::unserialize(const TQString& data) pResult = unserialize(&aux); - if(aux->tqunicode()) + if(aux->unicode()) { //strange extra characters? if(pResult) delete pResult; diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index b92afd9..1fa6635 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -63,7 +63,7 @@ #ifdef COMPILE_USE_QT4 #include <TQTextDocument> #else - #include <tqstylesheet.h> + #include <stylesheet.h> #endif @@ -1156,12 +1156,12 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) #ifdef COMPILE_ON_WINDOWS szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE; - szVersion.append(TQString(" - %1").tqarg(KviOsInfo::version())); + szVersion.append(TQString(" - %1").arg(KviOsInfo::version())); #else szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS; - szVersion.append(TQString(" - %1 (%2)").tqarg(KviOsInfo::name()).tqarg(KviOsInfo::release())); + szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release())); #endif - //szVersion.append(TQString(" - QT Version: %1 - %2").tqarg(qVersion()).tqarg(__tr2qs("http://www.kvirc.net/"))); + //szVersion.append(TQString(" - QT Version: %1 - %2").arg(qVersion()).arg(__tr2qs("http://www.kvirc.net/"))); if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty()) { TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix); @@ -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; } @@ -1460,7 +1460,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) if(bTargetFound) { - TQString szMsg = TQString("\r!n\r%1\r ").tqarg(msg->pSource->nick()); + TQString szMsg = TQString("\r!n\r%1\r ").arg(msg->pSource->nick()); szMsg += szData; if(bIsChannel) { @@ -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("?"); @@ -1531,7 +1531,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs),&(a->name()),&(a->localPath()),&szUserMask); } } - //if(o)szReply.append(TQString(" %1").tqarg(o->fileSize())); + //if(o)szReply.append(TQString(" %1").arg(o->fileSize())); } szReply.append(szGenderTag); @@ -1808,7 +1808,7 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) if(pos>=0) { TQChar c = decoded[pos+7]; - switch(c.tqunicode()) + switch(c.unicode()) { case 'F': case 'f': diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index 155a734..d76f659 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -75,7 +75,7 @@ #ifdef COMPILE_USE_QT4 #include <TQTextDocument> #else - #include <tqstylesheet.h> + #include <stylesheet.h> #endif extern KviNickServRuleSet * g_pNickServRuleSet; @@ -186,13 +186,13 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) // nick!user@host JOIN :#channel\x07[o|v] const TQChar * pExt = KviTQString::nullTerminatedArray(channel); char chExtMode = 0; - while(pExt->tqunicode() && (pExt->tqunicode() != 0x07))pExt++; - if(pExt->tqunicode()) + while(pExt->unicode() && (pExt->unicode() != 0x07))pExt++; + if(pExt->unicode()) { ++pExt; - if(pExt->tqunicode()) + if(pExt->unicode()) { - chExtMode = (char)pExt->tqunicode(); + chExtMode = (char)pExt->unicode(); channel.remove(channel.length() - 2,2); // assuming that we're at the end (we should be) } // else { senseless 0x07 in channel name ? } @@ -993,7 +993,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) if(!chan) { // check if the channel has some leading mode prefixes - while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode())) + while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode())) { szPrefixes += szTarget[0]; szTarget.remove(0,1); @@ -1328,7 +1328,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) if(!chan) { // check if the channel has some leading mode prefixes - while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode())) + while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode())) { szPrefixes += szTarget[0]; szTarget.remove(0,1); @@ -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(), \ diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index efa5220..5aca802 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -53,7 +53,7 @@ #include <tqpixmap.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqregexp.h> #include "kvi_kvs_eventtriggers.h" diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index d4b02e0..c2f9b8b 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,7 +30,7 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> //#include <tqscrollview.h> #include <tqpainter.h> diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index b9e2f2b..0f39aec 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -74,7 +74,7 @@ #include <tqlabel.h> #include <tqevent.h> -#include <tqpalette.h> +#include <palette.h> #include "kvi_tal_popupmenu.h" #include "kvi_pointerhashtable.h" #include <tqmessagebox.h> @@ -112,7 +112,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Register ourselves connection()->registerChannel(this); - // And create the widgets tqlayout + // And create the widgets layout // Button box m_pButtonBox = new KviTalHBox(this); @@ -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(); @@ -287,7 +287,7 @@ void KviChannel::applyOptions() m_pModeWidget->applyOptions(); - // this applies options for IrcView and Input and forces the window to retqlayout + // this applies options for IrcView and Input and forces the window to relayout KviWindow::applyOptions(); } @@ -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 @@ -704,7 +704,7 @@ void KviChannel::getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPas } else { // (l.count() - 1) is > 1 buffer += "</b> "; - buffer += __tr2qs("and other %1 users").tqarg(l.count() - 1); + buffer += __tr2qs("and other %1 users").arg(l.count() - 1); } buffer += " "; buffer += bPast ? __tr2qs("were talking recently") : __tr2qs("are talking"); @@ -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; @@ -1607,14 +1607,14 @@ void KviChannel::preprocessMessage(TQString & szMessage) for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { if((*it).contains('\r')) continue; TQString tmp = KviMircCntrl::stripControlBytes(*it); - if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").tqarg(*it); + if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").arg(*it); if(m_pConsole) if(m_pConsole->connection()) if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) - *it=TQString("\r!c\r%1\r").tqarg(*it); + *it=TQString("\r!c\r%1\r").arg(*it); else - *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); + *it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it); } szMessage=strings.join(" "); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 45a4801..3c86b6a 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -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); }; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index fdce502..36369ae 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -100,7 +100,7 @@ #ifdef COMPILE_USE_QT4 #include <TQTextDocument> #else - #include <tqstylesheet.h> + #include <stylesheet.h> #endif extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; @@ -353,7 +353,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString #else TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #endif - buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width()); + buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width()); } if(e->hasRealName()) @@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString if(e->hasServer()) { buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server()); + buffer += __tr2qs("Using server <b>%1</b>").arg(e->server()); if(e->hasHops()) { buffer += " ("; - buffer += __tr2qs("%1 hops").tqarg(e->hops()); + buffer += __tr2qs("%1 hops").arg(e->hops()); buffer += ")</nobr></td></tr>"; } else { buffer += "</nobr></td></tr></table>"; @@ -445,7 +445,7 @@ void KviConsole::saveProperties(KviConfig *cfg) void KviConsole::getBaseLogFileName(TQString &buffer) { - buffer=TQString("CONSOLE%1").tqarg(ircContextId()); + buffer=TQString("CONSOLE%1").arg(ircContextId()); } void KviConsole::showNotifyList(bool bShow) @@ -634,7 +634,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c TQChar* aux=(TQChar*)(szStripMsg.ucs2()); if(aux) { - while(aux->tqunicode()) + while(aux->unicode()) { if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) szSource.append(' '); @@ -649,7 +649,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c szSource.prepend(' '); if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - if(szSource.find(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.find(TQString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); } @@ -661,7 +661,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c if((*it).isEmpty()) continue; // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!! - if(szSource.find(TQString(" %1 ").tqarg(*it),0,false) > -1) + if(szSource.find(TQString(" %1 ").arg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const TQChar * aux = nick.tqunicode(); + const TQChar * aux = nick.unicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->tqunicode(); + sum += aux->unicode(); aux++; i--; } @@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const TQChar * aux = nick.tqunicode(); + const TQChar * aux = nick.unicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->tqunicode(); + sum += aux->unicode(); aux++; i--; } @@ -835,7 +835,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \ KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP)))); } - szNick.prepend(TQString("%1").tqarg(color)); + szNick.prepend(TQString("%1").arg(color)); szNick.prepend(KVI_TEXT_COLOR); szNick.append(KVI_TEXT_COLOR); } @@ -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; } diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index 18c02ee..a32ae7f 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -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 diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 83ac72e..14056f5 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -40,7 +40,7 @@ #include "kvi_memmove.h" #include "kvi_toolwindows_container.h" - #include <tqlayout.h> + #include <layout.h> #include "kvi_pointerhashtable.h" // kvi_app.cpp @@ -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); diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index da82146..c3df244 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -30,7 +30,7 @@ #include "kvi_iconmanager.h" #include <tqdatetime.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -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"); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 828eb02..a47cd61 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -33,7 +33,7 @@ #include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqcursor.h> #include <tqtoolbutton.h> @@ -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 } @@ -169,9 +169,9 @@ void KviCustomToolBar::beginCustomize() if(m_pFilteredChildren)delete m_pFilteredChildren; m_pFilteredChildren = new KviPointerHashTable<void *,bool>; m_pFilteredChildren->setAutoDelete(true); - // filter the events for all the tqchildren + // filter the events for all the children #ifdef COMPILE_USE_QT4 - TQList<TQObject*> l = tqchildren(); + TQList<TQObject*> l = children(); for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) @@ -193,7 +193,7 @@ void KviCustomToolBar::endCustomize() { // stop filtering events #ifdef COMPILE_USE_QT4 - TQList<TQObject*> l = tqchildren(); + TQList<TQObject*> l = children(); for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) @@ -209,7 +209,7 @@ void KviCustomToolBar::endCustomize() ++it; } #endif - // FIXME: We SHOULD MAKE SURE that the tqchildren are re-enabled... + // FIXME: We SHOULD MAKE SURE that the children are re-enabled... // this could be done by calling setEnabled(isEnabled()) on each action ? if(m_pFilteredChildren) { @@ -238,7 +238,7 @@ void KviCustomToolBar::childEvent(TQChildEvent *e) { if(KviActionManager::customizingToolBars()) { - // this is useful for droppped and dragged-out tqchildren + // this is useful for droppped and dragged-out children if(e->type() == TQEvent::ChildInserted) { if(e->child()->isWidgetType()) @@ -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); @@ -334,7 +334,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex // treating exclude as if it was going to be removed // find also the exclude index if needed #ifdef COMPILE_USE_QT4 - TQLayout * l = tqlayout(); + TQLayout * l = layout(); #else TQBoxLayout * l = boxLayout(); #endif @@ -345,7 +345,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex if(!l)return 0; TQLayoutIterator it = l->iterator(); - // find the tqchildren with minimum distance + // find the children with minimum distance int iMinDistIdx = -1; TQWidget * pMinDistW = 0; unsigned int uMinDist = 0xffffffff; @@ -453,7 +453,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex #ifdef COMPILE_USE_QT4 TQWidget * KviCustomToolBar::widgetAt(int index) { - TQLayout * l = tqlayout(); + TQLayout * l = layout(); if(!l) return NULL; TQLayoutItem * it = l->itemAt(index); @@ -527,11 +527,11 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) if(!KviActionManager::customizingToolBars())goto unhandled; // anything here is done when customizing only if(e->type() == TQEvent::Enter) { - if(m_pMovedChild)return true; // kill it while moving other tqchildren + if(m_pMovedChild)return true; // kill it while moving other children } if(e->type() == TQEvent::Leave) { - if(m_pMovedChild)return true; // kill it while moving other tqchildren + if(m_pMovedChild)return true; // kill it while moving other children } if(e->type() == TQEvent::MouseButtonPress) { @@ -550,7 +550,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) )) { m_pMovedChild = (TQWidget *)o; - // allow resizing of tqchildren + // allow resizing of children // FIXME: do it only if the child is really resizable if(m_pMovedChild->width() > 20) // might be an applet { diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h index ec6483b..d02ad59 100644 --- a/src/kvirc/ui/kvi_customtoolbar.h +++ b/src/kvirc/ui/kvi_customtoolbar.h @@ -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: diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 8110967..dcbb49d 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -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; } diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h index 616752a..1eab1ee 100644 --- a/src/kvirc/ui/kvi_debugwindow.h +++ b/src/kvirc/ui/kvi_debugwindow.h @@ -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_ diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index db5efa8..0a219e2 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -67,10 +67,10 @@ #include <tqcheckbox.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #ifdef COMPILE_USE_QT4 #include <tq3dockarea.h> #define TQDockArea Q3DockArea @@ -173,7 +173,7 @@ KviFrame::KviFrame() installAccelerators(this); - tqlayout()->setResizeMode(TQLayout::FreeResize); + layout()->setResizeMode(TQLayout::FreeResize); } KviFrame::~KviFrame() @@ -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(); @@ -1085,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { - TQString label = __tr2qs("Show %1").tqarg(d->visibleName()); + TQString label = __tr2qs("Show %1").arg(d->visibleName()); if(d->icon())id = p->insertItem(*(d->icon()),label); else id = p->insertItem(label); p->setItemChecked(id,moduleExtensionToolBar(d->id())); @@ -1101,7 +1101,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) if(cnt > 0)p->insertSeparator(); while(KviCustomToolBarDescriptor * d = it2.current()) { - TQString label = __tr2qs("Show %1").tqarg(d->label()); + TQString label = __tr2qs("Show %1").arg(d->label()); TQString ico = d->iconId(); // use the icon only if there is no check if(d->toolBar()) @@ -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 diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index 5f18eb4..cf5c430 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -110,7 +110,7 @@ protected: KviDockExtension * m_pDockExtension; // the frame's dock extension: this should be prolly moved ? KviAccel * m_pAccel; // the global accelelrator public: - // the mdi manager: handles mdi tqchildren + // the mdi manager: handles mdi children KviMdiManager * mdiManager(){ return m_pMdi; }; // the splitter is the central widget for this frame TQSplitter * splitter(){ return m_pSplitter; }; diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 7c16fe5..6f6aa8f 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -29,8 +29,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> -#include <tqtextbrowser.h> +#include <layout.h> +#include <textbrowser.h> KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) : TQDialog(pParent) diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index a4c89ad..cac2eed 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -25,7 +25,7 @@ #include "kvi_locale.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqimage.h> @@ -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()); } diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 5258577..b8dd492 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -61,14 +61,14 @@ #include <tqfiledialog.h> #include "kvi_tal_popupmenu.h" #include <tqpainter.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqstringlist.h> #include "kvi_pointerlist.h" #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmessagebox.h> #include "kvi_tal_hbox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqevent.h> @@ -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(); @@ -454,7 +454,7 @@ void KviInputEditor::drawContents(TQPainter *p) { pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); - TQString s = getSubstituteChar(m_szTextBuffer[charIdx].tqunicode()); + TQString s = getSubstituteChar(m_szTextBuffer[charIdx].unicode()); // the block width is 4 pixels more than the actual character @@ -523,9 +523,9 @@ void KviInputEditor::drawContents(TQPainter *p) { TQChar c = m_szTextBuffer.at(m_iBlockLen); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition+= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c); + m_iLastCursorXPosition+= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c); #else - m_iLastCursorXPosition+= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition+= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif m_iBlockLen++; } @@ -626,7 +626,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int TQChar c = m_szTextBuffer[idx]; - if((c.tqunicode() > 32) || + if((c.unicode() > 32) || ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && @@ -637,7 +637,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int while((idx < ((int)(m_szTextBuffer.length()))) && (curXPos < maxXPos)) { c = m_szTextBuffer[idx]; - if((c.tqunicode() > 32) || + if((c.unicode() > 32) || ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && @@ -645,9 +645,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int { m_iBlockLen++; #ifdef COMPILE_USE_QT4 - int xxx = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + int xxx = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - int xxx = (c.tqunicode() < 256 ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c)); + int xxx = (c.unicode() < 256 ? g_iInputFontCharWidth[c.unicode()] : fm.width(c)); #endif m_iBlockWidth +=xxx; curXPos +=xxx; @@ -658,9 +658,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int } else { m_bControlBlock = true; m_iBlockLen = 1; - m_iBlockWidth = g_iInputFontCharWidth[c.tqunicode()]; + m_iBlockWidth = g_iInputFontCharWidth[c.unicode()]; //Control code - switch(c.tqunicode()) + switch(c.unicode()) { case KVI_TEXT_BOLD: m_bCurBold = ! m_bCurBold; @@ -716,7 +716,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() register int idx = 0; while(idx < m_iFirstVisibleChar) { - unsigned short c = m_szTextBuffer[idx].tqunicode(); + unsigned short c = m_szTextBuffer[idx].unicode(); if(c < 32) { switch(c) @@ -789,7 +789,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) TQString szClip; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(c) { szClip = c->text(TQClipboard::Clipboard); @@ -918,7 +918,7 @@ bool KviInputEditor::hasSelection() void KviInputEditor::copyToClipboard() { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); c->setText(szTxt,TQClipboard::Clipboard); @@ -928,7 +928,7 @@ void KviInputEditor::copyToClipboard() void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); if(c->supportsSelection()) @@ -969,7 +969,7 @@ void KviInputEditor::removeSelected() void KviInputEditor::cut() { if(!hasSelection())return; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),TQClipboard::Clipboard); m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); @@ -1042,7 +1042,7 @@ int KviInputEditor::replaceSegment(int start, int length, const TQString &text) void KviInputEditor::pasteClipboardWithConfirmation() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szText = c->text(TQClipboard::Clipboard); @@ -1057,7 +1057,7 @@ void KviInputEditor::pasteClipboardWithConfirmation() void KviInputEditor::pasteSelectionWithConfirmation() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard); @@ -1325,7 +1325,7 @@ void KviInputEditor::imComposeEvent(TQIMEvent *e) #endif - // tqrepaint + // repaint m_bUpdatesEnabled = true; repaintWithCursorOn(); e->accept(); @@ -1347,7 +1347,7 @@ void KviInputEditor::imEndEvent(TQIMEvent *e) // move cursor to after the IM result text moveCursorTo(m_iIMStart + m_iIMLength); - // tqrepaint + // repaint m_bUpdatesEnabled = true; repaintWithCursorOn(); @@ -1819,7 +1819,7 @@ void KviInputEditor::completion(bool bShift) bool bIsDir = false; bool bIsNick = false; - unsigned short uc = word[0].tqunicode(); + unsigned short uc = word[0].unicode(); if(uc == '/') { @@ -1845,7 +1845,7 @@ void KviInputEditor::completion(bool bShift) { if(m_pKviWindow) { - if( (word.length()==1) && (m_pKviWindow->windowName()[0].tqunicode()==uc)) + if( (word.length()==1) && (m_pKviWindow->windowName()[0].unicode()==uc)) { match=m_pKviWindow->windowName(); match.append(" "); @@ -1911,8 +1911,8 @@ void KviInputEditor::completion(bool bShift) const TQChar * b2 = KviTQString::nullTerminatedArray(match) + wLen; const TQChar * c1 = b1; const TQChar * c2 = b2; - if(bIsDir)while(c1->tqunicode() && (c1->tqunicode() == c2->tqunicode()))c1++,c2++; - else while(c1->tqunicode() && (c1->lower().tqunicode() == c2->lower().tqunicode()))c1++,c2++; + if(bIsDir)while(c1->unicode() && (c1->unicode() == c2->unicode()))c1++,c2++; + else while(c1->unicode() && (c1->lower().unicode() == c2->lower().unicode()))c1++,c2++; int len = wLen + (c1 - b1); if(len < ((int)(match.length())))match.remove(len,match.length() - len); if(!all.isEmpty())all.append(", "); @@ -2084,17 +2084,17 @@ void KviInputEditor::moveRightFirstVisibleCharToShowCursor() TQChar c = m_szTextBuffer.at(m_iCursorPosition); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif while(m_iLastCursorXPosition >= contentsRect().width()-2*KVI_INPUT_MARGIN) { c = m_szTextBuffer.at(m_iFirstVisibleChar); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition -= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition -= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition -= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + m_iLastCursorXPosition -= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif m_iFirstVisibleChar++; } @@ -2127,9 +2127,9 @@ int KviInputEditor::charIndexFromXPosition(int xPos) { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - int widthCh = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + int widthCh = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - int widthCh = (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + int widthCh = (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif if(xPos < (curXPos+(widthCh/2)))return curChar; else if(xPos < (curXPos+widthCh))return (curChar+1); @@ -2150,9 +2150,9 @@ int KviInputEditor::xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bCo { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; + curXPos += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; #else - curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); + curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); #endif curChar++; } @@ -2170,9 +2170,9 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) { TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.tqunicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.tqunicode())) + 3 : g_pLastFontMetrics->width(c); + curXPos += c.unicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.unicode())) + 3 : g_pLastFontMetrics->width(c); #else - curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : g_pLastFontMetrics->width(c); + curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : g_pLastFontMetrics->width(c); #endif curChar++; } @@ -2335,9 +2335,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pButtonContainer->setSpacing(0); #ifdef COMPILE_USE_QT4 - m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); -// if(m_pButtonContainer->tqlayout()) -// m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize); + m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); +// if(m_pButtonContainer->layout()) +// m_pButtonContainer->layout()->setSizeConstraint(TQLayout::SetMinimumSize); #endif m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); @@ -2396,9 +2396,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pInputEditor = new KviInputEditor(this,par,view); connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed())); #ifdef COMPILE_USE_QT4 - m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); + m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); #else - m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); + m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); #endif @@ -2497,7 +2497,7 @@ void KviInput::keyPressEvent(TQKeyEvent *e) "here to prevent you from accidentally sending<br>" \ "a really large message just because you didn't edit it<br>" \ "properly after pasting text from the clipboard.<br><br>" \ - "Do you want the message to be sent?").tqarg(nLines), + "Do you want the message to be sent?").arg(nLines), __tr2qs("Yes, always"), __tr2qs("Yes"), __tr2qs("No"), @@ -2543,7 +2543,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) KviScriptEditor::destroyInstance(m_pMultiLineEditor); m_pMultiLineEditor = 0; m_pInputEditor->show(); - m_pWindow->tqchildrenTreeChanged(0); + m_pWindow->childrenTreeChanged(0); m_pInputEditor->setFocus(); m_pMultiEditorButton->setOn(false); } else { @@ -2556,7 +2556,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) m_pMultiLineEditor->setFindLineeditReadOnly(true); m_pInputEditor->hide(); m_pMultiLineEditor->show(); - m_pWindow->tqchildrenTreeChanged(m_pMultiLineEditor); + m_pWindow->childrenTreeChanged(m_pMultiLineEditor); m_pMultiLineEditor->setFocus(); m_pMultiEditorButton->setOn(true); } @@ -2596,14 +2596,14 @@ void KviInput::historyButtonClicked() void KviInput::setFocus() { - // redirect setFocus() to the right tqchildren + // redirect setFocus() to the right children if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } void KviInput::focusInEvent(TQFocusEvent * e) { - // if we get a focus in event , redirect the focus to the tqchildren + // if we get a focus in event , redirect the focus to the children if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 777fb41..6e2d5c9 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -144,7 +144,7 @@ protected: bool m_bReadOnly; public: int heightHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void setText(const TQString text); TQString text() { return m_szTextBuffer; }; void insertChar(TQChar c); diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 0e12d2d..df15e02 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -208,7 +208,7 @@ void KviIpEditor::recreateChildren() m_pEdit[i] = new TQLineEdit(this); m_pEdit[i]->installEventFilter(this); m_pEdit[i]->setFrame(false); - m_pEdit[i]->tqsetAlignment(TQt::AlignCenter); + m_pEdit[i]->setAlignment(TQt::AlignCenter); } //m_pEdit[i]->setMinimumWidth(minWidth); m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4); @@ -243,8 +243,8 @@ void KviIpEditor::recreateChildren() } } } - //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width())); - setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4); + //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width())); + setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4); resizeEvent(0); } @@ -395,7 +395,7 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e) if(m_pEdit[0]) { int maxW = (m_addrType == IpV4) ? 4 : 8; - int labHint = m_pLabel[0]->tqsizeHint().width(); + int labHint = m_pLabel[0]->sizeHint().width(); int hghHint = height() - 4; int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW; int curX = 2; @@ -413,16 +413,16 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e) if(e)TQFrame::resizeEvent(e); } -TQSize KviIpEditor::tqsizeHint() +TQSize KviIpEditor::sizeHint() { if(m_pEdit[0]) { - int labHint = m_pLabel[0]->tqsizeHint().width(); - int hghHint = m_pEdit[0]->tqsizeHint().height(); - int ediHint = m_pEdit[0]->tqsizeHint().width(); + int labHint = m_pLabel[0]->sizeHint().width(); + int hghHint = m_pEdit[0]->sizeHint().height(); + int ediHint = m_pEdit[0]->sizeHint().width(); if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); - } else return TQFrame::tqsizeHint(); + } else return TQFrame::sizeHint(); } diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 19e2a3c..625f164 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -55,7 +55,7 @@ public: protected: virtual bool eventFilter(TQObject * o,TQEvent *e); virtual void resizeEvent(TQResizeEvent *e); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); private: void recreateChildren(); }; diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index e551771..102a409 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -44,7 +44,7 @@ #include <tqstyle.h> #include <tqpainter.h> #include "kvi_tal_popupmenu.h" -#include <tqlayout.h> +#include <layout.h> #ifdef COMPILE_USE_QT4 #include <tqevent.h> @@ -77,7 +77,7 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char * setMouseTracking(true); m_bResizeMode = false; - m_tqsizeHint = TQSize(180,32); + m_sizeHint = TQSize(180,32); m_bSizeLoaded = false; } @@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth) void KviToolBarGraphicalApplet::setupSizeHint() { - m_tqsizeHint = TQSize(loadAppletWidth(),22); + m_sizeHint = TQSize(loadAppletWidth(),22); m_bSizeLoaded = true; } -TQSize KviToolBarGraphicalApplet::tqsizeHint() const +TQSize KviToolBarGraphicalApplet::sizeHint() const { // forget constness :( KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this; if(!m_bSizeLoaded)that->setupSizeHint(); - return m_tqsizeHint; + return m_sizeHint; } /* @@ -127,7 +127,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) int w = e->pos().x(); if(w < 32)w = 32; if(w > 480)w = 480; - m_tqsizeHint = TQSize(w,22); + m_sizeHint = TQSize(w,22); resize(w,height()); g_pApp->postEvent(parentWidget(),new TQEvent(TQEvent::LayoutHint)); } @@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e) KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet() { - saveAppletWidth(m_tqsizeHint.width()); + saveAppletWidth(m_sizeHint.width()); g_pToolBarGraphicalAppletList->removeRef(this); if(g_pToolBarGraphicalAppletList->isEmpty()) { @@ -208,10 +208,10 @@ void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e) drawContents(&pa); //Need to draw the sunken rect around the view now... - pa.setPen(tqcolorGroup().dark()); + pa.setPen(colorGroup().dark()); pa.drawLine(0,0,width(),0); pa.drawLine(0,0,0,width()); - pa.setPen(tqcolorGroup().light()); + pa.setPen(colorGroup().light()); pa.drawLine(1,height() - 1,width() - 1,height() - 1); pa.drawLine(width() - 1,1,width() - 1,height()); @@ -332,7 +332,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &) /* -TQSize KviIrcContextDisplay::tqsizeHint() const +TQSize KviIrcContextDisplay::sizeHint() const { return TQSize(160,22); } @@ -416,7 +416,7 @@ void KviIrcContextDisplay::drawContents(TQPainter * p) p->setClipping(false); - TQColor base = tqcolorGroup().background(); + TQColor base = colorGroup().background(); TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h index dd6c93e..1b1d94e 100644 --- a/src/kvirc/ui/kvi_irctoolbar.h +++ b/src/kvirc/ui/kvi_irctoolbar.h @@ -55,7 +55,7 @@ public: private: bool m_bResizeMode; bool m_bSizeLoaded; - TQSize m_tqsizeHint; + TQSize m_sizeHint; private: void resizeMemBuffer(); protected: @@ -63,7 +63,7 @@ protected: virtual unsigned int loadAppletWidth(); virtual void saveAppletWidth(unsigned int uWidth); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void mouseMoveEvent(TQMouseEvent *e); virtual void mousePressEvent(TQMouseEvent *e); virtual void mouseReleaseEvent(TQMouseEvent *e); diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index a500c46..1987790 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -117,7 +117,7 @@ #include <tqapplication.h> #include "kvi_tal_popupmenu.h" #include <tqmessagebox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdatetime.h> #include <tqevent.h> @@ -134,7 +134,7 @@ #include <tqcursor.h> #endif -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdatetime.h> #include <tqmessagebox.h> #include <tqscrollbar.h> @@ -165,7 +165,7 @@ #define KVI_DEF_BACK 200 -// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)" +// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)" // // FIXME: PgUp and PgDn scrolls a fixed number of lines! @@ -243,12 +243,12 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * kvi_wslen_t oldLen = qstrptr->length(); qstrptr->setLength(oldLen + len); #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR - _WSTRING_WMEMCPY(qstrptr->tqunicode() + oldLen,ptr,len); + _WSTRING_WMEMCPY(qstrptr->unicode() + oldLen,ptr,len); #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR - TQChar * c = (qstrptr->tqunicode() + oldLen); + TQChar * c = (qstrptr->unicode() + oldLen); while(*ptr) { - c->tqunicode() = *ptr; + c->unicode() = *ptr; ptr++; c++; } @@ -290,7 +290,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) #ifdef COMPILE_USE_QT4 setAttribute(TQt::WA_NoSystemBackground); // This disables automatic qt double buffering setAttribute(TQt::WA_OpaquePaintEvent); - //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger tqrepaint() instead of the 10 times faster paintEvent(0)) + //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0)) #endif m_iFlushTimer = 0; @@ -346,7 +346,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>; m_pMessagesStoppedWhileSelecting->setAutoDelete(false); - // say qt to avoid erasing on tqrepaint + // say qt to avoid erasing on repaint #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else @@ -532,7 +532,7 @@ void KviIrcView::stopLogging() if(m_pLogFile) { TQString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); + szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); add2Log(szLogEnd); m_pLogFile->close(); @@ -706,7 +706,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) } TQString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); + szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); add2Log(szLogStart); if(bPrependCurBuffer) { @@ -723,7 +723,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType) { - TQString szToWrite=TQString("%1 %2\n").tqarg(iMsgType).tqarg(szBuffer); + TQString szToWrite=TQString("%1 %2\n").arg(iMsgType).arg(szBuffer); KviTQCString szTmp = KviTQString::toUtf8(szToWrite); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); } @@ -803,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint) void KviIrcView::checkLogDate() { - TQDate::tqcurrentDate(); + TQDate::currentDate(); } void KviIrcView::clearUnreaded() @@ -900,7 +900,7 @@ void KviIrcView::scrollBarPositionChanged(int newValue) } } if(!m_bSkipScrollBarRepaint) - tqrepaint(); + repaint(); //update(); // if(!m_bSkipScrollBarRepaint)postUpdateEvent(); } @@ -911,7 +911,7 @@ bool KviIrcView::event(TQEvent *e) { __range_valid(m_bPostedPaintEventPending); if(m_iUnprocessedPaintEventRequests) - tqrepaint(); + repaint(); // else we just had a pointEvent that did the job m_bPostedPaintEventPending = false; return true; @@ -935,12 +935,12 @@ void KviIrcView::wheelEvent(TQWheelEvent *e) void KviIrcView::postUpdateEvent() { - // This will post a TQEvent with a full tqrepaint request + // This will post a TQEvent with a full repaint request if(!m_bPostedPaintEventPending) { m_bPostedPaintEventPending = true; TQEvent *e = new TQEvent(TQEvent::User); - g_pApp->postEvent(this,e); // queue a tqrepaint + g_pApp->postEvent(this,e); // queue a repaint } m_iUnprocessedPaintEventRequests++; // paintEvent() will set it to 0 @@ -956,7 +956,7 @@ void KviIrcView::postUpdateEvent() fastScroll(3); #endif else - tqrepaint(); + repaint(); } } @@ -1093,7 +1093,7 @@ void KviIrcView::removeHeadLine(bool bRepaint) m_pLastLine = 0; } if(bRepaint) - tqrepaint(); + repaint(); } void KviIrcView::splitMessagesTo(KviIrcView *v) @@ -1150,12 +1150,12 @@ void KviIrcView::splitMessagesTo(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); v->m_iLastScrollBarValue = v->m_iNumLines; v->m_pScrollBar->setRange(0,v->m_iNumLines); v->m_pScrollBar->setValue(v->m_iNumLines); - v->tqrepaint(); + v->repaint(); } @@ -1183,7 +1183,7 @@ void KviIrcView::appendMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); } void KviIrcView::joinMessagesFrom(KviIrcView *v) @@ -1243,7 +1243,7 @@ void KviIrcView::joinMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - tqrepaint(); + repaint(); } void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) @@ -1264,7 +1264,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) { TQString szBuffer; kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); - szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] ")); + szBuffer.prepend(TQDateTime::currentDateTime().toString("[h:mm:ss] ")); if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled()) { add2Log(szBuffer,iMsgType); @@ -1923,7 +1923,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)) { TQString szTimestamp; - szTimestamp=TQDateTime::tqcurrentDateTime ( + szTimestamp=TQDateTime::currentDateTime ( KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString( KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) ); szTimestamp.append(' '); @@ -1964,8 +1964,8 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, iTextIdx = iTimeStampLength; // the rest of the string will begin 11 chars later // throw away const: we WANT to set the chars :D - register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.tqunicode(); - register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.tqunicode(); + register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.unicode(); + register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.unicode(); for(int i=0;i<iTimeStampLength;i++) *data_ptr_aux++ = *stamp_ptr_aux++; @@ -2713,8 +2713,8 @@ void KviIrcView::fastScroll(int lines) if(!m_pFm) { // We must get the metrics from a real paint event :/ - // must do a full tqrepaint to get them... - tqrepaint(); + // must do a full repaint to get them... + repaint(); return; } @@ -2788,7 +2788,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) int widgetWidth = width() - scrollbarWidth; if(!isVisible() || (widgetWidth < 20)) { - m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... return; //can't show stuff here } @@ -2800,7 +2800,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) (m_pKviWindow->mdiParent() != g_pFrame->mdiManager()->topChild()) && (m_pKviWindow->mdiParent())) { - m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... return; // totally hidden behind other windows } @@ -3428,10 +3428,10 @@ no_selection_paint: } //Need to draw the sunken rect around the view now... - pa.setPen(tqcolorGroup().dark()); + pa.setPen(colorGroup().dark()); pa.drawLine(0,0,widgetWidth,0); pa.drawLine(0,0,0,widgetHeight); - pa.setPen(tqcolorGroup().light()); + pa.setPen(colorGroup().light()); widgetWidth--; pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1); pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight); @@ -3449,7 +3449,7 @@ no_selection_paint: // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#define IRCVIEW_WCHARWIDTH(__c) (((__c).tqunicode() < 0xff) ? m_iFontCharacterWidth[(__c).tqunicode()] : m_pFm->width(__c)) +#define IRCVIEW_WCHARWIDTH(__c) (((__c).unicode() < 0xff) ? m_iFontCharacterWidth[(__c).unicode()] : m_pFm->width(__c)) void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) { @@ -3476,12 +3476,12 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) int maxBlockLen = ptr->pChunks->iTextLen; // ptr->pChunks[0].iTextLen - const TQChar * tqunicode = ptr->szText.tqunicode(); + const TQChar * unicode = ptr->szText.unicode(); for(;;) { //Calculate the block_width - register const TQChar * p = tqunicode + ptr->pBlocks[ptr->iBlockCount].block_start; + register const TQChar * p = unicode + ptr->pBlocks[ptr->iBlockCount].block_start; int curBlockLen = 0; int curBlockWidth = 0; @@ -3546,7 +3546,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = &(ptr->pChunks[curAttrBlock]); @@ -3579,7 +3579,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) maxBlockLen-=curBlockLen; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = 0; @@ -3632,8 +3632,8 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i // // Yahoo!!!! // - const TQChar * tqunicode = line->szText.tqunicode(); - register const TQChar * p = tqunicode + line->pBlocks[bufIndex].block_start; + const TQChar * unicode = line->szText.unicode(); + register const TQChar * p = unicode + line->pBlocks[bufIndex].block_start; int top = bottom-m_iFontLineSpacing; int right = ((line->pBlocks[bufIndex].block_width >= 0) ? \ @@ -3858,7 +3858,7 @@ void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &f void KviIrcView::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->tqsizeHint().width(); + int iScr = m_pScrollBar->sizeHint().width(); int iLeft = width()-iScr; m_pToolsButton->setGeometry(iLeft,0,iScr,iScr); m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr); @@ -3873,7 +3873,7 @@ void KviIrcView::resizeEvent(TQResizeEvent *) } } -TQSize KviIrcView::tqsizeHint() const +TQSize KviIrcView::sizeHint() const { TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); return ret; @@ -3900,7 +3900,7 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->insertSeparator(); m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer())); - TQSize s = m_pToolsPopup->tqsizeHint(); + TQSize s = m_pToolsPopup->sizeHint(); m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); } @@ -3955,11 +3955,11 @@ void KviIrcView::toggleToolWidget() delete m_pToolWidget; m_pToolWidget = 0; m_pCursorLine = 0; - tqrepaint(); + repaint(); } else { m_pToolWidget = new KviIrcViewToolWidget(this); - int w = m_pToolWidget->tqsizeHint().width(); + int w = m_pToolWidget->sizeHint().width(); m_pToolWidget->move(width() - (w + 40),10); m_pToolWidget->show(); } @@ -3979,7 +3979,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) if(m_pCursorLine == m_pCurLine) { - tqrepaint(); + repaint(); return; } @@ -4000,7 +4000,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - tqrepaint(); + repaint(); } } else { // The cursor line is over the current line @@ -4034,7 +4034,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - tqrepaint(); + repaint(); } } } @@ -4086,7 +4086,7 @@ do_pNext: } while(l != start); } m_pCursorLine = 0; - tqrepaint(); + repaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4140,7 +4140,7 @@ do_pPrev: } m_pCursorLine = 0; - tqrepaint(); + repaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4302,12 +4302,12 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect szLink.append(TQChar(KVI_TEXT_COLOR)); if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE) { - szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); + szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); } if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE) { szLink.append(TQChar(',')); - szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); + szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); } break; } @@ -4479,7 +4479,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) pParams->append(szCmd); - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'n': { @@ -4517,7 +4517,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) if(((KviChannel *)m_pKviWindow)->isMeOp()) { TQChar plmn = linkCmd[1]; - if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) + if((plmn.unicode() == '+') || (plmn.unicode() == '-')) { TQString target(m_pKviWindow->windowName()); target.replace("\\","\\\\"); @@ -4526,7 +4526,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) target.replace("$","\\$"); target.replace("%","\\%"); TQChar flag = linkCmd[2]; - switch(flag.tqunicode()) + switch(flag.unicode()) { case 'o': case 'v': @@ -4581,7 +4581,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) c->raise(); c->setFocus(); } else { - cmd = TQString("join %1").tqarg(szChan); + cmd = TQString("join %1").arg(szChan); } } } @@ -4619,7 +4619,7 @@ void KviIrcView::mousePressEvent(TQMouseEvent *e) if(m_pToolWidget) { m_pCursorLine = getVisibleLineAt(e->pos().x(),e->pos().y()); - tqrepaint(); + repaint(); } m_mousePressPos = e->pos(); @@ -4669,7 +4669,7 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) { if(!linkCmd.isEmpty()) { - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'n': { @@ -4782,7 +4782,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *) { killTimer(m_iSelectTimer); m_iSelectTimer = 0; - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(c) { // copy to both! @@ -4802,7 +4802,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *) m_pMessagesStoppedWhileSelecting->removeFirst(); appendLine(l,false); } - tqrepaint(); + repaint(); } } @@ -4858,11 +4858,11 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e) int lastBottom = m_iLastLinkRectTop + m_iLastLinkRectHeight; int thisBottom = rectTop + rectHeight; TQRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); - tqrepaint(r); + repaint(r); } else { // no prev link TQRect r(0,rectTop,width(),rectHeight); - tqrepaint(r); + repaint(r); } m_iLastLinkRectTop = rectTop; m_iLastLinkRectHeight = rectHeight; @@ -4872,7 +4872,7 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e) { // There was a previous bottom rect TQRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); - tqrepaint(r); + repaint(r); m_iLastLinkRectTop = -1; m_iLastLinkRectHeight = -1; } @@ -4896,7 +4896,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin TQString tip; - switch(linkCmd[0].tqunicode()) + switch(linkCmd[0].unicode()) { case 'u': // url link { @@ -4972,11 +4972,11 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin if(((KviChannel *)m_pKviWindow)->isMeOp()) { TQChar plmn = linkCmd[1]; - if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) + if((plmn.unicode() == '+') || (plmn.unicode() == '-')) { tip = __tr2qs("Double-click to set<br>"); TQChar flag = linkCmd[2]; - switch(flag.tqunicode()) + switch(flag.unicode()) { case 'o': case 'v': @@ -5100,7 +5100,7 @@ void KviIrcView::timerEvent(TQTimerEvent *e) if(e->timerId() == m_iSelectTimer) { calculateSelectionBounds(); - tqrepaint(); + repaint(); } if(e->timerId() == m_iMouseTimer) { diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 092d5ed..84b485f 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -197,7 +197,7 @@ public: void nextLine(); void nextPage(); void prevPage(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; const TQString & lastLineOfText(); const TQString & lastMessageText(); virtual void setFont(const TQFont &f); diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h index 790976b..34c70c4 100644 --- a/src/kvirc/ui/kvi_ircviewprivate.h +++ b/src/kvirc/ui/kvi_ircviewprivate.h @@ -148,7 +148,7 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag #endif //!COMPILE_ON_WINDOWS //========================================================================================================= -// Screen tqlayout +// Screen layout //========================================================================================================= //FIRST LINE (prev_line = 0) <---m_pFirstLine diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index c6f4138..6b076b0 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -38,7 +38,7 @@ #include <tqtoolbutton.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -278,7 +278,7 @@ void KviIrcViewToolWidget::filterSave() void KviIrcViewToolWidget::forceRepaint() { #if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) - m_pIrcView->tqrepaint(); + m_pIrcView->repaint(); #else m_pIrcView->paintEvent(0); #endif diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index c0dd4ba..168db46 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -190,7 +190,7 @@ void KviListView::resizeEvent(TQResizeEvent * e) { KviTalListView::resizeEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) + repaintContents(); // force a full repaint (otherwise qt does not honor static background here) } #ifdef COMPILE_ON_WINDOWS diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 21921b5..b5036b5 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -32,7 +32,7 @@ #include "kvi_toolwindows_container.h" #include "kvi_channel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvalidator.h> diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index f1d47c9..7f57350 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -81,11 +81,11 @@ void KviMdiCaptionButton::drawButton(TQPainter *p) #ifdef COMPILE_USE_QT4 TQBrush b(parentWidget()->palette().window()); #else - TQBrush b(parentWidget()->tqcolorGroup().background()); + TQBrush b(parentWidget()->colorGroup().background()); #endif if(isDown()) - qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b); + qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b); else p->fillRect(0,0,width(),height(),b); @@ -229,7 +229,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e) TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); - rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); + rt.draw(&p,height() + 2,-1,rect(),colorGroup()); } void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *) @@ -278,7 +278,7 @@ KviMenuBarToolButton::~KviMenuBarToolButton() { } -TQSize KviMenuBarToolButton::tqsizeHint() const +TQSize KviMenuBarToolButton::sizeHint() const { return TQSize(20,20); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index c46572a..d214d9a 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -57,7 +57,7 @@ public: KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name); ~KviMenuBarToolButton(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 2bf0130..1a8dccc 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -112,7 +112,7 @@ TQRect KviMdiChild::restoredGeometry() { if(m_state == Maximized)return m_restoredGeometry; else return TQRect(x(),y(),width(),height()); -// else return tqgeometry(); +// else return geometry(); } @@ -172,7 +172,7 @@ void KviMdiChild::setCaption(const TQString & plain,const TQString & xmlActive,c void KviMdiChild::maximize() { if(m_state == Minimized)restore(); // restore first - if(m_state == Normal)m_restoredGeometry = tqgeometry(); + if(m_state == Normal)m_restoredGeometry = geometry(); m_state = Maximized; manager()->maximizeChild(this); } @@ -225,7 +225,7 @@ void KviMdiChild::minimize() m_pManager->childMinimized(this,true); break; case Normal: - m_restoredGeometry = tqgeometry(); + m_restoredGeometry = geometry(); hide(); m_state = Minimized; m_pManager->childMinimized(this,false); @@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect & void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight) { if(m_pClient){ - minWidth = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1); - minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ + minWidth = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1); + minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ m_pCaption->heightHint() + KVI_MDICHILD_SPACING; } if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH; @@ -508,10 +508,10 @@ void KviMdiChild::setClient(TQWidget *w) */ //linkChildren(w); - if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && - m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ - setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1)); - setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + + if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && + m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ + setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1)); + setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + m_pCaption->heightHint() + KVI_MDICHILD_SPACING); } @@ -561,16 +561,16 @@ void KviMdiChild::focusInEvent(TQFocusEvent *) #endif } -TQSize KviMdiChild::tqsizeHint() +TQSize KviMdiChild::sizeHint() { if(m_pClient) { - TQSize s = m_pClient->tqsizeHint(); + TQSize s = m_pClient->sizeHint(); TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint()); return ret; } - return TQFrame::tqsizeHint(); + return TQFrame::sizeHint(); } diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index feac48b..6d7b879 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -77,7 +77,7 @@ public: const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); void setIcon(const TQPixmap &pix); const TQPixmap * icon(); void enableClose(bool bEnable); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 9163595..9d6fa18 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -38,7 +38,7 @@ #include "kvi_tal_popupmenu.h" #include <tqmenubar.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <math.h> #include <tqcursor.h> @@ -199,7 +199,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) return; // no such child ? } - // disable the labels of all the other tqchildren + // disable the labels of all the other children //for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) //{ // pC->captionLabel()->setActive(false); @@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) { lpC->setFocus(); /* - if(tqtopLevelWidget()->isActiveWindow()) + if(topLevelWidget()->isActiveWindow()) { } @@ -284,8 +284,8 @@ TQPoint KviMdiManager::getCascadePoint(int indexOfWindow) if(indexOfWindow==0)return pnt; KviMdiChild *lpC=m_pZ->first(); int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20); - int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); - int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH); + int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); + int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH); int ax=0; int ay=0; for(int i=0;i<indexOfWindow;i++) @@ -313,7 +313,7 @@ void KviMdiManager::childMoved(KviMdiChild *) void KviMdiManager::maximizeChild(KviMdiChild * lpC) { - // the tqchildren must be moved once by the means of TQScrollView::moveChild() + // the children must be moved once by the means of TQScrollView::moveChild() // so the TQScrollView internal structures get updated with the negative // position of the widget, otherwise, when restoring with moveChild() // it will refuse to move it back to the original position @@ -338,14 +338,14 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC) lpC->setFocus(); } - // fixme: we could hide all the other tqchildren now! + // fixme: we could hide all the other children now! } void KviMdiManager::resizeEvent(TQResizeEvent *e) { - //If we have a maximized tqchildren at the top , adjust its size + //If we have a maximized children at the top , adjust its size KviTalScrollView::resizeEvent(e); KviMdiChild *lpC=m_pZ->last(); if(lpC) @@ -431,7 +431,7 @@ void KviMdiManager::focusTopChild() if(!lpC->isVisible())return; // if(lpC->state()==KviMdiChild::Minimized)return; // debug("Focusing top child %s",lpC->name()); - //disable the labels of all the other tqchildren + //disable the labels of all the other children for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) { if(pC != lpC) @@ -591,7 +591,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... b->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); - // The show below SHOULD force a re-tqlayout of the menubar.. + // The show below SHOULD force a re-layout of the menubar.. // but it doesn't work when the KviFrame is still hidden (at startup) // We handle this BUG in showEvent() m_pSdiControls->show(); @@ -611,7 +611,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) void KviMdiManager::relayoutMenuButtons() { #ifdef COMPILE_USE_QT4 - // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) + // force a re-layout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget if(m_pSdiControls) { @@ -662,7 +662,7 @@ void KviMdiManager::leaveSDIMode() } if(m_pSdiIconButton) { - m_pSdiIconButton->hide(); // this will force a TQMenuBar retqlayout + m_pSdiIconButton->hide(); // this will force a TQMenuBar relayout delete m_pSdiIconButton; m_pSdiIconButton = 0; } @@ -814,7 +814,7 @@ void KviMdiManager::cascadeWindows() { TQPoint p = getCascadePoint(idx); moveChild(lpC,p.x(),p.y()); - lpC->resize(lpC->tqsizeHint()); + lpC->resize(lpC->sizeHint()); idx++; } list.removeFirst(); @@ -844,8 +844,8 @@ void KviMdiManager::cascadeMaximized() TQPoint pnt(getCascadePoint(idx)); moveChild(lpC,pnt.x(),pnt.y()); TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); - if((lpC->tqminimumSize().width() > curSize.width()) || - (lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize()); + if((lpC->minimumSize().width() > curSize.width()) || + (lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize()); else lpC->resize(curSize); idx++; } @@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal) int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible); int xQuantum=viewport()->width()/pColstable[numToHandle-1]; - if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ + if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space"); else tileAllInternal(pColrecall[numToHandle-1],bHorizontal); return; } int yQuantum=viewport()->height()/pRowstable[numToHandle-1]; - if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ + if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space"); else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal); return; @@ -1073,7 +1073,7 @@ void KviMdiManager::tileAnodine() int numVisible=getVisibleChildCount(); // count visible windows if(numVisible<1)return; int numCols=int(sqrt((double)numVisible)); // set columns to square root of visible count - // create an array to form grid tqlayout + // create an array to form grid layout int *numRows=new int[numCols]; int numCurCol=0; while(numCurCol<numCols) diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 1c43223..ad5531e 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -97,7 +97,7 @@ void KviMenuBar::showEvent(TQShowEvent *e) { #ifdef COMPILE_USE_QT4 debug("menubar show"); - // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) + // force a re-layout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget m_pFrm->mdiManager()->relayoutMenuButtons(); #endif diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 18ce661..c4b286e 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -33,7 +33,7 @@ #include "kvi_toolwindows_container.h" #include "kvi_tal_scrollview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> @@ -121,11 +121,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons TQChar ccc = szModes[0]; szModes.remove(0,1); - KviTQString::sprintf(tmp,"%c: %Q",ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -193,11 +193,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons TQChar ccc = szModes[0]; szModes.remove(0,1); - KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.tqunicode())); + cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -317,9 +317,9 @@ void KviModeEditor::commit() TQChar ccc = sz[0]; if(cb->isChecked()) { - if(!m_szMode.contains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); + if(!m_szMode.contains((char)ccc.unicode()))szPlusModes.append((char)ccc.unicode()); } else { - if(m_szMode.contains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); + if(m_szMode.contains((char)ccc.unicode()))szMinusModes.append((char)ccc.unicode()); } } } diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 7c817dd..9f9aba0 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -75,9 +75,9 @@ void KviModeWidget::refreshModes() { TQString szMode=m_pChannel->channelMode(); if(!m_pChannel->channelKey().isEmpty()) - szMode+=TQString(" k:%1").tqarg(m_pChannel->channelKey()); + szMode+=TQString(" k:%1").arg(m_pChannel->channelKey()); if(!m_pChannel->channelLimit().isEmpty()) - szMode+=TQString(" l:%1").tqarg(m_pChannel->channelLimit().ptr()); + szMode+=TQString(" l:%1").arg(m_pChannel->channelLimit().ptr()); if(m_pLabel) m_pLabel->setText(szMode); } diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 8b959a7..82c1a83 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -98,16 +98,16 @@ void KviOptionsWidget::createLayout(int rows,int cols) void KviOptionsWidget::createTabbedPage() { createLayout(1,1); - tqlayout()->setMargin(0); - tqlayout()->setSpacing(0); + layout()->setMargin(0); + layout()->setSpacing(0); m_pTabWidget = new TQTabWidget(this); addWidgetToLayout(m_pTabWidget,0,0,0,0); } void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget) { - if(pWidget->tqlayout()) - pWidget->tqlayout()->setMargin(10); + if(pWidget->layout()) + pWidget->layout()->setMargin(10); m_pTabWidget->addTab(pWidget,iconSet,szText); m_pSelectorInterfaceList->append(pWidget); } @@ -115,8 +115,8 @@ void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet & void KviOptionsWidget::addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2) { - if((x1 == x2) && (y1 == y2))tqlayout()->addWidget(w,y1,x1); - else tqlayout()->addMultiCellWidget(w,y1,y2,x1,x2); + if((x1 == x2) && (y1 == y2))layout()->addWidget(w,y1,x1); + else layout()->addMultiCellWidget(w,y1,y2,x1,x2); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -622,7 +622,7 @@ void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2) { TQWidget * w = new TQWidget(this); addWidgetToLayout(w,x1,y1,x2,y2); - tqlayout()->setRowStretch(y1,1); + layout()->setRowStretch(y1,1); } TQLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled) @@ -676,7 +676,7 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2) { - TQWidget * w = tqtopLevelWidget(); + TQWidget * w = topLevelWidget(); if(!w)return; if(!w->inherits("KviGeneralOptionsDialog"))return; diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 5e397f1..8259a8c 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_pointerlist.h" #include <tqlineedit.h> #include <kvi_tal_groupbox.h> @@ -54,7 +54,7 @@ private: public: void mergeResetFlag(int flag){ m_iResetFlags |= flag; }; void createLayout(int rows,int columns); - TQGridLayout * tqlayout(){ return m_pLayout; }; + TQGridLayout * layout(){ return m_pLayout; }; protected: void commitSelectors(); void commitOptionsReset(); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index ce26661..0d133bd 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -167,9 +167,9 @@ TQString KviQuery::getInfoLabelTipText() txt += "<tr><td>"; if(e->hasRealName()) - tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask); + tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask); tmp.replace('&',"&"); tmp.replace('<',"<"); @@ -183,21 +183,21 @@ TQString KviQuery::getInfoLabelTipText() { txt+="<tr><td>"; if(e->hasHops()) - txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops()); + txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops()); else - txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server()); + txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server()); txt+="</td></tr>"; } if(e->isAway()) { txt+="<tr><td>"; - txt+=__tr2qs("%1 is probably away").tqarg(m_szName); + txt+=__tr2qs("%1 is probably away").arg(m_szName); txt+="</td></tr>"; } txt+="<tr><td>"; - tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans); + tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans); tmp.replace('&',"&"); tmp.replace('<',"<"); @@ -237,19 +237,19 @@ TQString KviQuery::getInfoLabelText() else szMask+="*"; if(e->hasRealName()) - tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask); + tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask); if(e->hasServer()) - tmp+=__tr2qs(", using server %1").tqarg(e->server()); + tmp+=__tr2qs(", using server %1").arg(e->server()); if(e->hasHops()) - tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops()); + tmp+=__tr2qs(" (%1 hops)").arg(e->hops()); if(e->isAway()) tmp+=__tr2qs(", probably away"); tmp+="\n"; TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); - tmp+=__tr2qs("Common channels: %2").tqarg(szChans); + tmp+=__tr2qs("Common channels: %2").arg(szChans); } else { tmp=__tr2qs("[Dead Query]"); } @@ -547,7 +547,7 @@ void KviQuery::applyOptions() { m_pUserListView->applyOptions(); updateLabelText(); - // this applies options for IrcView and Input and forces the window to retqlayout + // this applies options for IrcView and Input and forces the window to relayout KviWindow::applyOptions(); } @@ -559,15 +559,15 @@ TQPixmap * KviQuery::myIconPtr() void KviQuery::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 KviQuery::tqsizeHint() const +TQSize KviQuery::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; } diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index 3b1a81b..d0a12e5 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -66,7 +66,7 @@ public: void setDeadQuery(); void setAliveQuery(); bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual const TQString & target(){ return windowName(); }; virtual void applyOptions(); KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index c3e5473..9eca884 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -35,9 +35,9 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolordialog.h> -#include <tqpalette.h> +#include <palette.h> #include <tqfontdialog.h> #include "kvi_tal_popupmenu.h" @@ -513,7 +513,7 @@ KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor * void KviColorSelector::setButtonPalette(TQColor * pOption) { - TQPalette pal(*pOption,tqcolorGroup().background()); + TQPalette pal(*pOption,colorGroup().background()); m_memColor = *pOption; m_pButton->setPalette(pal); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index d91be01..405d50b 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -37,7 +37,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <stdio.h> @@ -160,7 +160,7 @@ void KviSplashScreen::setProgress(int progress) painter.end(); #endif //raise(); - tqrepaint(); + repaint(); g_pApp->processEvents(); //damn... } diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 861facd..91c5fdb 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -43,7 +43,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqcursor.h> #include "kvi_tal_popupmenu.h" @@ -106,9 +106,9 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel"); m_pMessageLabel->setMargin(1); #ifdef COMPILE_USE_QT4 - m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); + m_pMessageLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); #else - m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); + m_pMessageLabel->setAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); #endif m_pMessageLabel->setMinimumWidth(350); @@ -210,7 +210,7 @@ void KviStatusBar::layoutChildren() int h = height() - (VMARGIN * 2); for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - int w = a->tqsizeHint().width(); + int w = a->sizeHint().width(); x -= w; a->setGeometry(x,VMARGIN,w,h); x -= SPACING; @@ -237,11 +237,11 @@ bool KviStatusBar::event(TQEvent * e) void KviStatusBar::recalcMinimumHeight() { int s = 18; - int h = m_pMessageLabel->tqsizeHint().height(); + int h = m_pMessageLabel->sizeHint().height(); if(h > s)s = h; for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - h = a->tqsizeHint().height(); + h = a->sizeHint().height(); if(h > s)s = h; } s += (VMARGIN * 2) + RICHTEXTLABELTRICK; @@ -249,7 +249,7 @@ void KviStatusBar::recalcMinimumHeight() { m_iLastMinimumHeight = s; setMinimumHeight(s); - TQLayout * l = tqlayout(); + TQLayout * l = layout(); if(l) if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING)) ((TQBoxLayout *)l)->addStrut(s); @@ -467,9 +467,9 @@ void KviStatusBar::paintEvent(TQPaintEvent * e) { // avoid the ugly rectangle around the widgets painted by TQStatusBar // TQPainter p(this); -// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); +// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),colorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); //TQStatusBar::paintEvent(e); - //qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0); + //qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0); } void KviStatusBar::mousePressEvent(TQMouseEvent * e) diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index bc8fa02..0177623 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -42,7 +42,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqcursor.h> #include "kvi_tal_popupmenu.h" diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 629fae9..6f7e8e6 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -84,7 +84,7 @@ void KviStyledControlInternal::paintTimerShot () m_pControl->m_pTimer->stop(); } } - m_pControl->m_pWidget->tqrepaint( false ); + m_pControl->m_pWidget->repaint( false ); } KviStyledControl::KviStyledControl(TQWidget* w) @@ -118,7 +118,7 @@ void KviStyledControl::enterEvent ( TQEvent * ) } m_bMouseEnter=1; m_iStepNumber++; - m_pWidget->tqrepaint( false ); + m_pWidget->repaint( false ); } } @@ -137,7 +137,7 @@ void KviStyledControl::leaveEvent ( TQEvent * ) } m_bMouseEnter=0; m_iStepNumber--; - m_pWidget->tqrepaint( false ); + m_pWidget->repaint( false ); } } @@ -279,7 +279,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event) pDoubleBufferPixmap->fill( bActive ? TQColor(206,215,223) : - tqcolorGroup().background() + colorGroup().background() ); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index ad47661..171e411 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -290,7 +290,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT; - TQColor base = tqcolorGroup().background(); + TQColor base = colorGroup().background(); if(m_pWindow->console()) { TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); @@ -298,7 +298,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) (base.blue() + cntx.blue()) >> 1); pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base); } else { - pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background)); + pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(TQColorGroup::Background)); } } @@ -394,7 +394,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter) { pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height()); TQColor base = pPainter->pen().color(); - TQColor bg = tqcolorGroup().color(TQColorGroup::Background); + TQColor bg = colorGroup().color(TQColorGroup::Background); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); @@ -421,7 +421,7 @@ void KviTaskBarButton::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - update(); // tqrepaint(false) ? + update(); // repaint(false) ? } void KviTaskBarButton::unhighlight() @@ -439,7 +439,7 @@ void KviTaskBarButton::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(m_bActive)return; - update(); // tqrepaint(false) ? + update(); // repaint(false) ? } @@ -833,7 +833,7 @@ void KviTreeTaskBarItem::applyOptions() void KviTreeTaskBarItem::captionChanged() { // FIXME: can we do better ? - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::unhighlight() @@ -841,7 +841,7 @@ void KviTreeTaskBarItem::unhighlight() if(m_iHighlightLevel < 1)return; m_iHighlightLevel = 0; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::highlight(int iLevel) @@ -851,14 +851,14 @@ void KviTreeTaskBarItem::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(isSelected())return; - tqrepaint(); // tqrepaint(false) ? + repaint(); // repaint(false) ? } void KviTreeTaskBarItem::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - tqrepaint(); // tqrepaint(false) ? + repaint(); // repaint(false) ? } void KviTreeTaskBarItem::setActive(bool bActive) @@ -868,7 +868,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was not selected: the listView will tqrepaint it + // was not selected: the listView will repaint it } else { if(isSelected()) { @@ -876,7 +876,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was selected: the list view will tqrepaint it + // was selected: the list view will repaint it } } } @@ -907,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -918,7 +918,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); // debug("%i %i",pnt.x(),pnt.y()); p.translate(-pnt.x(),-pnt.y()); @@ -1081,7 +1081,7 @@ void KviTreeTaskBarItem::timerShot() m_pAnimTimer->stop(); m_iStepNumber=0; //make shure, that we cannot get out of range } - tqrepaint(); + repaint(); } void KviTreeTaskBarItem::mouseEnter() @@ -1192,7 +1192,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); + TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -1204,7 +1204,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); + TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); //p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y()); KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); } @@ -1235,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar() // FIXME: this code is useless ? if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48) KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48; - int iMin = m_pListView->tqminimumSize().width() + 4; + int iMin = m_pListView->minimumSize().width() + 4; if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)) iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth); setMinimumWidth(iMin); @@ -1305,7 +1305,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { TQString szText; ((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText); - m_pToolTip->tip(m_pListView->tqitemRect(it),szText); + m_pToolTip->tip(m_pListView->itemRect(it),szText); } } } @@ -1405,7 +1405,7 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->firstChild(); } else { - // this item has no tqchildren: try the next sibling + // this item has no children: try the next sibling if(m_pCurrentItem->nextSibling()) { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index 9e9ebe2..6c5794c 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -226,7 +226,7 @@ protected: int m_iBlueDiff; public: virtual TQString key(int column,bool) const; - virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int tqalignment); + virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int alignment); #ifdef COMPILE_USE_QT4 virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h); #else diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index 1f57db0..ef54460 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -44,9 +44,9 @@ KviThemedLabel::~KviThemedLabel() { } -/*TQSize KviThemedLabel::tqsizeHint() +/*TQSize KviThemedLabel::sizeHint() { - TQSize size=TQFrame::tqsizeHint(); + TQSize size=TQFrame::sizeHint(); int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; size.setHeight(iHeight); return size; diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h index a307149..f704310 100644 --- a/src/kvirc/ui/kvi_themedlabel.h +++ b/src/kvirc/ui/kvi_themedlabel.h @@ -55,7 +55,7 @@ public: void setAutoHeight(bool value) { m_bAutoHeight=value; }; void applyOptions(); -// TQSize tqsizeHint(); +// TQSize sizeHint(); signals: void doubleClicked(); }; diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 65c6dec..470957f 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -1,7 +1,7 @@ #define __KVIRC__ -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqobjectcleanuphandler.h> #include <tqpushbutton.h> @@ -94,7 +94,7 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const T setToggleButton(true); setOn(bOn); -// tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); +// setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); } KviWindowToolPageButton::~KviWindowToolPageButton() @@ -106,9 +106,9 @@ KviWindowToolPageButton::~KviWindowToolPageButton() { TQPixmap pixmap( height(), width() ); if(isOn()) - pixmap.fill(tqcolorGroup().mid()); + pixmap.fill(colorGroup().mid()); else - pixmap.fill(tqcolorGroup().button()); + pixmap.fill(colorGroup().button()); TQPainter painter( &pixmap ); TQPixmap icon; @@ -118,7 +118,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton() icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); // Draw the frame - //painter.setPen( tqcolorGroup().mid() ); + //painter.setPen( colorGroup().mid() ); //if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); //painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -127,7 +127,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton() TQString str = text(); str.remove("&"); const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2; - painter.setPen( tqcolorGroup().buttonText() ); + painter.setPen( colorGroup().buttonText() ); const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str ); diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index fe9011e..b9905ca 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -52,7 +52,7 @@ static int g_iInputFontCharWidth[256]; #include <tqlineedit.h> #include "kvi_tal_listbox.h" #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include "kvi_tal_popupmenu.h" #include <tqevent.h> @@ -74,7 +74,7 @@ int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const void KviListBoxTopicItem::paint ( TQPainter * p ) { - KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox())); + KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox())); } @@ -153,7 +153,7 @@ TQString convertToHtml(const TQString &text) while(idx < text.length()) { - unsigned short c = text[(int)idx].tqunicode(); + unsigned short c = text[(int)idx].unicode(); unsigned int start = idx; @@ -168,7 +168,7 @@ TQString convertToHtml(const TQString &text) { idx++; if(idx >= text.length())break; - else c = text[(int)idx].tqunicode(); + else c = text[(int)idx].unicode(); } int len = idx - start; @@ -251,7 +251,7 @@ TQString convertToHtml(const TQString &text) ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG while((idx < text.length()) && (curX < width)) { - unsigned short c = text[(int)idx].tqunicode(); + unsigned short c = text[(int)idx].unicode(); unsigned int start = idx; @@ -305,7 +305,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG ) { idx++; - c = text[(int)idx].tqunicode(); + c = text[(int)idx].unicode(); } int len = idx - start; @@ -392,7 +392,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -438,11 +438,11 @@ void KviTopicWidget::drawContents(TQPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - TQColorGroup tqcolorGroup; - //tqcolorGroup() - tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); - paintColoredText(p,m_szTopic,tqcolorGroup); + TQColorGroup colorGroup; + //colorGroup() + colorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); + colorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); + paintColoredText(p,m_szTopic,colorGroup); } void KviTopicWidget::setTopic(const TQString & topic) @@ -541,7 +541,7 @@ void KviTopicWidget::updateToolTip() KviTalToolTip::add(this,txt); } -TQSize KviTopicWidget::tqsizeHint() const +TQSize KviTopicWidget::sizeHint() const { TQFontMetrics fm(font()); int hght = fm.lineSpacing() + (frameWidth() << 1) + 4; @@ -629,7 +629,7 @@ void KviTopicWidget::contextPopupAboutToShow() void KviTopicWidget::copy() { - TQClipboard * c = TQApplication::tqclipboard(); + TQClipboard * c = TQApplication::clipboard(); if(!c)return; if(c->supportsSelection())c->setText(m_szTopic,TQClipboard::Selection); c->setText(m_szTopic,TQClipboard::Clipboard); diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index 5a59ced..89e4901 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -102,7 +102,7 @@ public: const TQString & topic(){ return m_szTopic; }; const TQString & topicSetBy(){ return m_szSetBy; }; const TQString & topicSetAt(){ return m_szSetAt; }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void applyOptions(); static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1); diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index d504915..a66156c 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -305,7 +305,7 @@ void KviUserListView::applyOptions() m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); setMinimumWidth(100); resizeEvent(0); // this will call update() too - tqrepaint(); + repaint(); } void KviUserListView::updateArea() { @@ -838,7 +838,7 @@ int KviUserListView::getUserModeLevel(const TQString &szNick) char KviUserListView::getUserFlag(KviUserListEntry * e) { if(!e)return 0; - return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).tqunicode(); + return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode(); } void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer) @@ -1141,7 +1141,7 @@ void KviUserListView::resizeEvent(TQResizeEvent *) int hght; if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005 { - hght = m_pUsersLabel->tqsizeHint().height(); + hght = m_pUsersLabel->sizeHint().height(); if(hght < 16)hght = 16; // at least m_pUsersLabel->setGeometry(0,0,width(),hght); } @@ -1281,7 +1281,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) TQDateTime dt; dt.setTime_t(it->m_joinTime); buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Joined on <b>%1</b>").tqarg(dt.toString()); + buffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString()); buffer += "</nobr></td></tr>"; } @@ -1293,7 +1293,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) int hors = mins / 60; mins = mins % 60; buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").tqarg(hors).tqarg(mins).tqarg(secs); + buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(hors).arg(mins).arg(secs); buffer += "</nobr></td></tr>"; } buffer += "</table>"; @@ -1531,9 +1531,9 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/)); if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID)) p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY); - p.setPen(tqcolorGroup().shadow()); + p.setPen(colorGroup().shadow()); p.drawLine(0,bottom - 1,wdth,bottom - 1); - p.setPen(tqcolorGroup().light()); + p.setPen(colorGroup().light()); p.drawLine(0,theY,wdth,theY); theY--; } @@ -1725,10 +1725,10 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) //we really do not need any self-draw borders. //if we will need it, we will draw a better one with system style - //p.setPen(tqcolorGroup().dark()); + //p.setPen(colorGroup().dark()); //p.drawLine(0,0,wdth,0); //p.drawLine(0,0,0,height()); - //p.setPen(tqcolorGroup().light()); + //p.setPen(colorGroup().light()); //p.drawLine(1,height()-1,wdth,height()-1); //p.drawLine(wdth - 1,1,wdth - 1,height()); @@ -1742,7 +1742,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) void KviUserListViewArea::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->tqsizeHint().width(); + int iScr = m_pScrollBar->sizeHint().width(); m_pScrollBar->setGeometry(width() - iScr,0,iScr,height()); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1); diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 6c959e7..435c915 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -60,7 +60,7 @@ #include <tqsplitter.h> #include <tqmetaobject.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqevent.h> // it looks they can't decide :D @@ -285,7 +285,7 @@ void KviWindow::demandAttention() bool KviWindow::focusNextPrevChild(bool next) { - TQWidget * w = tqfocusWidget(); + TQWidget * w = focusWidget(); if(w) { #ifdef COMPILE_USE_QT4 @@ -299,9 +299,9 @@ bool KviWindow::focusNextPrevChild(bool next) if(w->parent()) { #ifdef COMPILE_USE_QT4 - if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } @@ -586,7 +586,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer) { // FIXME: #warning "Make it configurable ?" TQString date; - TQDate dt(TQDate::tqcurrentDate()); + TQDate dt(TQDate::currentDate()); date=dt.toString("yyyy.MM.dd"); TQString base; getBaseLogFileName(base); @@ -1006,7 +1006,7 @@ void KviWindow::focusInEvent(TQFocusEvent *) if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = tqchildren(); + TQList<TQObject *> list = children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1042,7 +1042,7 @@ void KviWindow::focusInEvent(TQFocusEvent *) } // Setting the focus to the focus handler usually - // triggers our filter for the tqchildren's focusInEvent. + // triggers our filter for the children's focusInEvent. // This should call activateSelf() and thus // we should be already the active window at this point. // If we're not, then run activateSelf() to fix this. @@ -1124,7 +1124,7 @@ void KviWindow::childInserted(TQWidget * o) } #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = o->tqchildren(); + TQList<TQObject *> list = o->children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1162,7 +1162,7 @@ void KviWindow::childRemoved(TQWidget * o) m_pLastFocusedChild = 0; #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = o->tqchildren(); + TQList<TQObject *> list = o->children(); for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; @@ -1180,7 +1180,7 @@ void KviWindow::childRemoved(TQWidget * o) if(c->isWidgetType()) childRemoved((TQWidget *)c); } - } //else debug("The removed object has no tqchildren"); + } //else debug("The removed object has no children"); #endif } @@ -1202,7 +1202,7 @@ void KviWindow::wheelEvent(TQWheelEvent *e) } -void KviWindow::tqchildrenTreeChanged(TQWidget * widgetAdded) +void KviWindow::childrenTreeChanged(TQWidget * widgetAdded) { // if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded); // FIXME: This might be useless @@ -1217,14 +1217,14 @@ void KviWindow::updateBackgrounds(TQObject * obj) if(!obj) obj = TQT_TQOBJECT(this); #ifdef COMPILE_USE_QT4 - TQList<TQObject *> list = obj->tqchildren(); + TQList<TQObject *> list = obj->children(); if (list.count()) { for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { TQObject * child = *it; - if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){ + if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){ // if (child->isWidgetType()) ((TQWidget *)child)->update(); } @@ -1239,7 +1239,7 @@ void KviWindow::updateBackgrounds(TQObject * obj) { TQObject * child = list.at(i); // FIXME: check if this code can work with qt < 3.0.0 too - if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1) + if(child->metaObject()->findProperty("TransparencyCapable",true) != -1) ((TQWidget *)child)->update(); updateBackgrounds(child); @@ -1317,7 +1317,7 @@ TQRect KviWindow::externalGeometry() #ifndef Q_OS_MACX return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry(); #else - return mdiParent() ? mdiParent()->restoredGeometry() : tqgeometry(); + return mdiParent() ? mdiParent()->restoredGeometry() : geometry(); #endif } @@ -1327,7 +1327,7 @@ void KviWindow::applyOptions() if(m_pIrcView)m_pIrcView->applyOptions(); if(m_pInput)m_pInput->applyOptions(); - // trick: retqlayout + // trick: relayout resize(width() - 1,height() - 1); resize(width() + 1,height() + 1); } @@ -1490,10 +1490,10 @@ void KviWindow::preprocessMessage(TQString & szMessage) if(m_pConsole->connection()) if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) if((*it)==tmp) - *it=TQString("\r!c\r%1\r").tqarg(*it); + *it=TQString("\r!c\r%1\r").arg(*it); else { - *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); + *it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it); } } szMessage=strings.join(" "); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index a044bae..913c63b 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -181,7 +181,7 @@ protected: // almost private: don't touch :D // KviToolWindowsContainer * m_pEditorsContainer; public: // The global ID of this window: unique in the application - TQString id(){ return TQString("%1").tqarg(m_uId); }; + TQString id(){ return TQString("%1").arg(m_uId); }; unsigned long int numericId(){ return m_uId; }; public: // THIS is the function that should be used @@ -262,7 +262,7 @@ public: bool isMaximized(); // Retrieves the default log file name: this is pre-build void getDefaultLogFileName(TQString &buffer); - // Well...the external tqgeometry :) + // Well...the external geometry :) TQRect externalGeometry(); void delayedClose(); // close that jumps out of the current event loop @@ -374,7 +374,7 @@ protected: BUTTON_CLASS * createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn); // This is called by KviInput: actually it links the widgetAdded - virtual void tqchildrenTreeChanged(TQWidget * widgetAdded); + virtual void childrenTreeChanged(TQWidget * widgetAdded); virtual bool focusNextPrevChild(bool bNext); |