From 32a249baaef1b910bffd79734c78cac3671f00f2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:14:01 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/modules/about/aboutdialog.cpp | 4 +-- src/modules/actioneditor/actioneditor.cpp | 2 +- src/modules/addon/managementdialog.cpp | 2 +- src/modules/aliaseditor/aliaseditor.cpp | 2 +- src/modules/clock/libkviclock.cpp | 2 +- src/modules/clock/libkviclock.h | 2 +- src/modules/dcc/broker.cpp | 4 +-- src/modules/dcc/canvas.cpp | 8 +++--- src/modules/dcc/canvas.h | 2 +- src/modules/dcc/canvaswidget.cpp | 4 +-- src/modules/dcc/chat.cpp | 8 +++--- src/modules/dcc/chat.h | 2 +- src/modules/dcc/libkvidcc.cpp | 14 +++++----- src/modules/dcc/send.cpp | 24 ++++++++--------- src/modules/dcc/send.h | 4 +-- src/modules/dcc/voice.cpp | 10 ++++---- src/modules/dcc/voice.h | 2 +- src/modules/dialog/libkvidialog.cpp | 2 +- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 4 +-- src/modules/dockwidget/libkvidockwidget_qt4.cpp | 2 +- src/modules/editor/scripteditor.cpp | 2 +- src/modules/eventeditor/eventeditor.cpp | 2 +- .../filetransferwindow/filetransferwindow.cpp | 6 ++--- .../filetransferwindow/filetransferwindow.h | 2 +- src/modules/help/helpwidget.cpp | 10 ++++---- src/modules/help/helpwidget.h | 2 +- src/modules/help/helpwindow.cpp | 4 +-- src/modules/help/helpwindow.h | 2 +- src/modules/http/httpfiletransfer.cpp | 16 ++++++------ src/modules/http/httpfiletransfer.h | 4 +-- src/modules/iograph/libkviiograph.cpp | 2 +- src/modules/iograph/libkviiograph.h | 2 +- src/modules/links/linkswindow.cpp | 8 +++--- src/modules/links/linkswindow.h | 2 +- src/modules/list/listwindow.cpp | 8 +++--- src/modules/list/listwindow.h | 2 +- src/modules/logview/logviewmdiwindow.cpp | 10 ++++---- src/modules/logview/logviewmdiwindow.h | 2 +- src/modules/mediaplayer/libkvimediaplayer.cpp | 4 +-- src/modules/mediaplayer/mp_amarokinterface.cpp | 2 +- src/modules/mediaplayer/mp_amarokinterface.h | 2 +- src/modules/mediaplayer/mp_amipinterface.cpp | 2 +- src/modules/mediaplayer/mp_amipinterface.h | 2 +- src/modules/mediaplayer/mp_interface.cpp | 16 ++++++------ src/modules/mediaplayer/mp_interface.h | 4 +-- src/modules/mediaplayer/mp_jukinterface.cpp | 2 +- src/modules/mediaplayer/mp_jukinterface.h | 2 +- src/modules/mediaplayer/mp_winampinterface.cpp | 2 +- src/modules/mediaplayer/mp_winampinterface.h | 2 +- src/modules/mediaplayer/mp_xmmsinterface.cpp | 2 +- src/modules/mediaplayer/mp_xmmsinterface.h | 2 +- src/modules/my/idle.cpp | 10 ++++---- src/modules/my/idle_mac.cpp | 6 ++--- src/modules/notifier/notifierwindow.cpp | 2 +- src/modules/objects/class_groupbox.cpp | 10 ++++---- src/modules/objects/class_label.cpp | 10 ++++---- src/modules/objects/class_layout.cpp | 4 +-- src/modules/objects/class_listbox.cpp | 8 +++--- src/modules/objects/class_listbox.h | 2 +- src/modules/objects/class_multilineedit.cpp | 14 +++++----- src/modules/objects/class_multilineedit.h | 2 +- src/modules/objects/class_popupmenu.cpp | 2 +- src/modules/objects/class_socket.cpp | 30 +++++++++++----------- src/modules/objects/class_socket.h | 8 +++--- src/modules/objects/class_urllabel.cpp | 2 +- src/modules/objects/class_widget.cpp | 6 ++--- src/modules/objects/class_widget.h | 2 +- src/modules/objects/class_wrapper.cpp | 4 +-- src/modules/objects/libkviobjects.cpp | 4 +-- src/modules/options/container.cpp | 2 +- src/modules/options/dialog.cpp | 2 +- src/modules/options/optw_messages.cpp | 6 ++--- src/modules/options/optw_servers.cpp | 4 +-- src/modules/options/optw_texticons.cpp | 2 +- src/modules/popupeditor/popupeditor.cpp | 2 +- src/modules/raweditor/raweditor.cpp | 2 +- src/modules/reguser/dialog.cpp | 2 +- src/modules/reguser/edituser.cpp | 14 +++++----- src/modules/reguser/wizard.cpp | 18 ++++++------- src/modules/setup/setupwizard.cpp | 10 ++++---- .../sharedfileswindow/sharedfileswindow.cpp | 10 ++++---- src/modules/sharedfileswindow/sharedfileswindow.h | 2 +- src/modules/socketspy/socketspywindow.cpp | 4 +-- src/modules/socketspy/socketspywindow.h | 2 +- src/modules/term/termwidget.cpp | 10 ++++---- src/modules/term/termwidget.h | 2 +- src/modules/term/termwindow.cpp | 4 +-- src/modules/term/termwindow.h | 2 +- src/modules/theme/managementdialog.cpp | 6 ++--- src/modules/theme/packthemedialog.cpp | 4 +-- src/modules/theme/savethemedialog.cpp | 4 +-- src/modules/tip/libkvitip.cpp | 2 +- src/modules/toolbareditor/toolbareditor.cpp | 2 +- src/modules/url/libkviurl.cpp | 2 +- 94 files changed, 240 insertions(+), 240 deletions(-) (limited to 'src/modules') diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 47f18adb..52651e26 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -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/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 5957d901..a0ac665d 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -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/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 24c539f2..8b08c542 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -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); diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index e7bd5d75..0f1201e5 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -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/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/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 4110c213..f4728172 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); 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..47bacf5b 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -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..660191fe 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -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/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index ce6949f2..56f28b3d 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -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: - $dcc.transfertqStatus - $dcc.transfertqStatus() + $dcc.transferStatus + $dcc.transferStatus() @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/send.cpp b/src/modules/dcc/send.cpp index a7485ca2..969a54aa 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -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); @@ -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; @@ -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; @@ -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); @@ -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()); 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..40804790 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -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..6978ce0c 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)); @@ -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..d1f4efff 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -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..525acfd8 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -1128,7 +1128,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co 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 diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index fc7a4d47..3a6b6b24 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -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/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index f6068378..3fcf59de 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -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() @@ -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..c0f7f1c3 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -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,11 +128,11 @@ 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; } diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 9e2c1c49..48019e7b 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.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/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 789b7a1b..cfe90879 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; @@ -406,7 +406,7 @@ void KviHttpFileTransfer::receivedResponse(const TQString &response) m_lHeaders.append(response); m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").tqarg(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(KviPointerHashTablestart(); } 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..51ebce12 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; } 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..acc6fd10 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -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..bab0a964 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -130,7 +130,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab); m_pFromDateEdit = new TQDateEdit(m_pSearchTab); - m_pFromDateEdit->setDate(TQDate::tqcurrentDate()); + m_pFromDateEdit->setDate(TQDate::currentDate()); tqlayout->addWidget(m_pEnableFromFilter,8,0); tqlayout->addWidget(m_pFromDateEdit,8,1); connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool))); @@ -138,7 +138,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab); m_pToDateEdit = new TQDateEdit(m_pSearchTab); - m_pToDateEdit->setDate(TQDate::tqcurrentDate()); + m_pToDateEdit->setDate(TQDate::currentDate()); tqlayout->addWidget(m_pEnableToFilter,9,0); tqlayout->addWidget(m_pToDateEdit,9,1); connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool))); @@ -149,7 +149,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra tqlayout->addWidget(pb,10,1); TQWidget *w = new TQWidget(m_pSearchTab); - w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); tqlayout->addWidget(w,11,1); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); @@ -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; } 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/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..29fc347b 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -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..283f551c 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -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_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 6bc3e24b..7820dbbf 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -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/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 // 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..3a7568bd 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; diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 07f73bea..d0ecae08 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 , $tqalignment and in $setOrientation & $orientation const char * const align_tbl[] = { "Left", @@ -91,7 +91,7 @@ const int align_cod[] = { Adds an empty cell at the next free position. !fn: $tqalignment() Returns the tqalignment of the group box title. - !fn: $tqsetAlignment() + !fn: $setAlignment() Set the tqalignment of the groupbox; Valid values are Left,Right,HCenter. !fn: $setOrientation Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical. @@ -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] @@ -166,7 +166,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget") 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,"setAlignment", functionSetAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setOrientation", functionSetOrientation) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"isChecked", functionIsChecked) KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setChecked", functionSetChecked) @@ -317,7 +317,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c) { if(KviTQString::equalCI(szAlign, align_tbl[i])) { - ((KviTalGroupBox *)widget())->tqsetAlignment(align_cod[i]); + ((KviTalGroupBox *)widget())->setAlignment(align_cod[i]); return true; } } diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index ce2c5365..580f93b9 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 & $tqalignment const char * const align_tbl[] = { "Left", "Right", @@ -149,9 +149,9 @@ const int frame_cod[] = { 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 + See [classfnc]$setAlignment[/classfnc]() for explanation of all tqalignment flags. - !fn: $tqsetAlignment(, , ...) + !fn: $setAlignment(, , ...) This function sets tqalignment flags, given as parameters, for this label. Valid flags are: [pre] @@ -217,7 +217,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget") 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,"setAlignment", functionSetAlignment) KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear) KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle) KVSO_REGISTER_HANDLER(KviKvsObject_label,"setFrameStyle", functionSetFrameStyle) @@ -321,7 +321,7 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it)); } - ((TQLabel *)widget())->tqsetAlignment(sum); + ((TQLabel *)widget())->setAlignment(sum); return true; } bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index b2842a8c..43814169 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -83,8 +83,8 @@ Sets the resize mode of the parent widget in relation to this tqlayout. 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] + -Fixed: the parent widget of this tqlayout 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 tqlayout is set to minimumSize() and it cannot be smaller[br] -FreeResize: the parent widget of this tqlayout is not constrained at all[br] */ 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: $onItemEvent() This function is called by KVIrc when the current item pointed by the mouse changes and gives in $0 the item index. - !fn: $tqitemRect() + !fn: $itemRect() 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_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index a4beed49..70d5086c 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -226,7 +226,7 @@ static int mod_cod[] = { Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE). !fn: $isRedoAvailable () Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE). - !fn: $tqsetAlignment() + !fn: $setAlignment() Sets the tqalignment of the current paragraph to . Valid values are:[br] - AlignAuto - Aligns according to the language.[br] - TQt::AlignLeft - Aligns with the left edge.[br] @@ -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,7 +1090,7 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c) +bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c) { TQString szAlignment; @@ -1099,13 +1099,13 @@ bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c) 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); + ((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignJustify); else c->warning(__tr2qs("Unknown tqalignment '%Q'"),&szAlignment); 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_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 394c39a6..8f1afd74 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -110,7 +110,7 @@ #we create the label widget wich will be used as popup's title[br] $$->%Popuptitle=$new(label)[br] $$->%Popuptitle->$settext("Windows Options")[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_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_urllabel.cpp b/src/modules/objects/class_urllabel.cpp index 8b989236..639b3112 100644 --- a/src/modules/objects/class_urllabel.cpp +++ b/src/modules/objects/class_urllabel.cpp @@ -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_widget.cpp b/src/modules/objects/class_widget.cpp index 4ff98d6e..fec39257 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -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) @@ -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())); diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index 807d50ab..edbe6102 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -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_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index ca1333f9..928ddaf7 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -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;idxtqtopLevelWidgets(); + 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..3a939ff8 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -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 = ">"; diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index c0b7bf8a..a11dfaa5 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -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..107c597d 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -69,7 +69,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif - l->tqsetAlignment(TQt::AlignTop); + l->setAlignment(TQt::AlignTop); tqlayout()->addWidget(l,0,0); } diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 175f119b..568499a9 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -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()) diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 319f5be8..309344cc 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); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 3d6e01bc..7f861823 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -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; diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index db3479e2..dd1cf24a 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -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..123675b6 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -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..59fc7325 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -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..9fb7f612 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -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.
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("
This the nickname that will match this user, default value is the registered name.
")); #endif l = new TQLabel("
!
",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("
This the username that will match this user. * will match any username.
")); #endif l = new TQLabel("
@
",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("
This the hostname that will match this user. * will match any hostname.
")); #endif @@ -481,7 +481,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist tqlayout->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..d93fcf61 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -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("
!
"); - 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("
!
"); - 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("
@
"); - 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("
@
"); - 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..b0c72cf1 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -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 = "
" \ "

KVIrc " KVI_VERSION "

" \ @@ -120,7 +120,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) TQString szHeader = "

 KVIrc " KVI_VERSION "

"; 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); diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 157e3757..c8aa9e40 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -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); } */ @@ -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/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..839f0f74 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -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..6f2e24c3 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -271,7 +271,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerListsetFrameStyle(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"; @@ -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..b6a93a0d 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -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..bcf2403f 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -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..927fbf70 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -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; diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 4bb76752..b3edd194 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -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()+"]"; -- cgit v1.2.1