diff options
Diffstat (limited to 'src/modules')
163 files changed, 741 insertions, 741 deletions
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 47f18adb..d1c5f51b 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -32,7 +32,7 @@ #include "kvi_sourcesdate.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kvi_tal_textedit.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -86,7 +86,7 @@ KviAboutDialog::KviAboutDialog() TQLabel * l = new TQLabel(w); l->setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); l->setBackgroundColor(TQt::black); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); l->setPixmap(pix); g->addWidget(l,0,0); @@ -99,7 +99,7 @@ KviAboutDialog::KviAboutDialog() aboutString += KVI_SOURCES_DATE; l = new TQLabel(aboutString,w); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); g->addWidget(l,1,0); addTab(w,__tr2qs_ctx("About","about")); diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index ead09cd5..9404b8bc 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -109,10 +109,10 @@ static bool action_kvs_cmd_trigger(KviKvsModuleCommandCall * c) a->activate(); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The action \"%1\" is disabled").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" is disabled").arg(szName)); } } else { - c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName)); } return true; @@ -158,7 +158,7 @@ static bool action_kvs_cmd_enable(KviKvsModuleCommandCall * c) if(!a->isEnabled())a->setEnabled(true); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName)); } return true; @@ -206,7 +206,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c) if(a->isEnabled())a->setEnabled(false); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName)); } return true; @@ -252,11 +252,11 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c) a->suicide(); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").arg(szName)); } } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName)); } return true; @@ -417,7 +417,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c) if(old->isKviUserActionNeverOverrideThis()) old->suicide(); else { - c->warning(__tr2qs("The action \"%1\" is already defined as core action and cannot be overridden").tqarg(szName)); + c->warning(__tr2qs("The action \"%1\" is already defined as core action and cannot be overridden").arg(szName)); return false; } } diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 5957d901..98a6c4f7 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -42,7 +42,7 @@ #include "kvi_customtoolbarmanager.h" #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_vbox.h" #include <tqtooltip.h> #include <tqpushbutton.h> @@ -980,7 +980,7 @@ TQPixmap * KviActionEditorWindow::myIconPtr() void KviActionEditorWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pBase->tqsizeHint().height(); + int hght = m_pBase->sizeHint().height(); m_pEditor->setGeometry(0,0,width(),height()- hght); m_pBase->setGeometry(0,height() - hght,width(),hght); } diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 08f18081..9d3b0ebc 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -195,7 +195,7 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c) KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback")); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName)); } return true; @@ -235,13 +235,13 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c) if(ss.isEmpty()) { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" has no configure callback set").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" has no configure callback set").arg(szName)); } else { a->executeConfigureCallback(c->window()); } } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName)); } return true; @@ -282,13 +282,13 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c) if(ss.isEmpty()) { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" has no help callback set").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" has no help callback set").arg(szName)); } else { a->executeHelpCallback(c->window()); } } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName)); } return true; @@ -334,7 +334,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall * a->setConfigureCallback(c->callback()->code()); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName)); } return true; @@ -381,7 +381,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c) a->setHelpCallback(c->callback()->code()); } else { if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); + c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName)); } return true; diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 24c539f2..34bc7eec 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -37,7 +37,7 @@ #include "kvi_sourcesdate.h" #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqtooltip.h> #include <tqlineedit.h> @@ -213,7 +213,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p) lb->setFixedWidth(pix->width()); } lb->setBackgroundColor(TQt::black); - lb->tqsetAlignment(TQt::AlignBottom | TQt::AlignRight); + lb->setAlignment(TQt::AlignBottom | TQt::AlignRight); */ m_pListView = new KviScriptAddonListView(this); g->addMultiCellWidget(m_pListView,0,10,1,1); @@ -330,7 +330,7 @@ void KviScriptManagementDialog::uninstallScript() if(!it)return; TQString txt = "<p>"; - txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").tqarg(it->addon()->visibleName()); + txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").arg(it->addon()->visibleName()); txt += "</p>"; if(TQMessageBox::question(this, diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index e7bd5d75..a3664ca8 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -42,7 +42,7 @@ #include "kvi_valuelist.h" #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_vbox.h" #include <tqtooltip.h> #include <tqpushbutton.h> @@ -794,7 +794,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll else { KviTQString::sprintf(szMsg,__tr2qs("Do you really want to remove the namespace \"%Q\" ?"),&szName); szMsg += "<br>"; - szMsg += __tr2qs("Please note that all the tqchildren items will be deleted too."); + szMsg += __tr2qs("Please note that all the children items will be deleted too."); } g_pAliasEditorModule->lock(); @@ -1383,7 +1383,7 @@ TQPixmap * KviAliasEditorWindow::myIconPtr() void KviAliasEditorWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pBase->tqsizeHint().height(); + int hght = m_pBase->sizeHint().height(); m_pEditor->setGeometry(0,0,width(),height()- hght); m_pBase->setGeometry(0,height() - hght,width(),hght); } diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index a71f4974..211ea238 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -52,7 +52,7 @@ #include <tqtimer.h> #include <tqlabel.h> #include "kvi_tal_hbox.h" -#include <tqlayout.h> +#include <layout.h> static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0; extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; @@ -119,7 +119,7 @@ void KviAsyncAvatarSelectionDialog::okClicked() { TQString tmp = m_szAvatarName; tmp.replace("\\","\\\\"); - TQString szBuffer=TQString("avatar.set \"%1\"").tqarg(tmp); + TQString szBuffer=TQString("avatar.set \"%1\"").arg(tmp); KviKvsScript::run(szBuffer,m_pConnection->console()); } diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index fc3428bd..bfd0622f 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -39,7 +39,7 @@ #include <tqlineedit.h> #include "kvi_tal_listview.h" #include <kvi_tal_groupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpushbutton.h> #ifdef COMPILE_USE_QT4 diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp index 1b731219..b1682bcb 100644 --- a/src/modules/clock/libkviclock.cpp +++ b/src/modules/clock/libkviclock.cpp @@ -169,7 +169,7 @@ void KviClockDisplay::drawContents(TQPainter *p) } -TQSize KviClockDisplay::tqsizeHint() const +TQSize KviClockDisplay::sizeHint() const { return TQSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT); } diff --git a/src/modules/clock/libkviclock.h b/src/modules/clock/libkviclock.h index 7c960df7..a841047f 100644 --- a/src/modules/clock/libkviclock.h +++ b/src/modules/clock/libkviclock.h @@ -38,7 +38,7 @@ protected: unsigned char m_uDigit[6]; protected: virtual void drawContents(TQPainter * p); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void timerEvent(TQTimerEvent *e); }; diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index a4728959..e18f7da0 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -36,7 +36,7 @@ #include "kvi_kvs_variantlist.h" #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtoolbutton.h> #include "kvi_tal_popupmenu.h" diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp index 97c92ec8..64b9a106 100644 --- a/src/modules/config/libkviconfig.cpp +++ b/src/modules/config/libkviconfig.cpp @@ -124,7 +124,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c) KviConfig * cfg = new KviConfig(szAbsFile,fileMode); g_iNextConfigId++; - TQString tmp = TQString("%1").tqarg(g_iNextConfigId); + TQString tmp = TQString("%1").arg(g_iNextConfigId); g_pConfigDict->insert(tmp,cfg); c->returnValue()->setString(tmp); return true; diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 4110c213..976b6383 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -81,7 +81,7 @@ KviDccZeroPortTag * KviDccBroker::addZeroPortTag() static unsigned int g_uNextZeroPortTag = 0; g_uNextZeroPortTag++; KviDccZeroPortTag * t = new KviDccZeroPortTag; - t->m_tTimestamp = TQDateTime::tqcurrentDateTime(); + t->m_tTimestamp = TQDateTime::currentDateTime(); t->m_szTag.setNum(g_uNextZeroPortTag); //t->m_szTag.prepend("mIrc-zero-port-"); t->m_uResumePosition = 0; @@ -94,7 +94,7 @@ KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const TQString &szTag) { KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag); if(!t)return 0; - if(t->m_tTimestamp.secsTo(TQDateTime::tqcurrentDateTime()) > 180) + if(t->m_tTimestamp.secsTo(TQDateTime::currentDateTime()) > 180) { // too late man... m_pZeroPortTags->remove(szTag); @@ -268,7 +268,7 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc) TQString tmp = __tr2qs_ctx( \ "<b>%1 [%2@%3]</b> requests a " \ "<b>Direct Client Connection</b> in <b>%4</b> mode.<br>", \ - "dcc").tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szType); + "dcc").arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szType); #ifdef COMPILE_SSL_SUPPORT if(dcc->bIsSSL)tmp += __tr2qs_ctx("The connection will be secured using SSL.<br>","dcc"); @@ -282,11 +282,11 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc) } else { tmp += __tr2qs_ctx( \ "The connection target will be host <b>%1</b> on port <b>%2</b><br>" \ - ,"dcc").tqarg(dcc->szIp).tqarg(dcc->szPort); + ,"dcc").arg(dcc->szIp).arg(dcc->szPort); } - TQString caption = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").tqarg(dcc->szType); + TQString caption = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType); KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption); @@ -315,7 +315,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc) KviStr szSubProto = dcc->szType; szSubProto.toLower(); - TQString tmp = TQString("dcc: %1 %2@%3:%4").tqarg(szSubProto.ptr()).tqarg(dcc->szNick).tqarg(dcc->szIp).tqarg(dcc->szPort); + TQString tmp = TQString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr()).arg(dcc->szNick).arg(dcc->szIp).arg(dcc->szPort); KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.utf8().data()); bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \ @@ -341,7 +341,7 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc) "<b>Direct Client Connection</b> in <b>VOICE</b> mode.<br>" \ "The connection target will be host <b>%4</b> on port <b>%5</b><br>" \ ,"dcc" \ - ).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szIp).tqarg(dcc->szPort); + ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort); KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc")); m_pBoxList->append(box); @@ -412,7 +412,7 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc) "<b>Direct Client Connection</b> in <b>CANVAS</b> mode.<br>" \ "The connection target will be host <b>%4</b> on port <b>%5</b><br>" \ ,"dcc" \ - ).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szIp).tqarg(dcc->szPort); + ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort); KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc")); m_pBoxList->append(box); @@ -505,9 +505,9 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) "<b>%5</b> large.<br>" \ "The connection target will be host <b>%6</b> on port <b>%7</b><br>" \ ,"dcc" \ - ).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg( - dcc->szFileName).tqarg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())).tqarg( - dcc->szIp).tqarg(dcc->szPort); + ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg( + dcc->szFileName).arg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())).arg( + dcc->szIp).arg(dcc->szPort); } else { // passive: we will be listening! @@ -518,8 +518,8 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) "<b>%5</b> large.<br>" \ "You will be the passive side of the connection.<br>" \ ,"dcc" \ - ).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg( - dcc->szFileName).tqarg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())); + ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg( + dcc->szFileName).arg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())); } if(dcc->bIsIncomingAvatar) @@ -540,7 +540,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) //#warning "Maybe remove the pending avatar if rejected ?" - TQString title = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").tqarg(dcc->szType); + TQString title = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType); KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title); m_pBoxList->append(box); @@ -669,7 +669,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc) "<b>auto-rename</b> the new file, or<br>" \ "<b>resume</b> an incomplete download?" \ ,"dcc" \ - ).tqarg(dcc->szLocalFileName).tqarg(KviTQString::makeSizeReadable(fi.size())); + ).arg(dcc->szLocalFileName).arg(KviTQString::makeSizeReadable(fi.size())); } else { bDisableResume = true; // the file on disk is larger or equal to the remote one @@ -680,7 +680,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc) "<b>overwrite</b> the existing file, or<br> " \ "<b>auto-rename</b> the new file ?" \ ,"dcc" \ - ).tqarg(dcc->szLocalFileName); + ).arg(dcc->szLocalFileName); } KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume); diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 6b5f6872..cea1b918 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -258,16 +258,16 @@ bool KviDccCanvas::event(TQEvent *e) void KviDccCanvas::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); -// int hght2 = m_pTopSplitter->tqsizeHint().height(); +// int hght2 = m_pTopSplitter->sizeHint().height(); // m_pTopSplitter->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,0,width(),height() - hght); m_pInput->setGeometry(0,height() - hght,width(),hght); } -TQSize KviDccCanvas::tqsizeHint() const +TQSize KviDccCanvas::sizeHint() const { - TQSize ret(m_pIrcView->tqsizeHint().width(), - m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->sizeHint().width(), + m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h index 38349cae..6c481255 100644 --- a/src/modules/dcc/canvas.h +++ b/src/modules/dcc/canvas.h @@ -61,7 +61,7 @@ protected: virtual void getBaseLogFileName(KviStr &buffer); virtual TQPixmap * myIconPtr(); virtual void resizeEvent(TQResizeEvent *e); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual bool event(TQEvent *e); virtual void ownMessage(const char *text); virtual void ownAction(const char *text); diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index e007a3cb..06f5d2f8 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1509,14 +1509,14 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par) connect(m_pPropertiesWidget,TQT_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQT_SLOT(propertyChanged(const TQString &,const TQVariant &))); KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar); - KviTalPopupMenu * tqshapes = new KviTalPopupMenu(add); + KviTalPopupMenu * shapes = new KviTalPopupMenu(add); KviTalPopupMenu * polygons = new KviTalPopupMenu(add); KviTalPopupMenu * items = new KviTalPopupMenu(add); - tqshapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine())); - tqshapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle())); - tqshapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse())); - tqshapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie())); - tqshapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord())); + shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine())); + shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle())); + shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse())); + shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie())); + shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord())); items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQT_SLOT(insertRichText())); @@ -1525,7 +1525,7 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par) polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonPentagon())); polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonHexagon())); - add->insertItem(__tr2qs_ctx("&Shape","dcc"),tqshapes); + add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes); add->insertItem(__tr2qs_ctx("&Item","dcc"),items); add->insertItem(__tr2qs_ctx("&Polygons","dcc"),polygons); @@ -1540,9 +1540,9 @@ KviCanvasWidget::~KviCanvasWidget() void KviCanvasWidget::resizeEvent(TQResizeEvent *) { - int h = m_pMenuBar->tqsizeHint().height(); + int h = m_pMenuBar->sizeHint().height(); m_pMenuBar->setGeometry(0,0,width(),h); - int h2 = m_pStatusLabel->tqsizeHint().height(); + int h2 = m_pStatusLabel->sizeHint().height(); m_pStatusLabel->setGeometry(0,height() - h2,width(),h2); m_pSplitter->setGeometry(0,h,width(),height() - (h + h2)); } diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 7e41034b..a9171714 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -221,7 +221,7 @@ void KviDccChat::connectionInProgress() struct in_addr a; if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr)); - TQString szReq = TQString("PRIVMSG %1 :%2DCC %3 chat %4 %5").tqarg(m_pDescriptor->szNick).tqarg((char)0x01).tqarg(m_pDescriptor->szType).tqarg(ip.ptr()).tqarg(port); + TQString szReq = TQString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port); if(m_pDescriptor->isZeroPortRequest()) { @@ -268,13 +268,13 @@ const TQString & KviDccChat::target() void KviDccChat::fillCaptionBuffers() { - TQString tmp = TQString("DCC %1 %2@%3:%4").tqarg( + TQString tmp = TQString("DCC %1 %2@%3:%4").arg( #ifdef COMPILE_SSL_SUPPORT - m_pDescriptor->bIsSSL ? "SChat" : "Chat").tqarg( + m_pDescriptor->bIsSSL ? "SChat" : "Chat").arg( #else - "Chat").tqarg( + "Chat").arg( #endif - m_pDescriptor->szNick).tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort); + m_pDescriptor->szNick).arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort); m_szPlainTextCaption = tmp; @@ -473,16 +473,16 @@ bool KviDccChat::event(TQEvent *e) void KviDccChat::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pTopSplitter->tqsizeHint().height(); + int hght2 = m_pTopSplitter->sizeHint().height(); m_pTopSplitter->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -TQSize KviDccChat::tqsizeHint() const +TQSize KviDccChat::sizeHint() const { - TQSize ret(m_pIrcView->tqsizeHint().width(), - m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->sizeHint().width(), + m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h index c2785915..bf492b3a 100644 --- a/src/modules/dcc/chat.h +++ b/src/modules/dcc/chat.h @@ -81,7 +81,7 @@ protected: virtual void getBaseLogFileName(KviStr &buffer); virtual TQPixmap * myIconPtr(); virtual void resizeEvent(TQResizeEvent *e); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual const TQString & localNick(); virtual bool event(TQEvent *e); virtual void ownMessage(const TQString &text); diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 89435202..493ca344 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -25,7 +25,7 @@ #include "kvi_iconmanager.h" #include "kvi_app.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlabel.h> #include <tqstringlist.h> diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index ce6949f2..03f5d304 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -1543,8 +1543,8 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c) [br] [big]DCC File Transfer[/big][br] DCC Send: Send a file, sender is passive, receiver is active (not good for firewalled senders)[br] - DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br] - DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br] + DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled receivers)[br] + DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled receivers)[br] DCC Get: Receive a file, sender is passive if not firewalled, receiver active if sender not firewalled (will fail only if both are firewalled)[br] The "turbo" extension disables the stream of acknowledges and is activated by prepending the 'T' character to the DCC subprotocol name[br] The "SSL" extension causes a Secure Socket Layer to be used and is activated by prepending the 'S' character to the DCC subprotocol name[br] @@ -2369,16 +2369,16 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c) /* - @doc: dcc.transfertqStatus + @doc: dcc.transferStatus @type: function @title: - $dcc.transfertqStatus + $dcc.transferStatus @short: Returns the current status of a dcc file transfer @syntax: - <string> $dcc.transfertqStatus - <string> $dcc.transfertqStatus(<dcc_id:uint>) + <string> $dcc.transferStatus + <string> $dcc.transferStatus(<dcc_id:uint>) @description: Returns the status in the specified DCC session.[br] The status is one of the strings "connecting", "transferring", "success" and "failure". @@ -2393,7 +2393,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c) See the [module:dcc]dcc module[/module] documentation for more informations.[br] */ -static bool dcc_kvs_fnc_transfertqStatus(KviKvsModuleFunctionCall * c) +static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c) { kvs_uint_t uDccId; KVSM_PARAMETERS_BEGIN(c) @@ -2669,7 +2669,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c) [fnc]$dcc.sessionList[/fnc][br] [fnc]$dcc.protocol[/fnc][br] [fnc]$dcc.connectionType[/fnc][br] - [fnc]$dcc.transfertqStatus[/fnc][br] + [fnc]$dcc.transferStatus[/fnc][br] [fnc]$dcc.isFileTransfer[/fnc][br] [fnc]$dcc.isFileUpload[/fnc][br] [fnc]$dcc.isFileDownload[/fnc][br] @@ -2708,7 +2708,7 @@ static bool dcc_module_init(KviModule * m) // FIXME: file upload / download state ? - KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transfertqStatus); + KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transferStatus); KVSM_REGISTER_FUNCTION(m,"protocol",dcc_kvs_fnc_protocol); KVSM_REGISTER_FUNCTION(m,"connectionType",dcc_kvs_fnc_connectionType); KVSM_REGISTER_FUNCTION(m,"isFileTransfer",dcc_kvs_fnc_isFileTransfer); diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 00a1d1e7..bf8a9192 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -80,7 +80,7 @@ static void dcc_module_request_error(KviDccRequest * dcc,const TQString& errText if(KVI_OPTION_BOOL(KviOption_boolNotifyFailedDccHandshakes)) { - TQString szError = TQString("Sorry, your DCC %1 request can't be satisfied: %2").tqarg(dcc->szType.ptr()).tqarg(errText); + TQString szError = TQString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr()).arg(errText); dcc_module_reply_errmsg(dcc,szError); } } diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index a7485ca2..e3ef9e7d 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -67,7 +67,7 @@ #include <tqglobal.h> #include <tqcheckbox.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #define INSTANT_BANDWIDTH_CHECK_INTERVAL_IN_MSECS 3000 @@ -753,7 +753,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc) m_tTransferEndTime = 0; m_szStatusString = __tr2qs_ctx("Setting up the connection","dcc"); - m_eGeneraltqStatus = Connecting; + m_eGeneralStatus = Connecting; bool bOk; m_uTotalFileSize = dcc->bRecvFile ? dcc->szFileSize.toUInt(&bOk) : dcc->szLocalFileSize.toUInt(&bOk); @@ -811,11 +811,11 @@ void KviDccFileTransfer::startConnection() if(!(m_pDescriptor->bActive)) { // PASSIVE CONNECTION - m_szStatusString = __tr2qs_ctx("Attempting a passive DCC %1 connection","dcc").tqarg(m_szDccType.ptr()); + m_szStatusString = __tr2qs_ctx("Attempting a passive DCC %1 connection","dcc").arg(m_szDccType.ptr()); outputAndLog(m_szStatusString); } else { // ACTIVE CONNECTION - m_szStatusString = __tr2qs_ctx("Attempting an active DCC %1 connection","dcc").tqarg(m_szDccType.ptr()); + m_szStatusString = __tr2qs_ctx("Attempting an active DCC %1 connection","dcc").arg(m_szDccType.ptr()); outputAndLog(m_szStatusString); } @@ -841,7 +841,7 @@ void KviDccFileTransfer::startConnection() m_pDescriptor->szPort.utf8().data(), m_pDescriptor->szLocalFileSize.utf8().data(),0x01); } - m_szStatusString = __tr2qs_ctx("Sent DCC RESUME request to %1, waiting for ACCEPT","dcc").tqarg(m_pDescriptor->szNick); + m_szStatusString = __tr2qs_ctx("Sent DCC RESUME request to %1, waiting for ACCEPT","dcc").arg(m_pDescriptor->szNick); outputAndLog(m_szStatusString); // setup the resume timer: we don't want to wait forever @@ -919,7 +919,7 @@ void KviDccFileTransfer::abort() else if(m_pSlaveSendThread)tmp.setNum(m_pSlaveSendThread->sentBytes()); else tmp = '0'; - m_eGeneraltqStatus = Failure; + m_eGeneralStatus = Failure; m_tTransferEndTime = kvi_unixTime(); m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc"); m_szStatusString += __tr2qs_ctx("Aborted","dcc"); @@ -988,7 +988,7 @@ void KviDccFileTransfer::retryRevDCC() void KviDccFileTransfer::fillStatusString(TQString &szBuffer) { - switch(m_eGeneraltqStatus) + switch(m_eGeneralStatus) { case Connecting: szBuffer = "connecting"; @@ -1010,7 +1010,7 @@ void KviDccFileTransfer::fillStatusString(TQString &szBuffer) bool KviDccFileTransfer::active() { - return ((m_eGeneraltqStatus == Connecting) || (m_eGeneraltqStatus == Transferring)); + return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Transferring)); } int KviDccFileTransfer::bandwidthLimit() @@ -1108,7 +1108,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei { TQString txt; - bool bIsTerminated = ((m_eGeneraltqStatus == Success) || (m_eGeneraltqStatus == Failure)); + bool bIsTerminated = ((m_eGeneralStatus == Success) || (m_eGeneralStatus == Failure)); switch(column) { @@ -1117,7 +1117,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei int xoffset = 0; int yoffset = 0; if(m_pDescriptor->bRecvFile)yoffset = 64; - switch(m_eGeneraltqStatus) + switch(m_eGeneralStatus) { case Connecting: xoffset = 0; break; case Transferring: xoffset = 48; break; @@ -1236,18 +1236,18 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei if(iW2 > 0)p->fillRect(5 + iL2,5,iW2,10,bIsTerminated ? TQColor(150,130,110) : TQColor(220,170,100)); p->fillRect(5,5,iL2,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100)); - txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).tqarg(KviTQString::makeSizeReadable(iAckedBytes)).tqarg(KviTQString::makeSizeReadable(m_uTotalFileSize)).tqarg(dPerc2,0,'f',2); + txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviTQString::makeSizeReadable(iAckedBytes)).arg(KviTQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc2,0,'f',2); } else { // we are receiving a file or not sending acks double dPerc = (double)(((double)uTransferred) * 100.0) / (double)m_uTotalFileSize; int iL = (int) ((((double)iW) * dPerc) / 100.0); p->fillRect(5,5,iL,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100)); - txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).tqarg(KviTQString::makeSizeReadable(uTransferred)).tqarg(KviTQString::makeSizeReadable(m_uTotalFileSize)).tqarg(dPerc,0,'f',2); + txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviTQString::makeSizeReadable(uTransferred)).arg(KviTQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2); } } else { - txt = TQString(__tr2qs_ctx("%1","dcc")).tqarg(KviTQString::makeSizeReadable(uTransferred)); + txt = TQString(__tr2qs_ctx("%1","dcc")).arg(KviTQString::makeSizeReadable(uTransferred)); } p->setPen(TQt::black); @@ -1343,7 +1343,7 @@ TQString KviDccFileTransfer::tipText() TQString s; - s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").tqarg(m_szDccType.ptr()).tqarg(id()); + s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr()).arg(id()); s += "<tr><td bgcolor=\"#404040\"><font color=\"#FFFFFF\">"; s += __tr2qs_ctx("Transfer Log","dcc"); @@ -1396,7 +1396,7 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons if(t->localFileName() == szLocalFileName) #endif { - if(t->m_eGeneraltqStatus != Failure) + if(t->m_eGeneralStatus != Failure) return t; } } @@ -1456,7 +1456,7 @@ void KviDccFileTransfer::outputAndLog(int msgtype,const TQString &s) void KviDccFileTransfer::addToTransferLog(const TQString &s) { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQString ts; ts.sprintf("[%4d.%2d.%2d %2d:%2d:%2d] ",dt.date().year(),dt.date().month(),dt.date().day(),dt.time().hour(),dt.time().minute(),dt.time().second()); m_szTransferLog += ts+s; @@ -1477,14 +1477,14 @@ void KviDccFileTransfer::connectionInProgress() // if(TRIGGER_EVENT_5PARAM_RETVALUE(KviEvent_OnDCCSendConnected,this,m_pDescriptor->szPort.ptr(),m_pDescriptor->szFileName.ptr(),m_pDescriptor->szNick.ptr(),m_pDescriptor->szUser.ptr(),m_pDescriptor->szHost.ptr())); // } // - m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort); + m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort); outputAndLog(m_szStatusString); displayUpdate(); return; } // PASSIVE CONNECTION - m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").tqarg(m_pMarshal->localIp()).tqarg(m_pMarshal->localPort()); + m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort()); outputAndLog(m_szStatusString); if(m_pDescriptor->bSendRequest) @@ -1507,7 +1507,7 @@ void KviDccFileTransfer::connectionInProgress() if(!tmp.isEmpty()) { ip = tmp; - outputAndLog(__tr2qs_ctx("The local IP address is private, determining from IRC server: %1","dcc").tqarg(ip)); + outputAndLog(__tr2qs_ctx("The local IP address is private, determining from IRC server: %1","dcc").arg(ip)); } else { outputAndLog(__tr2qs_ctx("The local IP address is private, but unable to determine it from the IRC server","dcc")); } @@ -1558,9 +1558,9 @@ void KviDccFileTransfer::connectionInProgress() ip.utf8().data(),port.ptr(), &(m_pDescriptor->szLocalFileSize),0x01); } - outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").tqarg(szReq.ptr()).tqarg(m_pDescriptor->szNick)); + outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").arg(szReq.ptr()).arg(m_pDescriptor->szNick)); } else { - outputAndLog(__tr2qs_ctx("DCC %1 request not sent, awaiting manual connection","dcc").tqarg(m_szDccType.ptr())); + outputAndLog(__tr2qs_ctx("DCC %1 request not sent, awaiting manual connection","dcc").arg(m_szDccType.ptr())); } KVS_TRIGGER_EVENT_1(KviEvent_OnDCCFileTransferConnectionInProgress,eventWindow(),m_pDescriptor->idString()); @@ -1579,7 +1579,7 @@ void KviDccFileTransfer::startingSSLHandshake() void KviDccFileTransfer::sslError(const char * msg) { #ifdef COMPILE_SSL_SUPPORT - outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("[SSL ERROR]: %1","dcc").tqarg(msg)); + outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("[SSL ERROR]: %1","dcc").arg(msg)); #endif } @@ -1602,7 +1602,7 @@ bool KviDccFileTransfer::event(TQEvent *e) m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc"); m_szStatusString += szErrorString; - m_eGeneraltqStatus = Failure; + m_eGeneralStatus = Failure; m_tTransferEndTime = kvi_unixTime(); KVS_TRIGGER_EVENT_3(KviEvent_OnDCCFileTransferFailed, @@ -1642,7 +1642,7 @@ bool KviDccFileTransfer::event(TQEvent *e) if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data()); m_szStatusString = __tr2qs_ctx("Transfer completed","dcc"); outputAndLog(m_szStatusString); - m_eGeneraltqStatus = Success; + m_eGeneralStatus = Success; m_tTransferEndTime = kvi_unixTime(); KVS_TRIGGER_EVENT_2(KviEvent_OnDCCFileTransferSuccess, @@ -1677,7 +1677,7 @@ bool KviDccFileTransfer::event(TQEvent *e) void KviDccFileTransfer::handleMarshalError(int err) { TQString szErr = KviError::getDescription(err); - m_eGeneraltqStatus = Failure; + m_eGeneralStatus = Failure; m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc"); m_szStatusString += szErr; outputAndLog(m_szStatusString); @@ -1687,8 +1687,8 @@ void KviDccFileTransfer::handleMarshalError(int err) void KviDccFileTransfer::connected() { - outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").tqarg(m_pMarshal->remoteIp()).tqarg(m_pMarshal->remotePort())); - outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").tqarg(m_pMarshal->localIp()).tqarg(m_pMarshal->localPort())); + outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").arg(m_pMarshal->remoteIp()).arg(m_pMarshal->remotePort())); + outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort())); m_tTransferStartTime = kvi_unixTime(); @@ -1731,7 +1731,7 @@ void KviDccFileTransfer::connected() m_pSlaveSendThread->start(); } - m_eGeneraltqStatus = Transferring; + m_eGeneralStatus = Transferring; m_szStatusString = __tr2qs_ctx("Transferring data","dcc"); KVS_TRIGGER_EVENT_1(KviEvent_OnDCCFileTransferBegin,eventWindow(),m_pDescriptor->idString()); @@ -1758,7 +1758,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co delete m_pResumeTimer; m_pResumeTimer = 0; - outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1","dcc").tqarg(m_pDescriptor->szLocalFileSize)); + outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1","dcc").arg(m_pDescriptor->szLocalFileSize)); listenOrConnect(); @@ -1768,7 +1768,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co if(ret != KviError_success)handleMarshalError(ret); else { - m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort); + m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort); outputAndLog(m_szStatusString); displayUpdate(); } @@ -1794,11 +1794,11 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,unsign } if(iLocalFileSize <= filePos) { - outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Invalid RESUME request: Position %1 is larger than file size","dcc").tqarg(filePos)); + outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Invalid RESUME request: Position %1 is larger than file size","dcc").arg(filePos)); return false; } - outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Accepting RESUME request, transfer will begin at position %1","dcc").tqarg(filePos)); + outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Accepting RESUME request, transfer will begin at position %1","dcc").arg(filePos)); m_pDescriptor->szFileSize.setNum(filePos); @@ -1830,7 +1830,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget * m_pTransfer = t; int iVal = m_pTransfer->bandwidthLimit(); - TQString szText = __tr2qs_ctx("Configure bandwidth for DCC transfer %1","dcc").tqarg(t->id()); + TQString szText = __tr2qs_ctx("Configure bandwidth for DCC transfer %1","dcc").arg(t->id()); setCaption(szText); szText = t->isFileUpload() ? __tr2qs_ctx("Limit upload bandwidth to","dcc") : __tr2qs_ctx("Limit download bandwidth to","dcc"); diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h index a5e80be9..8b03306b 100644 --- a/src/modules/dcc/send.h +++ b/src/modules/dcc/send.h @@ -173,7 +173,7 @@ class KviTalPopupMenu; class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext { - enum GeneraltqStatus { Connecting , Transferring , Success , Failure }; + enum GeneralStatus { Connecting , Transferring , Success , Failure }; Q_OBJECT TQ_OBJECT public: @@ -190,7 +190,7 @@ private: TQString m_szTransferIdString; TQString m_szStatusString; - GeneraltqStatus m_eGeneraltqStatus; + GeneralStatus m_eGeneralStatus; TQString m_szTransferLog; // html diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index e9d8a2a6..deec4452 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -886,16 +886,16 @@ void KviDccVoice::updateInfo() void KviDccVoice::resizeEvent(TQResizeEvent *e) { - int hght2 = m_pHBox->tqsizeHint().height(); + int hght2 = m_pHBox->sizeHint().height(); m_pHBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - hght2); } -TQSize KviDccVoice::tqsizeHint() const +TQSize KviDccVoice::sizeHint() const { - int w = m_pIrcView->tqsizeHint().width(); - int w2 = m_pHBox->tqsizeHint().width(); - TQSize ret(w > w2 ? w : w2, m_pIrcView->tqsizeHint().height() + m_pHBox->tqsizeHint().height()); + int w = m_pIrcView->sizeHint().width(); + int w2 = m_pHBox->sizeHint().width(); + TQSize ret(w > w2 ? w : w2, m_pIrcView->sizeHint().height() + m_pHBox->sizeHint().height()); return ret; } diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h index c241f4a1..49899602 100644 --- a/src/modules/dcc/voice.h +++ b/src/modules/dcc/voice.h @@ -124,7 +124,7 @@ protected: virtual void fillCaptionBuffers(); virtual TQPixmap * myIconPtr(); virtual void resizeEvent(TQResizeEvent *e); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual bool event(TQEvent *e); virtual void getBaseLogFileName(KviStr &buffer); void startTalking(); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 7e3149f6..cea62db4 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -26,7 +26,7 @@ #include "libkvidialog.h" #include <tqmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_hbox.h" #include <tqlineedit.h> #ifdef COMPILE_USE_QT4 @@ -222,7 +222,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( { TQLabel * il = new TQLabel(this); il->setPixmap(*pix); - il->tqsetAlignment(TQt::AlignCenter); + il->setAlignment(TQt::AlignCenter); g->addWidget(il,0,0); TQLabel * tl = new TQLabel(szLabel,this); g->addWidget(tl,0,1); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 771db15c..ce454b2b 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -308,7 +308,7 @@ static const char * idlemsgs[NIDLEMSGS]= void KviDockWidget::enterEvent( TQEvent* ) { #ifdef COMPILE_KDE_SUPPORT - if(!g_pApp->tqfocusWidget()) + if(!g_pApp->focusWidget()) { XEvent ev; kvi_memset(&ev, 0, sizeof(ev)); @@ -447,10 +447,10 @@ void KviDockWidget::fillContextPopup() int id; if(pConsole->connection()->userInfo()->isAway()) { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); bAllUnaway=0; } else { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); bAllAway=0; } m_pAwayPopup->setItemParameter(id,pConsole->ircContextId()); @@ -475,7 +475,7 @@ void KviDockWidget::fillContextPopup() void KviDockWidget::toggleParentFrame() { - TQWidget *top_widget = m_pFrm->tqtopLevelWidget(); + TQWidget *top_widget = m_pFrm->topLevelWidget(); if(m_pFrm->isVisible()) { m_pFrm->hide(); diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp index 00fd0094..54033af5 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -279,10 +279,10 @@ void KviDockWidget::fillContextPopup() int id; if(pConsole->connection()->userInfo()->isAway()) { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); bAllUnaway=0; } else { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); bAllAway=0; } m_pAwayPopup->setItemParameter(id,pConsole->ircContextId()); @@ -307,7 +307,7 @@ void KviDockWidget::fillContextPopup() void KviDockWidget::toggleParentFrame() { - TQWidget *top_widget = m_pFrm->tqtopLevelWidget(); + TQWidget *top_widget = m_pFrm->topLevelWidget(); if(m_pFrm->isVisible()) { m_pFrm->hide(); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 25508d66..cd2e6576 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -25,7 +25,7 @@ #include "scripteditor.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <kvi_tal_groupbox.h> #include "kvi_tal_popupmenu.h" @@ -55,7 +55,7 @@ #include "kvi_iconmanager.h" #include "kvi_kvs_kernel.h" -#include <tqlayout.h> +#include <layout.h> extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList; @@ -107,11 +107,11 @@ void KviCompletionBox::updateContents(TQString buffer) if(pos>0) { szModule=buffer.left(pos); - if(szModule[0].tqunicode()=='$') + if(szModule[0].unicode()=='$') szModule.remove(0,1); } - if(pCur->tqunicode() == '$') + if(pCur->unicode() == '$') { buffer.remove(0,1); if(!buffer.isEmpty()) @@ -369,13 +369,13 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e) TQString szPrev=text(para-1); if(!szPrev.isEmpty()) { - if(szPrev.tqat(szPrev.length() - 1).tqunicode() == ' ') + if(szPrev.at(szPrev.length() - 1).unicode() == ' ') szPrev.remove(szPrev.length() - 1,1); TQString szCur; const TQChar * pCur = (const TQChar *)szPrev.ucs2(); if(pCur) { - while(pCur->tqunicode() && pCur->isSpace()) + while(pCur->unicode() && pCur->isSpace()) { szCur.append(*pCur); pCur++; @@ -557,9 +557,9 @@ void KviScriptEditorWidget::slotComplete(const TQString &str) bool bIsFirstWordInLine; getWordBeforeCursor(buffer,index,&bIsFirstWordInLine); int len=buffer.length(); -// if (buffer[1].tqunicode() == '$') len --; +// if (buffer[1].unicode() == '$') len --; complete.remove(0,len-1); - if (buffer[1].tqunicode() == '$') complete.append("("); + if (buffer[1].unicode() == '$') complete.append("("); else complete.append(" "); insert (complete); completelistbox->hide(); @@ -595,19 +595,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS const TQChar * pBegin; - while(c->tqunicode()) + while(c->unicode()) { if(bInComment) { pBegin = c; - while(c->tqunicode() && (c->tqunicode() != '*'))c++; - if(!c->tqunicode()) + while(c->unicode() && (c->unicode() != '*'))c++; + if(!c->unicode()) { setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment); return IN_COMMENT; } c++; - if(c->tqunicode() == '/') + if(c->unicode() == '/') { // end of the comment! c++; @@ -620,14 +620,14 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS if(c->isSpace()) { - while(c->tqunicode() && c->isSpace())c++; - if(!c->tqunicode())continue; + while(c->unicode() && c->isSpace())c++; + if(!c->unicode())continue; } pBegin = c; // this does not break the bNewCommand flag - if((c->tqunicode() == '{') || (c->tqunicode() == '}')) + if((c->unicode() == '{') || (c->unicode() == '}')) { c++; setFormat(pBegin - pBuf,1,g_fntNormal,g_clrBracket); @@ -639,12 +639,12 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS { bNewCommand = false; - if(c->tqunicode() == '#') + if(c->unicode() == '#') { if(c > pBuf) { const TQChar * prev = c - 1; - if((prev->tqunicode() == ']') || (prev->tqunicode() == '}')) + if((prev->unicode() == ']') || (prev->unicode() == '}')) { // array or hash count c++; @@ -653,19 +653,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } } // comment until the end of the line - while(c->tqunicode())c++; + while(c->unicode())c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment); continue; } - if(c->tqunicode() == '/') + if(c->unicode() == '/') { c++; - if(c->tqunicode() == '/') + if(c->unicode() == '/') { - while(c->tqunicode())c++; + while(c->unicode())c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment); continue; - } else if(c->tqunicode() == '*') + } else if(c->unicode() == '*') { c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment); @@ -674,13 +674,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } c--; } - if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_'))) + if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_'))) { c++; - while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++; + while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword); // special processing for callbacks and magic commands - if(pBegin->tqunicode() == 'e') + if(pBegin->unicode() == 'e') { if(c - pBegin == 4) { @@ -691,7 +691,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } } else - if(pBegin->tqunicode() == 'f') + if(pBegin->unicode() == 'f') { if(c - pBegin == 8) { @@ -702,7 +702,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } } - if(pBegin->tqunicode() == 'i') + if(pBegin->unicode() == 'i') { if(c - pBegin == 8) { @@ -717,28 +717,28 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS continue; } } - if(c->tqunicode() == '$') + if(c->unicode() == '$') { c++; - if(c->tqunicode() == '$') + if(c->unicode() == '$') { c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword); } else { - while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++; + while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrFunction); } continue; } - if(c->tqunicode() == '-') + if(c->unicode() == '-') { TQChar * pTmp =(TQChar *) c; c++; - if(c->tqunicode() == '-') c++; + if(c->unicode() == '-') c++; if(c->isLetter()) { - while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_')))c++; + while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_')))c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword); continue; } else { @@ -746,35 +746,35 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS } } - if(c->tqunicode() == '%') + if(c->unicode() == '%') { c++; - if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_'))) + if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_'))) { - while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_')))c++; + while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_')))c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrVariable); continue; } c--; } - if(!c->tqunicode())continue; + if(!c->unicode())continue; - if(c->isLetterOrNumber() || c->tqunicode() == '_') + if(c->isLetterOrNumber() || c->unicode() == '_') { c++; - while(c->tqunicode() && c->isLetterOrNumber() || (c->tqunicode() == '_'))c++; + while(c->unicode() && c->isLetterOrNumber() || (c->unicode() == '_'))c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText); continue; } - if(c->tqunicode() == '\\') + if(c->unicode() == '\\') { c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation); // the next char is to be interpreted as normal text pBegin = c; - if(c->tqunicode() && (c->tqunicode() != '\n')) + if(c->unicode() && (c->unicode() != '\n')) { c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText); @@ -785,13 +785,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS return IN_LINE; } - if(c->tqunicode() == '"') + if(c->unicode() == '"') { bInString = !bInString; c++; setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation); continue; - } else if(c->tqunicode() == ';') + } else if(c->unicode() == ';') { if(!bInString) bNewCommand = true; // the next will be a new command } @@ -1124,23 +1124,23 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co emit initFind(); setPaletteForegroundColor( TQColor( 0, 0, 0 ) ); setPaletteBackgroundColor( TQColor( 236, 233, 216 ) ); - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6, "replace tqlayout"); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6, "replace layout"); m_pFindlineedit = new TQLineEdit( this, "findlineedit" ); #ifndef COMPILE_USE_QT4 - m_pFindlineedit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_pFindlineedit->sizePolicy().hasHeightForWidth() ) ); + m_pFindlineedit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_pFindlineedit->sizePolicy().hasHeightForWidth() ) ); m_pFindlineedit->setFrameShape( TQLineEdit::LineEditPanel ); m_pFindlineedit->setFrameShadow( TQLineEdit::Sunken ); #endif - tqlayout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 ); + layout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 ); m_pReplacelineedit = new TQLineEdit( this, "replacelineedit" ); #ifndef COMPILE_USE_QT4 m_pReplacelineedit->setFrameShape( TQLineEdit::LineEditPanel ); m_pReplacelineedit->setFrameShadow( TQLineEdit::Sunken ); #endif - tqlayout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 ); + layout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 ); m_pFindlineedit->setFocus(); @@ -1150,36 +1150,36 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co findlabel->setAutoResize(true); #endif - tqlayout->addWidget( findlabel, 2, 0 ); + layout->addWidget( findlabel, 2, 0 ); TQLabel *replacelabel = new TQLabel( this, "replacelabel" ); replacelabel->setText(tr("Replace with")); #ifndef COMPILE_USE_QT4 replacelabel->setAutoResize(true); #endif - tqlayout->addWidget( replacelabel, 3, 0 ); + layout->addWidget( replacelabel, 3, 0 ); TQPushButton *cancelbutton = new TQPushButton( this, "cancelButton" ); cancelbutton->setText(tr("&Cancel")); - tqlayout->addWidget( cancelbutton, 5, 2 ); + layout->addWidget( cancelbutton, 5, 2 ); replacebutton = new TQPushButton( this, "replacebutton" ); replacebutton->setText(tr("&Replace")); replacebutton->setEnabled( FALSE ); - tqlayout->addWidget( replacebutton, 5, 0 ); + layout->addWidget( replacebutton, 5, 0 ); checkReplaceAll = new KviStyledCheckBox( this, "replaceAll" ); checkReplaceAll->setText(tr("&Replace in all Aliases")); - tqlayout->addWidget( checkReplaceAll, 4, 0 ); + layout->addWidget( checkReplaceAll, 4, 0 ); findNext = new TQPushButton(this, "findNext(WIP)" ); findNext->setText(tr("&Findnext")); - tqlayout->addWidget( findNext, 2, 3 ); + layout->addWidget( findNext, 2, 3 ); findNext->setEnabled(false); replace = new TQPushButton(this, "replace" ); replace->setText(tr("&Replace(WIP)")); - tqlayout->addWidget( replace, 3, 3 ); + layout->addWidget( replace, 3, 3 ); replace->setEnabled(false); #ifndef COMPILE_USE_QT4 diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index fc7a4d47..a0f3e0fe 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -42,7 +42,7 @@ #include <tqmessagebox.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_vbox.h" #include "kvi_tal_popupmenu.h" #include <tqtooltip.h> @@ -476,7 +476,7 @@ TQPixmap * KviEventEditorWindow::myIconPtr() void KviEventEditorWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pBase->tqsizeHint().height(); + int hght = m_pBase->sizeHint().height(); m_pEditor->setGeometry(0,0,width(),height()- hght); m_pBase->setGeometry(0,height() - hght,width(),hght); } diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 14ddad5b..dc067815 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -35,7 +35,7 @@ #include <tqfileinfo.h> #include "kvi_file.h" #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> /* @doc: file.copy @@ -873,7 +873,7 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) @switches: !sw: -l | --local-8-bit Causes the lines to be saved in local 8 bit character set instead - of the default tqunicode encoding. + of the default unicode encoding. !sw: -a | --append If the file already exists, then the lines are appended to the end instead of overwriting the file. diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index f6068378..ab441a47 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -46,7 +46,7 @@ #endif #include <tqpainter.h> #include <tqmessagebox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfileinfo.h> #include <tqfile.h> #include <tqlabel.h> @@ -233,7 +233,7 @@ void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const TQPoint &pn KviFileTransferItem * it = (KviFileTransferItem *)m_pListView->itemAt(pnt); if(!it)return; TQString txt = it->transfer()->tipText(); - tip->tip(m_pListView->tqitemRect(it),txt); + tip->tip(m_pListView->itemRect(it),txt); } void KviFileTransferWindow::fillTransferView() @@ -313,7 +313,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo if(fi.exists()) { tmp += "<nobr>"; - tmp += __tr2qs_ctx("Size: %1","filetransferwindow").tqarg(KviTQString::makeSizeReadable(fi.size())); + tmp += __tr2qs_ctx("Size: %1","filetransferwindow").arg(KviTQString::makeSizeReadable(fi.size())); tmp += "</nobr><br>"; } @@ -580,12 +580,12 @@ void KviFileTransferWindow::copyLocalFileToClipboard() TQString tmp = t->localFileName(); if(tmp.isEmpty())return; #ifdef COMPILE_USE_QT4 - TQApplication::tqclipboard()->setText(tmp); + TQApplication::clipboard()->setText(tmp); #else - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setText(tmp); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setText(tmp); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setText(tmp); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setText(tmp); #endif } @@ -701,9 +701,9 @@ void KviFileTransferWindow::resizeEvent(TQResizeEvent *e) m_pInput->setGeometry(0,height() - h,width(),h); } -TQSize KviFileTransferWindow::tqsizeHint() const +TQSize KviFileTransferWindow::sizeHint() const { - return m_pSplitter->tqsizeHint(); + return m_pSplitter->sizeHint(); } void KviFileTransferWindow::fillCaptionBuffers() diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h index 963c12e0..b213f6be 100644 --- a/src/modules/filetransferwindow/filetransferwindow.h +++ b/src/modules/filetransferwindow/filetransferwindow.h @@ -88,7 +88,7 @@ protected: virtual void fontChange(const TQFont &oldFont); bool eventFilter( TQObject *obj, TQEvent *ev ); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; int lineSpacing(){ return m_iLineSpacing; }; protected slots: void transferRegistered(KviFileTransfer *t); diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 67ee30b0..cd32db5c 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -36,7 +36,7 @@ #include <tqlineedit.h> #include <tqtooltip.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> extern Index * g_pDocIndex; extern KviPointerList<KviHelpWindow> * g_pHelpWindowList; @@ -108,7 +108,7 @@ void KviHelpWidget::showIndex() void KviHelpWidget::resizeEvent(TQResizeEvent *e) { - int hght = m_pToolBar->tqsizeHint().height(); + int hght = m_pToolBar->sizeHint().height(); if(hght < 40)hght = 40; m_pToolBar->setGeometry(0,0,width(),hght); m_pTextBrowser->setGeometry(0,hght,width(),height() - hght); @@ -128,17 +128,17 @@ void KviHelpWidget::suicide() delete this; } -TQSize KviHelpWidget::tqsizeHint() const +TQSize KviHelpWidget::sizeHint() const { - int wdth = m_pTextBrowser->tqsizeHint().width(); - if(m_pToolBar->tqsizeHint().width() > wdth)wdth = m_pToolBar->tqsizeHint().width(); - TQSize s(wdth,m_pTextBrowser->tqsizeHint().height() + m_pToolBar->tqsizeHint().height()); + int wdth = m_pTextBrowser->sizeHint().width(); + if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width(); + TQSize s(wdth,m_pTextBrowser->sizeHint().height() + m_pToolBar->sizeHint().height()); return s; } bool KviHelpWidget::eventFilter(TQObject * o, TQEvent *e) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if(e->type() == TQEvent::MouseButtonRelease) { if(m_pTextBrowser->hasSelectedText()) { diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 9e2c1c49..b8253d65 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -23,7 +23,7 @@ // #include "kvi_tal_hbox.h" -#include <tqtextbrowser.h> +#include <textbrowser.h> #include "index.h" #include <tqprogressbar.h> @@ -54,7 +54,7 @@ protected slots: void showIndex(); void suicide(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; TQTextBrowser * textBrowser() { return m_pTextBrowser; } }; diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 82003488..1be7f5e8 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -303,9 +303,9 @@ void KviHelpWindow::resizeEvent(TQResizeEvent *e) m_pSplitter->setGeometry(0,0,width(),height()); } -TQSize KviHelpWindow::tqsizeHint() const +TQSize KviHelpWindow::sizeHint() const { - return m_pHelpWidget->tqsizeHint(); + return m_pHelpWidget->sizeHint(); } void KviHelpWindow::fillCaptionBuffers() { diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h index 300116f8..1f243534 100644 --- a/src/modules/help/helpwindow.h +++ b/src/modules/help/helpwindow.h @@ -62,7 +62,7 @@ protected: virtual void saveProperties(KviConfig * cfg); virtual void loadProperties(KviConfig * cfg); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; TQTextBrowser * textBrowser(); public slots: void indexSelected ( int ); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 46dc4f22..596b0e44 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -5,7 +5,7 @@ #include <tqstringlist.h> #include "kvi_pointerhashtable.h" #include <tqapplication.h> -#include <tqtextstream.h> +#include <textstream.h> #include <ctype.h> @@ -164,7 +164,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) if (text.isNull()) return; bool valid = TRUE; - const TQChar *buf = text.tqunicode(); + const TQChar *buf = text.unicode(); TQChar str[64]; TQChar c = buf[0]; int j = 0; @@ -727,7 +727,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & bool valid = TRUE; - const TQChar *buf = text.tqunicode(); + const TQChar *buf = text.unicode(); TQChar str[64]; diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 789b7a1b..8ad7c8f9 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -67,7 +67,7 @@ KviHttpFileTransfer::KviHttpFileTransfer() connect(m_pHttpRequest,TQT_SIGNAL(receivedResponse(const TQString &)),this,TQT_SLOT(receivedResponse(const TQString &))); connect(m_pHttpRequest,TQT_SIGNAL(connectionEstabilished()),this,TQT_SLOT(connectionEstabilished())); - m_eGeneraltqStatus = Initializing; + m_eGeneralStatus = Initializing; m_szStatusString = __tr2qs_ctx("Initializing","http"); } @@ -110,20 +110,20 @@ void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column) bool KviHttpFileTransfer::active() { - return ((m_eGeneraltqStatus == Connecting) || (m_eGeneraltqStatus == Downloading)); + return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Downloading)); } void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int height) { TQString txt; - bool bIsTerminated = ((m_eGeneraltqStatus == Success) || (m_eGeneraltqStatus == Failure)); + bool bIsTerminated = ((m_eGeneralStatus == Success) || (m_eGeneralStatus == Failure)); switch(column) { case COLUMN_TRANSFERTYPE: { int offset = 0; - switch(m_eGeneraltqStatus) + switch(m_eGeneralStatus) { case Initializing: offset = 0; break; case Connecting: offset = 0; break; @@ -211,8 +211,8 @@ void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int he //iR = iW - iL; p->fillRect(5,5,iL,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100)); - txt = TQString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).tqarg(KviTQString::makeSizeReadable(uRecvd)) - .tqarg(KviTQString::makeSizeReadable(uTotal)).tqarg(dPerc,0,'f',2); + txt = TQString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).arg(KviTQString::makeSizeReadable(uRecvd)) + .arg(KviTQString::makeSizeReadable(uTotal)).arg(dPerc,0,'f',2); } else { txt = KviTQString::makeSizeReadable(m_pHttpRequest->receivedSize()); } @@ -265,17 +265,17 @@ void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int he { KviTimeUtils::secondsToDaysHoursMinsSecs(kvi_timeSpan(m_tTransferEndTime,m_tTransferStartTime),&uD,&uH,&uM,&uS); txt = "TOT: "; - if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).tqarg(uD).tqarg(uH).tqarg(uM).tqarg(uS); - else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).tqarg(uH).tqarg(uM).tqarg(uS); - else txt += TQString(__tr2qs_ctx("%3m %4s","http")).tqarg(uM).tqarg(uS); + if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS); + else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS); + else txt += TQString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS); } else { if(iEta >= 0) { KviTimeUtils::secondsToDaysHoursMinsSecs(iEta,&uD,&uH,&uM,&uS); txt = "ETA: "; - if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).tqarg(uD).tqarg(uH).tqarg(uM).tqarg(uS); - else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).tqarg(uH).tqarg(uM).tqarg(uS); - else txt += TQString(__tr2qs_ctx("%3m %4s","http")).tqarg(uM).tqarg(uS); + if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS); + else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS); + else txt += TQString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS); } else { txt = "ETA: Unknown"; } @@ -301,7 +301,7 @@ int KviHttpFileTransfer::displayHeight(int iLineSpacing) TQString KviHttpFileTransfer::tipText() { TQString s; - s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").tqarg(id()); + s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").arg(id()); if(m_lRequest.count() > 0) { @@ -390,13 +390,13 @@ void KviHttpFileTransfer::connectionEstabilished() void KviHttpFileTransfer::resolvingHost(const TQString &hostname) { - m_szStatusString = __tr2qs_ctx("Resolving host %1","http").tqarg(hostname); + m_szStatusString = __tr2qs_ctx("Resolving host %1","http").arg(hostname); displayUpdate(); } void KviHttpFileTransfer::contactingHost(const TQString &ipandport) { - m_szStatusString = __tr2qs_ctx("Contacting host %1","http").tqarg(ipandport); + m_szStatusString = __tr2qs_ctx("Contacting host %1","http").arg(ipandport); displayUpdate(); } @@ -404,9 +404,9 @@ void KviHttpFileTransfer::receivedResponse(const TQString &response) { m_lHeaders.clear(); m_lHeaders.append(response); - m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").tqarg(response); + m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").arg(response); m_tTransferStartTime = kvi_unixTime(); - m_eGeneraltqStatus = Downloading; + m_eGeneralStatus = Downloading; displayUpdate(); } @@ -439,7 +439,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) if(bSuccess) { m_szStatusString = __tr2qs_ctx("Transfer completed","http"); - m_eGeneraltqStatus = Success; + m_eGeneralStatus = Success; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id()); g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),TQString(),TQString(),!m_bNotifyCompletion); @@ -447,7 +447,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) m_szStatusString = __tr2qs_ctx("Transfer failed","http"); m_szStatusString += ": "; m_szStatusString += m_pHttpRequest->lastError(); - m_eGeneraltqStatus = Failure; + m_eGeneralStatus = Failure; displayUpdate(); if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError())); g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),TQString(),m_pHttpRequest->lastError(),!m_bNotifyCompletion); @@ -482,7 +482,7 @@ void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviSt bool KviHttpFileTransfer::startDownload() { - m_eGeneraltqStatus = Connecting; + m_eGeneralStatus = Connecting; return m_pHttpRequest->start(); } diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index 792205b1..cfba8910 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -38,7 +38,7 @@ class KviTalPopupMenu; class KviHttpFileTransfer : public KviFileTransfer { - enum GeneraltqStatus { Initializing, Connecting, Downloading, Success, Failure }; + enum GeneralStatus { Initializing, Connecting, Downloading, Success, Failure }; Q_OBJECT TQ_OBJECT public: @@ -46,7 +46,7 @@ public: ~KviHttpFileTransfer(); private: KviHttpRequest * m_pHttpRequest; - GeneraltqStatus m_eGeneraltqStatus; + GeneralStatus m_eGeneralStatus; TQString m_szStatusString; TQStringList m_lHeaders; diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index f6398f03..745937fc 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -199,7 +199,7 @@ void KviIOGraphDisplay::drawContents(TQPainter * p) } } -TQSize KviIOGraphDisplay::tqsizeHint() const +TQSize KviIOGraphDisplay::sizeHint() const { return TQSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT); } diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h index 3c3d8f1a..5ff83a91 100644 --- a/src/modules/iograph/libkviiograph.h +++ b/src/modules/iograph/libkviiograph.h @@ -47,7 +47,7 @@ protected: bool m_bShowRecvGraph; protected: virtual void drawContents(TQPainter *p); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void timerEvent(TQTimerEvent *e); }; diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index e01b3165..f2f51dd7 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -136,15 +136,15 @@ TQPixmap * KviLinksWindow::myIconPtr() void KviLinksWindow::resizeEvent(TQResizeEvent *e) { - int hght2 = m_pTopSplitter->tqsizeHint().height(); + int hght2 = m_pTopSplitter->sizeHint().height(); m_pTopSplitter->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - hght2); } -TQSize KviLinksWindow::tqsizeHint() const +TQSize KviLinksWindow::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(), - m_pSplitter->tqsizeHint().height() + m_pTopSplitter->tqsizeHint().height()); + TQSize ret(m_pSplitter->sizeHint().width(), + m_pSplitter->sizeHint().height() + m_pTopSplitter->sizeHint().height()); return ret; } @@ -301,7 +301,7 @@ void KviLinksWindow::endOfLinks() while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst(); m_pListView->setUpdatesEnabled(true); - m_pListView->tqrepaint(); + m_pListView->repaint(); } KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l) diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h index d0af9ebb..cf676d75 100644 --- a/src/modules/links/linkswindow.h +++ b/src/modules/links/linkswindow.h @@ -79,7 +79,7 @@ protected slots: void requestLinks(); void connectionStateChange(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: void reset(); void endOfLinks(); diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index c9d56e3e..c5ed5eac 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -140,12 +140,12 @@ void KviChannelListViewItem::paintCell(TQPainter * p,const TQColorGroup &cg,int if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().highlightedText() ); + p->setPen( lv->palette().disabled().highlightedText() ); } else { if ( isEnabled() || !lv ) p->setPen( cg.text() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().text() ); + p->setPen( lv->palette().disabled().text() ); } KviTopicWidget::paintColoredText(p,szText,cg,height(),width); @@ -301,14 +301,14 @@ TQPixmap * KviListWindow::myIconPtr() void KviListWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pTopSplitter->tqsizeHint().height(); + int hght = m_pTopSplitter->sizeHint().height(); m_pTopSplitter->setGeometry(0,0,width(),hght); m_pSplitter->setGeometry(0,hght,width(),height() - hght); } -TQSize KviListWindow::tqsizeHint() const +TQSize KviListWindow::sizeHint() const { - return m_pSplitter->tqsizeHint(); + return m_pSplitter->sizeHint(); } void KviListWindow::fillCaptionBuffers() @@ -346,7 +346,7 @@ void KviListWindow::exportList() TQString szFile; if(connection()) { - TQString szDate = TQDateTime::tqcurrentDateTime().toString("d MMM yyyy hh-mm"); + TQString szDate = TQDateTime::currentDateTime().toString("d MMM yyyy hh-mm"); KviTQString::sprintf(szFile,__tr2qs("Channel list for %Q - %Q"), &(connection()->networkName()),&(szDate)); } else { diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h index c0103519..51f5bce6 100644 --- a/src/modules/list/listwindow.h +++ b/src/modules/list/listwindow.h @@ -113,7 +113,7 @@ protected slots: void exportList(); void importList(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: void reset(); void endOfList(); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 97d50355..f2f11c26 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -47,7 +47,7 @@ #include <tqdir.h> #include "kvi_tal_popupmenu.h" #include <tqcursor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> @@ -55,7 +55,7 @@ #ifdef COMPILE_ZLIB_SUPPORT #include <zlib.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include "kvi_styled_controls.h" #include <tqdatetimeedit.h> #include <tqlineedit.h> @@ -90,67 +90,67 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pSearchTab = new TQWidget(m_pTabWidget); m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview")); - TQGridLayout *tqlayout = new TQGridLayout(m_pSearchTab,10,2,3,5); + TQGridLayout *layout = new TQGridLayout(m_pSearchTab,10,2,3,5); m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab); m_pShowChannelsCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); + layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); m_pShowQueryesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab); m_pShowQueryesCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); + layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab); m_pShowConsolesCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); + layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); m_pShowDccChatCheck = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab); m_pShowDccChatCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); + layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); m_pShowOtherCheck = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab); m_pShowOtherCheck->setChecked(true); - tqlayout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); + layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); TQLabel *l; l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab); - tqlayout->addMultiCellWidget(l,5,5,0,1); + layout->addMultiCellWidget(l,5,5,0,1); l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab); m_pFileNameMask = new TQLineEdit(m_pSearchTab); connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(l,6,0); - tqlayout->addWidget(m_pFileNameMask,6,1); + layout->addWidget(l,6,0); + layout->addWidget(m_pFileNameMask,6,1); l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab); m_pContentsMask = new TQLineEdit(m_pSearchTab); connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(l,7,0); - tqlayout->addWidget(m_pContentsMask,7,1); + layout->addWidget(l,7,0); + layout->addWidget(m_pContentsMask,7,1); m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab); m_pFromDateEdit = new TQDateEdit(m_pSearchTab); - m_pFromDateEdit->setDate(TQDate::tqcurrentDate()); - tqlayout->addWidget(m_pEnableFromFilter,8,0); - tqlayout->addWidget(m_pFromDateEdit,8,1); + m_pFromDateEdit->setDate(TQDate::currentDate()); + layout->addWidget(m_pEnableFromFilter,8,0); + layout->addWidget(m_pFromDateEdit,8,1); connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool))); m_pFromDateEdit->setEnabled(false); m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab); m_pToDateEdit = new TQDateEdit(m_pSearchTab); - m_pToDateEdit->setDate(TQDate::tqcurrentDate()); - tqlayout->addWidget(m_pEnableToFilter,9,0); - tqlayout->addWidget(m_pToDateEdit,9,1); + m_pToDateEdit->setDate(TQDate::currentDate()); + layout->addWidget(m_pEnableToFilter,9,0); + layout->addWidget(m_pToDateEdit,9,1); connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool))); m_pToDateEdit->setEnabled(false); TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab); connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter())); - tqlayout->addWidget(pb,10,1); + layout->addWidget(pb,10,1); TQWidget *w = new TQWidget(m_pSearchTab); - w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); - tqlayout->addWidget(w,11,1); + w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + layout->addWidget(w,11,1); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); #ifdef COMPILE_USE_QT4 @@ -202,11 +202,11 @@ void KviLogViewMDIWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview"); - m_szHtmlActiveCaption = TQString("<nobr><font color=\"%1\"><b>").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii()); + m_szHtmlActiveCaption = TQString("<nobr><font color=\"%1\"><b>").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii()); m_szHtmlActiveCaption.append(m_szPlainTextCaption); m_szHtmlActiveCaption.append("</b></font></nobr>"); - m_szHtmlInactiveCaption = TQString("<nobr><font color=\"%1\"><b>").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii()); + m_szHtmlInactiveCaption = TQString("<nobr><font color=\"%1\"><b>").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii()); m_szHtmlInactiveCaption.append(m_szPlainTextCaption); m_szHtmlInactiveCaption.append("</b></font></nobr>"); } @@ -216,9 +216,9 @@ void KviLogViewMDIWindow::die() close(); } -TQSize KviLogViewMDIWindow::tqsizeHint() const +TQSize KviLogViewMDIWindow::sizeHint() const { - TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height()); + TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height()); return ret; } @@ -361,7 +361,7 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it) else outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp); } - m_pIrcView->tqrepaint(false); + m_pIrcView->repaint(false); } TQStringList KviLogViewMDIWindow::getFileNames() diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h index 96546e73..d2a7e676 100644 --- a/src/modules/logview/logviewmdiwindow.h +++ b/src/modules/logview/logviewmdiwindow.h @@ -114,7 +114,7 @@ protected: virtual void resizeEvent(TQResizeEvent *e); virtual void fillCaptionBuffers(); virtual void die(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected slots: void rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ); void itemSelected(KviTalListViewItem * it); diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 31da5033..f41ed4e7 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -23,7 +23,7 @@ #include "logviewwidget.h" #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdir.h> //#include "kvi_debug.h" @@ -35,7 +35,7 @@ #ifdef COMPILE_ZLIB_SUPPORT #include <zlib.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> const TQPixmap * KviLogListViewItemType::pixmap(int col) const { diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index 91badb3d..5c04bdc8 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1401,7 +1401,7 @@ MP_KVS_FUNCTION(localFile) MP_KVS_FAIL_ON_NO_INTERFACE TQString szRet = g_pMPInterface->mrl(); if(szRet.isEmpty())return true; - if(szRet.tqstartsWith("file://",false)) + if(szRet.startsWith("file://",false)) { szRet.remove(0,7); c->returnValue()->setString(szRet); @@ -1453,7 +1453,7 @@ MP_KVS_FUNCTION(status) KVSM_PARAMETERS_END(c) MP_KVS_FAIL_ON_NO_INTERFACE - KviMediaPlayerInterface::PlayertqStatus eStat = g_pMPInterface->status(); + KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status(); switch(eStat) { case KviMediaPlayerInterface::Stopped: diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 699bc74b..7bbfa927 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -143,7 +143,7 @@ bool KviAmarokInterface::setShuffle(bool &bVal) return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal); } -KviMediaPlayerInterface::PlayertqStatus KviAmarokInterface::status() +KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status() { int ret; if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown; diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h index f0169bb0..6dcfec6c 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.h +++ b/src/modules/mediaplayer/mp_amarokinterface.h @@ -62,7 +62,7 @@ //virtual int bitRate(); unsupported virtual int sampleRate(); virtual bool playMrl(const TQString &mrl); - virtual KviMediaPlayerInterface::PlayertqStatus status(); + virtual KviMediaPlayerInterface::PlayerStatus status(); virtual bool getRepeat(); virtual bool getShuffle(); virtual bool setRepeat(bool &bVal); diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp index 3a363ed5..bf028219 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -3,7 +3,7 @@ #ifdef COMPILE_ON_WINDOWS -#include <tqtextcodec.h> +#include <textcodec.h> #include "kvi_locale.h" #include "kvi_module.h" @@ -189,7 +189,7 @@ int KviAmipInterface::channels() return ret; } -KviMediaPlayerInterface::PlayertqStatus KviAmipInterface::status() +KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status() { int ret = eval_int("var_stat"); switch(ret) diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h index 392d854f..5d49f69d 100644 --- a/src/modules/mediaplayer/mp_amipinterface.h +++ b/src/modules/mediaplayer/mp_amipinterface.h @@ -48,7 +48,7 @@ virtual bool setShuffle(bool &bVal); virtual bool amipExec(const TQString &cmd); virtual TQString amipEval(const TQString &cmd); - virtual KviMediaPlayerInterface::PlayertqStatus status(); + virtual KviMediaPlayerInterface::PlayerStatus status(); }; MP_DECLARE_DESCRIPTOR(KviAmipInterface) diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index 0c0a97a0..c318e632 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -26,7 +26,7 @@ #include "mp_mp3.h" #include "kvi_options.h" #include "kvi_locale.h" -#include <tqtextcodec.h> +#include <textcodec.h> static TQTextCodec * mediaplayer_get_codec() { @@ -82,7 +82,7 @@ TQString KviMediaPlayerInterface::getLocalFile() { TQString ret = mrl(); if(ret.isEmpty())return ret; - if(ret.tqstartsWith("file://",false)) + if(ret.startsWith("file://",false)) { ret.remove(0,7); return ret; @@ -183,7 +183,7 @@ bool KviMediaPlayerInterface::jumpTo(int &iPos) return false; } -KviMediaPlayerInterface::PlayertqStatus KviMediaPlayerInterface::status() +KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status() { notImplemented(); return KviMediaPlayerInterface::Unknown; @@ -265,12 +265,12 @@ bool KviMediaPlayerInterface::setShuffle(bool &bVal) TQString KviMediaPlayerInterface::mediaType() { TQString ret = mrl(); - if(ret.tqendsWith(".mp3",false))ret = "MPEG Layer 3"; - else if(ret.tqendsWith(".ogg",false))ret = "OGG Vorbis"; - else if(ret.tqendsWith(".avi",false))ret = "Audio Video Interleave"; - else if(ret.tqendsWith(".mpeg",false))ret = "MPEG Video"; - else if(ret.tqendsWith(".mpg",false))ret = "MPEG Video"; - else if(ret.tqstartsWith("http://",false))ret = "HTTP Audio Stream"; + if(ret.endsWith(".mp3",false))ret = "MPEG Layer 3"; + else if(ret.endsWith(".ogg",false))ret = "OGG Vorbis"; + else if(ret.endsWith(".avi",false))ret = "Audio Video Interleave"; + else if(ret.endsWith(".mpeg",false))ret = "MPEG Video"; + else if(ret.endsWith(".mpg",false))ret = "MPEG Video"; + else if(ret.startsWith("http://",false))ret = "HTTP Audio Stream"; else ret = TQString(); return ret; } diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h index 593a2490..f1a5479c 100644 --- a/src/modules/mediaplayer/mp_interface.h +++ b/src/modules/mediaplayer/mp_interface.h @@ -108,8 +108,8 @@ public: // return false only on communication failure virtual bool quit(); // return the current player status - enum PlayertqStatus { Unknown, Stopped, Playing, Paused }; - virtual KviMediaPlayerInterface::PlayertqStatus status(); + enum PlayerStatus { Unknown, Stopped, Playing, Paused }; + virtual KviMediaPlayerInterface::PlayerStatus status(); // current position in the media (msecs) // 0 if the player isn't playing anything and -1 if unknown virtual int position(); diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 5b50a046..0be694cc 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -140,7 +140,7 @@ int KviJukInterface::position() return ret * 1000; } -KviMediaPlayerInterface::PlayertqStatus KviJukInterface::status() +KviMediaPlayerInterface::PlayerStatus KviJukInterface::status() { int ret; if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown; diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h index c2b7fd16..cde06ee8 100644 --- a/src/modules/mediaplayer/mp_jukinterface.h +++ b/src/modules/mediaplayer/mp_jukinterface.h @@ -67,7 +67,7 @@ virtual bool setShuffle(bool &bVal); virtual bool playMrl(const TQString &mrl); - virtual KviMediaPlayerInterface::PlayertqStatus status(); + virtual KviMediaPlayerInterface::PlayerStatus status(); }; MP_DECLARE_DESCRIPTOR(KviJukInterface) diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 4942ee50..0eaa9cfb 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -41,7 +41,7 @@ #include "kvi_options.h" #include <tqfileinfo.h> -#include <tqtextcodec.h> +#include <textcodec.h> #define MAXGENRE 147 #define GENREROWS 50 diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 6bc3e24b..4f045417 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_ON_WINDOWS -#include <tqtextcodec.h> +#include <textcodec.h> #include "kvi_locale.h" #include "kvi_module.h" @@ -280,7 +280,7 @@ int KviWinampInterface::channels() return ret; } -KviMediaPlayerInterface::PlayertqStatus KviWinampInterface::status() +KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status() { HWND hWinamp = find_winamp(this); int ret = 1000; diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h index 3f2a62c2..f1b3cf5f 100644 --- a/src/modules/mediaplayer/mp_winampinterface.h +++ b/src/modules/mediaplayer/mp_winampinterface.h @@ -66,7 +66,7 @@ virtual bool getShuffle(); virtual bool setRepeat(bool &bVal); virtual bool setShuffle(bool &bVal); - virtual KviMediaPlayerInterface::PlayertqStatus status(); + virtual KviMediaPlayerInterface::PlayerStatus status(); }; MP_DECLARE_DESCRIPTOR(KviWinampInterface) diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index 730b4fe6..60820f09 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -256,7 +256,7 @@ bool KviXmmsInterface::setShuffle(bool &bVal) return true; } -KviMediaPlayerInterface::PlayertqStatus KviXmmsInterface::status() +KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status() { bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused"); if(sym1) diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h index e2b2c38f..0b3f62b2 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.h +++ b/src/modules/mediaplayer/mp_xmmsinterface.h @@ -52,7 +52,7 @@ virtual bool jumpTo(kvs_int_t &iPos); virtual bool setVol(kvs_int_t &iVol); virtual int getVol(); - virtual KviMediaPlayerInterface::PlayertqStatus status(); + virtual KviMediaPlayerInterface::PlayerStatus status(); virtual TQString nowPlaying(); virtual bool playMrl(const TQString &mrl); virtual TQString mrl(); diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index bdd21f1a..e1066237 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -243,7 +243,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess) if(bSuccess) { m_pOutput->setText(__tr2qs("File downloaded: processing ...")); - m_pOutput->tqrepaint(); + m_pOutput->repaint(); #ifndef COMPILE_ON_WINDOWS g_pApp->syncX(); #endif //!COMPILE_ON_WINDOWS @@ -252,7 +252,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess) TQString tmp; if(iCount > 0) - tmp = __tr2qs("%1 servers imported succesfully").tqarg(iCount); + tmp = __tr2qs("%1 servers imported succesfully").arg(iCount); else tmp = __tr2qs("No servers imported"); m_pOutput->setText(tmp); diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp index daa5c209..0917aec7 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -72,12 +72,12 @@ bool Idle::usingPlatform() const void Idle::start() { - d->startTime = TQDateTime::tqcurrentDateTime(); + d->startTime = TQDateTime::currentDateTime(); if(!platform) { // generic idle d->lastMousePos = TQCursor::pos(); - d->idleSince = TQDateTime::tqcurrentDateTime(); + d->idleSince = TQDateTime::currentDateTime(); } // poll every second (use a lower value if you need more accuracy) @@ -96,7 +96,7 @@ int Idle::secondsIdle() i = platform->secondsIdle(); else { TQPoint curMousePos = TQCursor::pos(); - TQDateTime curDateTime = TQDateTime::tqcurrentDateTime(); + TQDateTime curDateTime = TQDateTime::currentDateTime(); if(d->lastMousePos != curMousePos) { d->lastMousePos = curMousePos; d->idleSince = curDateTime; @@ -105,7 +105,7 @@ int Idle::secondsIdle() } // set 'beginIdle' to the beginning of the idle time (by backtracking 'i' seconds from now) - TQDateTime beginIdle = TQDateTime::tqcurrentDateTime().addSecs(-i); + TQDateTime beginIdle = TQDateTime::currentDateTime().addSecs(-i); // set 't' to hold the number of seconds between 'beginIdle' and 'startTime' int t = beginIdle.secsTo(d->startTime); @@ -121,7 +121,7 @@ int Idle::secondsIdle() } // how long have we been idle? - int idleTime = d->startTime.secsTo(TQDateTime::tqcurrentDateTime()); + int idleTime = d->startTime.secsTo(TQDateTime::currentDateTime()); return idleTime; } diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp index 4e116fa9..92de564d 100644 --- a/src/modules/my/idle_mac.cpp +++ b/src/modules/my/idle_mac.cpp @@ -24,8 +24,8 @@ #include <Carbon/Carbon.h> // Why does Apple have to make this so complicated? -static OStqStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) { - OStqStatus err; +static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) { + OSStatus err; FSRef frameworksFolderRef; CFURLRef baseURL; CFURLRef bundleURL; @@ -117,7 +117,7 @@ IdlePlatform::~IdlePlatform() { // Typedef for the function we're getting back from CFBundleGetFunctionPointerForName. -typedef OStqStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop, +typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop, EventTimerInterval inFireDelay, EventTimerInterval inInterval, EventLoopIdleTimerUPP inTimerProc, diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index e0f080a1..bbc12987 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -727,7 +727,7 @@ void KviNotifierWindow::redrawText() if(m_pLineEdit->isVisible())y -= (m_pLineEdit->height() + 4); - TQColorGroup grp = tqcolorGroup(); + TQColorGroup grp = colorGroup(); int idx = iIdx; KviNotifierMessage * m = cur; @@ -1191,7 +1191,7 @@ void KviNotifierWindow::redrawWindow() } inline void KviNotifierWindow::setCursor(int cur) { - if (m_cursor.tqshape() != cur) { + if (m_cursor.shape() != cur) { if(TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor(); m_cursor.setShape((Qt::CursorShape)cur); TQApplication::setOverrideCursor(m_cursor); diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h index dfc9d6de..cbb26828 100644 --- a/src/modules/notifier/notifierwindow.h +++ b/src/modules/notifier/notifierwindow.h @@ -77,7 +77,7 @@ protected: TQPixmap m_pixBackgroundHighlighted; TQPixmap m_pixForeground; // we paint the stuff HERE - // Notifier graphic tqlayout + // Notifier graphic layout TQPixmap m_pixBckgrnd; TQImage m_imgBuffer; // here we merge the two images diff --git a/src/modules/notifier/notifierwindowbody.cpp b/src/modules/notifier/notifierwindowbody.cpp index 397068cd..d10b8916 100644 --- a/src/modules/notifier/notifierwindowbody.cpp +++ b/src/modules/notifier/notifierwindowbody.cpp @@ -26,7 +26,7 @@ #include "kvi_iconmanager.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpainter.h> diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 9e024d5b..7aba4dc4 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -32,7 +32,7 @@ #include <tqevent.h> #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqfontmetrics.h> diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index 9f6e26ae..96ecc40c 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -48,8 +48,8 @@ @description: This widget organizes buttons in a group. It will be usually a parent for other child controls. - You can either use a child tqlayout to manage the tqchildren geometries - or use $setColumnLayout function to manage the tqlayout automatically. + You can either use a child layout to manage the children geometries + or use $setColumnLayout function to manage the layout automatically. The class ineriths groupbox. @functions: diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 40fc473b..3dae8c3c 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -34,7 +34,7 @@ #include <tqdockwindow.h> #define TQT_DOCK_WINDOW TQDockWindow #endif -#include <tqlayout.h> +#include <layout.h> /* @doc: dockwindow @@ -49,11 +49,11 @@ [class]widget[/class] @description: A window dockable to the KVIrc main frame borders (like a toolbar). - The window has an implicit tqlayout that will automatically manage - the tqchildren depending on the dock window's orientation. + The window has an implicit layout that will automatically manage + the children depending on the dock window's orientation. @functions: !fn: $addWidget(<widget:hobject>) - Adds <widget> to the internal tqlayout of this dock window.[br] + Adds <widget> to the internal layout of this dock window.[br] The widget must be a child of this dock window (otherwise strange things may happen). !fn: <string> $orientation() Returns the string "vertical" or "horizontal" depending on the orientation of this dock window. diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index aa99bb69..21a4c814 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -25,7 +25,7 @@ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "kvi_string.h" diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 07f73bea..7c011403 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -29,7 +29,7 @@ #include "kvi_locale.h" #include "kvi_iconmanager.h" -// Tables used in $tqsetAlignment , $tqalignment and in $setOrientation & $orientation +// Tables used in $setAlignment , $alignment and in $setOrientation & $orientation const char * const align_tbl[] = { "Left", @@ -60,8 +60,8 @@ const int align_cod[] = { @description: This widget can be used to display a groupbox. It will be usually a parent for other child controls. - You can either use a child tqlayout to manage the tqchildren geometries - or use $setColumnLayout to manage the tqlayout automatically. + You can either use a child layout to manage the children geometries + or use $setColumnLayout to manage the layout automatically. @functions: !fn: $setTitle(<text:String>) Sets the group box title to <text>. @@ -89,14 +89,14 @@ const int align_cod[] = { Returns the number of columns or rows in the groupbox. !fn: $addSpace() Adds an empty cell at the next free position. - !fn: <string> $tqalignment() - Returns the tqalignment of the group box title. - !fn: $tqsetAlignment(<tqalignment:string>) - Set the tqalignment of the groupbox; Valid values are Left,Right,HCenter. + !fn: <string> $alignment() + Returns the alignment of the group box title. + !fn: $setAlignment(<alignment:string>) + Set the alignment of the groupbox; Valid values are Left,Right,HCenter. !fn: $setOrientation<orientation:string> Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical. !fn: $setColumnLayout(<columns:integer>,<orientation:string>) - Enables the automatic tqlayout management. The tqchildren are arranged in n columns with the specified orientation.[br] + Enables the automatic layout management. The children are arranged in n columns with the specified orientation.[br] Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical. @examples: [example] @@ -108,7 +108,7 @@ const int align_cod[] = { #then the groupbox [br] %gb=$new(groupbox,%widget)[br] %gb->$setTitle(Login)[br] - %gb->$tqsetAlignment("Left")[br] + %gb->$setAlignment("Left")[br] [br] #now we create the labels and lineedits.[br] %labeluser=$new(label,%gb)[br] @@ -120,16 +120,16 @@ const int align_cod[] = { %inputpass->$setechomode("password")[br] [br] #now lets' layouting the groupbox's element's.[br] - %layoutgb=$new(tqlayout,%gb)[br] + %layoutgb=$new(layout,%gb)[br] %layoutgb->$setmargin(20)[br] %layoutgb->$addwidget(%labeluser,0,0)[br] %layoutgb->$addwidget(%labelpass,1,0)[br] %layoutgb->$addwidget(%inputuser,0,1)[br] %layoutgb->$addwidget(%inputpass,1,1)[br] [br] - # now we create a fake widget and managing the two buttons tqlayout.[br] + # now we create a fake widget and managing the two buttons layout.[br] %fakewidget=$new(widget,%widget)[br] - %layoutbtn=$new(tqlayout,%fakewidget)[br] + %layoutbtn=$new(layout,%fakewidget)[br] %btnok=$new(button,%fakewidget)[br] %btnok->$settext("OK")[br] %btncancel=$new(button,%fakewidget)[br] @@ -137,13 +137,13 @@ const int align_cod[] = { %layoutbtn->$addwidget(%btnok,0,0)[br] %layoutbtn->$addwidget(%btncancel,0,1)[br] [br] - #And finally we create a main tqlayout with the groupbox (and its "tqchildren")[br] - #and fakewiget (with its buttons tqchildren). - %maintqlayout=$new(tqlayout,%widget)[br] - %maintqlayout->$setspacing(10)[br] - %maintqlayout->$setmargin(10)[br] - %maintqlayout->$addwidget(%gb,0,0)[br] - %maintqlayout->$addwidget(%fakewidget,1,0)[br] + #And finally we create a main layout with the groupbox (and its "children")[br] + #and fakewiget (with its buttons children). + %mainlayout=$new(layout,%widget)[br] + %mainlayout->$setspacing(10)[br] + %mainlayout->$setmargin(10)[br] + %mainlayout->$addwidget(%gb,0,0)[br] + %mainlayout->$addwidget(%fakewidget,1,0)[br] [br] #Let's show our nice login request =D ! [br] %widget->$show()[br] @@ -165,8 +165,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget") KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setColumns", functionSetColumns) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"columns", functionColumns) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"addSpace", functionAddSpace) - KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqalignment", functionAlignment) - KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqsetAlignment", functionSetAlignment) + KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"alignment", functionAlignment) + KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setAlignment", functionSetAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setOrientation", functionSetOrientation) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"isChecked", functionIsChecked) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setChecked", functionSetChecked) @@ -310,23 +310,23 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c) { TQString szAlign; KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlign) + KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlign) KVSO_PARAMETERS_END(c) if (!widget()) return true; for(unsigned int i = 0; i < align_num; i++) { if(KviTQString::equalCI(szAlign, align_tbl[i])) { - ((KviTalGroupBox *)widget())->tqsetAlignment(align_cod[i]); + ((KviTalGroupBox *)widget())->setAlignment(align_cod[i]); return true; } } - c->warning(__tr2qs("Unknown tqalignment")); + c->warning(__tr2qs("Unknown alignment")); return true; } bool KviKvsObject_groupbox::functionAlignment(KviKvsObjectFunctionCall *c) { - int mode = ((KviTalGroupBox *)widget())->tqalignment(); + int mode = ((KviTalGroupBox *)widget())->alignment(); TQString szAlignment=""; for(unsigned int i = 0; i < align_num; i++) { diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 58c518cc..21167be1 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -35,16 +35,16 @@ @type: class @short: - Manages child widget horizontal tqgeometry + Manages child widget horizontal geometry @inherits: [class]object[/class] @description: - The hbox class widget provides horizontal tqgeometry management for its child widgets. + The hbox class widget provides horizontal geometry management for its child widgets. @functions: !fn: $setSpacing(<spacing:uint>) Sets the default spacing of the widgets in pixels !fn: $setMargin(<margin:uint>) - Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges. + Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges. !fn: $setStretchFactor(<widget:hobject>,<stretch:uint>) Sets the stretch factor of widget to stretch. */ diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index ce2c5365..f0e93e21 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -34,7 +34,7 @@ -// Tables used in $tqsetAlignment & $tqalignment +// Tables used in $setAlignment & $alignment const char * const align_tbl[] = { "Left", "Right", @@ -120,7 +120,7 @@ const int frame_cod[] = { [class]widget[/class] @description: This widget can be used to display a text or an image. It can - have different frame styles and text/image tqalignment. + have different frame styles and text/image alignment. @functions: !fn: $setText(<text:string>) Sets the text to be displayed by the label. @@ -144,15 +144,15 @@ const int frame_cod[] = { automagically resize itself accordingly to the 'size' of the text it contains. See also [classfnc]$autoResize[/classfnc](). - !fn: <string> $tqalignment() - Returns a string containing tqalignment flags that are set for + !fn: <string> $alignment() + Returns a string containing alignment flags that are set for this label. The flags are separated by commas. An example output could look like this:[br] [pre]Bottom, Right[/pre][br] - See [classfnc]$tqsetAlignment[/classfnc]() for explanation of all - tqalignment flags. - !fn: $tqsetAlignment(<flag1:string>, <flag2:string>, ...) - This function sets tqalignment flags, given as parameters, for + See [classfnc]$setAlignment[/classfnc]() for explanation of all + alignment flags. + !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) + This function sets alignment flags, given as parameters, for this label. Valid flags are: [pre] Right - Text is aligned to right border[br] @@ -179,8 +179,8 @@ const int frame_cod[] = { frame-style flags and their explenation. !fn: $setFrameStyle(<flag1>, <flag2>, ...) Sets the frame-style flags to the ones passed as arguments. - The flags can either decide of the tqshape or shadow of the - label's frame. Valid tqshape flags are:[br] + The flags can either decide of the shape or shadow of the + label's frame. Valid shape flags are:[br] [pre] NoFrame - draw no frame. You shouldn't specify a shadow when using this.[br] @@ -216,8 +216,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget") KVSO_REGISTER_HANDLER(KviKvsObject_label,"setMargin", functionSetMargin) KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize) KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize) - KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqalignment", functionAlignment) - KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqsetAlignment", functionSetAlignment) + KVSO_REGISTER_HANDLER(KviKvsObject_label,"alignment", functionAlignment) + KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear) KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle) KVSO_REGISTER_HANDLER(KviKvsObject_label,"setFrameStyle", functionSetFrameStyle) @@ -297,13 +297,13 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c) // bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c) { - TQStringList tqalignment; + TQStringList alignment; KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("tqalignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,tqalignment) + KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment) KVSO_PARAMETERS_END(c) if (!widget()) return true; int align,sum=0; - for ( TQStringList::Iterator it = tqalignment.begin(); it != tqalignment.end(); ++it ) + for ( TQStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) { align = 0; @@ -318,15 +318,15 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c) if(align) sum = sum | align; else - c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it)); + c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it)); } - ((TQLabel *)widget())->tqsetAlignment(sum); + ((TQLabel *)widget())->setAlignment(sum); return true; } bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c) { - int mode = ((TQLabel *)widget())->tqalignment(); + int mode = ((TQLabel *)widget())->alignment(); TQString szAlignment=""; for(unsigned int i = 0; i < align_num; i++) { diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index b2842a8c..7b2d252d 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -40,37 +40,37 @@ /* - @doc: tqlayout + @doc: layout @keyterms: - tqlayout object class, child widgets + layout object class, child widgets @title: - tqlayout class + layout class @type: class @short: - Manages child widget tqgeometry + Manages child widget geometry @inherits: [class]object[/class] @description: - The tqlayout is a tqgeometry management tool for child widgets. - You create a tqlayout , give it some widgets to manage and it will tqlayout them + The layout is a geometry management tool for child widgets. + You create a layout , give it some widgets to manage and it will layout them automatically.[br] - The parent of the tqlayout must be the widget for which child widget geometries have to be managed. - A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br] - Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br] + The parent of the layout must be the widget for which child widget geometries have to be managed. + A layout is a grid of NxM cells in which you insert child widgets with [classfnc:layout]$addWidget[/classfnc]().[br] + Widgets that must span multiple cells can be added to the layout with [classfnc:layout]$addMultiCellWidget[/classfnc]().[br] @functions: !fn: $addWidget(<widget:object widget>,<row:uint>,<column:uint>) - Adds a widget to this tqlayout placing it at position <row>,<column> in the grid + Adds a widget to this layout placing it at position <row>,<column> in the grid !fn: $addMultiCellWidget(<widget:object widget>,<start_row:uint>,<end_row:uint>,<start_col:uint>,<end_col:uint>) - Adds a widget to this tqlayout spanning multiple grid cells + Adds a widget to this layout spanning multiple grid cells !fn: $setRowStretch(<row:uint>,<stretch:uint>) - Sets the stretch value for a particular row of this tqlayout. The <stretch_value> + Sets the stretch value for a particular row of this layout. The <stretch_value> must be a positive integer. The rows with bigger stretch values will take more space - in the tqlayout. + in the layout. !fn: $setColStretch(<column:uint>,<stretch:uint>) - Sets the stretch value for a particular column in this tqlayout. The <stretch_value> + Sets the stretch value for a particular column in this layout. The <stretch_value> must be a positive integer. The rows with bigger stretch values will take more space - in the tqlayout. + in the layout. !fn: $addRowSpacing(<row:uint>,<spacing:uint>) Sets the minimum height of the specified <row> to <spacing> which must be a positive integer !fn: $addColSpacing(<column:uint>,<spacing:uint>) @@ -78,18 +78,18 @@ !fn: $setSpacing(<spacing:uint>) Sets the default spacing of the widgets in pixels !fn: $setMargin(<margin:uint>) - Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges. + Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges. !fn: $setResizeMode(<resize_mode:string>) - Sets the resize mode of the parent widget in relation to this tqlayout. + Sets the resize mode of the parent widget in relation to this layout. <mode> can be one of:[br] -Auto: this is the default[br] - -Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br] - -Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br] - -FreeResize: the parent widget of this tqlayout is not constrained at all[br] + -Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.[br] + -Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller[br] + -FreeResize: the parent widget of this layout is not constrained at all[br] */ -KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"tqlayout","object") +KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object") KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addWidget", functionAddWidget) KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addMultiCellWidget", functionAddMultiCellWidget) KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setRowStretch", functionSetRowStretch) @@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList if(!w) { - pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!")); + pContext->warning(__tr2qs("The parent of a layout must be a widget!")); return false; } setObject(TQT_TQOBJECT(new TQGridLayout(w))); diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/class_layout.h index 596c7ae8..0970d591 100644 --- a/src/modules/objects/class_layout.h +++ b/src/modules/objects/class_layout.h @@ -23,7 +23,7 @@ // #include "kvi_string.h" -#include <tqlayout.h> +#include <layout.h> #include "object_macros.h" class KviKvsObject_layout : public KviKvsObject diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index 241c3855..c85a4c02 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -100,7 +100,7 @@ This function is called by KVIrc when the current item changes. !fn: <index:integer> $onItemEvent() This function is called by KVIrc when the current item pointed by the mouse changes and gives in $0 the item index. - !fn: <array:x,y,width,height> $tqitemRect(<item:index>) + !fn: <array:x,y,width,height> $itemRect(<item:index>) Returns the rectangle on the screen that item occupies, or an invalid rectangle if item is 0 or is not currently visible. @signals: @@ -122,7 +122,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listbox,"listbox","widget") KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"currentItem", functioncurrentItem) KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"textAt", functiontextAt); KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemAt", functionitemAt); - KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"tqitemRect", functiontqitemRect); + KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemRect", functionitemRect); KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"setCurrentItem", functionsetCurrentItem); @@ -367,7 +367,7 @@ void KviKvsObject_listbox::onItem(KviTalListBoxItem *item) } -bool KviKvsObject_listbox::functiontqitemRect(KviKvsObjectFunctionCall *c) +bool KviKvsObject_listbox::functionitemRect(KviKvsObjectFunctionCall *c) { kvs_uint_t uIndex; KVSO_PARAMETERS_BEGIN(c) @@ -375,7 +375,7 @@ kvs_uint_t uIndex; KVSO_PARAMETERS_END(c) if(widget()) { - TQRect rect=((KviTalListBox *)widget())->tqitemRect(((KviTalListBox *)widget())->item(uIndex)); + TQRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(uIndex)); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)rect.left())); a->set(1,new KviKvsVariant((kvs_int_t)rect.top())); diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h index b7d00cb4..911f7842 100644 --- a/src/modules/objects/class_listbox.h +++ b/src/modules/objects/class_listbox.h @@ -60,7 +60,7 @@ protected: bool functiononItemEvent(KviKvsObjectFunctionCall *c); bool functionitemAt(KviKvsObjectFunctionCall *c); - bool functiontqitemRect(KviKvsObjectFunctionCall *c); + bool functionitemRect(KviKvsObjectFunctionCall *c); protected slots: void selectionChanged(); void currentItemChanged(KviTalListBoxItem *); diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 1bfe95a7..f21417c1 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -55,7 +55,7 @@ [class]widget[/class] @description: It can display and control a hierarchy of multi-column items, and provides the ability to add new items at any time. - The items are added by creating tqchildren [class]listviewitem[/class] objects: simply allocating them with $new + The items are added by creating children [class]listviewitem[/class] objects: simply allocating them with $new will add the items to the listview and simply deleting them will remove them. Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either @@ -132,11 +132,11 @@ The default implementation emits the [classfnc]$onItem[/classfnc]() signal. !fn: $itemExpandedEvent(<item:object>) - This event is called when an item has been expanded, i.e. when the tqchildren of item are shown. + This event is called when an item has been expanded, i.e. when the children of item are shown. The default implementation emits the [classfnc]$expanded[/classfnc]() signal. !fn: $itemCollapsedEvent(<item:object>) - This event is called when an item has been collapsed, i.e. when the tqchildren of item are hidden. + This event is called when an item has been collapsed, i.e. when the children of item are hidden. The default implementation emits the [classfnc]$collapsed[/classfnc]() signal. !fn: $itemRenamedEvent(<item:object>,<col:integer>,<text:string>) diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 49c448e3..605fceed 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -71,7 +71,7 @@ Returns $true if this item is enabled and $false otherwise !fn: $setOpen(<bOpen:boolean>) - Opens or closes the item to show its tqchildren items + Opens or closes the item to show its children items !fn: $isOpen() Returns the open state of this item @@ -80,7 +80,7 @@ Makes this item checkable or not. This function should be called immediately after the item creation: changing this property later at runtime may have strange results (like the item being moved inside the list, text disappearing, - hidden tqchildren etc... don't do it :D ). + hidden children etc... don't do it :D ). !fn: $isCheckable() Returns $true if this item is checkable and $false otherwise @@ -94,7 +94,7 @@ have been previously called. !fn: <listviewitem> $firstChild() - Returns the first child item of this listviewitem or $null if this item has no tqchildren. + Returns the first child item of this listviewitem or $null if this item has no children. !fn: <listviewitem> $nextSibling() Returns the next sibling item of this listviewitem or $null if there are no sibling items. diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index a4beed49..7d04ecba 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -40,7 +40,7 @@ #define TQTEXTEDIT_AUTO_BULLET_LIST Q3TextEdit::AutoBulletList #else - #include <tqtextstream.h> + #include <textstream.h> #include <tqmultilineedit.h> #define KviTalMultiLineEdit TQMultiLineEdit @@ -226,15 +226,15 @@ static int mod_cod[] = { Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE). !fn: <boolean> $isRedoAvailable () Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE). - !fn: $tqsetAlignment(<tqalignment:string>) - Sets the tqalignment of the current paragraph to <tqalignment>. Valid values are:[br] + !fn: $setAlignment(<alignment:string>) + Sets the alignment of the current paragraph to <alignment>. Valid values are:[br] - AlignAuto - Aligns according to the language.[br] - TQt::AlignLeft - Aligns with the left edge.[br] - TQt::AlignRight - Aligns with the right edge.[br] - TQt::AlignCenter - Centers in both dimensions. - !fn: $setVerticalAlignment(<vertical_tqalignment:string>) - Sets the vertical tqalignment of the current format to <Valignemnt>. Valid Values are:[br] - - AlignNormal - Normal tqalignment.[br] + !fn: $setVerticalAlignment(<vertical_alignment:string>) + Sets the vertical alignment of the current format to <Valignemnt>. Valid Values are:[br] + - AlignNormal - Normal alignment.[br] - AlignSuperScript - Superscript.[br] - AlignSubScript - Subscript. !fn: $setAutoFormatting(<afvalue:string>) @@ -323,7 +323,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_mledit,"multilineedit","widget") KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setParagraphBackgroundColor", functionsetParagraphBackgroundColor) KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"clearParagraphBackgroundColor", functionsetParagraphBackgroundColor) KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"loadFile" , functionloadFile); // let's fantasy - KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"tqsetAlignment" , functiontqsetAlignment) + KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAlignment" , functionsetAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAutoFormatting" , functionsetAutoFormatting) KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setVerticalAlignment" , functionsetVerticalAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setWrapPolicy" , functionsetWrapPolicy) @@ -1090,23 +1090,23 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c) +bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c) { TQString szAlignment; KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlignment) + KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlignment) KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviTQString::equalCI(szAlignment,"Left")) - ((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignLeft); + ((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignLeft); else if(KviTQString::equalCI(szAlignment,"Right")) - ((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignRight); + ((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignRight); else if(KviTQString::equalCI(szAlignment,"Center")) - ((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignCenter); + ((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignCenter); else if(KviTQString::equalCI(szAlignment,"Justify")) - ((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignJustify); - else c->warning(__tr2qs("Unknown tqalignment '%Q'"),&szAlignment); + ((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignJustify); + else c->warning(__tr2qs("Unknown alignment '%Q'"),&szAlignment); return true; } @@ -1131,18 +1131,18 @@ bool KviKvsObject_mledit::functionsetAutoFormatting(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionsetVerticalAlignment(KviKvsObjectFunctionCall *c) { - TQString szVtqalignment; + TQString szValignment; KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szVtqalignment) + KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szValignment) KVSO_PARAMETERS_END(c) if(!widget()) return true; - if(KviTQString::equalCI(szVtqalignment,"Normal")) + if(KviTQString::equalCI(szValignment,"Normal")) ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignNormal); - else if(KviTQString::equalCI(szVtqalignment,"SuperScript")) + else if(KviTQString::equalCI(szValignment,"SuperScript")) ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSuperScript); - else if(KviTQString::equalCI(szVtqalignment,"SubScript")) + else if(KviTQString::equalCI(szValignment,"SubScript")) ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSubScript); - else c->warning(__tr2qs("Unknown vertical tqalignment '%Q'"),&szVtqalignment); + else c->warning(__tr2qs("Unknown vertical alignment '%Q'"),&szValignment); return true; } diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h index 5f531ed8..a1b1c8e5 100644 --- a/src/modules/objects/class_multilineedit.h +++ b/src/modules/objects/class_multilineedit.h @@ -95,7 +95,7 @@ protected: bool functionsetParagraphBackgroundColor(KviKvsObjectFunctionCall *c); bool functionclearParagraphBackground(KviKvsObjectFunctionCall *c); bool functionloadFile(KviKvsObjectFunctionCall *c); - bool functiontqsetAlignment(KviKvsObjectFunctionCall *c); + bool functionsetAlignment(KviKvsObjectFunctionCall *c); bool functionsetAutoFormatting(KviKvsObjectFunctionCall *c); bool functionsetVerticalAlignment(KviKvsObjectFunctionCall *c); bool functionsetWrapPolicy(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 826d119f..09499455 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -41,12 +41,12 @@ @type: class @short: - This class provide a painter to paint line and tqshapes. + This class provide a painter to paint line and shapes. @inherits: [class]object[/class] [class]widget[/class] @description: - With this class you can draw many graphics objects from simple lines to complex tqshapes like pies and chords.[br] + With this class you can draw many graphics objects from simple lines to complex shapes like pies and chords.[br] It can also draw aligned text and pixmaps. Normally, it draws in a "natural" coordinate system, but it can also do view and world transformation.[br] The class need to be implemented into a [classfnc]$paintEvent[/classfnc](); @functions: @@ -196,8 +196,8 @@ timerevent()[br] {[br] $$->%b = $(($$->%b + 1) & 15);[br] - if ($$->%nextanim == 1) $$->$tqrepaint(1);[br] - $$->$tqrepaint(0);[br] + if ($$->%nextanim == 1) $$->$repaint(1);[br] + $$->$repaint(0);[br] }[br] drawAnim()[br] {[br] @@ -323,7 +323,7 @@ }[br] }[br] [br] - %lay=$new(tqlayout,%Hello)[br] + %lay=$new(layout,%Hello)[br] %lay->$addwidget(%Btn,4,0)[br] %Hello->$setBackgroundColor("000000");[br] %Hello->$setmaximumwidth(800)[br] @@ -414,12 +414,12 @@ if(__pXOrArray->isArray())\ KviKvsVariant * pH = __pXOrArray->array()->at(3);\ if(!(pX && pY && pW && pH))\ {\ - c->error(__tr2qs("One of the tqgeometry array parameters is empty"));\ + c->error(__tr2qs("One of the geometry array parameters is empty"));\ return false;\ }\ if(!(pX->asInteger(iX) && pY->asInteger(__iY) && pW->asInteger(__iW) && pH->asInteger(__iH)))\ {\ - c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer"));\ + c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer"));\ return false;\ }\ } else {\ diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 394c39a6..cb9c3bba 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -89,7 +89,7 @@ {[br] #Geometry of the widget and setting-up of popupmenu [br] $$->$setGeometry(%X,%Y,100,100)[br] - $$->%lay=$new(tqlayout,$$)[br] + $$->%lay=$new(layout,$$)[br] #Here we generate a cicle to create our labels inside the widget.[br] %i=0[br] while (%i<10)[br] @@ -110,7 +110,7 @@ #we create the label widget wich will be used as popup's title[br] $$->%Popuptitle=$new(label)[br] $$->%Popuptitle->$settext(<B><U>"Windows Options"</B></U>)[br] - $$->%Popuptitle->$tqsetAlignment(Center)[br] + $$->%Popuptitle->$setAlignment(Center)[br] #and we add it.[br] %A=$$->%Popuptitle[br] $$->%Popupmenu->$insertwidget(%A)[br] diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 9ec6cc5a..1c45ed43 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -82,7 +82,7 @@ %tt=$new(test)[br] %A=$new(widget)[br] %A->$setGeometry(100,100,400,300)[br] - %layoutA=$new(tqlayout,%A)[br] + %layoutA=$new(layout,%A)[br] %Ainput=$new(lineedit,%A)[br] #%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br] %Aoutput=$new(label,%A)[br] diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 5b9103b3..5b52ad4c 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -57,7 +57,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip { m_uConnectionId = 0; m_sock = KVI_INVALID_SOCKET; - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; m_uRemotePort = 0; m_uSecondaryPort = 0; m_pSn = 0; @@ -128,7 +128,7 @@ void KviScriptSocketObject::reset() m_pOutBuffer = new KviDataBuffer(); m_uInBufferLen = 0; m_uInDataLen = 0; - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; m_uRemotePort = 0; m_szRemoteIp.clear(); m_uLocalPort = 0; @@ -366,7 +366,7 @@ void KviScriptSocketObject::reset() KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object") - KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functiontqStatus) + KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functionStatus) KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remotePort",functionRemotePort) KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remoteIp",functionRemoteIp) KVSO_REGISTER_HANDLER(KviKvsObject_socket,"localIp",functionLocalIp) @@ -398,7 +398,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject) m_bUdp = false; m_uConnectionId = 0; m_sock = KVI_INVALID_SOCKET; - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; m_uRemotePort = 0; m_uSecondaryPort = 0; m_pSn = 0; @@ -430,15 +430,15 @@ KVSO_END_DESTRUCTOR(KviKvsObject_socket) //---------------------- -bool KviKvsObject_socket::functiontqStatus(KviKvsObjectFunctionCall *c) +bool KviKvsObject_socket::functionStatus(KviKvsObjectFunctionCall *c) { - c->returnValue()->setInteger(m_itqStatus); + c->returnValue()->setInteger(m_iStatus); return true; } bool KviKvsObject_socket::functionClose(KviKvsObjectFunctionCall *c) { - if((m_pOutBuffer->size() != 0) && (m_itqStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED)) + if((m_pOutBuffer->size() != 0) && (m_iStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED)) tryFlush(); reset(); @@ -591,7 +591,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Value %d for port is out of range (values allowed are from 0 to 65535"),m_uRemotePort); return true; } - if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) + if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) { c->warning(__tr2qs("Another connection in progress")); c->returnValue()->setBoolean(true); @@ -608,11 +608,11 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) debug ("ok connecting"); debug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); debug ("non so ip"); - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } c->returnValue()->setBoolean(true); @@ -626,7 +626,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) { - if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) + if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) { c->warning(__tr2qs("Another connection in progress")); c->returnValue()->setBoolean(false); @@ -770,7 +770,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(incomingConnection(int))); m_pSn->setEnabled(true); - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING; c->returnValue()->setBoolean(true); return true; @@ -846,7 +846,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const sareal.getStringAddress(m_szLocalIp); } - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED; m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int))); @@ -1070,7 +1070,7 @@ void KviKvsObject_socket::writeNotifierFired(int) KviKvsVariantList *params=0; callFunction(this,"connectEvent",params); if(m_uConnectionId == uOldConnectionId) - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED; // else the connection has been already changed! } } @@ -1256,7 +1256,7 @@ void KviKvsObject_socket::reset() m_pOutBuffer = new KviDataBuffer(); m_uInBufferLen = 0; m_uInDataLen = 0; - m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; + m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED; m_uRemotePort = 0; m_szRemoteIp=""; m_uLocalPort = 0; diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index 84771cae..f80d749a 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -47,7 +47,7 @@ public: virtual ~KviScriptSocketObject(); protected: kvi_socket_t m_sock; - int m_itqStatus; + int m_iStatus; KviStr m_szRemoteIp; unsigned short int m_uRemotePort; KviStr m_szLocalIp; @@ -69,7 +69,7 @@ protected: unsigned short int m_uSecondaryPort; KviStr m_szSecondaryIp; protected: - bool functiontqStatus(KviCommand *c,KviParameterList * params,KviStr &buffer); + bool functionStatus(KviCommand *c,KviParameterList * params,KviStr &buffer); bool functionRemotePort(KviCommand *c,KviParameterList * params,KviStr &buffer); bool functionRemoteIp(KviCommand *c,KviParameterList * params,KviStr &buffer); bool functionLocalPort(KviCommand *c,KviParameterList * params,KviStr &buffer); @@ -122,7 +122,7 @@ public: protected: bool m_bUdp; kvi_socket_t m_sock; - int m_itqStatus; + int m_iStatus; TQString m_szRemoteIp; // unsigned short int m_uRemotePort; TQString m_szLocalIp; @@ -144,7 +144,7 @@ protected: kvi_u32_t m_uSecondaryPort; TQString m_szSecondaryIp; protected: - bool functiontqStatus(KviKvsObjectFunctionCall *c); + bool functionStatus(KviKvsObjectFunctionCall *c); bool functionRemotePort(KviKvsObjectFunctionCall *c); bool functionRemoteIp(KviKvsObjectFunctionCall *c); bool functionLocalPort(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index d30a6b67..3b768217 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -94,7 +94,7 @@ %secondtab=$new(widget,%Tabwidget) # Now we'll create the item to put in to tab's pages. - %layoutfirsttab=$new(tqlayout,%firsttab) + %layoutfirsttab=$new(layout,%firsttab) %labelbt=$new(label,%firsttab) %labelbt->$settext(Botton Tab) %labeltt=$new(label,%firsttab) @@ -104,7 +104,7 @@ %buttontt=$new(button,%firsttab) %buttontt->$settext("To &Top") - # Now we'll give a tqlayout to all items. + # Now we'll give a layout to all items. # This also allows to use privateimpl without making buttons global variables %layoutfirsttab->$addwidget(%labelbt,0,0) %layoutfirsttab->$addwidget(%labeltt,0,1) @@ -125,14 +125,14 @@ } # We do the same work with the second tab's page. - %layoutsecondtab=$new(tqlayout,%secondtab) + %layoutsecondtab=$new(layout,%secondtab) %labelwp=$new(label,%secondtab) %labelwp->$settext("Enjoy the new Class provided by") %layoutsecondtab->$addwidget(%labelwp,0,0) - %labelwp->$settqalignment("Center") + %labelwp->$setalignment("Center") %labelgen=$new(label,%secondtab) %labelgen->$settext(Grifisx \& Noldor) - %labelgen->$settqalignment("Center") + %labelgen->$setalignment("Center") %layoutsecondtab->$addwidget(%labelgen,1,0) %Tabwidget->$addTab(%secondtab,&About,50) diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 7f4de6ca..74b5c7b0 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -21,7 +21,7 @@ // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // -#include <tqtextbrowser.h> +#include <textbrowser.h> #include "class_tbrowser.h" #include "kvi_error.h" #include "kvi_debug.h" diff --git a/src/modules/objects/class_tbrowser.h b/src/modules/objects/class_tbrowser.h index f494a05e..b357d3f0 100644 --- a/src/modules/objects/class_tbrowser.h +++ b/src/modules/objects/class_tbrowser.h @@ -23,7 +23,7 @@ // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // -#include <tqtextbrowser.h> +#include <textbrowser.h> #include "class_widget.h" #include <tqfile.h> #include "class_multilineedit.h" diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp index 8b989236..2d0416b4 100644 --- a/src/modules/objects/class_urllabel.cpp +++ b/src/modules/objects/class_urllabel.cpp @@ -152,7 +152,7 @@ bool KviScriptUrlLabelObject::eventFilter(TQObject * o, TQEvent * e) !fn: $setText(<text>) Sets the label's text. Reimplemented from internal reasons. !fn: $setCursorChange(<bEnabled:boolean>) - Tells the label wheather to change or not the tqshape of cursor, + Tells the label wheather to change or not the shape of cursor, when it is above the widget. Default is false. !fn: <boolean> $cursorChange() Returns true if the cursor changes over the label, false if not. @@ -287,7 +287,7 @@ bool KviKvsObject_urlabel::functionsetText(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget()) return true; ((TQLabel *)widget())->setText(szText); - ((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->tqsizeHint()); + ((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->sizeHint()); return true; } bool KviKvsObject_urlabel::functionaction(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index d068156e..0019f000 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -35,16 +35,16 @@ @type: class @short: - Manages child widget vertical tqgeometry + Manages child widget vertical geometry @inherits: [class]object[/class] @description: - The vbox class widget provides vertical tqgeometry management for its child widgets. + The vbox class widget provides vertical geometry management for its child widgets. @functions: !fn: $setSpacing(<spacing:int>) Sets the default spacing of the widgets in pixels !fn: $setMargin(<margin:int>) - Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges. + Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges. !fn: $setStretchFactor(<widget:hobject>,<stretch:uint>) Sets the stretch factor of widget to stretch. */ diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 4ff98d6e..4461f366 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -36,7 +36,7 @@ #include <tqcursor.h> #include <tqiconset.h> #include <tqcolor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqmetaobject.h> #include "class_widget.h" @@ -137,12 +137,12 @@ const int widgettypes_cod[] = { All the other widget-type classes inherit from this one. @functions: !fn: $show() - Shows this widget and the tqchildren. + Shows this widget and the children. See also [classfnc]$hide[/classfnc]() and [classfnc]$isVisible[/classfnc]. !fn: $hide() - Hides this widget (and conseguently all the tqchildren). + Hides this widget (and conseguently all the children). See also [classfnc]$show[/classfnc]() and [classfnc]$isVisible[/classfnc]. - !fn: $tqrepaint(<bool erase>) + !fn: $repaint(<bool erase>) Repaints the widget directly by calling [classfnc]$paintEvent[/classfnc]() immediately.[br] If erase is TRUE, erases the widget before the $paintEvent() call. !fn: $x() @@ -157,29 +157,29 @@ const int widgettypes_cod[] = { Returns the width of this widget in pixels. !fn: $height() Returns the height of this widget in pixels. - !fn: $tqgeometry() - Returns the widget tqgeometry in this form:[br] + !fn: $geometry() + Returns the widget geometry in this form:[br] x, y, width, height. !fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>]) - Sets the tqgeometry of this widget. <x> and <y> are relative + Sets the geometry of this widget. <x> and <y> are relative to the parent widget or to the desktop (if this widget is a toplevel one). All the parameters are in pixels. !fn: $setMinimumWidth(<value>) Sets the minimum width of this widget to <value>. The user will not be able to resize the widget to a smaller - value. This value is also used by the [class:tqlayout]tqlayout class[/class]. + value. This value is also used by the [class:layout]layout class[/class]. !fn: $setMinimumHeight(<value>) Sets the minimum height of this widget to <value>. The user will not be able to resize the widget to a smaller - value. This value is also used by the [class:tqlayout]tqlayout class[/class]. + value. This value is also used by the [class:layout]layout class[/class]. !fn: $setMaximumWidth(<value>) Sets the maximum width of this widget to <value>. The user will not be able to resize the widget to a bigger - value. This value is also used by the [class:tqlayout]tqlayout class[/class]. + value. This value is also used by the [class:layout]layout class[/class]. !fn: $setMaximumHeight(<value>) Sets the maximum height of this widget to <value>. The user will not be able to resize the widget to a bigger - value. This value is also used by the [class:tqlayout]tqlayout class[/class]. + value. This value is also used by the [class:layout]layout class[/class]. !fn: $move(<x_or_array>[,<y>]) Moves this widget to the coordinate <x> and <y> relative to its parent widget (or the desktop if this widget is a toplevel one). @@ -341,7 +341,7 @@ const int widgettypes_cod[] = { If a tooltip has setted with [classfnc]$setTooltip[/classfnc] the dynamic tooltip will be ignored. The default implementation does nothing. !fn: $paintEvent() - This event handler can be reimplemented to tqrepaint all or part of the widget. + This event handler can be reimplemented to repaint all or part of the widget. It's needed by the Painter class. It's very useful for drawing flicker free animations or low level special graphic effects. If you call "[cmd]return[/cmd] $true" you will stop the internal processing @@ -522,7 +522,7 @@ const int widgettypes_cod[] = { // ... now that I think about it , it // may happen that widget() will be zero here too: // If the TQt "physical" widget gets destroyed - // by some external factor (for example when tqchildren + // by some external factor (for example when children // of a wrapper widget destroyed by KVIrc). // // as a convention: @@ -546,7 +546,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") // apparence KVSO_REGISTER_HANDLER(KviKvsObject_widget,"show",function_show) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"hide",function_hide) - KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqrepaint",function_tqrepaint) + KVSO_REGISTER_HANDLER(KviKvsObject_widget,"repaint",function_repaint) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isTopLevel",function_isTopLevel) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isVisible",function_isVisible) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"raise",function_raise) @@ -567,10 +567,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsWidth",function_fontMetricsWidth) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsHeight",function_fontMetricsHeight) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFont",function_setFont) - // tqgeometry + // geometry KVSO_REGISTER_HANDLER(KviKvsObject_widget,"screenResolution",function_screenResolution) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"centerToScreen",function_centerToScreen) - KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_tqgeometry) + KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_geometry) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setGeometry",function_setGeometry) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapToGlobal",function_mapToGlobal) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapFromGlobal",function_mapFromGlobal) @@ -587,7 +587,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object") KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumWidth",function_setMaximumWidth) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumHeight",function_setMaximumHeight) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"move",function_move) - KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqsizeHint",function_tqsizeHint) + KVSO_REGISTER_HANDLER(KviKvsObject_widget,"sizeHint",function_sizeHint) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"resize",function_resize) KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFocusPolicy",function_setFocusPolicy) @@ -916,14 +916,14 @@ bool KviKvsObject_widget::function_fontAscent(KviKvsObjectFunctionCall * c) } -bool KviKvsObject_widget::function_tqrepaint(KviKvsObjectFunctionCall * c) +bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c) { bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(!widget()) return true; - widget()->tqrepaint(bEnabled); + widget()->repaint(bEnabled); return true; } @@ -955,9 +955,9 @@ bool KviKvsObject_widget::function_screenResolution(KviKvsObjectFunctionCall * c return true; } -bool KviKvsObject_widget::function_tqgeometry(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_geometry(KviKvsObjectFunctionCall *c) { - TQRect r = widget() ? widget()->tqgeometry() : TQRect(0,0,0,0); + TQRect r = widget() ? widget()->geometry() : TQRect(0,0,0,0); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)r.x())); a->set(1,new KviKvsVariant((kvs_int_t)r.y())); @@ -992,7 +992,7 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c) if(pXOrArray->isArray()) { - // the user has passed a complete tqgeometry array as first parameter + // the user has passed a complete geometry array as first parameter // make sure it has at least 4 elements if(pXOrArray->array()->size() < 4) { @@ -1009,12 +1009,12 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c) // no parameter was set in that place if(!(pX && pY && pW && pH)) { - c->error(__tr2qs("One of the tqgeometry array parameters is empty")); + c->error(__tr2qs("One of the geometry array parameters is empty")); return false; } if(!(pX->asInteger(iX) && pY->asInteger(iY) && pW->asInteger(iW) && pH->asInteger(iH))) { - c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer")); + c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer")); return false; } // ok: the params are correct @@ -1450,10 +1450,10 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c) widget()->move(TQPoint(iX,iY)); return true; } -bool KviKvsObject_widget::function_tqsizeHint(KviKvsObjectFunctionCall *c) +bool KviKvsObject_widget::function_sizeHint(KviKvsObjectFunctionCall *c) { if(!widget())return true; - TQSize sizehint = widget()->tqsizeHint(); + TQSize sizehint = widget()->sizeHint(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)sizehint.width())); a->set(1,new KviKvsVariant((kvs_int_t)sizehint.height())); @@ -1616,7 +1616,7 @@ bool KviKvsObject_widget::function_addWidgetToWrappedLayout(KviKvsObjectFunction c->warning(__tr2qs("Widget parameter is not a valid object")); return true; } - TQLayout *lay=widget()->tqlayout(); + TQLayout *lay=widget()->layout(); if (!lay) { c->warning(__tr2qs("No Layout associated to the widget ")); diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index 807d50ab..47d13cdb 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -59,7 +59,7 @@ protected: bool function_fontMetricsHeight(KviKvsObjectFunctionCall * c); bool function_fontMetricsWidth(KviKvsObjectFunctionCall * c); bool function_foregroundColor(KviKvsObjectFunctionCall *c); - bool function_tqgeometry(KviKvsObjectFunctionCall *c); + bool function_geometry(KviKvsObjectFunctionCall *c); bool function_globalCursorX(KviKvsObjectFunctionCall *c); bool function_globalCursorY(KviKvsObjectFunctionCall *c); bool function_hasFocus(KviKvsObjectFunctionCall *c); @@ -74,7 +74,7 @@ protected: bool function_move(KviKvsObjectFunctionCall *c); bool function_parentWidget(KviKvsObjectFunctionCall *c); bool function_raise(KviKvsObjectFunctionCall *); - bool function_tqrepaint(KviKvsObjectFunctionCall *c); + bool function_repaint(KviKvsObjectFunctionCall *c); bool function_reparent(KviKvsObjectFunctionCall *c); bool function_resize(KviKvsObjectFunctionCall *c); bool function_screenResolution(KviKvsObjectFunctionCall * c); @@ -96,7 +96,7 @@ protected: bool function_setGeometry(KviKvsObjectFunctionCall *c); bool function_setWFlags(KviKvsObjectFunctionCall *c); bool function_show(KviKvsObjectFunctionCall *c); - bool function_tqsizeHint(KviKvsObjectFunctionCall *c); + bool function_sizeHint(KviKvsObjectFunctionCall *c); bool function_width(KviKvsObjectFunctionCall *); bool function_x(KviKvsObjectFunctionCall *); bool function_y(KviKvsObjectFunctionCall *); diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 393c296d..918f541d 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -119,7 +119,7 @@ bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name()); setObject(TQT_TQOBJECT(w)); pContext->window()->frame()->addWindow(w,false); - w->minimize(); // must be minimized before tqchildren are added, otherwise the focus handling goes nuts... + w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts... return true; } diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 48092775..4f178024 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -110,7 +110,7 @@ constructor[br] {[br] $$->$setGeometry(%X,%Y,100,100)[br] - $$->%lay=$new(tqlayout,$$)[br] + $$->%lay=$new(layout,$$)[br] %i=0[br] while (%i<10)[br] {[br] diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index ca1333f9..38901ed1 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -72,7 +72,7 @@ The first entry in this example is a KVIrc server window, class "KviFrame" and name "kvirc_frame": it is a toplevel widget.[br] The "qt_top_dock", "qt_custom_toolbar" and the "qt_dockwidget_internal" are - direct tqchildren of that widget.[br] + direct children of that widget.[br] To indicate a specific widget we will use the "class::name" form.[br] So to indicate the main KVIrc frame you will use "KviFrame::kvirc_main_frame". Look at this example:[br] @@ -183,7 +183,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, const TQString szName) { #ifdef COMPILE_USE_QT4 - TQWidgetList list = g_pApp->tqtopLevelWidgets(); + TQWidgetList list = g_pApp->topLevelWidgets(); if( !list.count() ) return 0; for(int idx=0;idx<list.count();idx++) { @@ -205,7 +205,7 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, return 0; #else - TQWidgetList *list = g_pApp->tqtopLevelWidgets(); + TQWidgetList *list = g_pApp->topLevelWidgets(); if( !list ) return 0; TQWidgetListIt it(*list); diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 977c8c9b..2a4dc9de 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -153,7 +153,7 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c) Suppresses any warning message @description: Removes the definition of the class <class_name>.[br] - All the instances of the class are killed (thus tqchildren objects are killed too).[br] + All the instances of the class are killed (thus children objects are killed too).[br] All the derived class definitions are removed as well.[br] Builtin class definitions cannot be removed and this commands kills only all the instances of that class (derived class definitions @@ -827,7 +827,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) KVSO_PARAMETERS_END(cmd) if (bFlag) cmd->window()->output(80, "Objects dump:"); #ifdef COMPILE_USE_QT4 - TQWidgetList list = g_pApp->tqtopLevelWidgets(); + TQWidgetList list = g_pApp->topLevelWidgets(); KviStr spacing = ">"; TQString szTemp; @@ -865,7 +865,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) } #else - TQWidgetList *l = g_pApp->tqtopLevelWidgets(); + TQWidgetList *l = g_pApp->topLevelWidgets(); l->setAutoDelete(false); TQWidgetListIt it(*l); KviStr spacing = ">"; @@ -913,7 +913,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx) { #ifdef COMPILE_USE_QT4 - const TQObjectList list = parent->tqchildren(); + const TQObjectList list = parent->children(); if( !list.count() ) return; TQString sp(spacing); sp.append(">"); diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index c0b7bf8a..097d7729 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -27,7 +27,7 @@ #include "kvi_iconmanager.h" #include "kvi_app.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include "kvi_tal_tooltip.h" #include <tqevent.h> @@ -59,7 +59,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this); KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); - //b->setMinimumWidth(m_pCancel->tqsizeHint().width()); + //b->setMinimumWidth(m_pCancel->sizeHint().width()); g->addWidget(b,1,1); b->setDefault(true); connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index b00eba60..8b7242fb 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -32,7 +32,7 @@ #include "kvi_module.h" #include "kvi_styled_controls.h" #include "kvi_pointerhashtable.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_accel.h" #include <tqlabel.h> #include "kvi_tal_vbox.h" @@ -69,8 +69,8 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif - l->tqsetAlignment(TQt::AlignTop); - tqlayout()->addWidget(l,0,0); + l->setAlignment(TQt::AlignTop); + layout()->addWidget(l,0,0); } KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget() @@ -179,7 +179,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) "</td>" \ "</tr>" \ "</table>" - ).tqarg(szDialogTitle).tqarg(szDialog).tqarg(szInfoTips).tqarg(szOkCancelButtons); + ).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons); TQString szCaption = szDialogTitle + " - KVIrc"; setCaption(szCaption); @@ -534,10 +534,10 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt { if(e->bIsContainer) { - // it's a container: add only eventual not contained tqchildren (containers or explicitly marked as not contained) + // it's a container: add only eventual not contained children (containers or explicitly marked as not contained) fillListView(it,e->pChildList,szGroup,true); } else { - // it's not a container, add any tqchildren + // it's not a container, add any children fillListView(it,e->pChildList,szGroup,false); } } @@ -578,7 +578,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem if(it->m_pOptionsWidget == pPage)return it; KviOptionsListViewItem *i; - // run through the tqchildren + // run through the children i = (KviOptionsListViewItem *)(it->firstChild()); if(i) { @@ -586,7 +586,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem if(i)return i; } - // not found in the tqchildren tree.. look in the next sibling + // not found in the children tree.. look in the next sibling i = (KviOptionsListViewItem *)(it->nextSibling()); if(i) { @@ -647,7 +647,7 @@ void KviOptionsDialog::closeEvent(TQCloseEvent *e) void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it) { - // First commit the tqchildren + // First commit the children if(!it) return; KviOptionsListViewItem *it2 = (KviOptionsListViewItem *)it->firstChild(); while(it2) diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index 1a25a14d..9947aff7 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -271,7 +271,7 @@ printclass() fi } -addtqchildren() +addchildren() { if [ -f "$CLASSDIR/$2" ]; then LEVEL=`cat $CLASSDIR/$2` @@ -282,7 +282,7 @@ addtqchildren() echo "$3 e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $TARGET echo "$3 e$1->pChildList->setAutoDelete(true);" >> $TARGET NEXTLEVEL=`expr $1 + 1` - addtqchildren $NEXTLEVEL $achild "$3 " + addchildren $NEXTLEVEL $achild "$3 " else echo "$3 e$1->pChildList = 0;" >> $TARGET fi @@ -290,7 +290,7 @@ addtqchildren() fi } -addtqchildren 0 NOPARENT "" +addchildren 0 NOPARENT "" rm -fr $CLASSDIR diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 43cc13e9..edb2dc40 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -22,7 +22,7 @@ #include "optw_antispam.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" @@ -47,7 +47,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent) reenableStuff(true); - tqlayout()->setRowStretch(2,1); + layout()->setRowStretch(2,1); } KviAntispamOptionsWidget::~KviAntispamOptionsWidget() diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 0faf216e..546b232d 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -23,7 +23,7 @@ #include "optw_away.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index a0604d9b..82b3f95e 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -22,7 +22,7 @@ #include "optw_ctcpfloodprotection.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 8ddf15bc..f32dfc50 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -24,7 +24,7 @@ #include "optw_dcc.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index fdb8e908..2ecbc0bc 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -24,7 +24,7 @@ #include "optw_highlighting.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 57b67a48..bf270c49 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_tooltip.h" #include <tqtabwidget.h> #include <tqcombobox.h> @@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare createLayout(3,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options")); KviTalHBox * hb = new KviTalHBox(gbox); @@ -492,7 +492,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent : KviOptionsWidget(parent) { createLayout(4,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar)); @@ -540,7 +540,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar())); - tqlayout()->setRowStretch(1,2); + layout()->setRowStretch(1,2); } KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget() @@ -678,7 +678,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa createLayout(2,1); - tqlayout()->setMargin(10); + layout()->setMargin(10); KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options")); m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI); diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 9d6b56a8..90bec09a 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -22,7 +22,7 @@ #include "optw_ignore.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index c1ad6e84..a125f769 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -21,7 +21,7 @@ // #include "optw_input.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" @@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent) } - tqlayout()->setRowStretch(7,1); + layout()->setRowStretch(7,1); } KviInputLookOptionsWidget::~KviInputLookOptionsWidget() diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 780c493f..e10e3059 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -24,7 +24,7 @@ #include "optw_interfacefeatures.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <string.h> diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index 1e2c998f..a0e5aedb 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -22,7 +22,7 @@ #include "optw_interfacelookglobal.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_settings.h" #include "kvi_options.h" @@ -104,13 +104,13 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde)); - tqlayout()->setRowStretch(6,1); + layout()->setRowStretch(6,1); connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); #else //!COMPILE_KDE_SUPPORT m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - tqlayout()->setRowStretch(4,1); + layout()->setRowStretch(4,1); #endif //!COMPILE_KDE_SUPPORT connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); @@ -177,7 +177,7 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent) addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground); addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground); - tqlayout()->setRowStretch(1,1); + layout()->setRowStretch(1,1); } KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget() @@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidge addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground); - tqlayout()->setRowStretch(8,1); + layout()->setRowStretch(8,1); } KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index f39add08..a6cee9d0 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -181,7 +181,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar hostmask.mask(tmp1,(KviIrcMask::MaskType)i); ipmask.mask(tmp2,(KviIrcMask::MaskType)i); - m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2)); + m_pBanTypeCombo->insertItem(TQString("%1 (%2)").arg(tmp1).arg(tmp2)); } m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index 6446fe72..7ff21bee 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -22,7 +22,7 @@ #include "optw_ircoutput.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 4bb80f59..8c38bfa9 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -21,7 +21,7 @@ // #include "optw_ircview.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" @@ -98,7 +98,7 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent) m_pVerticalAlign->setCurrentItem(0); } - tqlayout()->setRowStretch(2,1); + layout()->setRowStretch(2,1); } KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget() diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 8dce8615..fa964a9c 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -23,7 +23,7 @@ #include "optw_lag.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_tooltip.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index 378c1dd1..e935dfc6 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -23,7 +23,7 @@ #include "optw_logging.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index b93081e9..51cdad76 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -22,7 +22,7 @@ #include "optw_mediatypes.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include "kvi_tal_tooltip.h" @@ -77,72 +77,72 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent) connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *))); - tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2); + layout()->addMultiCellWidget(m_pListView,0,0,0,2); TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this); - tqlayout()->addWidget(l,1,0); + layout()->addWidget(l,1,0); m_pDescription = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2); + layout()->addMultiCellWidget(m_pDescription,1,1,1,2); l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this); - tqlayout()->addWidget(l,2,0); + layout()->addWidget(l,2,0); m_pIanaType = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2); + layout()->addMultiCellWidget(m_pIanaType,2,2,1,2); l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this); - tqlayout()->addWidget(l,3,0); + layout()->addWidget(l,3,0); m_pFileMask = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2); + layout()->addMultiCellWidget(m_pFileMask,3,3,1,2); l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this); - tqlayout()->addWidget(l,4,0); + layout()->addWidget(l,4,0); m_pMagicBytes = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); + layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); l = new TQLabel(__tr2qs_ctx("Save path:","options"),this); - tqlayout()->addWidget(l,5,0); + layout()->addWidget(l,5,0); m_pSavePath = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2); + layout()->addMultiCellWidget(m_pSavePath,5,5,1,2); l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this); - tqlayout()->addWidget(l,6,0); + layout()->addWidget(l,6,0); m_pCommandline = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2); + layout()->addMultiCellWidget(m_pCommandline,6,6,1,2); #ifdef COMPILE_INFO_TIPS mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \ "<tt>$0</tt> is used in place of the filename</center>","options")); #endif l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this); - tqlayout()->addWidget(l,7,0); + layout()->addWidget(l,7,0); m_pRemoteExecCommandline = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); + layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); #ifdef COMPILE_INFO_TIPS mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \ "<tt>$0</tt> is used in place of the filename</center>","options")); #endif l = new TQLabel(__tr2qs_ctx("Icon","options"),this); - tqlayout()->addWidget(l,8,0); + layout()->addWidget(l,8,0); m_pIcon = new TQLineEdit(this); - tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2); + layout()->addMultiCellWidget(m_pIcon,8,8,1,2); TQFrame * f = new TQFrame(this); f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine); - tqlayout()->addMultiCellWidget(f,9,9,0,2); + layout()->addMultiCellWidget(f,9,9,0,2); TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this); connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType())); - tqlayout()->addWidget(b,10,1); + layout()->addWidget(b,10,1); m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this); connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType())); - tqlayout()->addWidget(m_pDelete,10,2); + layout()->addWidget(m_pDelete,10,2); - tqlayout()->setColStretch(1,1); - tqlayout()->setColStretch(2,1); - tqlayout()->setRowStretch(0,1); + layout()->setColStretch(1,1); + layout()->setColStretch(2,1); + layout()->setRowStretch(0,1); m_pLastItem = 0; diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 175f119b..faf26954 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -26,7 +26,7 @@ #include "optw_messages.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include "kvi_tal_vbox.h" #include <tqcursor.h> @@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent addRowSpacer(0,4,3,4); - tqlayout()->setRowStretch(4,1); + layout()->setRowStretch(4,1); } KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget() @@ -261,14 +261,14 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy()))); p->drawTiledPixmap(0,0,w,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap(); if(pix) { - TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy()))); p->fillRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground)); p->drawTiledPixmap(0,0,w,height(),*pix,pnt.x(),pnt.y()); } else { @@ -335,7 +335,7 @@ void KviMessageColorListBoxItem::paint(TQPainter * p) clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : TQt::gray; p->fillRect(0,0,width(lb),height(lb),clr); } else { - clr = listBox()->tqcolorGroup().background(); + clr = listBox()->colorGroup().background(); KviTalListBoxText::paint(p); } if(isSelected()) @@ -464,8 +464,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent) it = new KviMessageListViewItem(m_pListView,i); } - tqlayout()->setRowStretch(0,1); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + layout()->setColStretch(0,1); connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *))); connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *))); diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 19a7683d..0fa796c4 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -24,7 +24,7 @@ #include "optw_nickserv.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_tooltip.h" #include "kvi_tal_listview.h" #include <tqlineedit.h> @@ -236,7 +236,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent) { createLayout(3,3); - TQGridLayout * gl = tqlayout(); + TQGridLayout * gl = layout(); KviNickServRuleSet * rs = g_pNickServRuleSet; bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 8688cdc6..4e75c076 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -22,7 +22,7 @@ #include "optw_notify.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_settings.h" #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 5f125101..65bec77f 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -24,7 +24,7 @@ #include "optw_protection.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index f5db3256..aa9cedac 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -104,7 +104,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this); - //TQGridLayout * gl = new TQGridLayout(gbox->tqlayout()); + //TQGridLayout * gl = new TQGridLayout(gbox->layout()); //gl->setMargin(2); //gl->setSpacing(4); @@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) fillProxyList(); - tqlayout()->setRowStretch(0,1); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + layout()->setColStretch(0,1); m_pContextPopup = new KviTalPopupMenu(this); diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index dfaca3bb..a11f0a7d 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -23,7 +23,7 @@ #include "optw_query.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 319f5be8..3706f10c 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -102,7 +102,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * TQLabel * l = new TQLabel(szTmp,this); l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); l->setMargin(10); g->addMultiCellWidget(l,0,0,0,3); l->setMinimumWidth(200); @@ -451,7 +451,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) m_pHeaderLabel = new TQLabel("",this); // the text will be set later m_pHeaderLabel->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); - m_pHeaderLabel->tqsetAlignment(TQt::AlignCenter); + m_pHeaderLabel->setAlignment(TQt::AlignCenter); m_pHeaderLabel->setMargin(10); g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3); m_pHeaderLabel->setMinimumWidth(200); @@ -732,7 +732,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList(); for(KviProxy * p = proxylist->first();p;p = proxylist->next()) { - m_pProxyEditor->insertItem(TQString("%1:%2").tqarg(p->hostname()).tqarg(p->port())); + m_pProxyEditor->insertItem(TQString("%1:%2").arg(p->hostname()).arg(p->port())); } if(m_pProxyEditor->count() > (s->proxy()+2)) m_pProxyEditor->setCurrentItem(s->proxy()+2); @@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) fillServerList(); - tqlayout()->setRowStretch(0,1); - //tqlayout()->setColStretch(1,5); - //tqlayout()->setColStretch(2,2); - tqlayout()->setColStretch(0,1); + layout()->setRowStretch(0,1); + //layout()->setColStretch(1,5); + //layout()->setColStretch(2,2); + layout()->setColStretch(0,1); setMinimumWidth(320); } diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 54135f69..46da0619 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -22,7 +22,7 @@ #include "optw_ssl.h" -#include <tqlayout.h> +#include <layout.h> #include <kvi_tal_groupbox.h> #include "kvi_options.h" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 201766cd..0c85ea7e 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -161,7 +161,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW m_pVerticalAlign->setCurrentItem(0); } - tqlayout()->setRowStretch(1,1); + layout()->setRowStretch(1,1); } diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 495df00a..fc915ed4 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -68,7 +68,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("Automatic detection","options")); m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("en","options")); - TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath()); + TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath()); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); //We Have setted locale, but not restarted kvirc @@ -121,7 +121,7 @@ void KviTextEncodingOptionsWidget::commit() } idx=m_pForcedLocaleCombo->currentItem(); - TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath()); + TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath()); if(idx==0) { if(KviFileUtils::fileExists(szLangFile)) KviFileUtils::removeFile(szLangFile); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 3d6e01bc..b8ae293c 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -27,7 +27,7 @@ #include "kvi_locale.h" #include "kvi_filedialog.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcursor.h> #include "kvi_tal_hbox.h" @@ -37,7 +37,7 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc { m_pIconButton=new TQToolButton(this); m_pBrowseButton=new TQToolButton(this); - m_pBrowseButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum)); + m_pBrowseButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum)); m_pBrowseButton->setText("..."); m_pIcon = icon; m_pPopup = 0; @@ -160,14 +160,14 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent) ++it; } - tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1); + layout()->addMultiCellWidget(m_pTable,0,0,0,1); m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this); - tqlayout()->addWidget(m_pAdd,1,0); + layout()->addWidget(m_pAdd,1,0); connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this); - tqlayout()->addWidget(m_pDel,1,1); + layout()->addWidget(m_pDel,1,1); connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked())); m_pDel->setEnabled(false); diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index a1f3cf00..33347712 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -24,7 +24,7 @@ #include "optw_tools.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_settings.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index ec076dac..904eeaee 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviO addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground); addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground); - tqlayout()->setRowStretch(3, 1); + layout()->setRowStretch(3, 1); } KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index df6fd0ba..f0083c42 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -23,7 +23,7 @@ #include "optw_tray.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_tooltip.h" #include "kvi_options.h" diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 15fe465c..1a7c11ae 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -23,7 +23,7 @@ #include "optw_uparser.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 6e356770..1d712546 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -24,7 +24,7 @@ #include "optw_urlhandlers.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index 9785cf22..a18367dd 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -21,7 +21,7 @@ // #include "optw_userlist.h" -#include <tqlayout.h> +#include <layout.h> #include "kvi_options.h" #include "kvi_locale.h" @@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T - //tqlayout()->setColStretch(0,1); - tqlayout()->setRowStretch(1,1); + //layout()->setColStretch(0,1); + layout()->setRowStretch(1,1); } KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget() diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index db3479e2..45e4bb2d 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -43,7 +43,7 @@ #include <tqmessagebox.h> #include <tqdir.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include "kvi_pointerhashtable.h" @@ -1372,7 +1372,7 @@ TQPixmap * KviPopupEditorWindow::myIconPtr() void KviPopupEditorWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pBase->tqsizeHint().height(); + int hght = m_pBase->sizeHint().height(); m_pEditor->setGeometry(0,0,width(),height()- hght); m_pBase->setGeometry(0,height() - hght,width(),hght); } diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index b710cb40..570c988b 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -38,7 +38,7 @@ #include <tqmessagebox.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_vbox.h" #include "kvi_tal_popupmenu.h" #include <tqtooltip.h> @@ -502,7 +502,7 @@ TQPixmap * KviRawEditorWindow::myIconPtr() void KviRawEditorWindow::resizeEvent(TQResizeEvent *e) { - int hght = m_pBase->tqsizeHint().height(); + int hght = m_pBase->sizeHint().height(); m_pEditor->setGeometry(0,0,width(),height()- hght); m_pBase->setGeometry(0,height() - hght,width(),hght); } diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 648fdfb3..e1c17eb6 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -40,7 +40,7 @@ #include "kvi_stringconversion.h" #include "kvi_options.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #ifdef COMPILE_USE_QT4 #include <tq3header.h> @@ -312,7 +312,7 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog() if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); #else - if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry(); + if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry(); #endif g_pRegisteredUsersDialog = 0; @@ -329,7 +329,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint { KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)it; - TQRect r = m_pListView->tqitemRect(i); + TQRect r = m_pListView->itemRect(i); int daw = m_pListView->columnWidth(0); TQPoint ppp = m_pListView->mapFromGlobal(pnt); diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 646261a1..d9caeb43 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -41,7 +41,7 @@ #include "kvi_stringconversion.h" #include "kvi_options.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqgroupbox.h> #ifdef COMPILE_USE_QT4 @@ -217,7 +217,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m) TQGridLayout * g = new TQGridLayout(this,3,2,4,4); TQLabel * l = new TQLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this); - //l->tqsetAlignment(TQt::AlignCenter); + //l->setAlignment(TQt::AlignCenter); g->addMultiCellWidget(l,0,0,0,1); KviTalHBox * b = new KviTalHBox(this); @@ -225,29 +225,29 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m) m_pNickEdit = new TQLineEdit(b); //m_pNickEdit->setMinimumWidth(120); - m_pNickEdit->tqsetAlignment(TQt::AlignRight); + m_pNickEdit->setAlignment(TQt::AlignRight); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pNickEdit,__tr2qs("<center>This the <b>nickname</b> that will match this user, default value is the registered name.</center>")); #endif l = new TQLabel("<center><b>!</b></center>",b); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); //l->setMinimumWidth(40); m_pUserEdit = new TQLineEdit(b); //m_pUserEdit->setMinimumWidth(120); - m_pUserEdit->tqsetAlignment(TQt::AlignCenter); + m_pUserEdit->setAlignment(TQt::AlignCenter); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pUserEdit,__tr2qs("<center>This the <b>username</b> that will match this user. <b>*</b> will match any username.</center>")); #endif l = new TQLabel("<center><b>@</b></center>",b); - l->tqsetAlignment(TQt::AlignCenter); + l->setAlignment(TQt::AlignCenter); //l->setMinimumWidth(40); m_pHostEdit = new TQLineEdit(b); //m_pHostEdit->setMinimumWidth(120); - m_pHostEdit->tqsetAlignment(TQt::AlignLeft); + m_pHostEdit->setAlignment(TQt::AlignLeft); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pHostEdit,__tr2qs("<center>This the <b>hostname</b> that will match this user. <b>*</b> will match any hostname.</center>")); #endif @@ -460,28 +460,28 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb); connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool))); - TQVBoxLayout * tqlayout = new TQVBoxLayout(gb,20,3); + TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3); m_pIgnoreQuery = new KviStyledCheckBox(__tr2qs("Ignore query-messages"),gb); - tqlayout->addWidget(m_pIgnoreQuery); + layout->addWidget(m_pIgnoreQuery); m_pIgnoreChannel = new KviStyledCheckBox(__tr2qs("Ignore channel-messages"),gb); - tqlayout->addWidget(m_pIgnoreChannel); + layout->addWidget(m_pIgnoreChannel); m_pIgnoreNotice = new KviStyledCheckBox(__tr2qs("Ignore notice-messages"),gb); - tqlayout->addWidget(m_pIgnoreNotice); + layout->addWidget(m_pIgnoreNotice); m_pIgnoreCtcp = new KviStyledCheckBox(__tr2qs("Ignore ctcp-messages"),gb); - tqlayout->addWidget(m_pIgnoreCtcp); + layout->addWidget(m_pIgnoreCtcp); m_pIgnoreInvite = new KviStyledCheckBox(__tr2qs("Ignore invites"),gb); - tqlayout->addWidget(m_pIgnoreInvite); + layout->addWidget(m_pIgnoreInvite); m_pIgnoreDcc = new KviStyledCheckBox(__tr2qs("Ignore DCCs"),gb); - tqlayout->addWidget(m_pIgnoreDcc); + layout->addWidget(m_pIgnoreDcc); TQWidget *w = new TQWidget(vb); - w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); addTab(vb,__tr2qs("Ignore")); diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index e42b3c33..f720a8b8 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -40,7 +40,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqframe.h> @@ -91,7 +91,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pPage1Layout->addWidget(m_pLabel1, 0, 0); m_pEditRealName = new TQLineEdit(m_pPage1); - //m_pEditRealName->tqsetAlignment(int(TQLineEdit::AlignHCenter)); + //m_pEditRealName->setAlignment(int(TQLineEdit::AlignHCenter)); m_pPage1Layout->addWidget(m_pEditRealName,1,0); addPage( m_pPage1,__tr2qs("Step 1: Entry Name")); @@ -120,13 +120,13 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere //KviIrcMask masktempl(szMask.ptr()); m_pNicknameEdit1 = new TQLineEdit(m_pPage2); - m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight); + m_pNicknameEdit1->setAlignment(TQt::AlignRight); if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick()); connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 ); m_pUsernameEdit1 = new TQLineEdit(m_pPage2); - m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter); + m_pUsernameEdit1->setAlignment(TQt::AlignHCenter); if(mask.hasUser())m_pUsernameEdit1->setText(mask.user()); connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2); @@ -137,11 +137,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pPage2Layout->addWidget(m_pHostEdit1,1,4); m_pNicknameEdit2 = new TQLineEdit(m_pPage2); - m_pNicknameEdit2->tqsetAlignment(TQt::AlignRight); + m_pNicknameEdit2->setAlignment(TQt::AlignRight); m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0); m_pUsernameEdit2 = new TQLineEdit(m_pPage2); - m_pUsernameEdit2->tqsetAlignment(TQt::AlignHCenter); + m_pUsernameEdit2->setAlignment(TQt::AlignHCenter); m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2); m_pHostEdit2 = new TQLineEdit(m_pPage2); @@ -149,22 +149,22 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere TextLabel10_2 = new TQLabel(m_pPage2); TextLabel10_2->setText("<center><b>!</b></center>"); - TextLabel10_2->tqsetAlignment(int(TQt::AlignCenter)); + TextLabel10_2->setAlignment(int(TQt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_2,2,1); TextLabel10 = new TQLabel(m_pPage2); TextLabel10->setText("<center><b>!</b></center>"); - TextLabel10->tqsetAlignment(int(TQt::AlignCenter)); + TextLabel10->setAlignment(int(TQt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10,1,1); TextLabel10_3 = new TQLabel(m_pPage2); TextLabel10_3->setText("<center><b>@</b></center>"); - TextLabel10_3->tqsetAlignment(int(TQt::AlignCenter)); + TextLabel10_3->setAlignment(int(TQt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_3,1,3); TextLabel10_3_2 = new TQLabel(m_pPage2); TextLabel10_3_2->setText("<center><b>@</b></center>"); - TextLabel10_3_2->tqsetAlignment(int(TQt::AlignCenter)); + TextLabel10_3_2->setAlignment(int(TQt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_3_2,2,3); addPage(m_pPage2,__tr2qs("Step 2: Mask Selection")); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 858bad64..3af95a42 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -42,8 +42,8 @@ bool g_bFoundMirc; #include <tqdir.h> #include <tqpushbutton.h> #include <tqvalidator.h> -#include <tqtextcodec.h> -#include <tqlayout.h> +#include <textcodec.h> +#include <layout.h> #include "kvi_tal_hbox.h" #ifdef COMPILE_ON_WINDOWS @@ -103,7 +103,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) m_pVBox = new KviTalVBox(this); m_pVBox->setSpacing(4); m_pVBox->setMargin(0); - //m_pVBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding)); + //m_pVBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding)); //m_pVBox->setBackgroundColor(TQColor(0,80,0)); //m_pVBox->setMaximumHeight(450); g->addWidget(m_pVBox,0,1); @@ -111,7 +111,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) g->setColStretch(1,1); TQLabel * l = new TQLabel(m_pVBox); - l->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); + l->setAlignment(TQt::AlignAuto | TQt::AlignTop); /* TQString szHeader = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" style=\"margin:0px;padding:0px;\" width=\"100%\"><tr><td bgcolor=\"#303030\">" \ "<h1><font color=\"#FFFFFF\">KVIrc " KVI_VERSION "</font></h1>" \ @@ -120,7 +120,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) TQString szHeader = "<h1><font color=\"#FFFFFF\"> KVIrc " KVI_VERSION "</font></h1>"; l->setText(szHeader); l->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); - l->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); + l->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); l->setMargin(0); l->setBackgroundColor(TQColor(48,48,48)); @@ -128,7 +128,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) #ifdef COMPILE_USE_QT4 m_pTextLabel->setWordWrap(true); #endif - m_pTextLabel->tqsetAlignment(TQt::AlignJustify | TQt::AlignTop); + m_pTextLabel->setAlignment(TQt::AlignJustify | TQt::AlignTop); m_pVBox->setStretchFactor(m_pTextLabel,1); } @@ -673,7 +673,7 @@ void KviSetupWizard::showEvent(TQShowEvent *e) if(ww < 770)ww = 770; } - //wh = tqsizeHint().height(); + //wh = sizeHint().height(); setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh); @@ -736,7 +736,7 @@ void KviSetupWizard::chooseOldDataPath() __tr2qs("Do not overwrite folder? - KVIrc"), tqtr("A folder %1 seems to be not a valid KVIrc settings folder." "Do you want to use it anyway?") - .tqarg( szBuffer ), + .arg( szBuffer ), __tr2qs("&Yes"), __tr2qs("&No"), TQString(), 0, 1 ) == 0 ) { @@ -1005,7 +1005,7 @@ void KviSetupWizard::accept() #ifndef COMPILE_ON_WINDOWS // Make local->global link - TQString localPath = TQString("%1/global").tqarg(g_pApp->m_szLocalKvircDir); + TQString localPath = TQString("%1/global").arg(g_pApp->m_szLocalKvircDir); unlink(TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 157e3757..564d8392 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -44,7 +44,7 @@ #include <tqsplitter.h> #include "kvi_tal_hbox.h" #include "kvi_tal_vbox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqmessagebox.h> #include <tqfileinfo.h> @@ -115,7 +115,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile * m_pExpireDateTimeEdit->setEnabled(f->expires()); } else { m_pExpireCheckBox->setChecked(false); - m_pExpireDateTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime()); + m_pExpireDateTimeEdit->setDateTime(TQDateTime::currentDateTime()); m_pExpireDateTimeEdit->setEnabled(false); } @@ -151,7 +151,7 @@ void KviSharedFileEditDialog::okClicked() TQString szPath = m_pFilePathEdit->text(); TQDateTime dt = m_pExpireDateTimeEdit->dateTime(); bool bExpires = m_pExpireCheckBox->isChecked(); - if(bExpires && (dt <= TQDateTime::tqcurrentDateTime())) + if(bExpires && (dt <= TQDateTime::currentDateTime())) { TQMessageBox::warning(this,__tr2qs_ctx("Invalid expire time","sharedfileswindow"), __tr2qs_ctx("The expire date/time is in the past: please either remove the \"expires\"" \ @@ -336,7 +336,7 @@ void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const TQPoint &pnt KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->itemAt(pnt); if(!it)return; TQString txt = it->transfer()->tipText(); - tip->tip(m_pListView->tqitemRect(it),txt); + tip->tip(m_pListView->itemRect(it),txt); } */ @@ -411,7 +411,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi if(fi.exists()) { tmp += "<nobr>"; - tmp += __tr2qs_ctx("Size: %1 bytes","filetransferwindow").tqarg(fi.size()); + tmp += __tr2qs_ctx("Size: %1 bytes","filetransferwindow").arg(fi.size()); tmp += "</nobr><br>"; } @@ -592,10 +592,10 @@ void KviSharedFilesWindow::copyLocalFileToClipboard() if(!t)return; TQString tmp = t->localFileName(); if(tmp.isEmpty())return; - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setText(tmp); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setText(tmp); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setText(tmp); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setText(tmp); } void KviSharedFilesWindow::openLocalFileFolder() @@ -679,9 +679,9 @@ void KviSharedFilesWindow::resizeEvent(TQResizeEvent *e) //m_pInput->setGeometry(0,height() - h,width(),h); } -TQSize KviSharedFilesWindow::tqsizeHint() const +TQSize KviSharedFilesWindow::sizeHint() const { - return m_pSplitter->tqsizeHint(); + return m_pSplitter->sizeHint(); } void KviSharedFilesWindow::fillCaptionBuffers() diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h index 4832dc88..2f7f0278 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.h +++ b/src/modules/sharedfileswindow/sharedfileswindow.h @@ -102,7 +102,7 @@ protected: virtual void resizeEvent(TQResizeEvent *e); virtual void getBaseLogFileName(KviStr &buffer); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected slots: void fillFileView(); void sharedFileAdded(KviSharedFile * f); diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 6ab0154b..a5ee44e4 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -67,9 +67,9 @@ void KviSocketSpyWindow::resizeEvent(TQResizeEvent *e) m_pSplitter->setGeometry(0,0,width(),height()); } -TQSize KviSocketSpyWindow::tqsizeHint() const +TQSize KviSocketSpyWindow::sizeHint() const { - return m_pIrcView->tqsizeHint(); + return m_pIrcView->sizeHint(); } void KviSocketSpyWindow::getBaseLogFileName(KviStr &buffer) diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h index b210ce0b..7c2e9249 100644 --- a/src/modules/socketspy/socketspywindow.h +++ b/src/modules/socketspy/socketspywindow.h @@ -42,7 +42,7 @@ protected: virtual void getBaseLogFileName(KviStr &buffer); virtual void applyOptions(); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void incomingMessage(const char * message); // message is NOT null terminated! For proxy connections it might spit out binary data! virtual void outgoingMessage(const char * message,int len); diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index a98c8b24..8683326a 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -28,7 +28,7 @@ #include <tqtimer.h> #include <tqstringlist.h> -#include <tqclipboard.h> +#include <clipboard.h> extern KviPointerList<SPasteController> * g_pControllerList; diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index d22fbb70..d2293f65 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -35,7 +35,7 @@ #include "kvi_out.h" #include <tqfile.h> -#include <tqclipboard.h> +#include <clipboard.h> #ifndef COMPILE_ON_WINDOWS #include <unistd.h> diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index de2236c1..b6643d0f 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -35,7 +35,7 @@ #include "kvi_kvs_arraycast.h" #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #ifdef COMPILE_SSL_SUPPORT #include <openssl/evp.h> @@ -102,7 +102,7 @@ static bool str_kvs_fnc_fromclipboard(KviKvsModuleFunctionCall * c) TQString szString; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_END(c) - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); szString = cb->text(TQClipboard::Clipboard); c->returnValue()->setString(szString); return true; @@ -132,7 +132,7 @@ static bool str_kvs_cmd_toClipboard(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETERS_END(c) - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(szValue, TQClipboard::Clipboard ); return true; } @@ -1360,17 +1360,17 @@ static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c) int len = szString.length(); while (idx<len) { - TQChar szTmp = szString[idx].tqunicode(); + TQChar szTmp = szString[idx].unicode(); while (szTmp.isSpace()) { idx++; - szTmp = szString[idx].tqunicode(); + szTmp = szString[idx].unicode(); } begin = idx; while (idx<len && !szTmp.isSpace()) { idx++; - szTmp = szString[idx].tqunicode(); + szTmp = szString[idx].unicode(); } if (iOccurence == (kvs_int_t)cnt) { @@ -1433,18 +1433,18 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c) int len = szString.length(); while (idx<len) { - TQChar szTmp = szString[idx].tqunicode(); + TQChar szTmp = szString[idx].unicode(); // while (szTmp==sep) while (sep.contains(szTmp)) { idx++; - szTmp = szString[idx].tqunicode(); + szTmp = szString[idx].unicode(); } begin = idx; while (idx<len && !sep.contains(szTmp)) { idx++; - szTmp = szString[idx].tqunicode(); + szTmp = szString[idx].unicode(); } if (n == cnt) { @@ -1489,13 +1489,13 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c) { while(idx < len) { - sum += szString[idx].lower().tqunicode(); + sum += szString[idx].lower().unicode(); idx++; } } else { while(idx < len) { - sum += szString[idx].tqunicode(); + sum += szString[idx].unicode(); idx++; } } @@ -1963,7 +1963,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) if(fmt) { TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize); - //TQChar * p = (TQChar *)s.tqunicode(); + //TQChar * p = (TQChar *)s.unicode(); //9999999999999999999999999999999\0 char numberBuffer[1024]; @@ -1993,12 +1993,12 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) pVar = vArgs.first(); - for(; fmt->tqunicode() ; ++fmt) + for(; fmt->unicode() ; ++fmt) { if(reallen == allocsize)INCREMENT_MEM //copy up to a '?' - if(fmt->tqunicode() != '?') + if(fmt->unicode() != '?') { *p++ = *fmt; reallen++; @@ -2006,7 +2006,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) } ++fmt; //skip this '?' - switch(fmt->tqunicode()) + switch(fmt->unicode()) { case 's': { @@ -2015,7 +2015,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) if(sz.isEmpty())continue; int len = sz.length(); if((allocsize - reallen) < len)INCREMENT_MEM_BY(len) - const TQChar * ch = sz.tqunicode(); + const TQChar * ch = sz.unicode(); while(len--)*p++ = *ch++; reallen += sz.length(); pVar = vArgs.next(); @@ -2149,7 +2149,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) } case '?': { - if(fmt->tqunicode()) + if(fmt->unicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; @@ -2171,15 +2171,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) int idx = 2; - while((fmt->tqunicode() >= '0') && (fmt->tqunicode() <= '9') && (idx < 6)) + while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6)) { uPrecision *= 10; - fmtbuffer[idx] = fmt->tqunicode(); + fmtbuffer[idx] = fmt->unicode(); uPrecision += fmtbuffer[idx] - '0'; fmt++; idx++; } - fmtbuffer[idx] = fmt->tqunicode(); + fmtbuffer[idx] = fmt->unicode(); fmtbuffer[idx+1] = 0; if(pVar) @@ -2193,7 +2193,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Missing argument for a floating point escape sequence, 0.0 assumed")); argRValue = 0; } - switch(fmt->tqunicode()) + switch(fmt->unicode()) { case 'e': case 'E': @@ -2212,7 +2212,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) fmt = save; *p++ = '?'; //write it reallen++; - if(fmt->tqunicode()) + if(fmt->unicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; @@ -2228,7 +2228,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) { *p++ = '?'; //write it reallen++; - if(fmt->tqunicode()) + if(fmt->unicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index df684023..13e170a2 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -35,7 +35,7 @@ #include "kvi_osinfo.h" #include "kvi_qcstring.h" -#include <tqclipboard.h> +#include <clipboard.h> #ifndef COMPILE_ON_WINDOWS #include <sys/utsname.h> @@ -240,7 +240,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c) { - c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Clipboard)); + c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Clipboard)); return true; } @@ -275,7 +275,7 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETERS_END(c) - g_pApp->tqclipboard()->setText(szValue,TQClipboard::Clipboard); + g_pApp->clipboard()->setText(szValue,TQClipboard::Clipboard); return true; } @@ -307,7 +307,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETERS_END(c) - g_pApp->tqclipboard()->setText(szValue,TQClipboard::Selection); + g_pApp->clipboard()->setText(szValue,TQClipboard::Selection); return true; } @@ -337,7 +337,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c) static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c) { - c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Selection)); + c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Selection)); return true; } diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index d2618463..8b581c20 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -117,7 +117,7 @@ void KviTermWidget::resizeEvent(TQResizeEvent *e) int hght = 0; if(m_bIsStandalone) { - hght = m_pCloseButton->tqsizeHint().height(); + hght = m_pCloseButton->sizeHint().height(); m_pHBox->setGeometry(1,1,width() - 2,hght + 1); } @@ -157,18 +157,18 @@ void KviTermWidget::changeColumns(int) { } -TQSize KviTermWidget::tqsizeHint() const +TQSize KviTermWidget::sizeHint() const { int hght = 0; int wdth = 0; if(m_pKonsoleWidget) { - hght += m_pKonsoleWidget->tqsizeHint().height(); - wdth = m_pKonsoleWidget->tqsizeHint().width(); + hght += m_pKonsoleWidget->sizeHint().height(); + wdth = m_pKonsoleWidget->sizeHint().width(); } if(m_pCloseButton) { - hght += m_pCloseButton->tqsizeHint().height(); + hght += m_pCloseButton->sizeHint().height(); } return TQSize(wdth + 2,hght + 2); diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h index 75739677..eb798364 100644 --- a/src/modules/term/termwidget.h +++ b/src/modules/term/termwidget.h @@ -60,7 +60,7 @@ protected slots: void changeColumns(int); public: TQWidget * konsoleWidget(){ return m_pKonsoleWidget ? m_pKonsoleWidget : this; }; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; int dummy() const { return 0; }; protected slots: void konsoleDestroyed(); diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp index 700328fc..0610a600 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -60,9 +60,9 @@ void KviTermWindow::resizeEvent(TQResizeEvent *e) if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height()); } -TQSize KviTermWindow::tqsizeHint() const +TQSize KviTermWindow::sizeHint() const { - return m_pTermWidget ? m_pTermWidget->tqsizeHint() : KviWindow::tqsizeHint(); + return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint(); } void KviTermWindow::fillCaptionBuffers() diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h index 340e7439..1ac5a127 100644 --- a/src/modules/term/termwindow.h +++ b/src/modules/term/termwindow.h @@ -46,7 +46,7 @@ protected: virtual void fillCaptionBuffers(); virtual void resizeEvent(TQResizeEvent *e); public: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 816917a5..c567c56f 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -37,7 +37,7 @@ #include "kvi_msgbox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include "kvi_tal_listbox.h" #include <tqlineedit.h> @@ -128,7 +128,7 @@ void KviThemeListBoxItem::paint(TQPainter * p) int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING; int www = p->window().width() - (afterIcon + LVI_BORDER); m_pText->setWidth(www); - m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->tqcolorGroup()); + m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->colorGroup()); } int KviThemeListBoxItem::height(const KviTalListBox * lb) const @@ -198,7 +198,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent) connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreThemes())); TQWidget *w= new TQWidget(hb); - w->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum); + w->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum); m_pListBox = new KviTalListBox(this); m_pListBox->setMinimumHeight(400); @@ -455,5 +455,5 @@ void KviThemeManagementDialog::tipRequest(KviDynamicToolTip *pTip,const TQPoint 0 ); - pTip->tip(m_pListBox->tqitemRect(it),szThemeDescription); + pTip->tip(m_pListBox->itemRect(it),szThemeDescription); } diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index d29c6322..6c40603b 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -25,7 +25,7 @@ #include "packthemedialog.h" #include "themefunctions.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqregexp.h> @@ -271,7 +271,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem m_pImageLabel = new TQLabel(pPage); m_pImageLabel->setFrameStyle(TQFrame::Sunken | TQFrame::Panel); m_pImageLabel->setMinimumSize(300,225); - m_pImageLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter); + m_pImageLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter); pLayout->addWidget(m_pImageLabel,1,0); TQString szFilter = "*.png *.jpg *.xpm"; @@ -293,7 +293,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem pLayout = new TQGridLayout(pPage,4,1,4,4); pLabel = new TQLabel(pPage); - pLabel->setText(__tr2qs_ctx("Here you must choose the file name for the theme package. It should have a *.%1 extension.","theme").tqarg(KVI_FILEEXTENSION_THEMEPACKAGE)); + pLabel->setText(__tr2qs_ctx("Here you must choose the file name for the theme package. It should have a *.%1 extension.","theme").arg(KVI_FILEEXTENSION_THEMEPACKAGE)); pLabel->setTextFormat(TQt::RichText); pLayout->addWidget(pLabel,0,0); @@ -393,7 +393,7 @@ bool KviPackThemeDialog::packTheme() KviPackageWriter f; - TQString szTmp = TQDateTime::tqcurrentDateTime().toString(); + TQString szTmp = TQDateTime::currentDateTime().toString(); f.addInfoField("PackageType","ThemePack"); f.addInfoField("ThemePackVersion","1"); diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index a38f33e2..97352393 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -25,7 +25,7 @@ #include "savethemedialog.h" #include "themefunctions.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqregexp.h> @@ -158,7 +158,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(TQWidget * pParent) m_pImageLabel = new TQLabel(pPage); m_pImageLabel->setFrameStyle(TQFrame::Sunken | TQFrame::Panel); m_pImageLabel->setMinimumSize(300,225); - m_pImageLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter); + m_pImageLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter); pLayout->addWidget(m_pImageLabel,1,0); TQString szFilter = "*.png *.jpg *.xpm"; @@ -247,7 +247,7 @@ bool KviSaveThemeDialog::saveTheme() sto.setAuthor(m_pAuthorNameEdit->text()); sto.setDescription(m_pThemeDescriptionEdit->text()); - sto.setDate(TQDateTime::tqcurrentDateTime().toString()); + sto.setDate(TQDateTime::currentDateTime().toString()); sto.setVersion(m_pThemeVersionEdit->text()); sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 9fa3cc76..52b43650 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -44,7 +44,7 @@ #endif #include <tqfont.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqpainter.h> KviTipWindow * g_pTipWindow = 0; @@ -99,7 +99,7 @@ void KviTipFrame::drawContents(TQPainter *p) TQRegion reg(0,0,1000,20000); - doc.draw(p,70,10,reg,tqcolorGroup()); + doc.draw(p,70,10,reg,colorGroup()); } KviTipWindow::KviTipWindow() diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index 34b06899..89155af1 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -37,7 +37,7 @@ #include "kvi_draganddrop.h" #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqtooltip.h> @@ -61,7 +61,7 @@ KviTrashcanLabel::KviTrashcanLabel(TQWidget * p) TQToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them")); setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel); setAcceptDrops(true); - tqsetAlignment(TQt::AlignCenter); + setAlignment(TQt::AlignCenter); setMinimumSize(40,40); m_uFlashCount = 0; m_pFlashTimer = 0; @@ -371,7 +371,7 @@ void KviCustomizeToolBarsDialog::deleteToolBar() if(!t)return; if(TQMessageBox::question(this, __tr2qs("Confirm ToolBar Deletion"), - __tr2qs("Do you really want to delete toolbar \"%1\" ?").tqarg(t->label()), + __tr2qs("Do you really want to delete toolbar \"%1\" ?").arg(t->label()), __tr2qs("No"), __tr2qs("Yes")) == 0)return; KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id()); @@ -462,7 +462,7 @@ void KviCustomizeToolBarsDialog::renameToolBar() if(!t)return; KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this, - __tr2qs("Please specify the properties for the toolbar \"%1\"").tqarg(t->label()), + __tr2qs("Please specify the properties for the toolbar \"%1\"").arg(t->label()), t->descriptor()->id(), t->descriptor()->labelCode(), t->descriptor()->iconId()); diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 45b32dba..e8b6528b 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -39,12 +39,12 @@ void KviTorrentStatusBarApplet::selfRegister(KviStatusBar *bar) TQString formatSize(float sz) { if (sz >= 1024.0f*1024.0f*1024.0f) - return TQString("%1 GB").tqarg(sz / (1024.0f*1024.0f*1024.0f), 2, 'f', 2); + return TQString("%1 GB").arg(sz / (1024.0f*1024.0f*1024.0f), 2, 'f', 2); if (sz >= 1024.0f*1024.0f) - return TQString("%1 MB").tqarg(sz / (1024.0f*1024.0f), 2, 'f', 2); + return TQString("%1 MB").arg(sz / (1024.0f*1024.0f), 2, 'f', 2); if (sz >= 1024.0f) - return TQString("%1 KB").tqarg(sz / 1024.0f, 2, 'f', 2); - return TQString("%1 B").tqarg(sz, 2, 'f', 2); + return TQString("%1 KB").arg(sz / 1024.0f, 2, 'f', 2); + return TQString("%1 B").arg(sz, 2, 'f', 2); } void KviTorrentStatusBarApplet::update() @@ -52,10 +52,10 @@ void KviTorrentStatusBarApplet::update() if (KviTorrentInterface::selected()) { TQString msg = TQString("up: %1 K/s (%2), dn: %3 K/s (%4)") - .tqarg(KviTorrentInterface::selected()->speedUp(), 2) - .tqarg(formatSize(KviTorrentInterface::selected()->trafficUp())) - .tqarg(KviTorrentInterface::selected()->speedDown(), 2) - .tqarg(formatSize(KviTorrentInterface::selected()->trafficDown())); + .arg(KviTorrentInterface::selected()->speedUp(), 2) + .arg(formatSize(KviTorrentInterface::selected()->trafficUp())) + .arg(KviTorrentInterface::selected()->speedDown(), 2) + .arg(formatSize(KviTorrentInterface::selected()->trafficDown())); setText(msg); diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 4bb76752..c0e647cd 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -285,7 +285,7 @@ void UrlDialog::popup(KviTalListViewItem *item, const TQPoint &point, int col) void UrlDialog::sayToWin(int itemID) { KviWindow *wnd = g_pApp->findWindowByCaption(m_pListPopup->text(itemID).utf8().data()); - TQString say=TQString("PRIVMSG %1 %2").tqarg(wnd->windowName()).tqarg(m_szUrl.ptr()); + TQString say=TQString("PRIVMSG %1 %2").arg(wnd->windowName()).arg(m_szUrl.ptr()); if (wnd) { KviKvsScript::run(say,wnd); wnd->raise(); @@ -753,7 +753,7 @@ bool urllist_module_event_onUrl(KviKvsModuleEventCall * c) KviUrl *tmp = new KviUrl; KviStr tmpTimestamp; - TQDate d = TQDate::tqcurrentDate(); + TQDate d = TQDate::currentDate(); KviStr date(KviStr::Format,"%d-%d%d-%d%d",d.year(),d.month() / 10,d.month() % 10,d.day() / 10,d.day() % 10); tmpTimestamp = "["+date+"]"+" ["; tmpTimestamp += TQTime::currentTime().toString()+"]"; diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index 79d8d2a1..2fa906d4 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -22,7 +22,7 @@ #include <tqdialog.h> -#include <tqlayout.h> +#include <layout.h> #include "kvi_tal_listview.h" #include <tqstring.h> #include <tqpushbutton.h> @@ -30,7 +30,7 @@ #ifdef COMPILE_USE_QT4 #include <tq3textstream.h> #else - #include <tqtextstream.h> + #include <textstream.h> #endif #include <tqcheckbox.h> #include "kvi_tal_listbox.h" diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 7c83051e..3624402d 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1499,7 +1499,7 @@ static bool window_module_init(KviModule *m) // saveOutput (view()->saveBuffer()) /* - m->registerFunction("geometry",window_module_fnc_tqgeometry); + m->registerFunction("geometry",window_module_fnc_geometry); m->registerCommand("setGeometry",window_module_cmd_setGeometry); m->registerFunction("isActive",window_module_fnc_isActive); |