diff options
Diffstat (limited to 'src/kvirc/ui')
104 files changed, 5796 insertions, 5821 deletions
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index a4659141..bfa7eb5c 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,19 +30,19 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <qlayout.h> -#include <qlabel.h> -//#include <qscrollview.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqlayout.h> +#include <tqlabel.h> +//#include <tqscrollview.h> +#include <tqpainter.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> - #include <q3simplerichtext.h> - #include <qmime.h> - #include <qevent.h> + #include <tq3header.h> + #include <tq3simplerichtext.h> + #include <tqmime.h> + #include <tqevent.h> #else - #include <qheader.h> - #include <qsimplerichtext.h> + #include <tqheader.h> + #include <tqsimplerichtext.h> #endif #include "kvi_draganddrop.h" @@ -59,7 +59,7 @@ KviActionDrawerPageListViewItem::KviActionDrawerPageListViewItem(KviTalListView m_pListView = v; setDragEnabled(true); m_szName = a->name(); - QString t = "<b>" + a->visibleName() + "</b>"; + TQString t = "<b>" + a->visibleName() + "</b>"; if(a->isKviUserActionNeverOverrideThis()) t += " <font color=\"#a0a0a0\">[" + __tr2qs("Script") + "]</font>"; t += "<br><font size=\"-1\">" + a->description()+ "</font>"; @@ -67,10 +67,10 @@ KviActionDrawerPageListViewItem::KviActionDrawerPageListViewItem(KviTalListView #ifdef COMPILE_USE_QT4 m_pText = new Q3SimpleRichText(t,v->font()); #else - m_pText = new QSimpleRichText(t,v->font()); + m_pText = new TQSimpleRichText(t,v->font()); #endif - QPixmap * p = a->bigIcon(); - m_pIcon = p ? new QPixmap(*p) : new QPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE); + TQPixmap * p = a->bigIcon(); + m_pIcon = p ? new TQPixmap(*p) : new TQPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE); } KviActionDrawerPageListViewItem::~KviActionDrawerPageListViewItem() @@ -79,7 +79,7 @@ KviActionDrawerPageListViewItem::~KviActionDrawerPageListViewItem() delete m_pText; } -QString KviActionDrawerPageListViewItem::key(int,bool) const +TQString KviActionDrawerPageListViewItem::key(int,bool) const { return m_szKey; } @@ -96,29 +96,29 @@ void KviActionDrawerPageListViewItem::setup() setHeight(iHeight); } -void KviActionDrawerPageListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align) +void KviActionDrawerPageListViewItem::paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align) { KviTalListViewItem::paintCell(p,cg,column,width,align); - //p->fillRect(QRect(0,0,width,height()),isSelected() ? cg.highlight() : cg.base()); + //p->fillRect(TQRect(0,0,width,height()),isSelected() ? cg.highlight() : cg.base()); p->drawPixmap(LVI_BORDER,LVI_BORDER,*m_pIcon); int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING; int www = m_pListView->visibleWidth() - (afterIcon + LVI_BORDER); m_pText->setWidth(www); if(isSelected()) { - QColorGroup cg2(cg); - cg2.setColor(QColorGroup::HighlightedText,cg.text()); - m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2); + TQColorGroup cg2(cg); + cg2.setColor(TQColorGroup::HighlightedText,cg.text()); + m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2); } else { - m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg); + m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg); } } KviActionDrawerPageListView::KviActionDrawerPageListView(KviActionDrawerPage * pParent) : KviListView(pParent) { - QPixmap * p = g_pIconManager->getImage("kvi_actiondrawer.png"); - if(p)setBackgroundOverlayPixmap(p,Qt::AlignRight | Qt::AlignBottom); + TQPixmap * p = g_pIconManager->getImage("kvi_actiondrawer.png"); + if(p)setBackgroundOverlayPixmap(p,TQt::AlignRight | TQt::AlignBottom); // m_pPage = pParent; setSelectionMode(Single); @@ -134,17 +134,17 @@ KviActionDrawerPageListView::~KviActionDrawerPageListView() } -void KviActionDrawerPageListView::contentsMousePressEvent(QMouseEvent * e) +void KviActionDrawerPageListView::contentsMousePressEvent(TQMouseEvent * e) { KviListView::contentsMousePressEvent(e); - KviActionDrawerPageListViewItem * i = (KviActionDrawerPageListViewItem *)itemAt(QPoint(5,contentsToViewport(e->pos()).y())); + KviActionDrawerPageListViewItem * i = (KviActionDrawerPageListViewItem *)itemAt(TQPoint(5,contentsToViewport(e->pos()).y())); if(!i)return; KviTextDrag * dr = new KviTextDrag(i->name(),this); // does this leak memory ? - if(i->icon())dr->setPixmap(*(i->icon()),QPoint(3,3)); + if(i->icon())dr->setPixmap(*(i->icon()),TQPoint(3,3)); dr->dragCopy(); } -void KviActionDrawerPageListView::resizeEvent(QResizeEvent * e) +void KviActionDrawerPageListView::resizeEvent(TQResizeEvent * e) { KviListView::resizeEvent(e); int iWidth = visibleWidth(); @@ -153,13 +153,13 @@ void KviActionDrawerPageListView::resizeEvent(QResizeEvent * e) } -KviActionDrawerPage::KviActionDrawerPage(QWidget * pParent,const QString &szDescription) -: QWidget(pParent) +KviActionDrawerPage::KviActionDrawerPage(TQWidget * pParent,const TQString &szDescription) +: TQWidget(pParent) { - QGridLayout * g = new QGridLayout(this,2,1,4,4); + TQGridLayout * g = new TQGridLayout(this,2,1,4,4); - QString t = "<b>" + szDescription + "</b>"; - QLabel * l = new QLabel(t,this); + TQString t = "<b>" + szDescription + "</b>"; + TQLabel * l = new TQLabel(t,this); g->addWidget(l,0,0); m_pListView = new KviActionDrawerPageListView(this); @@ -178,8 +178,8 @@ void KviActionDrawerPage::add(KviAction * a) (void)new KviActionDrawerPageListViewItem(m_pListView,a); } -KviActionDrawer::KviActionDrawer(QWidget * pParent) -: QTabWidget(pParent) +KviActionDrawer::KviActionDrawer(TQWidget * pParent) +: TQTabWidget(pParent) { setMinimumWidth(400); setMinimumHeight(300); @@ -193,22 +193,22 @@ void KviActionDrawer::fill() { KviActionManager::loadAllAvailableActions(); - KviPointerHashTable<QString,KviActionDrawerPage> pages; + KviPointerHashTable<TQString,KviActionDrawerPage> pages; pages.setAutoDelete(false); - KviPointerHashTable<QString,KviAction> * d = KviActionManager::instance()->actions(); + KviPointerHashTable<TQString,KviAction> * d = KviActionManager::instance()->actions(); if(!d)return; // ooops - KviPointerHashTableIterator<QString,KviAction> it(*d); + KviPointerHashTableIterator<TQString,KviAction> it(*d); while(KviAction * a = it.current()) { KviActionCategory * c = a->category(); if(!c)c = KviActionManager::categoryGeneric(); - KviActionDrawerPage * p = pages.find(c->visibleName()); + KviActionDrawerPage * p = pages.tqfind(c->visibleName()); if(!p) { p = new KviActionDrawerPage(this,c->description()); - pages.replace(c->visibleName(),p); + pages.tqreplace(c->visibleName(),p); addTab(p,c->visibleName()); //p->show(); } @@ -216,7 +216,7 @@ void KviActionDrawer::fill() ++it; } - KviActionDrawerPage * p = pages.find(KviActionManager::categoryIrc()->visibleName()); + KviActionDrawerPage * p = pages.tqfind(KviActionManager::categoryIrc()->visibleName()); if(p) { int iii = indexOf(p); diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h index d9cd2778..fa405f3e 100644 --- a/src/kvirc/ui/kvi_actiondrawer.h +++ b/src/kvirc/ui/kvi_actiondrawer.h @@ -27,17 +27,17 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qwidget.h> -#include <qtabwidget.h> +#include <tqwidget.h> +#include <tqtabwidget.h> #include "kvi_listview.h" class KviActionDrawerPage; -class QPixmap; +class TQPixmap; #ifdef COMPILE_USE_QT4 class Q3SimpleRichText; #else - class QSimpleRichText; + class TQSimpleRichText; #endif class KviAction; @@ -47,28 +47,29 @@ public: KviActionDrawerPageListViewItem(KviTalListView * v,KviAction * a); ~KviActionDrawerPageListViewItem(); protected: - QString m_szName; + TQString m_szName; #ifdef COMPILE_USE_QT4 Q3SimpleRichText * m_pText; #else - QSimpleRichText * m_pText; + TQSimpleRichText * m_pText; #endif - QPixmap * m_pIcon; + TQPixmap * m_pIcon; KviTalListView * m_pListView; - QString m_szKey; + TQString m_szKey; public: - QPixmap * icon(){ return m_pIcon; }; - const QString & name(){ return m_szName; }; + TQPixmap * icon(){ return m_pIcon; }; + const TQString & name(){ return m_szName; }; protected: - virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align); + virtual void paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align); virtual void setup(); - virtual QString key(int,bool) const; + virtual TQString key(int,bool) const; }; class KVIRC_API KviActionDrawerPageListView : public KviListView { friend class KviActionDrawerPage; Q_OBJECT + TQ_OBJECT protected: KviActionDrawerPageListView(KviActionDrawerPage * pParent); public: @@ -76,16 +77,17 @@ public: //protected: // KviActionDrawerPage * m_pPage; protected: - virtual void resizeEvent(QResizeEvent * e); - virtual void contentsMousePressEvent(QMouseEvent * e); + virtual void resizeEvent(TQResizeEvent * e); + virtual void contentsMousePressEvent(TQMouseEvent * e); }; -class KVIRC_API KviActionDrawerPage : public QWidget +class KVIRC_API KviActionDrawerPage : public TQWidget { friend class KviActionDrawer; Q_OBJECT + TQ_OBJECT protected: - KviActionDrawerPage(QWidget * pParent,const QString &szDescription); + KviActionDrawerPage(TQWidget * pParent,const TQString &szDescription); public: ~KviActionDrawerPage(); protected: @@ -94,11 +96,12 @@ protected: void add(KviAction * a); }; -class KVIRC_API KviActionDrawer : public QTabWidget +class KVIRC_API KviActionDrawer : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - KviActionDrawer(QWidget * pParent); + KviActionDrawer(TQWidget * pParent); ~KviActionDrawer(); public: void fill(); diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index a06ab144..8ad6ffb1 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -69,15 +69,15 @@ #include <time.h> -#include <qsplitter.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qevent.h> +#include <tqsplitter.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqevent.h> -#include <qpalette.h> +#include <tqpalette.h> #include "kvi_tal_popupmenu.h" #include "kvi_pointerhashtable.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> #include "kvi_tal_widgetstack.h" #ifndef AVERAGE_CHANNEL_USERS @@ -107,16 +107,16 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name m_pActionHistory->setAutoDelete(true); m_uActionHistoryHotActionCount = 0; - m_pTmpHighLighted = new KviPointerHashTable<const char *,QString>(); + m_pTmpHighLighted = new KviPointerHashTable<const char *,TQString>(); m_pTmpHighLighted->setAutoDelete(true); // Register ourselves connection()->registerChannel(this); - // And create the widgets layout + // And create the widgets tqlayout // Button box m_pButtonBox = new KviTalHBox(this); - m_pTopSplitter = new QSplitter(Qt::Horizontal,m_pButtonBox); + m_pTopSplitter = new TQSplitter(Qt::Horizontal,m_pButtonBox); m_pButtonBox->setStretchFactor(m_pTopSplitter,1); @@ -125,8 +125,8 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Topic widget on the left m_pTopicWidget = new KviTopicWidget(m_pTopSplitter,"topic_widget"); - connect(m_pTopicWidget,SIGNAL(topicSelected(const QString &)), - this,SLOT(topicSelected(const QString &))); + connect(m_pTopicWidget,TQT_SIGNAL(topicSelected(const TQString &)), + this,TQT_SLOT(topicSelected(const TQString &))); // mode label follows the topic widget m_pModeWidget = new KviModeWidget(m_pTopSplitter,this,"mode_"); KviTalToolTip::add(m_pModeWidget,__tr2qs("Channel mode")); @@ -134,7 +134,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name createTextEncodingButton(m_pButtonContainer); // Central splitter - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(Qt::Horizontal,this); #ifdef COMPILE_USE_QT4 m_pSplitter->setObjectName(name); #else @@ -142,7 +142,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name #endif m_pSplitter->setOpaqueResize(false); // Spitted vertially on the left - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setOpaqueResize(false); // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); @@ -151,7 +151,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name #else m_pIrcView->setName(name); #endif - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); // And the double view (that may be unused) m_pMessageView = 0; // The userlist on the right @@ -160,29 +160,29 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // and the related buttons m_pDoubleViewButton = createToolButton(m_pButtonContainer,"double_view_button",KVI_SMALLICON_HIDEDOUBLEVIEW,KVI_SMALLICON_SHOWDOUBLEVIEW,__tr2qs("Split View"),false); - connect(m_pDoubleViewButton,SIGNAL(clicked()),this,SLOT(toggleDoubleView())); + connect(m_pDoubleViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleDoubleView())); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); + connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); m_pBanEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,__tr2qs("Ban Editor"),buttonContainer(),false,"ban_editor_button"); - connect(m_pBanEditorButton,SIGNAL(clicked()),this,SLOT(toggleBanEditor())); + connect(m_pBanEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanEditor())); - if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('e')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('e')) { m_pBanExceptionEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_BANUNEXCEPT,KVI_SMALLICON_BANEXCEPT,__tr2qs("Ban Exception Editor"),buttonContainer(),false,"ban_exception_editor_button"); - connect(m_pBanExceptionEditorButton,SIGNAL(clicked()),this,SLOT(toggleBanExceptionEditor())); + connect(m_pBanExceptionEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanExceptionEditor())); } else { m_pBanExceptionEditorButton=0; } - if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('I')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('I')) { m_pInviteEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_INVITEUNEXCEPT,KVI_SMALLICON_INVITEEXCEPT,__tr2qs("Invite Exception Editor"),buttonContainer(),false,"invite_exception_editor_button"); - connect(m_pInviteEditorButton,SIGNAL(clicked()),this,SLOT(toggleInviteEditor())); + connect(m_pInviteEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleInviteEditor())); } else { m_pInviteEditorButton = 0; } m_pModeEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_CHANMODEHIDE,KVI_SMALLICON_CHANMODE,__tr2qs("Mode Editor"),buttonContainer(),false,"mode_editor_button"); - connect(m_pModeEditorButton,SIGNAL(clicked()),this,SLOT(toggleModeEditor())); + connect(m_pModeEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleModeEditor())); m_pModeEditor = 0; #ifdef COMPILE_CRYPT_SUPPORT @@ -201,7 +201,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); m_pUserListView = new KviUserListView(m_pSplitter,m_pListViewButton,connection()->userDataBase(),this, AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view"); @@ -209,7 +209,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // m_pEditorsContainer->raiseWidget(m_pUserListView); // And finally the input line on the bottom m_pInput = new KviInput(this,m_pUserListView); - // no mask editors yet + // no tqmask editors yet m_pBanEditor = 0; m_pBanExceptionEditor = 0; m_pInviteEditor = 0; @@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging(); applyOptions(); - m_joinTime = QDateTime::currentDateTime(); + m_joinTime = TQDateTime::tqcurrentDateTime(); m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t(); @@ -245,7 +245,7 @@ void KviChannel::toggleToolButtons() { if(!buttonContainer()) return; toggleButtonContainer(); - QPixmap* pix= buttonContainer()->isVisible() ? + TQPixmap* pix= buttonContainer()->isVisible() ? g_pIconManager->getBigIcon("kvi_horizontal_left.png") : g_pIconManager->getBigIcon("kvi_horizontal_right.png"); if(pix) @@ -262,10 +262,10 @@ void KviChannel::textViewRightClicked() KVS_TRIGGER_EVENT_0(KviEvent_OnChannelPopupRequest,this); } -void KviChannel::getBaseLogFileName(QString &buffer) +void KviChannel::getBaseLogFileName(TQString &buffer) { - QString szChan(windowName()); - szChan.replace(".","%2e"); + TQString szChan(windowName()); + szChan.tqreplace(".","%2e"); if (console()->connection()) { buffer=szChan; @@ -287,11 +287,11 @@ void KviChannel::applyOptions() m_pModeWidget->applyOptions(); - // this applies options for IrcView and Input and forces the window to relayout + // this applies options for IrcView and Input and forces the window to retqlayout KviWindow::applyOptions(); } -void KviChannel::getConfigGroupName(QString &buf) +void KviChannel::getConfigGroupName(TQString &buf) { buf = windowName(); } @@ -302,9 +302,9 @@ void KviChannel::saveProperties(KviConfig *cfg) cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes()); cfg->writeEntry("Splitter",m_pSplitter->sizes()); #ifdef COMPILE_USE_QT4 - QList<int> tmp = m_pVertSplitter->sizes(); + TQList<int> tmp = m_pVertSplitter->sizes(); KviValueList<int> tmp2; - for(QList<int>::Iterator it = tmp.begin();it != tmp.end();++it) + for(TQList<int>::Iterator it = tmp.begin();it != tmp.end();++it) tmp2.append(*it); cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList); #else @@ -378,7 +378,7 @@ void KviChannel::showDoubleView(bool bShow) { m_pMessageView->setPrivateBackgroundPixmap(*(m_privateBackground.pixmap())); } - connect(m_pMessageView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pMessageView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); m_pMessageView->setMasterView(m_pIrcView); m_pIrcView->splitMessagesTo(m_pMessageView); m_pMessageView->show(); @@ -414,10 +414,10 @@ void KviChannel::toggleModeEditor() resizeEvent(0); } else { m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr()); - connect(m_pModeEditor,SIGNAL(setMode(const char *)),this,SLOT(setMode(const char *))); - connect(m_pModeEditor,SIGNAL(done()),this,SLOT(modeSelectorDone())); + connect(m_pModeEditor,TQT_SIGNAL(setMode(const char *)),this,TQT_SLOT(setMode(const char *))); + connect(m_pModeEditor,TQT_SIGNAL(done()),this,TQT_SLOT(modeSelectorDone())); m_pModeEditor->show(); - //setFocusHandlerNoClass(m_pInput,m_pModeEditor,"QLineEdit"); + //setFocusHandlerNoClass(m_pInput,m_pModeEditor,TQLINEEDIT_OBJECT_NAME_STRING); if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true); } } @@ -430,7 +430,7 @@ void KviChannel::modeSelectorDone() void KviChannel::setMode(const char * mode) { if(!connection())return; - KviQCString tmp = connection()->encodeText(m_szName); + KviTQCString tmp = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %s",tmp.data(),mode); } @@ -490,14 +490,14 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %c",szName.data(),flag); } } *ppEd = new KviMaskEditor(m_pSplitter,*ppBtn,l,flag,edName); - connect(*ppEd,SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), - this,SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); + connect(*ppEd,TQT_SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), + this,TQT_SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); //setFocusHandler(m_pInput,*ppEd); //socket it! (*ppEd)->show(); if(!(*ppBtn))return; @@ -507,76 +507,76 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l) { - KviStr masks; + KviStr tqmasks; KviStr flags; unsigned int count = 0; for(KviMaskEntry * e = l->first();e;e = l->next()) { - if(masks.hasData())masks.append(' '); - masks.append(e->szMask); + if(tqmasks.hasData())tqmasks.append(' '); + tqmasks.append(e->szMask); flags.append(ed->flag()); count++; if(count == connection()->serverInfo()->maxModeChanges()) { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); - connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); + KviTQCString szName = connection()->encodeText(m_szName); + connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data()); } flags = ""; - masks = ""; + tqmasks = ""; count = 0; } } - if(masks.hasData()) + if(tqmasks.hasData()) { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); - connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); + KviTQCString szName = connection()->encodeText(m_szName); + connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data()); } } } -QPixmap * KviChannel::myIconPtr() +TQPixmap * KviChannel::myIconPtr() { return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KVI_SMALLICON_DEADCHANNEL : KVI_SMALLICON_CHANNEL); } -void KviChannel::resizeEvent(QResizeEvent *e) +void KviChannel::resizeEvent(TQResizeEvent *e) { #ifdef COMPILE_USE_QT4 int hght = m_pInput->heightHint(); - int hght2 = m_pTopicWidget->sizeHint().height(); + int hght2 = m_pTopicWidget->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #else int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #endif } -QSize KviChannel::sizeHint() const +TQSize KviChannel::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(), - m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height()); + TQSize ret(m_pSplitter->tqsizeHint().width(), + m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height()); return ret; } void KviChannel::setChannelMode(char mode,bool bAdd) { - if(!m_pConsole->connection()->serverInfo()->supportedListModes().contains(mode)){ + if(!m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains(mode)){ if(bAdd) { - if(!(m_szChannelMode.contains(mode)))m_szChannelMode.append(mode); + if(!(m_szChannelMode.tqcontains(mode)))m_szChannelMode.append(mode); } else { - if(m_szChannelMode.contains(mode)) + if(m_szChannelMode.tqcontains(mode)) { - m_szChannelMode.replace(mode,""); + m_szChannelMode.tqreplace(mode,""); } } updateModeLabel(); @@ -602,7 +602,7 @@ void KviChannel::addHighlightedUser(const char * nick) { if(!m_pUserListView->findEntry(nick))return; else - m_pTmpHighLighted->replace(nick,new QString()); + m_pTmpHighLighted->tqreplace(nick,new TQString()); } void KviChannel::removeHighlightedUser(const char * nick) @@ -610,7 +610,7 @@ void KviChannel::removeHighlightedUser(const char * nick) m_pTmpHighLighted->remove(nick); } -void KviChannel::getChannelModeString(QString &buffer) +void KviChannel::getChannelModeString(TQString &buffer) { buffer = m_szChannelMode; if(!m_szChannelKey.isEmpty())buffer.append('k'); @@ -655,7 +655,7 @@ void KviChannel::setAliveChan() m_iStateFlags = 0; setType(KVI_WINDOW_TYPE_CHANNEL); m_pUserListView->setUserDataBase(connection()->userDataBase()); - m_joinTime = QDateTime::currentDateTime(); + m_joinTime = TQDateTime::tqcurrentDateTime(); context()->unregisterDeadChannel(this); connection()->registerChannel(this); // Update log file name @@ -665,7 +665,7 @@ void KviChannel::setAliveChan() m_pTopicWidget->reset(); // reset the topic (fixes bug #20 signaled by Klaus Weidenbach) } -void KviChannel::getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast) +void KviChannel::getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPast) { if(l.count() < 1)return; @@ -704,29 +704,29 @@ void KviChannel::getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast) } else { // (l.count() - 1) is > 1 buffer += "</b> "; - buffer += __tr2qs("and other %1 users").arg(l.count() - 1); + buffer += __tr2qs("and other %1 users").tqarg(l.count() - 1); } buffer += " "; buffer += bPast ? __tr2qs("were talking recently") : __tr2qs("are talking"); } } -void KviChannel::getTaskBarTipText(QString &buffer) +void KviChannel::getTaskBarTipText(TQString &buffer) { - static QString html_bold("<b>"); - static QString html_tab(" "); - static QString html_eofbold("</b> "); - static QString p5(" ("); + static TQString html_bold("<b>"); + static TQString html_tab(" "); + static TQString html_eofbold("</b> "); + static TQString p5(" ("); // p6 == p4 - static QString p7(" ("); - static QString p8(": "); - static QString p9(")"); - static QString p10("<br>"); + static TQString p7(" ("); + static TQString p8(": "); + static TQString p9(")"); + static TQString p10("<br>"); - static QString end_of_doc = "</table></body></html>"; - static QString end_of_fontboldrow = END_TABLE_BOLD_ROW; - static QString start_of_row = "<tr><td>"; - static QString end_of_row = "</td></tr>"; + static TQString end_of_doc = "</table></body></html>"; + static TQString end_of_fontboldrow = END_TABLE_BOLD_ROW; + static TQString start_of_row = "<tr><td>"; + static TQString end_of_row = "</td></tr>"; buffer = "<html>" \ "<body>" \ @@ -750,15 +750,15 @@ void KviChannel::getTaskBarTipText(QString &buffer) buffer += start_of_row; - QString op = __tr2qs("operator"); - QString ops = __tr2qs("operators"); + TQString op = __tr2qs("operator"); + TQString ops = __tr2qs("operators"); ////////////////////// buffer += html_tab; buffer += html_bold; - QString num; + TQString num; num.setNum(s.uActive); buffer += num; @@ -940,7 +940,7 @@ void KviChannel::getTaskBarTipText(QString &buffer) if(cas.dActionsPerMinute >= 0.1) { - QString num; + TQString num; num.sprintf(" [%u%% ",cas.uHotActionPercent); buffer += num; buffer += __tr2qs("human"); @@ -955,15 +955,15 @@ void KviChannel::getTaskBarTipText(QString &buffer) void KviChannel::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); if(!connection()) { - QString dead = __tr2qs("[Dead channel]"); + TQString dead = __tr2qs("[Dead channel]"); m_szNameWithUserFlag = m_szName; @@ -998,13 +998,13 @@ void KviChannel::fillCaptionBuffers() if(uFlag) { - m_szNameWithUserFlag = QChar(uFlag); + m_szNameWithUserFlag = TQChar(uFlag); m_szNameWithUserFlag += m_szName; } else { m_szNameWithUserFlag = m_szName; } - QString szChanMode; + TQString szChanMode; getChannelModeString(szChanMode); m_szPlainTextCaption = m_szNameWithUserFlag; @@ -1012,16 +1012,16 @@ void KviChannel::fillCaptionBuffers() { m_szPlainTextCaption += " (+"; m_szPlainTextCaption += szChanMode; - m_szPlainTextCaption += QChar(')'); + m_szPlainTextCaption += TQChar(')'); } - QString szNickOnServer = QChar('['); + TQString szNickOnServer = TQChar('['); szNickOnServer += connection()->currentNickName(); szNickOnServer += __tr2qs(" on "); szNickOnServer += connection()->currentServerName(); - szNickOnServer += QChar(']'); + szNickOnServer += TQChar(']'); - m_szPlainTextCaption += QChar(' '); + m_szPlainTextCaption += TQChar(' '); m_szPlainTextCaption += szNickOnServer; m_szHtmlActiveCaption = begin; @@ -1045,12 +1045,12 @@ void KviChannel::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -void KviChannel::ownMessage(const QString &buffer) +void KviChannel::ownMessage(const TQString &buffer) { if(!connection())return; - KviQCString szName = connection()->encodeText(windowName()); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(windowName()); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -1068,20 +1068,20 @@ void KviChannel::ownMessage(const QString &buffer) case KviCryptEngine::Encrypted: if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; // ugly ,but we must redecode here - QString szRedecoded = decodeText(encrypted.ptr()); + TQString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError { - QString szEngineError = cryptSessionInfo()->pEngine->lastError(); + TQString szEngineError = cryptSessionInfo()->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, __tr2qs("The crypto engine was unable to encrypt the current message (%Q): %Q, no data sent to the server"), &buffer,&szEngineError); @@ -1092,9 +1092,9 @@ void KviChannel::ownMessage(const QString &buffer) return; } else { d++; //eat the escape code - QString tmp = buffer.right(buffer.length() - 1); + TQString tmp = buffer.right(buffer.length() - 1); if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,tmp,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),tmp,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); return; } @@ -1104,21 +1104,21 @@ void KviChannel::ownMessage(const QString &buffer) if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d)) { - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } } -void KviChannel::ownAction(const QString &buffer) +void KviChannel::ownAction(const TQString &buffer) { if(!connection())return; - KviQCString szName = connection()->encodeText(m_szName); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(m_szName); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(d)))return; - QString szBuffer = "\r!nc\r"; + if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,TQString(d)))return; + TQString szBuffer = "\r!nc\r"; szBuffer += connection()->currentNickName(); szBuffer += "\r "; szBuffer += buffer; @@ -1126,14 +1126,14 @@ void KviChannel::ownAction(const QString &buffer) userAction(connection()->currentNickName(),KVI_USERACTION_ACTION); } -bool KviChannel::nickChange(const QString &oldNick,const QString &newNick) +bool KviChannel::nickChange(const TQString &oldNick,const TQString &newNick) { bool bWasHere = m_pUserListView->nickChange(oldNick,newNick); if(bWasHere)channelAction(newNick,KVI_USERACTION_NICK,kvi_getUserActionTemperature(KVI_USERACTION_NICK)); return bWasHere; } -bool KviChannel::part(const QString &nick) +bool KviChannel::part(const TQString &nick) { bool bWasHere = m_pUserListView->part(nick); if(bWasHere)channelAction(nick,KVI_USERACTION_PART,kvi_getUserActionTemperature(KVI_USERACTION_PART)); @@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(QDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate if(dSpan < 60.0)dSpan = 60.0; @@ -1208,7 +1208,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA } -void KviChannel::channelAction(const QString &nick,unsigned int uActionType,int iTemperature) +void KviChannel::channelAction(const TQString &nick,unsigned int uActionType,int iTemperature) { KviChannelAction * a = new KviChannelAction; a->tTime = kvi_unixTime(); @@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(QDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate s->bStatsInaccurate = true; @@ -1301,7 +1301,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) tTwoMinsAgo-= 120; tNow -= 60; - KviPointerHashTable<QString,int> userDict; + KviPointerHashTable<TQString,int> userDict; userDict.setAutoDelete(false); int fake; @@ -1319,7 +1319,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) (a->uActionType == KVI_USERACTION_NOTICE) || (a->uActionType == KVI_USERACTION_ACTION)) { - if(!userDict.find(a->szNick)) + if(!userDict.tqfind(a->szNick)) { if(isOn(a->szNick.ascii())) { @@ -1338,14 +1338,14 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) -void KviChannel::userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType) +void KviChannel::userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); channelAction(nick,uActionType,iTemperature); m_pUserListView->userAction(nick,user,host,iTemperature); } -void KviChannel::userAction(const QString &nick,unsigned int uActionType) +void KviChannel::userAction(const TQString &nick,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); channelAction(nick,uActionType,iTemperature); @@ -1359,15 +1359,15 @@ void KviChannel::userAction(KviIrcMask * user,unsigned int uActionType) m_pUserListView->userAction(user,iTemperature); } -void KviChannel::topicSelected(const QString & topic) +void KviChannel::topicSelected(const TQString & topic) { if(!connection())return; - KviQCString szEncoded = encodeText(topic); - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szEncoded = encodeText(topic); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("TOPIC %s :%s",szName.data(),szEncoded.length() ? szEncoded.data() : ""); } -void KviChannel::closeEvent(QCloseEvent *e) +void KviChannel::closeEvent(TQCloseEvent *e) { if((m_iStateFlags & KVI_CHANNEL_STATE_SENTPART) || (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) || !(m_pConsole->isConnected())) { @@ -1378,16 +1378,16 @@ void KviChannel::closeEvent(QCloseEvent *e) // FIXME: #warning "THIS PART SHOULD BECOME A COMMAND /PART $option()..so the identifiers are parsed" if(connection()) { - QString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage); - tmp.replace(";","\\;"); - tmp.replace("\n"," "); + TQString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage); + tmp.tqreplace(";","\\;"); + tmp.tqreplace("\n"," "); KviKvsVariant vRet; if(KviKvsScript::evaluate(tmp,this,0,&vRet))vRet.asString(tmp); - KviQCString dat = encodeText(tmp); + KviTQCString dat = encodeText(tmp); partMessageSent(); - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("PART %s :%s",szName.data(),dat.data() ? dat.data() : ""); // be sure to not reference ourselves here.. we could be disconnected! } else { @@ -1424,7 +1424,7 @@ int KviChannel::myFlags() } -void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt) +void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt) { if(!connection())return; KviPointerList<KviMaskEntry> * list = m_pBanList; @@ -1446,21 +1446,21 @@ void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString break; } - internalMask(mask,bAdd,setBy,setAt,list,&editor); + internalMask(tqmask,bAdd,setBy,setAt,list,&editor); m_pUserListView->setMaskEntries(flag,(int)list->count()); } -void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) +void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) { KviMaskEntry * e = 0; if(bAdd) { for(e = l->first();e;e = l->next()) { - if(KviQString::equalCI(e->szMask,mask))return; //already there + if(KviTQString::equalCI(e->szMask,tqmask))return; //already there } e = new KviMaskEntry; - e->szMask = mask; + e->szMask = tqmask; e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)"); e->uSetAt = setAt; l->append(e); @@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy } else { for(e = l->first();e;e = l->next()) { - if(KviQString::equalCI(e->szMask,mask))break; + if(KviTQString::equalCI(e->szMask,tqmask))break; } if(e) { @@ -1480,29 +1480,29 @@ void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy void KviChannel::updateModeLabel() { - QString tmp = m_szChannelMode; - QString tip = __tr2qs("<b>Channel mode:</b>"); + TQString tmp = m_szChannelMode; + TQString tip = __tr2qs("<b>Channel mode:</b>"); //const char * aux = m_szChannelMode.utf8().data(); leaks memory and will not work with getChannelModeDescription() (can channel modes be multibyte ?) KviStr mod = m_szChannelMode; const char * aux = mod.ptr(); while(*aux) { - KviQString::appendFormatted(tip,"<br>%c: %Q",*aux,&(m_pConsole->connection()->serverInfo()->getChannelModeDescription(*aux))); + KviTQString::appendFormatted(tip,"<br>%c: %Q",*aux,&(m_pConsole->connection()->serverInfo()->getChannelModeDescription(*aux))); ++aux; } if(!m_szChannelKey.isEmpty()) { if(!tmp.isEmpty())tmp.append(' '); - KviQString::appendFormatted(tmp,"k:%s",m_szChannelKey.utf8().data()); - KviQString::appendFormatted(tip,__tr2qs("<br><b>Key:</b> %s"),m_szChannelKey.utf8().data()); + KviTQString::appendFormatted(tmp,"k:%s",m_szChannelKey.utf8().data()); + KviTQString::appendFormatted(tip,__tr2qs("<br><b>Key:</b> %s"),m_szChannelKey.utf8().data()); } if(m_szChannelLimit.hasData()) { if(!tmp.isEmpty())tmp.append(' '); - KviQString::appendFormatted(tmp,"l:%s",m_szChannelLimit.ptr()); - KviQString::appendFormatted(tip,__tr2qs("<br><b>Limit:</b> %s"),m_szChannelLimit.ptr()); + KviTQString::appendFormatted(tmp,"l:%s",m_szChannelLimit.ptr()); + KviTQString::appendFormatted(tip,__tr2qs("<br><b>Limit:</b> %s"),m_szChannelLimit.ptr()); } m_pModeWidget->refreshModes(); @@ -1541,11 +1541,11 @@ void KviChannel::outputMessage(int msg_type,const char *format,...) } */ -void KviChannel::outputMessage(int msg_type,const QString &msg) +void KviChannel::outputMessage(int msg_type,const TQString &msg) { - QString szBuf(msg); + TQString szBuf(msg); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pMessageView ? m_pMessageView : m_pIrcView,msg_type,(const kvi_wchar_t *)pC); } @@ -1580,7 +1580,7 @@ void KviChannel::checkChannelSync() // we already have all the spontaneous server replies // (so probably mode, topic (or no topic is set),names) // we have already received the I and e lists (if requested) - kvs_int_t iSyncTime = m_joinTime.time().msecsTo(QTime::currentTime()); + kvs_int_t iSyncTime = m_joinTime.time().msecsTo(TQTime::currentTime()); if(iSyncTime < 0)iSyncTime += 86400000; bool bStop = KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnChannelSync,this,iSyncTime); @@ -1591,9 +1591,9 @@ void KviChannel::checkChannelSync() } } -bool KviChannel::eventFilter(QObject * o, QEvent * e) +bool KviChannel::eventFilter(TQObject * o, TQEvent * e) { - if(e->type() == QEvent::FocusOut && o == m_pTopicWidget && \ + if(e->type() == TQEvent::FocusOut && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pTopicWidget) && \ m_pTopicWidget->isVisible()) m_pTopicWidget->deactivate(); @@ -1601,20 +1601,20 @@ bool KviChannel::eventFilter(QObject * o, QEvent * e) } -void KviChannel::preprocessMessage(QString & szMessage) +void KviChannel::preprocessMessage(TQString & szMessage) { - QStringList strings = QStringList::split(" ",szMessage, TRUE); - for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { - if((*it).contains('\r')) continue; - QString tmp = KviMircCntrl::stripControlBytes(*it); - if( findEntry(*it) ) *it=QString("\r!n\r%1\r").arg(*it); + TQStringList strings = TQStringList::split(" ",szMessage, TRUE); + for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { + if((*it).tqcontains('\r')) continue; + TQString tmp = KviMircCntrl::stripControlBytes(*it); + if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").tqarg(*it); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) if((*it)==tmp) - *it=QString("\r!c\r%1\r").arg(*it); + *it=TQString("\r!c\r%1\r").tqarg(*it); else - *it=QString("\r!c%1\r%2\r").arg(tmp).arg(*it); + *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); } szMessage=strings.join(" "); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 0efdabb0..98f9fc6b 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -37,13 +37,13 @@ #include "kvi_modew.h" #include "kvi_valuelist.h" -#include <qdatetime.h> +#include <tqdatetime.h> #include "kvi_pointerhashtable.h" -#include <qstringlist.h> +#include <tqstringlist.h> class KviConsole; -class QSplitter; -class QToolButton; +class TQSplitter; +class TQToolButton; class KviTopicWidget; class KviIrcMask; class KviThemedLabel; @@ -51,9 +51,9 @@ class KviTalHBox; #ifdef COMPILE_ON_WINDOWS // windows compiler wants this instead of the forward decl - #include "kvi_maskeditor.h" + #include "kvi_tqmaskeditor.h" #else - typedef struct _KviMaskEntry KviMaskEntry; // kvi_maskeditor.h + typedef struct _KviMaskEntry KviMaskEntry; // kvi_tqmaskeditor.h #endif class KviMaskEditor; class KviModeEditor; @@ -79,7 +79,7 @@ class KviModeEditor; typedef struct _KviChannelAction { - QString szNick; // action source nick + TQString szNick; // action source nick unsigned int uActionType; // type of the action kvi_time_t tTime; // time of the action int iTemperature; // temperature of the action @@ -102,19 +102,20 @@ typedef struct _KviChannelActivityStats int iAverageActionTemperature; // the average chan temperature unsigned int uHotActionCount; unsigned int uHotActionPercent; - QStringList lTalkingUsers; // users that seem to be talking NOW - QStringList lWereTalkingUsers; + TQStringList lTalkingUsers; // users that seem to be talking NOW + TQStringList lWereTalkingUsers; } KviChannelActivityStats; class KVIRC_API KviChannel : public KviWindow { Q_OBJECT + TQ_OBJECT public: KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name); ~KviChannel(); protected: - QSplitter * m_pTopSplitter; - QSplitter * m_pVertSplitter; + TQSplitter * m_pTopSplitter; + TQSplitter * m_pVertSplitter; BUTTON_CLASS * m_pDoubleViewButton; KviWindowToolPageButton * m_pListViewButton; KviWindowToolPageButton * m_pBanEditorButton; @@ -130,50 +131,50 @@ protected: KviUserListView * m_pUserListView; KviModeWidget * m_pModeWidget; int m_iStateFlags; - QString m_szChannelMode; - QString m_szChannelKey; + TQString m_szChannelMode; + TQString m_szChannelKey; KviStr m_szChannelLimit; KviPointerList<KviMaskEntry> * m_pBanList; KviPointerList<KviMaskEntry> * m_pBanExceptionList; KviPointerList<KviMaskEntry> * m_pInviteList; KviPixmap m_privateBackground; - QDateTime m_joinTime; - QString m_szNameWithUserFlag; - KviPointerHashTable<const char *,QString> * m_pTmpHighLighted; + TQDateTime m_joinTime; + TQString m_szNameWithUserFlag; + KviPointerHashTable<const char *,TQString> * m_pTmpHighLighted; unsigned int m_uActionHistoryHotActionCount; KviPointerList<KviChannelAction> * m_pActionHistory; kvi_time_t m_tLastReceivedWhoReply; KviValueList<int> m_VertSplitterSizesList; KviTalHBox * m_pButtonContainer; protected: - bool eventFilter(QObject *, QEvent *); - virtual QPixmap * myIconPtr(); + bool eventFilter(TQObject *, TQEvent *); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); - virtual void closeEvent(QCloseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void closeEvent(TQCloseEvent *e); // virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void getConfigGroupName(QString &buf); + virtual void getConfigGroupName(TQString &buf); virtual void saveProperties(KviConfig * cfg); virtual void loadProperties(KviConfig * cfg); virtual void applyOptions(); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void triggerCreationEvents(); void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName); - void internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); + void internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); void checkChannelSync(); void showDoubleView(bool bShow); void fixActionHistory(); - void getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast); + void getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPast); public: void getChannelActivityStats(KviChannelActivityStats * s); - //void getChannelActivityStatsDescription(QString &buffer); + //void getChannelActivityStatsDescription(TQString &buffer); KviPointerList<KviMaskEntry> * banList(){ return m_pBanList; }; KviPointerList<KviMaskEntry> * banExceptionList(){ return m_pBanExceptionList; }; KviPointerList<KviMaskEntry> * inviteList(){ return m_pInviteList; }; - QString * firstSelectedNickname(){ return m_pUserListView->firstSelectedNickname(); }; - QString * nextSelectedNickname(){ return m_pUserListView->nextSelectedNickname(); }; + TQString * firstSelectedNickname(){ return m_pUserListView->firstSelectedNickname(); }; + TQString * nextSelectedNickname(){ return m_pUserListView->nextSelectedNickname(); }; int selectedCount(){ return m_pUserListView->selectedCount(); }; int opCount(){ return m_pUserListView->opCount(); }; @@ -188,10 +189,10 @@ public: unsigned int banExceptionCount(){ return m_pBanExceptionList->count(); }; unsigned int inviteCount(){ return m_pInviteList->count(); }; - const QString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; - virtual const QString & target(){ return windowName(); }; + const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; + virtual const TQString & target(){ return windowName(); }; // void appendSelectedNicknames(KviStr &buffer); - void setMask(char flag, const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt); + void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt); kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; }; void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; }; @@ -229,28 +230,28 @@ public: void setDeadChan(); void setAliveChan(); - void prependUserFlag(const QString &nick,QString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); }; - char getUserFlag(const QString &nick){ return m_pUserListView->getUserFlag(nick); }; + void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); }; + char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); }; bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); }; - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); }; - KviUserListEntry * join(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,int iFlags = 0) + KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0) { return m_pUserListView->join(nick,user,host,iFlags); }; - bool op(const QString &nick,bool bOp){ return m_pUserListView->op(nick,bOp); }; - bool avatarChanged(const QString &nick){ return m_pUserListView->avatarChanged(nick); }; - bool voice(const QString &nick,bool bVoice){ return m_pUserListView->voice(nick,bVoice); }; - bool halfop(const QString &nick,bool bHalfOp){ return m_pUserListView->halfop(nick,bHalfOp); }; - bool userop(const QString &nick,bool bUserOp){ return m_pUserListView->userop(nick,bUserOp); }; - bool setChanOwner(const QString &nick,bool bChanOwner){ return m_pUserListView->setChanOwner(nick,bChanOwner); }; - bool setChanAdmin(const QString &nick,bool bChanAdmin){ return m_pUserListView->setChanAdmin(nick,bChanAdmin); }; + bool op(const TQString &nick,bool bOp){ return m_pUserListView->op(nick,bOp); }; + bool avatarChanged(const TQString &nick){ return m_pUserListView->avatarChanged(nick); }; + bool voice(const TQString &nick,bool bVoice){ return m_pUserListView->voice(nick,bVoice); }; + bool halfop(const TQString &nick,bool bHalfOp){ return m_pUserListView->halfop(nick,bHalfOp); }; + bool userop(const TQString &nick,bool bUserOp){ return m_pUserListView->userop(nick,bUserOp); }; + bool setChanOwner(const TQString &nick,bool bChanOwner){ return m_pUserListView->setChanOwner(nick,bChanOwner); }; + bool setChanAdmin(const TQString &nick,bool bChanAdmin){ return m_pUserListView->setChanAdmin(nick,bChanAdmin); }; void userAction(KviIrcMask * user,unsigned int uActionType); - void userAction(const QString &nick,unsigned int uActionType); - void userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType); - bool nickChange(const QString &oldNick,const QString &newNick); - void channelAction(const QString &nick,unsigned int uActionType,int iTemperature); - bool part(const QString &nick); - bool isOn(const QString &nick){ return (m_pUserListView->findEntry(nick) != 0); }; - KviUserListEntry * findEntry(const QString &nick){ return m_pUserListView->findEntry(nick); }; + void userAction(const TQString &nick,unsigned int uActionType); + void userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType); + bool nickChange(const TQString &oldNick,const TQString &newNick); + void channelAction(const TQString &nick,unsigned int uActionType,int iTemperature); + bool part(const TQString &nick); + bool isOn(const TQString &nick){ return (m_pUserListView->findEntry(nick) != 0); }; + KviUserListEntry * findEntry(const TQString &nick){ return m_pUserListView->findEntry(nick); }; KviUserListView * userListView(){ return m_pUserListView; }; bool isMeOp(bool bAtLeast = false); bool isMeChanOwner(bool bAtLeast = false); @@ -258,41 +259,41 @@ public: bool isMeVoice(bool bAtLeast = false); bool isMeHalfOp(bool bAtLeast = false); bool isMeUserOp(bool bAtLeast = false); - bool isOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isOp(nick,bAtLeast); }; - bool isVoice(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isVoice(nick,bAtLeast); }; - bool isHalfOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isHalfOp(nick,bAtLeast); }; - bool isUserOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isUserOp(nick,bAtLeast); }; - bool isChanOwner(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isChanOwner(nick,bAtLeast); }; - bool isChanAdmin(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isChanAdmin(nick,bAtLeast); }; + bool isOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isOp(nick,bAtLeast); }; + bool isVoice(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isVoice(nick,bAtLeast); }; + bool isHalfOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isHalfOp(nick,bAtLeast); }; + bool isUserOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isUserOp(nick,bAtLeast); }; + bool isChanOwner(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isChanOwner(nick,bAtLeast); }; + bool isChanAdmin(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isChanAdmin(nick,bAtLeast); }; int myFlags(); void updateModeLabel(); KviTopicWidget * topicWidget(){ return m_pTopicWidget; }; - virtual void outputMessage(int msg_type,const QString &msg); - void ownMessage(const QString &buffer); - void ownAction(const QString &buffer); + virtual void outputMessage(int msg_type,const TQString &msg); + void ownMessage(const TQString &buffer); + void ownAction(const TQString &buffer); void setChannelMode(char mode,bool bAdd); void setChannelKey(const char * key); void setChannelLimit(const char * limit); - void getChannelModeString(QString &buffer); + void getChannelModeString(TQString &buffer); KviStr & channelLimit(){ return m_szChannelLimit; }; bool hasChannelLimit(){ return m_szChannelLimit.hasData(); }; bool hasChannelKey() { return !m_szChannelKey.isEmpty(); }; - QString & channelKey(){ return m_szChannelKey; }; + TQString & channelKey(){ return m_szChannelKey; }; void addHighlightedUser(const char * nick); void removeHighlightedUser(const char * nick); - bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); }; + bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->tqfind(nick); }; KviIrcView * messageView() const { return m_pMessageView; }; virtual void lostUserFocus(); - virtual void getTaskBarTipText(QString &buffer); - QString channelMode() { return m_szChannelMode; }; + virtual void getTaskBarTipText(TQString &buffer); + TQString channelMode() { return m_szChannelMode; }; void unhighlight(); - QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; }; + TQFrame * buttonContainer() { return (TQFrame*)m_pButtonContainer; }; private slots: void toggleDoubleView(); void toggleListView(); @@ -300,14 +301,14 @@ private slots: void toggleBanExceptionEditor(); void toggleInviteEditor(); void toggleModeEditor(); - void topicSelected(const QString & topic); + void topicSelected(const TQString & topic); void setMode(const char * mode); void modeSelectorDone(); void textViewRightClicked(); void removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l); void toggleToolButtons(); protected: - virtual void preprocessMessage(QString & szMessage); + virtual void preprocessMessage(TQString & szMessage); }; #endif //_KVI_CHANNEL_H_ diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 9cc1c6e4..39a7051c 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -29,27 +29,27 @@ #include "kvi_options.h" -#include <qnamespace.h> -#include <qpainter.h> -#include <qstring.h> -#include <qevent.h> +#include <tqnamespace.h> +#include <tqpainter.h> +#include <tqstring.h> +#include <tqevent.h> KviColorWindow::KviColorWindow() -:QWidget(0,"toplevel_color_window",Qt::WType_Popup) +:TQWidget(0,"toplevel_color_window",TQt::WType_Popup) { #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::NoFocus); + setFocusPolicy(TTQ_NoFocus); #else - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); #endif - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setFixedSize(146,38); m_pOwner = 0; - QFont fnt = QFont(); - fnt.setStyleHint(QFont::TypeWriter); + TQFont fnt = TQFont(); + fnt.setStyleHint(TQFont::TypeWriter); fnt.setPointSize(10); - //QFont fnt("fixed",10); + //TQFont fnt("fixed",10); setFont(fnt); m_iTimerId = -1; } @@ -61,28 +61,28 @@ KviColorWindow::~KviColorWindow() // if(m_pOwner)m_pOwner->setFocus(); } -void KviColorWindow::popup(QWidget *owner) +void KviColorWindow::popup(TQWidget *owner) { m_pOwner = owner; show(); } -void KviColorWindow::paintEvent(QPaintEvent *) +void KviColorWindow::paintEvent(TQPaintEvent *) { static int clrIdx[16]={ 1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,1 }; - QPainter p(this); + TQPainter p(this); for(int i=0;i<16;i++) { p.fillRect((i % 8) * 18,(i / 8) * 18,18,18,KVI_OPTION_MIRCCOLOR(i)); p.setPen(KVI_OPTION_MIRCCOLOR(clrIdx[i])); KviStr szI(KviStr::Format,"%d",i); - p.drawText((i % 8) * 18,(i / 8) * 18,18,18,Qt::AlignVCenter | Qt::AlignHCenter,szI.ptr()); + p.drawText((i % 8) * 18,(i / 8) * 18,18,18,TQt::AlignVCenter | TQt::AlignHCenter,szI.ptr()); } } -void KviColorWindow::keyPressEvent(QKeyEvent *e) +void KviColorWindow::keyPressEvent(TQKeyEvent *e) { if(m_iTimerId != -1) killTimer(m_iTimerId); @@ -90,17 +90,17 @@ void KviColorWindow::keyPressEvent(QKeyEvent *e) if(m_pOwner)g_pApp->sendEvent(m_pOwner,e); } -void KviColorWindow::mousePressEvent(QMouseEvent *e) +void KviColorWindow::mousePressEvent(TQMouseEvent *e) { - QString str; + TQString str; int key=e->x()/18; if (e->x()<36 && e->y()>18) key +=8; if (e->x()>36 && e->y()>18) key -=2; int ascii=key+48; str.setNum(key); if (e->x()>36 && e->y()>18) - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,Qt::Key_1,49,Qt::NoButton,"1")); - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,key,ascii,Qt::NoButton,str)); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,TQt::Key_1,49,Qt::NoButton,"1")); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,key,ascii,Qt::NoButton,str)); if(m_iTimerId != -1) killTimer(m_iTimerId); hide(); @@ -108,10 +108,10 @@ void KviColorWindow::mousePressEvent(QMouseEvent *e) void KviColorWindow::show() { m_iTimerId = startTimer(10000); //10 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviColorWindow::timerEvent(QTimerEvent *) +void KviColorWindow::timerEvent(TQTimerEvent *) { if(m_iTimerId != -1) killTimer(m_iTimerId); diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/kvi_colorwin.h index 21cf1ae3..9528cf62 100644 --- a/src/kvirc/ui/kvi_colorwin.h +++ b/src/kvirc/ui/kvi_colorwin.h @@ -23,25 +23,26 @@ // #include "kvi_settings.h" -#include <qwidget.h> +#include <tqwidget.h> -class KVIRC_API KviColorWindow : public QWidget +class KVIRC_API KviColorWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviColorWindow(); ~KviColorWindow(); private: - QWidget *m_pOwner; + TQWidget *m_pOwner; int m_iTimerId; public: - void popup(QWidget *owner); + void popup(TQWidget *owner); private: virtual void show(); - virtual void paintEvent(QPaintEvent *); - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *); - virtual void timerEvent(QTimerEvent *); + virtual void paintEvent(TQPaintEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *); + virtual void timerEvent(TQTimerEvent *); }; #endif //_KVI_COLORWIN_H_ diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index df0bd707..a843ae19 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -81,26 +81,26 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include <qsplitter.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qtimer.h> +#include <tqsplitter.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqtimer.h> #include "kvi_tal_hbox.h" #include "kvi_tal_popupmenu.h" -#include <qmessagebox.h> -#include <qstringlist.h> +#include <tqmessagebox.h> +#include <tqstringlist.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif #define __KVI_DEBUG__ #include "kvi_debug.h" #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; @@ -128,35 +128,35 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) m_pButtonBox = new KviTalHBox(this); m_pButtonBox->setSpacing(0); m_pButtonBox->setMargin(0); - new QLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); - m_pAddressEdit = new QComboBox(m_pButtonBox,"url_editor"); + new TQLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); + m_pAddressEdit = new TQComboBox(m_pButtonBox,"url_editor"); m_pAddressEdit->setAutoCompletion(true); m_pAddressEdit->setDuplicatesEnabled(false); m_pAddressEdit->setEditable(true); m_pAddressEdit->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); recentUrlsChanged(); m_pAddressEdit->setCurrentText(""); - m_pAddressEdit->setInsertionPolicy(QComboBox::NoInsertion); + m_pAddressEdit->setInsertionPolicy(TQComboBox::NoInsertion); m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins m_pButtonBox->setStretchFactor(m_pAddressEdit,1); #ifdef COMPILE_USE_QT4 - m_pButtonBox->setObjectName( QLatin1String( "kvi_window_button_box" ) ); + m_pButtonBox->setObjectName( TQLatin1String( "kvi_window_button_box" ) ); #endif KviTalToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI")); - connect(m_pAddressEdit,SIGNAL(activated(const QString & )),this,SLOT(ircUriChanged(const QString & ))); - connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged())); + connect(m_pAddressEdit,TQT_SIGNAL(activated(const TQString & )),this,TQT_SLOT(ircUriChanged(const TQString & ))); + connect(g_pApp,TQT_SIGNAL(recentUrlsChanged()),this,TQT_SLOT(recentUrlsChanged())); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); // FIXME: #warning "If notify list is disabled avoid to show this" // FIXME: #warning "Button to show/hide the notifyListView (NOT DELETE RE_CREATE!)" // The userlist on the right //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pNotifyViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Notify List"),buttonContainer(),true,"list_view_button"); - connect(m_pNotifyViewButton,SIGNAL(clicked()),this,SLOT(toggleNotifyView())); + connect(m_pNotifyViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleNotifyView())); m_pNotifyListView = new KviUserListView(m_pSplitter,m_pNotifyViewButton,0,this,19,__tr2qs("Notify List"),"notify_list_view"); @@ -173,10 +173,10 @@ int KviConsole::selectedCount() } void KviConsole::recentUrlsChanged(){ - QString cur = m_pAddressEdit->currentText(); + TQString cur = m_pAddressEdit->currentText(); m_pAddressEdit->clear(); for ( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); + TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); ++it ) { @@ -200,7 +200,7 @@ bool KviConsole::connectionInProgress() KviConsole::~KviConsole() { - // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /QUIT $option() so the idents are parsed!" + // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /TQUIT $option() so the idents are parsed!" // Force connection close: it will just return if no connection is present context()->terminateConnectionRequest(true); @@ -229,9 +229,9 @@ unsigned int KviConsole::ircContextId() return m_pContext->id(); } -QString KviConsole::currentNetworkName() +TQString KviConsole::currentNetworkName() { - return (connection() ? connection()->networkName() : QString::null); + return (connection() ? connection()->networkName() : TQString()); } @@ -265,24 +265,24 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p) cc = channelCount(); qc = queryCount(); p->insertSeparator(); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),SLOT(partAllChannels())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQT_SLOT(partAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),SLOT(closeAllQueries())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries())); if(!qc)p->setItemEnabled(id,false); } p->insertSeparator(); - p->insertItem(__tr2qs("Unhighlight All Windows"),context(),SLOT(unhighlightAllWindows())); + p->insertItem(__tr2qs("Unhighlight All Windows"),context(),TQT_SLOT(unhighlightAllWindows())); if(connection()) { - id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),SLOT(unhighlightAllChannels())); + id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),TQT_SLOT(unhighlightAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),SLOT(unhighlightAllQueries())); + id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),TQT_SLOT(unhighlightAllQueries())); if(!qc)p->setItemEnabled(id,false); } } -void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * matches) +void KviConsole::completeChannel(const TQString &word,KviPointerList<TQString> * matches) { // FIXME: first look in our context ? /* @@ -292,35 +292,35 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviStr((*it) } */ - QStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); + TQStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(TQStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { - if(KviQString::equalCIN((*it),word,word.length()))matches->append(new QString(*it)); + if(KviTQString::equalCIN((*it),word,word.length()))matches->append(new TQString(*it)); } } } -void KviConsole::completeServer(const QString &word, KviPointerList<QString> * matches) +void KviConsole::completeServer(const TQString &word, KviPointerList<TQString> * matches) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) { - QString srv((*it)); + TQString srv((*it)); - KviQString::cutToFirst(srv,'/'); + KviTQString::cutToFirst(srv,'/'); while(srv.startsWith("/"))srv.remove(0,1); - KviQString::cutFromLast(srv,':'); + KviTQString::cutFromLast(srv,':'); //We should have a full server name here, without the irc:// and without the port - if(KviQString::equalCIN(srv,word,word.length())) + if(KviTQString::equalCIN(srv,word,word.length())) { - matches->append(new QString(srv)); + matches->append(new TQString(srv)); } } } -void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer) +void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString &buffer) { KviRegisteredMask *u = g_pRegisteredUserDataBase->findMatchingMask(nick,e->user(),e->host()); @@ -330,15 +330,15 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += nick; buffer += "!"; - buffer += e->user().isEmpty() ? QString("*") : e->user(); + buffer += e->user().isEmpty() ? TQString("*") : e->user(); buffer += "@"; - buffer += e->host().isEmpty() ? QString("*") : e->host(); + buffer += e->host().isEmpty() ? TQString("*") : e->host(); buffer += "</b></font></center></td></tr>"; if(u) { - QString szComment=u->user()->getProperty("comment"); + TQString szComment=u->user()->getProperty("comment"); if(!szComment.isEmpty()) { buffer += "<tr bgcolor=\"#F0F0F0\"><td><center><font size=\"-1\">("; @@ -351,9 +351,9 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & #ifdef COMPILE_USE_QT4 Q3MimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #else - QMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); + TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #endif - buffer += QString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width()); + buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width()); } if(e->hasRealName()) @@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(u) { - QString mask; - u->mask()->mask(mask); + TQString tqmask; + u->tqmask()->tqmask(tqmask); buffer += "<tr bgcolor=\"#F0F0F0\"><td>"; buffer += __tr2qs("Registered as"); buffer += " <b>"; @@ -385,13 +385,13 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">"; buffer += __tr2qs("(Matched by"); buffer += " "; - buffer += mask; + buffer += tqmask; buffer += ")</td></tr>"; } if(connection()) { - QString chans; + TQString chans; if(connection()->getCommonChannels(nick,chans,false)) { buffer += "<tr><td bgcolor=\"#F0F0F0\">"; @@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(e->hasServer()) { buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Using server <b>%1</b>").arg(e->server()); + buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server()); if(e->hasHops()) { buffer += " ("; - buffer += __tr2qs("%1 hops").arg(e->hops()); + buffer += __tr2qs("%1 hops").tqarg(e->hops()); buffer += ")</nobr></td></tr>"; } else { buffer += "</nobr></td></tr></table>"; @@ -443,9 +443,9 @@ void KviConsole::saveProperties(KviConfig *cfg) } -void KviConsole::getBaseLogFileName(QString &buffer) +void KviConsole::getBaseLogFileName(TQString &buffer) { - buffer=QString("CONSOLE%1").arg(ircContextId()); + buffer=TQString("CONSOLE%1").tqarg(ircContextId()); } void KviConsole::showNotifyList(bool bShow) @@ -492,7 +492,7 @@ KviWindow * KviConsole::activeWindow() return this; } -void KviConsole::ircUriChanged(const QString & text){ +void KviConsole::ircUriChanged(const TQString & text){ if(KviIrcUrl::run(text,KviIrcUrl::CurrentContext,this) & KviIrcUrl::InvalidProtocol) { KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or irc6s:// URL's\n" @@ -502,7 +502,7 @@ void KviConsole::ircUriChanged(const QString & text){ void KviConsole::updateUri() { - QString uri; + TQString uri; if(connection()) { KviIrcServer* server = connection()->target()->server(); @@ -527,7 +527,7 @@ void KviConsole::updateUri() void KviConsole::connectionAttached() { //need to update URI - connect(m_pContext->connection(),SIGNAL(chanListChanged()),this,SLOT(updateUri())); + connect(m_pContext->connection(),TQT_SIGNAL(chanListChanged()),this,TQT_SLOT(updateUri())); updateUri(); m_pNotifyListView->setUserDataBase(connection()->userDataBase()); } @@ -545,7 +545,7 @@ bool KviConsole::isIpV6Connection() return connection()->server()->isIpV6(); } -void KviConsole::closeEvent(QCloseEvent *e) +void KviConsole::closeEvent(TQCloseEvent *e) { if(g_pFrame->consoleCount() > 1) { @@ -554,7 +554,7 @@ void KviConsole::closeEvent(QCloseEvent *e) { if(!KVI_OPTION_BOOL(KviOption_boolAlwaysDisconnectClosingConnectedConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close a console window with an active connection inside.\n" \ "Are you sure you wish to terminate the connection?"), @@ -588,7 +588,7 @@ void KviConsole::closeEvent(QCloseEvent *e) // this is the only console... ask if the user really wants to quit KVirc if(!KVI_OPTION_BOOL(KviOption_boolAlwaysQuitKVIrcClosingLastConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close the last console window.\nAre you sure you wish to quit KVIrc?"), __tr2qs("&Always"), @@ -612,11 +612,11 @@ void KviConsole::closeEvent(QCloseEvent *e) } // internal helper for applyHighlighting -int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger) +int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg,const TQString &trigger) { if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound)))); - QString szMessageType; - KviQString::sprintf(szMessageType,"%d",type); + TQString szMessageType; + KviTQString::sprintf(szMessageType,"%d",type); if(KVS_TRIGGER_EVENT_7_HALTED(KviEvent_OnHighlight, wnd,nick,user,host, szMsg,trigger, @@ -626,17 +626,17 @@ int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,c } // if it returns -1 you should just return and not display the message -int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg) +int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg) { - QString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); - QString szSource; - QString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); - QChar* aux=(QChar*)(szStripMsg.ucs2()); + TQString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); + TQString szSource; + TQString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); + TQChar* aux=(TQChar*)(szStripMsg.ucs2()); if(aux) { - while(aux->unicode()) + while(aux->tqunicode()) { - if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) + if( KVI_OPTION_STRING(KviOption_stringWordSplitters).tqfind(*aux) > -1 ) szSource.append(' '); else szSource.append(*aux); @@ -649,19 +649,19 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co szSource.prepend(' '); if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - if(szSource.find(QString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.tqfind(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); } if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end() ; ++it) { if((*it).isEmpty()) continue; - // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) !!!! - if(szSource.find(QString(" %1 ").arg(*it),0,false) > -1) + // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!! + if(szSource.tqfind(TQString(" %1 ").tqarg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -714,13 +714,13 @@ static const char * g_nickColors[KVI_NUM_NICK_COLORS]= void KviConsole::outputPrivmsg(KviWindow *wnd, int type, - const QString &daNick, - const QString &daUser, - const QString &daHost, - const QString &msg, + const TQString &daNick, + const TQString &daUser, + const TQString &daHost, + const TQString &msg, int iFlags, - const QString &prefix, - const QString &suffix) + const TQString &prefix, + const TQString &suffix) { // FIXME: #warning "THIS IS USED BY WINDOWS THAT ARE NOT BOUND TO THIS IRC CONTEXT" // FIXME: #warning "REMEMBER IT IN ESCAPE COMMANDS" @@ -728,11 +728,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, bool bIsChan = (wnd->type() == KVI_WINDOW_TYPE_CHANNEL); bool bIsNotice = ((type == KVI_OUT_CHANNELNOTICE)||(type == KVI_OUT_CHANNELNOTICECRYPTED) \ - ||(type == KVI_OUT_QUERYNOTICE)||(type == KVI_OUT_QUERYNOTICECRYPTED)); + ||(type == KVI_OUT_TQUERYNOTICE)||(type == KVI_OUT_TQUERYNOTICECRYPTED)); - QString nick = daNick; // not that beautiful.. :/ - QString user = daUser; - QString host = daHost; + TQString nick = daNick; // not that beautiful.. :/ + TQString user = daUser; + TQString host = daHost; if(connection()) { @@ -741,7 +741,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(host.isEmpty())host = connection()->userInfo()->hostName(); } - QString szDecodedMessage = msg; // shallow copy + TQString szDecodedMessage = msg; // shallow copy if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) szDecodedMessage = KviMircCntrl::stripControlBytes(szDecodedMessage); @@ -764,13 +764,13 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnHighlightedMessages) && (!(iFlags & NoNotifier))) { - QString szMsg = "<b><"; + TQString szMsg = "<b><"; szMsg += nick; szMsg += "></b> "; #ifdef COMPILE_USE_QT4 - szMsg += Qt::escape(szDecodedMessage); + szMsg += TQt::escape(szDecodedMessage); #else - szMsg += QStyleSheet::escape(szDecodedMessage); + szMsg += TQStyleSheet::escape(szDecodedMessage); #endif //debug("kvi_console.cpp:629 debug: %s",szMsg.data()); g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90); @@ -781,11 +781,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, // <PREFIX>nick[!user@host]<POSTFIX>This is a test message - QString szNick; - KviQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); + TQString szNick; + KviTQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); if(KVI_OPTION_BOOL(KviOption_boolShowUserAndHostInPrivmsgView)) - KviQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); + KviTQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); if(bIsChan && KVI_OPTION_BOOL(KviOption_boolShowChannelUserFlagInPrivmsgView)) ((KviChannel *)wnd)->prependUserFlag(nick,szNick); @@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); aux++; i--; } @@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); aux++; i--; } @@ -835,7 +835,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \ KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP)))); } - szNick.prepend(QString("%1").arg(color)); + szNick.prepend(TQString("%1").tqarg(color)); szNick.prepend(KVI_TEXT_COLOR); szNick.append(KVI_TEXT_COLOR); } @@ -847,7 +847,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, szNick.append(KVI_TEXT_BOLD); } - QString szMessage; + TQString szMessage; if(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)) { @@ -857,14 +857,14 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, } else { if(bIsNotice) { - static QString pre1("*"); - static QString suf1("* "); + static TQString pre1("*"); + static TQString suf1("* "); szMessage = prefix.isEmpty() ? pre1 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf1 : suffix; } else { - static QString pre2("<"); - static QString suf2("> "); + static TQString pre2("<"); + static TQString suf2("> "); szMessage = prefix.isEmpty() ? pre2 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf2 : suffix; @@ -877,12 +877,12 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, else wnd->outputNoFmt(type,szMessage); } -void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &textLine) +void KviConsole::avatarChangedUpdateWindows(const TQString &nick,const TQString &textLine) { if(!connection())return; //ops... // in quiet mode avoid bugging the user about avatar changes - bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_QUIET))); + bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_TQUIET))); for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next()) { @@ -901,7 +901,7 @@ void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &t m_pNotifyListView->avatarChanged(nick); // recalc the item height here too! } -void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine) +void KviConsole::avatarChanged(KviAvatar * avatar,const TQString &nick,const TQString &user,const TQString &host,const TQString &textLine) { if(!connection())return; //ops... @@ -910,13 +910,13 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr if(KVI_OPTION_BOOL(KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers)) { // Don't even try to do it for myself - if(!KviQString::equalCI(nick,connection()->userInfo()->nickName())) + if(!KviTQString::equalCI(nick,connection()->userInfo()->nickName())) { KviRegisteredUser * u = connection()->userDataBase()->registeredUser(nick,user,host); if(u) { if(avatar)u->setProperty("avatar",avatar->identificationString()); - else u->setProperty("avatar",QString::null); + else u->setProperty("avatar",TQString()); bRegisteredStuff = true; } } @@ -926,7 +926,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr { // cache it if(avatar) - KviAvatarCache::instance()->replace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + KviAvatarCache::instance()->tqreplace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); else KviAvatarCache::instance()->remove(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); } @@ -934,19 +934,19 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr avatarChangedUpdateWindows(nick,textLine); } -void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host) +void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const TQString &nick,const TQString &user,const TQString &host) { // look it up in the cache - QString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + TQString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); if(!szAvatar.isEmpty()) { // got a cache hit... is it on disk ? - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { // cached image on disk e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } else { // no cached image on disk.. will need to requery it anyway @@ -960,15 +960,15 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const if(u) { // the user is registered... - QString szAvatar; + TQString szAvatar; if(u->getProperty("avatar",szAvatar)) { // the user has a default avatar... - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } } @@ -979,40 +979,40 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u) { if(!connection())return; - QString szAvatar; + TQString szAvatar; if(!u->getProperty("avatar",szAvatar))return; - KviPointerHashTableIterator<QString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); + KviPointerHashTableIterator<TQString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); while(KviIrcUserEntry * e = it.current()) { if(e->hasHost()) { if(u->matchesFixed(it.currentKey(),e->user(),e->host())) { - KviAvatar * a = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * a = g_pIconManager->getAvatar(TQString(),szAvatar); e->setAvatar(a); - avatarChangedUpdateWindows(it.currentKey(),QString::null); + avatarChangedUpdateWindows(it.currentKey(),TQString()); } } ++it; } } -KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName) +KviAvatar * KviConsole::setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName) { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(nick); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(nick); if(e) { // User and host must match if((!user.isEmpty()) && e->hasUser()) { - if(!KviQString::equalCI(user,e->user()))return 0; + if(!KviTQString::equalCI(user,e->user()))return 0; } if((!host.isEmpty()) && e->hasHost()) { - if(!KviQString::equalCI(host,e->host()))return 0; + if(!KviTQString::equalCI(host,e->host()))return 0; } // Ok...got it @@ -1021,7 +1021,7 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const if(avatar) { e->setAvatar(avatar); - avatarChanged(avatar,nick,user,host,QString::null); + avatarChanged(avatar,nick,user,host,TQString()); return avatar; } else { if(_OUTPUT_PARANOIC) @@ -1033,17 +1033,17 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const KviAvatar * KviConsole::defaultAvatarFromOptions() { - QPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); + TQPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); if(!avatar)return 0; if(avatar->isNull())return 0; if(KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty())return 0; - return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new QPixmap(*avatar)); + return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new TQPixmap(*avatar)); } KviAvatar * KviConsole::currentAvatar() { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return 0; KviAvatar * a = e->avatar(); if(!a) @@ -1052,7 +1052,7 @@ KviAvatar * KviConsole::currentAvatar() if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } return a; @@ -1061,13 +1061,13 @@ KviAvatar * KviConsole::currentAvatar() void KviConsole::setAvatarFromOptions() { if(!connection())return; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return; KviAvatar * a = defaultAvatarFromOptions(); if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } @@ -1084,18 +1084,18 @@ void KviConsole::applyOptions() resize(width() + 1,height() + 1); } -void KviConsole::resizeEvent(QResizeEvent *e) +void KviConsole::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviConsole::sizeHint() const +TQSize KviConsole::tqsizeHint() const { - QSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } @@ -1115,16 +1115,16 @@ void KviConsole::fillStatusString() if(connection()->userInfo()->isAway()) { - m_szStatusString += QChar(' '); + m_szStatusString += TQChar(' '); m_szStatusString += __tr2qs("away"); } - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } else { if(connection()->userInfo()->isAway()) { m_szStatusString += " ("; m_szStatusString += __tr2qs("away"); - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } } @@ -1138,16 +1138,16 @@ void KviConsole::fillCaptionBuffers() { fillStatusString(); - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); m_szPlainTextCaption = windowName(); m_szPlainTextCaption += " ["; m_szPlainTextCaption += m_szStatusString; - m_szPlainTextCaption += QChar(']'); + m_szPlainTextCaption += TQChar(']'); m_szHtmlActiveCaption = begin; m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); @@ -1171,29 +1171,29 @@ void KviConsole::fillCaptionBuffers() } -QPixmap * KviConsole::myIconPtr() +TQPixmap * KviConsole::myIconPtr() { return g_pIconManager->getSmallIcon(isConnected() ? KVI_SMALLICON_LINKS : KVI_SMALLICON_CONSOLE); } -void KviConsole::getTaskBarTipText(QString &buffer) +void KviConsole::getTaskBarTipText(TQString &buffer) { fillStatusString(); - static QString html_bold("<b>"); - static QString html_tab(" "); - static QString html_eofbold("</b>"); - static QString html_hrbr("<br><hr>"); - static QString html_channel(__tr2qs("channel")); - static QString html_channels(__tr2qs("channels")); - static QString html_query(__tr2qs("query")); - static QString html_queries(__tr2qs("queries")); - static QString html_space(" "); - static QString html_commaspace(", "); - static QString html_br("<br>"); - static QString html_spaceparopen(" ("); - static QString html_spaceparclosed(")"); + static TQString html_bold("<b>"); + static TQString html_tab(" "); + static TQString html_eofbold("</b>"); + static TQString html_hrbr("<br><hr>"); + static TQString html_channel(__tr2qs("channel")); + static TQString html_channels(__tr2qs("channels")); + static TQString html_query(__tr2qs("query")); + static TQString html_queries(__tr2qs("queries")); + static TQString html_space(" "); + static TQString html_commaspace(", "); + static TQString html_br("<br>"); + static TQString html_spaceparopen(" ("); + static TQString html_spaceparclosed(")"); buffer = "<table width=\"100%\">" \ START_TABLE_BOLD_ROW; @@ -1201,7 +1201,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += END_TABLE_BOLD_ROW; if((context()->state() == KviIrcContext::Connected) && connection()) { - QString num; + TQString num; unsigned int uD; unsigned int uH; @@ -1239,7 +1239,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += "</td></tr>"; } - QDateTime dt; + TQDateTime dt; dt.setTime_t(connection()->statistics()->connectionStartTime()); buffer += START_TABLE_NORMAL_ROW; @@ -1255,7 +1255,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) //buffer += html_spaceparopen; - QString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), + TQString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), KviTimeUtils::NoLeadingEmptyIntervals | KviTimeUtils::NoLeadingZeroes); buffer += __tr2qs("Online for"); diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index b9f494c3..18c02ee5 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -34,11 +34,11 @@ #include "kvi_pointerlist.h" #include <time.h> -#include <qcombobox.h> +#include <tqcombobox.h> -class QToolBar; -class QToolButton; +class TQToolBar; +class TQToolButton; class KviAvatar; class KviDns; @@ -51,7 +51,7 @@ class KviProxy; class KviChannel; class KviQuery; #else - // windoze wants it to compile QList<KviChannel> and QList<KviQuery> + // windoze wants it to compile TQList<KviChannel> and TQList<KviQuery> #include "kvi_channel.h" #include "kvi_query.h" #endif @@ -80,6 +80,7 @@ class KVIRC_API KviConsole : public KviWindow friend class KviQuery; friend class KviIrcContext; Q_OBJECT + TQ_OBJECT protected: KviConsole(KviFrame * lpFrm,int iFlags); public: @@ -89,18 +90,18 @@ protected: // UI KviUserListView * m_pNotifyListView; KviWindowToolPageButton * m_pNotifyViewButton; - QComboBox * m_pAddressEdit; - QString m_szStatusString; // nick (flags) on server | not connected + TQComboBox * m_pAddressEdit; + TQString m_szStatusString; // nick (flags) on server | not connected protected: // UI - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); - virtual void closeEvent(QCloseEvent *e); - virtual void getBaseLogFileName(QString &buffer); - virtual void getTaskBarTipText(QString &buffer); + virtual void resizeEvent(TQResizeEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void getBaseLogFileName(TQString &buffer); + virtual void getTaskBarTipText(TQString &buffer); virtual void fillContextPopup(KviTalPopupMenu * p); - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void applyOptions(); virtual void triggerCreationEvents(); void fillStatusString(); @@ -113,7 +114,7 @@ protected: void destroyConnection(); // internal helper for applyHighlighting - int triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger); + int triggerOnHighlight(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg,const TQString &trigger); void showNotifyList(bool bShow); @@ -142,33 +143,33 @@ public: // // This connection info // - QString currentNetworkName(); + TQString currentNetworkName(); KviAvatar * currentAvatar(); // // IRC Context wide helpers (connection related) // - void getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer); + void getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString &buffer); enum OutputPrivmsgFlags { NoWindowFlashing = 1, // has meaning only if NoHighlighting is NOT given, otherwise it is implied NoNotifier = 2, // has meaning only if NoHighlighitng is NOT given, otherwise it is implied NoHighlighting = 4, NoNotifications = 7 // this is 1|2|4 implies NoWindowFlashing and NoNotifier }; - void outputPrivmsg(KviWindow *wnd,int type,const QString &nick, - const QString &user,const QString &host,const QString &msg,int iFlags = 0,const QString &prefix = QString::null,const QString &suffix = QString::null); + void outputPrivmsg(KviWindow *wnd,int type,const TQString &nick, + const TQString &user,const TQString &host,const TQString &msg,int iFlags = 0,const TQString &prefix = TQString(),const TQString &suffix = TQString()); // this applies highlighting to the specified message // and triggers the OnHighlight event. // it returns KVI_OUT_HIGHLIGHT if highlighting was applied // and -1 if OnHighlight called halt // otherwise it returns <type> - int applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg); + int applyHighlighting(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg); // Avatar helpers (conneciton related) void resetAvatarForMatchingUsers(KviRegisteredUser * u); // this should be protected at least - void avatarChangedUpdateWindows(const QString &nick,const QString &textLine); - void avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine); - KviAvatar * setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName); - void checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host); + void avatarChangedUpdateWindows(const TQString &nick,const TQString &textLine); + void avatarChanged(KviAvatar * avatar,const TQString &nick,const TQString &user,const TQString &host,const TQString &textLine); + KviAvatar * setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName); + void checkDefaultAvatar(KviIrcUserEntry *e,const TQString &nick,const TQString &user,const TQString &host); void setAvatarFromOptions(); // This returns the default avatar for the current KVIrc user @@ -180,8 +181,8 @@ public: void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0); - // Status string (usermode + nick) (connection related too) - const QString & statusString(){ return m_szStatusString; }; + // tqStatus string (usermode + nick) (connection related too) + const TQString & statusString(){ return m_szStatusString; }; // forwarders from KviIrcConnection KVI_DEPRECATED KviPointerList<KviChannel> * channelList(){ return connection() ? connection()->channelList() : 0; }; @@ -195,8 +196,8 @@ public: KviWindow * activeWindow(); // User db, connection related - void completeChannel(const QString &word,KviPointerList<QString> * matches); - void completeServer(const QString &word,KviPointerList<QString> * matches); + void completeChannel(const TQString &word,KviPointerList<TQString> * matches); + void completeServer(const TQString &word,KviPointerList<TQString> * matches); void connectionAttached(); void connectionDetached(); public slots: @@ -204,7 +205,7 @@ public slots: void executeInternalCommand(int index); void recentUrlsChanged(); protected slots: - void ircUriChanged(const QString & ); + void ircUriChanged(const TQString & ); void toggleNotifyView(); void textViewRightClicked(); }; diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 6cbdd5bc..f9a7a134 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -40,7 +40,7 @@ #include "kvi_memmove.h" #include "kvi_toolwindows_container.h" - #include <qlayout.h> + #include <tqlayout.h> #include "kvi_pointerhashtable.h" // kvi_app.cpp @@ -65,7 +65,7 @@ - KviCryptController::KviCryptController(QWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur) + KviCryptController::KviCryptController(TQWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur) : KviWindowToolWidget(par,button) { // FIXME: #warning "Load the available modules here" @@ -79,51 +79,51 @@ m_pWindow = wnd; #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif - QGridLayout *g = new QGridLayout(this,10,4,2,2); + TQGridLayout *g = new TQGridLayout(this,10,4,2,2); - QLabel *l = new QLabel(this); + TQLabel *l = new TQLabel(this); l->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LOCKED))); g->addWidget(l,0,0); - l = new QLabel(__tr2qs("Cryptography/text transformation"),this); + l = new TQLabel(__tr2qs("Cryptography/text transformation"),this); g->addMultiCellWidget(l,0,0,1,3); - QFrame * frm = new QFrame(this); - frm->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * frm = new TQFrame(this); + frm->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(frm,1,1,0,3); m_pEnableCheck = new KviStyledCheckBox(__tr2qs("Use the crypt engine"),this); g->addMultiCellWidget(m_pEnableCheck,2,2,0,3); - connect(m_pEnableCheck,SIGNAL(toggled(bool)),this,SLOT(enableCheckToggled(bool))); + connect(m_pEnableCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCheckToggled(bool))); m_pListBox = new KviTalListBox(this); - connect(m_pListBox,SIGNAL(highlighted(KviTalListBoxItem *)),this,SLOT(engineHighlighted(KviTalListBoxItem *))); + connect(m_pListBox,TQT_SIGNAL(highlighted(KviTalListBoxItem *)),this,TQT_SLOT(engineHighlighted(KviTalListBoxItem *))); g->addMultiCellWidget(m_pListBox,3,8,0,0); - m_pDescriptionLabel = new QLabel(this); - m_pDescriptionLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pDescriptionLabel = new TQLabel(this); + m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); #ifdef COMPILE_USE_QT4 - m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); + m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); #else - m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); + m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); #endif g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3); - m_pAuthorLabel = new QLabel(this); - m_pAuthorLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pAuthorLabel = new TQLabel(this); + m_pAuthorLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); g->addMultiCellWidget(m_pAuthorLabel,4,4,1,3); m_pEnableEncrypt = new KviStyledCheckBox(__tr2qs("Enable encryption"),this); g->addMultiCellWidget(m_pEnableEncrypt,5,5,1,3); - m_pEncryptKeyLabel = new QLabel(__tr2qs("Encrypt key:"),this); + m_pEncryptKeyLabel = new TQLabel(__tr2qs("Encrypt key:"),this); g->addWidget(m_pEncryptKeyLabel,6,1); - m_pEncryptKeyEdit = new QLineEdit(this); + m_pEncryptKeyEdit = new TQLineEdit(this); g->addWidget(m_pEncryptKeyEdit,6,2); m_pEncryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); @@ -132,18 +132,18 @@ m_pEnableDecrypt = new KviStyledCheckBox(__tr2qs("Enable decryption"),this); g->addMultiCellWidget(m_pEnableDecrypt,7,7,1,3); - m_pDecryptKeyLabel = new QLabel(__tr2qs("Decrypt key:"),this); + m_pDecryptKeyLabel = new TQLabel(__tr2qs("Decrypt key:"),this); g->addWidget(m_pDecryptKeyLabel,8,1); - m_pDecryptKeyEdit = new QLineEdit(this); + m_pDecryptKeyEdit = new TQLineEdit(this); g->addWidget(m_pDecryptKeyEdit,8,2); m_pDecryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); g->addWidget(m_pDecryptHexKeyCheck,8,3); - m_pOkButton = new QPushButton(__tr2qs("OK"),this); + m_pOkButton = new TQPushButton(__tr2qs("OK"),this); g->addMultiCellWidget(m_pOkButton,9,9,0,3); - connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okClicked())); + connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); g->setRowStretch(3,1); g->setColStretch(2,1); @@ -155,7 +155,7 @@ if(cur) { - KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->findItem(cur->szEngineName.ptr()); + KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->tqfindItem(cur->szEngineName.ptr()); if(it) { m_pEnableCheck->setChecked(true); @@ -184,10 +184,10 @@ void KviCryptController::fillEngineList() { - const KviPointerHashTable<QString,KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict(); + const KviPointerHashTable<TQString,KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict(); if(a) { - KviPointerHashTableIterator<QString,KviCryptEngineDescription> it(*a); + KviPointerHashTableIterator<TQString,KviCryptEngineDescription> it(*a); while(it.current()) { KviStr modName = it.current()->providerHandle ? ((KviModule *)(it.current()->providerHandle))->name() : ""; @@ -205,7 +205,7 @@ { KviEngineListBoxItem * eit = (KviEngineListBoxItem *)it; m_pAuthorLabel->setText(eit->m_szAuthor.ptr()); - QString des = "<p>"; + TQString des = "<p>"; des += eit->m_szDescription.ptr(); des += "<br><br>"; des += __tr2qs("If you dont want to encrypt a particular text line then just start it with the CTRL+P prefix"); diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 1d6afcb6..17e26a46 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -26,17 +26,19 @@ #include "kvi_settings.h" +#ifdef Q_MOC_RUN +#define COMPILE_CRYPT_SUPPORT +#endif // Q_MOC_RUN +// TQt4 tqmoc bails out on this ?????? -// Qt4 moc bails out on this ?????? - -#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN) - #include <qwidget.h> +#if defined(COMPILE_CRYPT_SUPPORT) || defined(TQ_TQMOC_RUN) + #include <tqwidget.h> #include "kvi_tal_listbox.h" - #include <qpushbutton.h> - #include <qcheckbox.h> - #include <qlabel.h> - #include <qlineedit.h> + #include <tqpushbutton.h> + #include <tqcheckbox.h> + #include <tqlabel.h> + #include <tqlineedit.h> #include "kvi_styled_controls.h" #include "kvi_crypt.h" @@ -72,23 +74,24 @@ class KVIRC_API KviCryptController : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviCryptController(QWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); + KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); ~KviCryptController(); protected: KviWindow * m_pWindow; KviTalListBox * m_pListBox; - QPushButton * m_pOkButton; + TQPushButton * m_pOkButton; KviStyledCheckBox * m_pEnableCheck; - QLabel * m_pDescriptionLabel; - QLabel * m_pAuthorLabel; + TQLabel * m_pDescriptionLabel; + TQLabel * m_pAuthorLabel; KviStyledCheckBox * m_pEnableEncrypt; - QLabel * m_pEncryptKeyLabel; - QLineEdit * m_pEncryptKeyEdit; + TQLabel * m_pEncryptKeyLabel; + TQLineEdit * m_pEncryptKeyEdit; KviStyledCheckBox * m_pEncryptHexKeyCheck; KviStyledCheckBox * m_pEnableDecrypt; - QLabel * m_pDecryptKeyLabel; - QLineEdit * m_pDecryptKeyEdit; + TQLabel * m_pDecryptKeyLabel; + TQLineEdit * m_pDecryptKeyEdit; KviStyledCheckBox * m_pDecryptHexKeyCheck; KviEngineListBoxItem * m_pLastItem; KviCryptSessionInfo * m_pSessionInfo; diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index e6f392d6..da821469 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -29,40 +29,40 @@ #include "kvi_iconmanager.h" -#include <qdatetime.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqdatetime.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> + #include <tqdesktopwidget.h> #endif // kvi_app.cpp extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; KviCtcpPageDialog::KviCtcpPageDialog() -: QWidget(0,"kvirc_ctcppage_dialog", +: TQWidget(0,"kvirc_ctcppage_dialog", #ifdef COMPILE_USE_QT4 - Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window) + TQt::WindowStaysOnTopHint | TQt::Tool | TQt::Dialog | TQt::Window) #else WStyle_StaysOnTop | WStyle_Tool | WType_Dialog | WType_TopLevel) #endif { - QGridLayout * g = new QGridLayout(this,4,1,6,0); + TQGridLayout * g = new TQGridLayout(this,4,1,6,0); m_pWidgetStack = new KviTalWidgetStack(this); g->addWidget(m_pWidgetStack,0,0); - m_pTabBar = new QTabBar(this); - m_pTabBar->setShape(QTabBar::TriangularBelow); - connect(m_pTabBar,SIGNAL(selected(int)),this,SLOT(tabSelected(int))); + m_pTabBar = new TQTabBar(this); + m_pTabBar->setShape(TQTabBar::TriangularBelow); + connect(m_pTabBar,TQT_SIGNAL(selected(int)),this,TQT_SLOT(tabSelected(int))); g->addWidget(m_pTabBar,1,0); g->setRowStretch(0,1); g->addRowSpacing(2,15); - m_pCloseButton = new QPushButton(__tr2qs("Close"),this); - connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(die())); + m_pCloseButton = new TQPushButton(__tr2qs("Close"),this); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(die())); g->addWidget(m_pCloseButton,3,0); setMinimumSize(300,200); @@ -93,19 +93,19 @@ void KviCtcpPageDialog::tabSelected(int id) m_pWidgetStack->raiseWidget(id); } -void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg) +void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,const TQString &szHost,const TQString &szMsg) { #ifdef COMPILE_USE_QT4 int id = m_pTabBar->addTab(szNick); #else - int id = m_pTabBar->addTab(new QTab(szNick)); + int id = m_pTabBar->addTab(new TQTab(szNick)); #endif - QLabel * l = new QLabel(this); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + TQLabel * l = new TQLabel(this); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); //l->setMaximumWidth(600); - QString date = QDateTime::currentDateTime().toString(); + TQString date = TQDateTime::tqcurrentDateTime().toString(); - QString tmp = "<center>"; + TQString tmp = "<center>"; tmp += __tr2qs("You have been paged by"); tmp += "<br><b>"; tmp += szNick; @@ -125,7 +125,7 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons m_pTabBar->setCurrentTab(id); } -void KviCtcpPageDialog::closeEvent(QCloseEvent *) +void KviCtcpPageDialog::closeEvent(TQCloseEvent *) { delete this; } @@ -138,9 +138,9 @@ void KviCtcpPageDialog::popup() m_pCloseButton->setFocus(); } -void KviCtcpPageDialog::showEvent(QShowEvent *e) +void KviCtcpPageDialog::showEvent(TQShowEvent *e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); center(); } diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/kvi_ctcppagedialog.h index ea615257..d1e4ba7e 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.h +++ b/src/kvirc/ui/kvi_ctcppagedialog.h @@ -27,30 +27,31 @@ #include "kvi_string.h" #include "kvi_tal_widgetstack.h" -#include <qtabbar.h> -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqtabbar.h> +#include <tqwidget.h> +#include <tqpushbutton.h> -class KVIRC_API KviCtcpPageDialog : public QWidget +class KVIRC_API KviCtcpPageDialog : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviCtcpPageDialog(); ~KviCtcpPageDialog(); protected: KviTalWidgetStack * m_pWidgetStack; - QTabBar * m_pTabBar; - QPushButton * m_pCloseButton; + TQTabBar * m_pTabBar; + TQPushButton * m_pCloseButton; public: void popup(); - void addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg); + void addPage(const TQString &szNick,const TQString &szUser,const TQString &szHost,const TQString &szMsg); protected slots: void tabSelected(int id); void die(); protected: void center(); - virtual void showEvent(QShowEvent *e); - virtual void closeEvent(QCloseEvent *); + virtual void showEvent(TQShowEvent *e); + virtual void closeEvent(TQCloseEvent *); }; #endif //_KVI_CTCPPAGEDIALOG_H_ diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 7aa6f1cc..b4e06306 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -31,69 +31,69 @@ #include "kvi_actionmanager.h" #include "kvi_customtoolbardescriptor.h" -#include <qcursor.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qlayout.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qtoolbutton.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqtoolbutton.h> +#include <tqpainter.h> +#include <tqstyle.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> - #include <q3dragobject.h> + #include <tqevent.h> + #include <tq3dragobject.h> - #define QDragObject Q3DragObject - #define QTextDrag Q3TextDrag - #define QIconDrag Q3IconDrag + #define TQDragObject Q3DragObject + #define TQTextDrag Q3TextDrag + #define TQIconDrag Q3IconDrag - #include <qstyleoption.h> + #include <tqstyleoption.h> #else - #include <qobjectlist.h> - #include <qdragobject.h> + #include <tqobjectlist.h> + #include <tqdragobject.h> #endif KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name) -: QWidget(pParent,name) +: TQWidget(pParent,name) { m_pToolBar = pParent; setBackgroundMode(pParent->backgroundMode()); setBackgroundOrigin(ParentOrigin); - setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum)); } -QSize KviCustomToolBarSeparator::sizeHint() const +TQSize KviCustomToolBarSeparator::tqsizeHint() const { #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent,&opt,this); + int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this); #else - int extent = style().pixelMetric(QStyle::PM_DockWindowSeparatorExtent,this); + int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this); #endif - if(m_pToolBar->orientation() == Qt::Horizontal)return QSize(extent,0); - else return QSize(0,extent); + if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0); + else return TQSize(0,extent); } -void KviCustomToolBarSeparator::paintEvent(QPaintEvent *) +void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *) { - QPainter p(this); + TQPainter p(this); #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - style()->drawPrimitive(QStyle::PE_Q3DockWindowSeparator,&opt,&p,this); + tqstyle()->drawPrimitive(TQStyle::PE_Q3DockWindowSeparator,&opt,&p,this); #else - QStyle::SFlags flags = QStyle::Style_Default; - if(m_pToolBar->orientation() == Qt::Horizontal)flags |= QStyle::Style_Horizontal; - style().drawPrimitive(QStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); + TQStyle::SFlags flags = TQStyle::Style_Default; + if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal; + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags); #endif } -KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) +KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const TQString &label,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KviToolBar(label,dock,bNewLine,nam) { m_pDescriptor = d; @@ -101,8 +101,8 @@ KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString m_pDraggedChild = 0; m_pFilteredChildren = 0; setAcceptDrops(true); - connect(KviActionManager::instance(),SIGNAL(beginCustomizeToolBars()),this,SLOT(beginCustomize())); - connect(KviActionManager::instance(),SIGNAL(endCustomizeToolBars()),this,SLOT(endCustomize())); + connect(KviActionManager::instance(),TQT_SIGNAL(beginCustomizeToolBars()),this,TQT_SLOT(beginCustomize())); + connect(KviActionManager::instance(),TQT_SIGNAL(endCustomizeToolBars()),this,TQT_SLOT(endCustomize())); setMinimumSize(20,20); d->registerToolBar(this); if(KviActionManager::customizingToolBars()) @@ -122,13 +122,13 @@ KviCustomToolBar::~KviCustomToolBar() if(m_pFilteredChildren)delete m_pFilteredChildren; } -void KviCustomToolBar::paintEvent(QPaintEvent * e) +void KviCustomToolBar::paintEvent(TQPaintEvent * e) { KviToolBar::paintEvent(e); if(KviActionManager::customizingToolBars() && (KviActionManager::currentToolBar() == this)) { - QPainter p(this); - p.setPen(Qt::red); + TQPainter p(this); + p.setPen(TQt::red); p.drawRect(0,0,width(),height()); } } @@ -136,30 +136,30 @@ void KviCustomToolBar::paintEvent(QPaintEvent * e) void KviCustomToolBar::filteredChildDestroyed() { if(!m_pFilteredChildren)return; - const QObject * o = sender(); + const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); m_pFilteredChildren->remove((void *)o); } -void KviCustomToolBar::filterChild(QObject * o) +void KviCustomToolBar::filterChild(TQObject * o) { - bool * b = new bool(((QWidget *)o)->isEnabled()); + bool * b = new bool(((TQWidget *)o)->isEnabled()); if(m_pFilteredChildren) m_pFilteredChildren->insert(o,b); - if(!*b)((QWidget *)o)->setEnabled(true); + if(!*b)((TQWidget *)o)->setEnabled(true); o->installEventFilter(this); - connect(o,SIGNAL(destroyed()),this,SLOT(filteredChildDestroyed())); + connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); } -void KviCustomToolBar::unfilterChild(QObject * o) +void KviCustomToolBar::unfilterChild(TQObject * o) { if(m_pFilteredChildren) { - bool * b = m_pFilteredChildren->find(o); + bool * b = m_pFilteredChildren->tqfind(o); if(b) { - if(!*b)((QWidget *)o)->setEnabled(false); + if(!*b)((TQWidget *)o)->setEnabled(false); o->removeEventFilter(this); - disconnect(o,SIGNAL(destroyed()),this,SLOT(filteredChildDestroyed())); + disconnect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); } } } @@ -169,18 +169,18 @@ void KviCustomToolBar::beginCustomize() if(m_pFilteredChildren)delete m_pFilteredChildren; m_pFilteredChildren = new KviPointerHashTable<void *,bool>; m_pFilteredChildren->setAutoDelete(true); - // filter the events for all the children + // filter the events for all the tqchildren #ifdef COMPILE_USE_QT4 - QList<QObject*> l = children(); - for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + TQList<TQObject*> l = tqchildren(); + for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) filterChild(*it); } #else - const QObjectList * l = children(); - QObjectListIterator it(*l); - while(QObject * o = it.current()) + const TQObjectList l = childrenListObject(); + TQObjectListIterator it(l); + while(TQObject * o = it.current()) { if(o->isWidgetType()) filterChild(o); @@ -193,23 +193,23 @@ void KviCustomToolBar::endCustomize() { // stop filtering events #ifdef COMPILE_USE_QT4 - QList<QObject*> l = children(); - for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + TQList<TQObject*> l = tqchildren(); + for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) unfilterChild(*it); } #else - const QObjectList * l = children(); - QObjectListIterator it(*l); - while(QObject * o = it.current()) + const TQObjectList l = childrenListObject(); + TQObjectListIterator it(l); + while(TQObject * o = it.current()) { if(o->isWidgetType()) unfilterChild(o); ++it; } #endif - // FIXME: We SHOULD MAKE SURE that the children are re-enabled... + // FIXME: We SHOULD MAKE SURE that the tqchildren are re-enabled... // this could be done by calling setEnabled(isEnabled()) on each action ? if(m_pFilteredChildren) { @@ -222,34 +222,34 @@ void KviCustomToolBar::endCustomize() void KviCustomToolBar::syncDescriptor() { // store the item order in the descriptor - QBoxLayout * lay = boxLayout(); - QLayoutIterator iter = lay->iterator(); - QLayoutItem * i; + TQBoxLayout * lay = boxLayout(); + TQLayoutIterator iter = lay->iterator(); + TQLayoutItem * i; m_pDescriptor->actions()->clear(); while((i = iter.current())) { - if(QWidget * w = i->widget()) - m_pDescriptor->actions()->append(new QString(w->name())); + if(TQWidget * w = i->widget()) + m_pDescriptor->actions()->append(new TQString(w->name())); ++iter; } } -void KviCustomToolBar::childEvent(QChildEvent *e) +void KviCustomToolBar::childEvent(TQChildEvent *e) { if(KviActionManager::customizingToolBars()) { - // this is useful for droppped and dragged-out children - if(e->type() == QEvent::ChildInserted) + // this is useful for droppped and dragged-out tqchildren + if(e->type() == TQEvent::ChildInserted) { if(e->child()->isWidgetType()) - filterChild(e->child()); + filterChild(TQT_TQOBJECT(e->child())); goto done; } - if(e->type() == QEvent::ChildRemoved) + if(e->type() == TQEvent::ChildRemoved) { if(e->child()->isWidgetType()) - unfilterChild(e->child()); + unfilterChild(TQT_TQOBJECT(e->child())); goto done; } } @@ -257,12 +257,12 @@ done: KviToolBar::childEvent(e); } -void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) +void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e) { if(!KviActionManager::customizingToolBars())return; KviActionManager::instance()->setCurrentToolBar(this); - QString text; - if(QTextDrag::decode(e,text)) + TQString text; + if(TQTextDrag::decode(e,text)) { if(!text.isEmpty()) { @@ -270,12 +270,12 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) if(a) { e->accept(true); - int idx = dropIndexAt(mapFromGlobal(QCursor::pos()),0,0); + int idx = dropIndexAt(mapFromGlobal(TQCursor::pos()),0,0); m_pDraggedChild = a->addToCustomToolBar(this); #ifdef COMPILE_USE_QT4 - QWidget * pWidgetToMove = widgetAt(idx); + TQWidget * pWidgetToMove = widgetAt(idx); bool bDone = false; - QAction * a; + TQAction * a; if(pWidgetToMove) { a = actionForWidget(pWidgetToMove); @@ -293,23 +293,23 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) boxLayout()->insertWidget(idx,m_pDraggedChild); #ifdef COMPILE_KDE_SUPPORT // bleah :///// - insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx); + insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } else e->accept(false); } else e->accept(false); } else e->accept(false); } -void KviCustomToolBar::dragMoveEvent(QDragMoveEvent *e) +void KviCustomToolBar::dragMoveEvent(TQDragMoveEvent *e) { if(!m_pDraggedChild)return; - drag(m_pDraggedChild,mapFromGlobal(QCursor::pos())); + drag(m_pDraggedChild,mapFromGlobal(TQCursor::pos())); } -void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent *e) +void KviCustomToolBar::dragLeaveEvent(TQDragLeaveEvent *e) { if(m_pDraggedChild) { @@ -320,7 +320,7 @@ void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent *e) } } -void KviCustomToolBar::dropEvent(QDropEvent *e) +void KviCustomToolBar::dropEvent(TQDropEvent *e) { if(!m_pDraggedChild)return; m_pDraggedChild = 0; @@ -328,30 +328,30 @@ void KviCustomToolBar::dropEvent(QDropEvent *e) // nuthin :) } -int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excludeIdx) +int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * excludeIdx) { // find the widget at the current poisition // treating exclude as if it was going to be removed // find also the exclude index if needed #ifdef COMPILE_USE_QT4 - QLayout * l = layout(); + TQLayout * l = tqlayout(); #else - QBoxLayout * l = boxLayout(); + TQBoxLayout * l = boxLayout(); #endif - QLayoutItem * i = 0; + TQLayoutItem * i = 0; if(excludeIdx)*excludeIdx = -1; int idx = 0; if(!l)return 0; - QLayoutIterator it = l->iterator(); + TQLayoutIterator it = l->iterator(); - // find the children with minimum distance + // find the tqchildren with minimum distance int iMinDistIdx = -1; - QWidget * pMinDistW = 0; + TQWidget * pMinDistW = 0; unsigned int uMinDist = 0xffffffff; int iExcludeIdx = -1; - QPoint pntExclude; - QWidget * w = 0; + TQPoint pntExclude; + TQWidget * w = 0; while((i = it.current())) { @@ -451,25 +451,25 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl } #ifdef COMPILE_USE_QT4 -QWidget * KviCustomToolBar::widgetAt(int index) +TQWidget * KviCustomToolBar::widgetAt(int index) { - QLayout * l = layout(); + TQLayout * l = tqlayout(); if(!l) return NULL; - QLayoutItem * it = l->itemAt(index); + TQLayoutItem * it = l->itemAt(index); if(!it) return NULL; return it->widget(); } -QAction * KviCustomToolBar::actionForWidget(QWidget * pWidget) +TQAction * KviCustomToolBar::actionForWidget(TQWidget * pWidget) { return actionAt(pWidget->x() + 1,pWidget->y() + 1); } #endif -void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) +void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt) { int me = -1; int idx = dropIndexAt(pnt,child,&me); @@ -477,15 +477,15 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) if(idx == me) return; // would move over itself #ifdef COMPILE_USE_QT4 - QWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx); + TQWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx); debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",idx > me ? idx-1 : idx,pWidgetToMove,child); if(pWidgetToMove == child) return; // hmmm bool bDone = false; - QAction * pMyOwnAction = actionForWidget(child); + TQAction * pMyOwnAction = actionForWidget(child); if(!pMyOwnAction) return; - QAction * a; + TQAction * a; removeAction(pMyOwnAction); if(pWidgetToMove) { @@ -511,46 +511,46 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) insertWidget(-1,child->width(),child,idx); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } -void KviCustomToolBar::mousePressEvent(QMouseEvent * e) +void KviCustomToolBar::mousePressEvent(TQMouseEvent * e) { if(KviActionManager::customizingToolBars()) KviActionManager::instance()->setCurrentToolBar(this); KviToolBar::mousePressEvent(e); } -bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) +bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) { if(!KviActionManager::customizingToolBars())goto unhandled; // anything here is done when customizing only - if(e->type() == QEvent::Enter) + if(e->type() == TQEvent::Enter) { - if(m_pMovedChild)return true; // kill it while moving other children + if(m_pMovedChild)return true; // kill it while moving other tqchildren } - if(e->type() == QEvent::Leave) + if(e->type() == TQEvent::Leave) { - if(m_pMovedChild)return true; // kill it while moving other children + if(m_pMovedChild)return true; // kill it while moving other tqchildren } - if(e->type() == QEvent::MouseButtonPress) + if(e->type() == TQEvent::MouseButtonPress) { KviActionManager::instance()->setCurrentToolBar(this); - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; if(ev->button() & Qt::LeftButton) { if(o->isWidgetType()) { if(!( o->inherits("KviTalPopupMenu") || - o->inherits("QToolBarHandle") || - o->inherits("QDockWindowHandle") || - o->inherits("QDockWindowResizeHandle") || - o->inherits("QToolBarExtensionWidget") + o->inherits("TQToolBarHandle") || + o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) || + o->inherits("TQDockWindowResizeHandle") || + o->inherits("TQToolBarExtensionWidget") )) { - m_pMovedChild = (QWidget *)o; - // allow resizing of children + m_pMovedChild = (TQWidget *)o; + // allow resizing of tqchildren // FIXME: do it only if the child is really resizable if(m_pMovedChild->width() > 20) // might be an applet { @@ -560,14 +560,14 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) goto unhandled; // let the applet handle the event it } } - g_pApp->setOverrideCursor(Qt::sizeAllCursor); + g_pApp->setOverrideCursor(TQt::sizeAllCursor); return true; } } } goto unhandled; } - if(e->type() == QEvent::MouseButtonRelease) + if(e->type() == TQEvent::MouseButtonRelease) { if(m_pMovedChild) { @@ -577,56 +577,56 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) } goto unhandled; } - if(e->type() == QEvent::MouseMove) + if(e->type() == TQEvent::MouseMove) { if(m_pMovedChild) { - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; - QPoint pnt = mapFromGlobal(m_pMovedChild->mapToGlobal(ev->pos())); + TQPoint pnt = mapFromGlobal(m_pMovedChild->mapToGlobal(ev->pos())); if((pnt.y() < 0) || (pnt.y() > height()) || (pnt.x() < 0) || (pnt.x() > width())) { // drag out! -// FIXME: This is screwed up in Qt4.... :/ +// FIXME: This is screwed up in TQt4.... :/ #ifdef COMPILE_USE_QT4 - QDrag * d = new QDrag(this); - QMimeData * m = new QMimeData(); + TQDrag * d = new TQDrag(this); + TQMimeData * m = new TQMimeData(); m->setText(m_pMovedChild->name()); d->setMimeData(m); #else - QDragObject * d = new QTextDrag(m_pMovedChild->name(),this); + TQDragObject * d = new TQTextDrag(m_pMovedChild->name(),this); #endif KviAction * act = KviActionManager::instance()->getAction(m_pMovedChild->name()); if(act) { - QPixmap * pixie = act->bigIcon(); + TQPixmap * pixie = act->bigIcon(); #ifdef COMPILE_USE_QT4 if(pixie) { d->setPixmap(*pixie); - d->setHotSpot(QPoint(3,3)); + d->setHotSpot(TQPoint(3,3)); } #else - if(pixie)d->setPixmap(*pixie,QPoint(3,3)); + if(pixie)d->setPixmap(*pixie,TQPoint(3,3)); #endif } - //d->setPixmap(QPixmap::grabWidget(m_pMovedChild),QPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2)); + //d->setPixmap(TQPixmap::grabWidget(m_pMovedChild),TQPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2)); // throw it somewhere else for now if(m_pFilteredChildren) - unfilterChild(m_pMovedChild); + unfilterChild(TQT_TQOBJECT(m_pMovedChild)); #ifdef COMPILE_USE_QT4 - QAction * pActionForMovedChild = actionForWidget(m_pMovedChild); + TQAction * pActionForMovedChild = actionForWidget(m_pMovedChild); if(pActionForMovedChild) pActionForMovedChild->setVisible(false); m_pMovedChild->hide(); #else m_pMovedChild->hide(); - m_pMovedChild->reparent(g_pFrame,QPoint(-1000,-1000),false); + m_pMovedChild->reparent(g_pFrame,TQPoint(-1000,-1000),false); #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); #ifdef COMPILE_USE_QT4 - if(!d->exec(Qt::MoveAction) != Qt::MoveAction) + if(!d->exec(TQt::MoveAction) != TQt::MoveAction) #else if(!d->dragMove()) #endif @@ -636,10 +636,10 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) KviActionManager::instance()->emitRemoveActionsHintRequest(); // will filter it as ChildInserted #ifndef COMPILE_USE_QT4 - m_pMovedChild->reparent(this,QPoint(0,0),false); + m_pMovedChild->reparent(this,TQPoint(0,0),false); #endif #ifdef COMPILE_USE_QT4 - QAction * pActionForMovedChild = actionForWidget(m_pMovedChild); + TQAction * pActionForMovedChild = actionForWidget(m_pMovedChild); if(pActionForMovedChild) pActionForMovedChild->setVisible(false); #else @@ -650,10 +650,10 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } else { - QApplication::sendPostedEvents(m_pMovedChild,0); + TQApplication::sendPostedEvents(m_pMovedChild,0); m_pMovedChild->deleteLater(); m_pMovedChild = 0; } diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h index 64e9526e..ec6483b4 100644 --- a/src/kvirc/ui/kvi_customtoolbar.h +++ b/src/kvirc/ui/kvi_customtoolbar.h @@ -35,50 +35,52 @@ #endif class KviCustomToolBar; -class KviCustomToolBarSeparator : public QWidget +class KviCustomToolBarSeparator : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name); - QSize sizeHint() const; + TQSize tqsizeHint() const; protected: KviCustomToolBar * m_pToolBar; protected: - void paintEvent(QPaintEvent *e); + void paintEvent(TQPaintEvent *e); }; class KVIRC_API KviCustomToolBar : public KviToolBar { friend class KviCustomToolBarDescriptor; Q_OBJECT + TQ_OBJECT protected: - KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString &label,QT_TOOLBARDOCK_TYPE dock = QT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); + KviCustomToolBar(KviCustomToolBarDescriptor * d,const TQString &label,TQT_TOOLBARDOCK_TYPE dock = TQT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); public: ~KviCustomToolBar(); protected: KviCustomToolBarDescriptor * m_pDescriptor; - QWidget * m_pMovedChild; - QWidget * m_pDraggedChild; + TQWidget * m_pMovedChild; + TQWidget * m_pDraggedChild; KviPointerHashTable<void *,bool> * m_pFilteredChildren; public: KviCustomToolBarDescriptor * descriptor(){ return m_pDescriptor; }; protected: - virtual void mousePressEvent(QMouseEvent * e); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dragMoveEvent(QDragMoveEvent *e); - virtual void dragLeaveEvent(QDragLeaveEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual void childEvent(QChildEvent *e); - virtual bool eventFilter(QObject *o,QEvent *e); - int dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excludeIdx); + virtual void mousePressEvent(TQMouseEvent * e); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dragMoveEvent(TQDragMoveEvent *e); + virtual void dragLeaveEvent(TQDragLeaveEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual void childEvent(TQChildEvent *e); + virtual bool eventFilter(TQObject *o,TQEvent *e); + int dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * excludeIdx); #ifdef COMPILE_USE_QT4 - QWidget * widgetAt(int index); - QAction * actionForWidget(QWidget * pWidget); + TQWidget * widgetAt(int index); + TQAction * actionForWidget(TQWidget * pWidget); #endif - void drag(QWidget * child,const QPoint &pnt); - void filterChild(QObject * o); - void unfilterChild(QObject * o); - virtual void paintEvent(QPaintEvent * e); + void drag(TQWidget * child,const TQPoint &pnt); + void filterChild(TQObject * o); + void unfilterChild(TQObject * o); + virtual void paintEvent(TQPaintEvent * e); void syncDescriptor(); protected slots: void beginCustomize(); diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 81067c04..8110967c 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -36,9 +36,9 @@ #include "kvi_frame.h" #include "kvi_valuelist.h" -#include <qpixmap.h> -#include <qsplitter.h> -#include <qtoolbutton.h> +#include <tqpixmap.h> +#include <tqsplitter.h> +#include <tqtoolbutton.h> KviDebugWindow * KviDebugWindow::m_pInstance = 0; @@ -47,7 +47,7 @@ KviDebugWindow::KviDebugWindow() : KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) { m_pInstance = this; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pInput = new KviInput(this,0); updateCaption(); @@ -70,7 +70,7 @@ KviDebugWindow * KviDebugWindow::getInstance() -void KviDebugWindow::getBaseLogFileName(QString &buffer) +void KviDebugWindow::getBaseLogFileName(TQString &buffer) { buffer = "debug"; } @@ -93,9 +93,9 @@ void KviDebugWindow::loadProperties(KviConfig *cfg) void KviDebugWindow::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString end("</b></font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString end("</b></font></nobr>"); m_szPlainTextCaption = windowName(); @@ -112,21 +112,21 @@ void KviDebugWindow::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -QPixmap * KviDebugWindow::myIconPtr() +TQPixmap * KviDebugWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_BUG); } -void KviDebugWindow::resizeEvent(QResizeEvent *e) +void KviDebugWindow::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); m_pSplitter->setGeometry(0,0,width(),height() - hght); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviDebugWindow::sizeHint() const +TQSize KviDebugWindow::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h index b9646e24..616752a6 100644 --- a/src/kvirc/ui/kvi_debugwindow.h +++ b/src/kvirc/ui/kvi_debugwindow.h @@ -28,11 +28,12 @@ #include "kvi_window.h" #include "kvi_string.h" -class QSplitter; +class TQSplitter; class KVIRC_API KviDebugWindow : public KviWindow { Q_OBJECT + TQ_OBJECT public: KviDebugWindow(); ~KviDebugWindow(); @@ -42,13 +43,13 @@ public: static KviDebugWindow * instance(){ return m_pInstance; }; static KviDebugWindow * getInstance(); protected: - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); + virtual void resizeEvent(TQResizeEvent *e); virtual void loadProperties(KviConfig * cfg); virtual void saveProperties(KviConfig * cfg); - virtual void getBaseLogFileName(QString &buffer); - virtual QSize sizeHint() const; + virtual void getBaseLogFileName(TQString &buffer); + virtual TQSize tqsizeHint() const; }; #endif //_KVI_DEBUGWINDOW_H_ diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index 3e6f22ce..fe676197 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.cpp +++ b/src/kvirc/ui/kvi_dynamictooltip.cpp @@ -22,8 +22,8 @@ #define __KVIRC__ #include "kvi_dynamictooltip.h" -KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip) -: KviTalToolTip(parent) +KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip) +: KviTalToolTip(tqparent) { m_pParentToolTip = parToolTip; } @@ -32,15 +32,15 @@ KviDynamicToolTipHelper::~KviDynamicToolTipHelper() { } -void KviDynamicToolTipHelper::maybeTip(const QPoint & pnt) +void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt) { m_pParentToolTip->maybeTip(pnt); } -KviDynamicToolTip::KviDynamicToolTip(QWidget * parent,const char * name) -: QObject(parent,name) +KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name) +: TQObject(tqparent,name) { - m_pHelper = new KviDynamicToolTipHelper(parent,this); + m_pHelper = new KviDynamicToolTipHelper(tqparent,this); } KviDynamicToolTip::~KviDynamicToolTip() @@ -48,12 +48,12 @@ KviDynamicToolTip::~KviDynamicToolTip() delete m_pHelper; } -void KviDynamicToolTip::maybeTip(const QPoint &pnt) +void KviDynamicToolTip::maybeTip(const TQPoint &pnt) { emit tipRequest(this,pnt); } -void KviDynamicToolTip::tip(const QRect &rct,const QString & text) +void KviDynamicToolTip::tip(const TQRect &rct,const TQString & text) { m_pHelper->tip(rct,text); } diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h index 119c224c..d6a6adfb 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.h +++ b/src/kvirc/ui/kvi_dynamictooltip.h @@ -25,7 +25,7 @@ #include "kvi_settings.h" #include "kvi_tal_tooltip.h" -#include <qobject.h> +#include <tqobject.h> class KviDynamicToolTip; @@ -33,29 +33,30 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip { friend class KviDynamicToolTip; protected: - KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip); + KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip); virtual ~KviDynamicToolTipHelper(); protected: KviDynamicToolTip * m_pParentToolTip; protected: - virtual void maybeTip(const QPoint &pnt); + virtual void maybeTip(const TQPoint &pnt); }; -class KVIRC_API KviDynamicToolTip : public QObject +class KVIRC_API KviDynamicToolTip : public TQObject { friend class KviDynamicToolTipHelper; Q_OBJECT + TQ_OBJECT public: - KviDynamicToolTip(QWidget * parent,const char * name = 0); + KviDynamicToolTip(TQWidget * tqparent,const char * name = 0); virtual ~KviDynamicToolTip(); protected: KviDynamicToolTipHelper * m_pHelper; public: - void tip(const QRect &rct,const QString & text); + void tip(const TQRect &rct,const TQString & text); protected: - void maybeTip(const QPoint &pnt); + void maybeTip(const TQPoint &pnt); signals: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; #endif //!_KVI_DYNAMICTOOLTIP_H_ diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 99f9c169..2dfba50c 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -29,16 +29,16 @@ #include "kvi_frame.h" #include "kvi_qstring.h" -#include <qdir.h> +#include <tqdir.h> #include "kvi_tal_tooltip.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> extern KviMediaManager * g_pMediaManager; -KviFileDialog::KviFileDialog(const QString &dirName, const QString &filter, - QWidget *parent, const char *name, bool modal) -: KviTalFileDialog(dirName,filter,parent,name,modal) +KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter, + TQWidget *tqparent, const char *name, bool modal) +: KviTalFileDialog(dirName,filter,tqparent,name,modal) { setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); @@ -56,35 +56,35 @@ void KviFileDialog::goKvirc() KviStr tmp; g_pApp->getLocalKvircDirectory(tmp,KviApp::None); - setDir(QDir(tmp.ptr())); + setDir(TQDir(tmp.ptr())); } void KviFileDialog::goHome() { - setDir(QDir::home()); + setDir(TQDir::home()); } */ -bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,const QString &initial,const QString &filter,bool showHidden, bool showNative,QWidget* parent) +bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer=QFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); return !buffer.isEmpty(); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::ExistingFile); + d->setMode(TQFileDialog::ExistingFile); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -96,26 +96,26 @@ bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,co } -bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,const QString &initial,const QString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,QWidget* parent) +bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { while (1) { - buffer=QFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption); + buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); //return !buffer.isEmpty(); if(buffer.isEmpty()) return false; if(!bConfirmOverwrite) return true; // Check for the file existence if(!KviFileUtils::fileExists(buffer)) return true; - QString tmp; - KviQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); - switch(QMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,QMessageBox::Yes,QMessageBox::No | QMessageBox::Default,QMessageBox::Cancel | QMessageBox::Escape)) + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); + switch(TQMessageBox::information(tqparent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { - case QMessageBox::Cancel: return false; break; - case QMessageBox::Yes: return true; break; + case TQMessageBox::Cancel: return false; break; + case TQMessageBox::Yes: return true; break; } } @@ -125,12 +125,12 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c #endif - KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::AnyFile); + d->setMode(TQFileDialog::AnyFile); //d->setShowHiddenFiles(showHidden); - while(d->exec() == QDialog::Accepted) + while(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -145,12 +145,12 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c // Check for the file existence if(KviFileUtils::fileExists(buffer)) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); - switch(QMessageBox::information(d,__tr2qs("File Exists - KVIrc"),tmp,QMessageBox::Yes,QMessageBox::No | QMessageBox::Default,QMessageBox::Cancel | QMessageBox::Escape)) + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); + switch(TQMessageBox::information(d,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { - case QMessageBox::Cancel: delete d; return false; break; - case QMessageBox::Yes: delete d; return true; break; + case TQMessageBox::Cancel: delete d; return false; break; + case TQMessageBox::Yes: delete d; return true; break; } } else { delete d; @@ -167,28 +167,28 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c } -bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent) +bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer = QFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption); + buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption); return !buffer.isEmpty(); } #else #ifdef COMPILE_KDE_SUPPORT // the KDE based dir selection dialog is now quite nice - buffer = KFileDialog::getExistingDirectory(initial,parent,caption); + buffer = KFileDialog::getExistingDirectory(initial,tqparent,caption); return !buffer.isEmpty(); #endif #endif KviFileDialog * d = new KviFileDialog(initial, - filter,parent,"directory_name_dialog",true); + filter,tqparent,"directory_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::Directory); + d->setMode(TQFileDialog::Directory); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -201,21 +201,21 @@ bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption, } -bool KviFileDialog::askForOpenFileNames(QStringList &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent) +bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { - buffer=QFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption); return (buffer.count()>0); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter ? QString(filter) : QString::null,parent,"open_file_names_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::ExistingFiles); + d->setMode(TQFileDialog::ExistingFiles); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFiles(); delete d; diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 985898d6..0bb03f6f 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -32,22 +32,23 @@ #include "kvi_tal_filedialog.h" -#include <qstringlist.h> +#include <tqstringlist.h> class KVIRC_API KviFileDialog : public KviTalFileDialog { Q_OBJECT + TQ_OBJECT public: - KviFileDialog(const QString &dirName, const QString &filter=QString::null, - QWidget *parent=0, const char *name=0, bool modal=false); + KviFileDialog(const TQString &dirName, const TQString &filter=TQString(), + TQWidget *tqparent=0, const char *name=0, bool modal=false); ~KviFileDialog(); public: - static bool askForOpenFileName(QString &buffer,const QString & caption,const QString &initial = QString::null,const QString &filter = QString::null,bool showHidden = false,bool showNative = true,QWidget* parent=0); - static bool askForSaveFileName(QString &buffer,const QString & caption,const QString &initial = QString::null,const QString &filter = QString::null,bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,QWidget* parent=0); + static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* tqparent=0); + static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* tqparent=0); - static bool askForDirectoryName(QString &buffer,const QString & caption,const QString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,QWidget* parent=0); - static bool askForOpenFileNames(QStringList &buffer,const QString & caption,const QString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,QWidget* parent=0); + static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); + static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); }; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index e7b7c0b8..6b6db20c 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -60,42 +60,40 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include <qsplitter.h> -#include <qvariant.h> -#include <qlineedit.h> -#include <qmessagebox.h> -#include <qcheckbox.h> - -#include <qtimer.h> -#include <qlayout.h> - -#if QT_VERSION >= 300 - #include <qfile.h> - #include <qtextstream.h> - #ifdef COMPILE_USE_QT4 - #include <q3dockarea.h> - #define QDockArea Q3DockArea - #else - #include <qdockarea.h> - #endif +#include <tqsplitter.h> +#include <tqvariant.h> +#include <tqlineedit.h> +#include <tqmessagebox.h> +#include <tqcheckbox.h> + +#include <tqtimer.h> +#include <tqlayout.h> + +#include <tqfile.h> +#include <tqtextstream.h> +#ifdef COMPILE_USE_QT4 + #include <tq3dockarea.h> + #define TQDockArea Q3DockArea +#else + #include <tqdockarea.h> #endif #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> - #include <qevent.h> - #include <QShortcut> + #include <tqdesktopwidget.h> + #include <tqevent.h> + #include <TQShortcut> #else - #include <qaccel.h> + #include <tqaccel.h> #endif #include <time.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - #include <qpixmap.h> + #include <tqpixmap.h> // kvi_app.h - extern QPixmap * g_pShadedParentGlobalDesktopBackground; - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedParentGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; // FIXME: #warning "When a toolbar is moved , MdiManager is resized but does not update the MdiChild backgrounds" #endif @@ -120,16 +118,16 @@ KviFrame::KviFrame() m_pDockExtension = 0; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); -// m_pSplitter->setFrameShape(QFrame::NoFrame); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); +// m_pSplitter->setFrameShape(TQFrame::NoFrame); setCentralWidget(m_pSplitter); setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons)); m_pMdi = new KviMdiManager(m_pSplitter,this,"mdi_manager"); - connect(m_pMdi,SIGNAL(enteredSdiMode()),this,SLOT(enteredSdiMode())); - connect(m_pMdi,SIGNAL(leftSdiMode()),this,SLOT(leftSdiMode())); + connect(m_pMdi,TQT_SIGNAL(enteredSdiMode()),this,TQT_SLOT(enteredSdiMode())); + connect(m_pMdi,TQT_SIGNAL(leftSdiMode()),this,TQT_SLOT(leftSdiMode())); // This theoretically had to exists before KviMdiManager (that uses enterSdiMode) m_pMenuBar = new KviMenuBar(this,"main_menu_bar"); @@ -160,7 +158,7 @@ KviFrame::KviFrame() if((KVI_OPTION_RECT(KviOption_rectFrameGeometry).width() < 100) || (KVI_OPTION_RECT(KviOption_rectFrameGeometry).height() < 100)) { // Try to find some reasonable defaults - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); } resize(KVI_OPTION_RECT(KviOption_rectFrameGeometry).width(), @@ -175,12 +173,12 @@ KviFrame::KviFrame() installAccelerators(this); - layout()->setResizeMode(QLayout::FreeResize); + tqlayout()->setResizeMode(TQLayout::FreeResize); } KviFrame::~KviFrame() { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KVI_OPTION_BOOL(KviOption_boolUseBigIcons) = usesBigPixmaps(); @@ -222,7 +220,7 @@ KviFrame::~KviFrame() g_pFrame = 0; } -int KviFrame::registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot) +int KviFrame::registerAccelerator(const TQString &szKeySequence,TQObject * recv,const char * slot) { int id = m_pAccel->insertItem(szKeySequence); m_pAccel->connectItem(id,recv,slot); @@ -246,13 +244,13 @@ void KviFrame::unregisterModuleExtensionToolBar(KviMexToolBar * t) void KviFrame::restoreModuleExtensionToolBars() { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) { - QString szEntry = *it; - int idx = szEntry.find(':'); + TQString szEntry = *it; + int idx = szEntry.tqfind(':'); if(idx != -1) { - QString szMod = szEntry.left(idx); + TQString szMod = szEntry.left(idx); szEntry.remove(0,idx + 1); g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod); } @@ -265,7 +263,7 @@ void KviFrame::saveModuleExtensionToolBars() for(KviMexToolBar * t = m_pModuleExtensionToolBarList->first();t;t = m_pModuleExtensionToolBarList->next()) { - QString s = t->descriptor()->module()->name(); + TQString s = t->descriptor()->module()->name(); s += ":"; s += t->descriptor()->name().ptr(); @@ -311,7 +309,7 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) [b]Tab after a leading /[/b]: Completes commands[br] [b]Tab after a / in the middle of input[/b]: Completes directories[br] [b]Tab after a $[/b]: Completes function names[br] - [b]Shift+Tab after the first word of input[/b]: completes masks in the current channel or query[br] + [b]Shift+Tab after the first word of input[/b]: completes tqmasks in the current channel or query[br] [b]Ctrl+B[/b]: Inserts the 'bold' mIRC text control character[br] [b]Ctrl+K[/b]: Inserts the 'color' mIRC text control character[br] [b]Ctrl+R[/b]: Inserts the 'reverse' mIRC text control character[br] @@ -345,63 +343,63 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) </example> */ -KviAccel * KviFrame::installAccelerators(QWidget * wnd) +KviAccel * KviFrame::installAccelerators(TQWidget * wnd) { - QWidget * pParent = wnd ? (QWidget *)wnd : (QWidget *)this; + TQWidget * pParent = wnd ? (TQWidget *)wnd : (TQWidget *)this; #ifdef COMPILE_USE_QT4 - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT),pParent,SLOT(switchToPrevWindow())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT),pParent,SLOT(switchToNextWindow())); - new QShortcut(QKeySequence(Qt::Key_Up + Qt::CTRL),pParent,SLOT(maximizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Down + Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Escape +Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToPrevWindowInContext())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToNextWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT),pParent,TQT_SLOT(switchToPrevWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT),pParent,TQT_SLOT(switchToNextWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Up + TQt::CTRL),pParent,TQT_SLOT(maximizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Down + TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Escape +TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToPrevWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToNextWindowInContext())); #endif KviAccel *ac = new KviAccel(pParent); static int accel_table[] = { - Qt::Key_Left + Qt::ALT , // prev window - Qt::Key_Right + Qt::ALT , // next window - Qt::Key_Up + Qt::CTRL , // maximize window - Qt::Key_Down + Qt::CTRL , // minimize window - Qt::Key_Escape +Qt::CTRL, // minimize window - Qt::Key_Left + Qt::ALT + Qt::SHIFT , // prev window in context - Qt::Key_Right + Qt::ALT + Qt::SHIFT, // next window in context - Qt::Key_F4 + Qt::CTRL , // close current window - Qt::Key_1 + Qt::CTRL , // script accels... - Qt::Key_2 + Qt::CTRL , - Qt::Key_3 + Qt::CTRL , - Qt::Key_4 + Qt::CTRL , - Qt::Key_5 + Qt::CTRL , - Qt::Key_6 + Qt::CTRL , - Qt::Key_7 + Qt::CTRL , - Qt::Key_8 + Qt::CTRL , - Qt::Key_9 + Qt::CTRL , - Qt::Key_0 + Qt::CTRL , - Qt::Key_F1 , // reserved for context sensitive help - Qt::Key_F2 , - Qt::Key_F3 , - Qt::Key_F4 , - Qt::Key_F5 , - Qt::Key_F6 , - Qt::Key_F7 , - Qt::Key_F8 , - Qt::Key_F9 , - Qt::Key_F10 , - Qt::Key_F11 , - Qt::Key_F12 , -/* Qt::Key_F1 + Qt::SHIFT , // window select... - Qt::Key_F2 + Qt::SHIFT , - Qt::Key_F3 + Qt::SHIFT , - Qt::Key_F4 + Qt::SHIFT , - Qt::Key_F5 + Qt::SHIFT , - Qt::Key_F6 + Qt::SHIFT , - Qt::Key_F7 + Qt::SHIFT , - Qt::Key_F8 + Qt::SHIFT , - Qt::Key_F9 + Qt::SHIFT , - Qt::Key_F10 + Qt::SHIFT , - Qt::Key_F11 + Qt::SHIFT , - Qt::Key_F12 + Qt::SHIFT ,*/ + TQt::Key_Left + TQt::ALT , // prev window + TQt::Key_Right + TQt::ALT , // next window + TQt::Key_Up + TQt::CTRL , // maximize window + TQt::Key_Down + TQt::CTRL , // minimize window + TQt::Key_Escape +TQt::CTRL, // minimize window + TQt::Key_Left + TQt::ALT + TQt::SHIFT , // prev window in context + TQt::Key_Right + TQt::ALT + TQt::SHIFT, // next window in context + TQt::Key_F4 + TQt::CTRL , // close current window + TQt::Key_1 + TQt::CTRL , // script accels... + TQt::Key_2 + TQt::CTRL , + TQt::Key_3 + TQt::CTRL , + TQt::Key_4 + TQt::CTRL , + TQt::Key_5 + TQt::CTRL , + TQt::Key_6 + TQt::CTRL , + TQt::Key_7 + TQt::CTRL , + TQt::Key_8 + TQt::CTRL , + TQt::Key_9 + TQt::CTRL , + TQt::Key_0 + TQt::CTRL , + TQt::Key_F1 , // reserved for context sensitive help + TQt::Key_F2 , + TQt::Key_F3 , + TQt::Key_F4 , + TQt::Key_F5 , + TQt::Key_F6 , + TQt::Key_F7 , + TQt::Key_F8 , + TQt::Key_F9 , + TQt::Key_F10 , + TQt::Key_F11 , + TQt::Key_F12 , +/* TQt::Key_F1 + TQt::SHIFT , // window select... + TQt::Key_F2 + TQt::SHIFT , + TQt::Key_F3 + TQt::SHIFT , + TQt::Key_F4 + TQt::SHIFT , + TQt::Key_F5 + TQt::SHIFT , + TQt::Key_F6 + TQt::SHIFT , + TQt::Key_F7 + TQt::SHIFT , + TQt::Key_F8 + TQt::SHIFT , + TQt::Key_F9 + TQt::SHIFT , + TQt::Key_F10 + TQt::SHIFT , + TQt::Key_F11 + TQt::SHIFT , + TQt::Key_F12 + TQt::SHIFT ,*/ 0 }; @@ -413,79 +411,79 @@ KviAccel * KviFrame::installAccelerators(QWidget * wnd) i++; } - connect(ac,SIGNAL(activated(int)),this,SLOT(accelActivated(int))); + connect(ac,TQT_SIGNAL(activated(int)),this,TQT_SLOT(accelActivated(int))); return ac; } void KviFrame::accelActivated(int id) { - KviAccel * acc = (KviAccel *)sender(); + KviAccel * acc = (KviAccel *)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); int keys = (int)(acc->key(id)); KviTaskBarItem *item = 0; debug("accel"); switch(keys) { - case (Qt::Key_Left+Qt::ALT): switchToPrevWindow(); break; - case (Qt::Key_Right+Qt::ALT): switchToNextWindow(); break; - case (Qt::Key_Up+Qt::CTRL): maximizeWindow(); break; - case (Qt::Key_Escape+Qt::CTRL): - case (Qt::Key_Down+Qt::CTRL): minimizeWindow(); break; - case (Qt::Key_Left+Qt::ALT+Qt::SHIFT): switchToPrevWindowInContext(); break; - case (Qt::Key_Right+Qt::ALT+Qt::SHIFT): switchToNextWindowInContext(); break; - case (Qt::Key_F4+Qt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; - case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break; -/* case(Qt::Key_F1 + SHIFT): + case (TQt::Key_Left+TQt::ALT): switchToPrevWindow(); break; + case (TQt::Key_Right+TQt::ALT): switchToNextWindow(); break; + case (TQt::Key_Up+TQt::CTRL): maximizeWindow(); break; + case (TQt::Key_Escape+TQt::CTRL): + case (TQt::Key_Down+TQt::CTRL): minimizeWindow(); break; + case (TQt::Key_Left+TQt::ALT+TQt::SHIFT): switchToPrevWindowInContext(); break; + case (TQt::Key_Right+TQt::ALT+TQt::SHIFT): switchToNextWindowInContext(); break; + case (TQt::Key_F4+TQt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; + case (TQt::Key_F1): g_pApp->contextSensitiveHelp(); break; +/* case(TQt::Key_F1 + SHIFT): item = m_pTaskBar->item(0); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F2 + SHIFT): + case(TQt::Key_F2 + SHIFT): item = m_pTaskBar->item(1); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F3 + SHIFT): + case(TQt::Key_F3 + SHIFT): item = m_pTaskBar->item(2); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F4 + SHIFT): + case(TQt::Key_F4 + SHIFT): item = m_pTaskBar->item(3); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F5 + SHIFT): + case(TQt::Key_F5 + SHIFT): item = m_pTaskBar->item(4); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F6 + SHIFT): + case(TQt::Key_F6 + SHIFT): item = m_pTaskBar->item(5); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F7 + SHIFT): + case(TQt::Key_F7 + SHIFT): item = m_pTaskBar->item(6); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F8 + SHIFT): + case(TQt::Key_F8 + SHIFT): item = m_pTaskBar->item(7); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F9 + SHIFT): + case(TQt::Key_F9 + SHIFT): item = m_pTaskBar->item(8); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F10 + SHIFT): + case(TQt::Key_F10 + SHIFT): item = m_pTaskBar->item(9); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F11 + SHIFT): + case(TQt::Key_F11 + SHIFT): item = m_pTaskBar->item(10); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F12 + SHIFT): + case(TQt::Key_F12 + SHIFT): item = m_pTaskBar->item(11); if(item) setActiveWindow(item->window()); break;*/ default: { - KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(acc->key(id))); + KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(TQString)(acc->key(id))); } break; }; @@ -511,7 +509,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) unsigned int minVal = time(0); while(it.current() && minVal) { - QString * pVal = it.current()->find("EntryTimestamp"); + TQString * pVal = it.current()->tqfind("EntryTimestamp"); if(pVal) { bool bOk; @@ -560,7 +558,7 @@ void KviFrame::closeWindow(KviWindow *wnd) // save it's properties if(KVI_OPTION_BOOL(KviOption_boolWindowsRememberProperties)) // && (wnd->type() == KVI_WINDOW_TYPE_CHANNEL)) { - QString group; + TQString group; wnd->getConfigGroupName(group); // not uses default settings : store it always saveWindowProperties(wnd,group); @@ -617,7 +615,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) m_pWinList->append(wnd); wnd->createTaskBarItem(); // create the window taskbar item AFTER it has been constructed - QString group; + TQString group; wnd->getConfigGroupName(group); bool bGroupSettings = false; @@ -652,7 +650,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) //KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode) = false; } else bMaximized = false; - QRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",QRect(10,10,500,380)); + TQRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",TQRect(10,10,500,380)); if(bDocked) { @@ -713,7 +711,7 @@ docking_done: } } -KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,QRect *setGeom) +KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,TQRect *setGeom) { if(wnd->mdiParent())return wnd->mdiParent(); KviMdiChild * lpC = new KviMdiChild(m_pMdi,""); @@ -807,7 +805,7 @@ void KviFrame::unhighlightWindowsOfContext(KviIrcContext * c) void KviFrame::setActiveWindow(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(wnd->isMinimized())wnd->restore(); if(wnd->mdiParent())wnd->setFocus(); else wnd->delayedAutoRaise(); @@ -869,7 +867,7 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c) void KviFrame::childWindowActivated(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(g_pActiveWindow == wnd)return; if(g_pActiveWindow)g_pActiveWindow->lostUserFocus(); // YES: it's HERE! @@ -881,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd) if(wnd->isMaximized() && wnd->mdiParent())updateCaption(); m_pTaskBar->setActiveItem(wnd->taskBarItem()); - //wnd->gainedActiveWindowStatus(); // <-- atm unused + //wnd->gainedActiveWindowtqStatus(); // <-- atm unused if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); @@ -934,8 +932,8 @@ void KviFrame::updateCaption() { if(g_pActiveWindow->isMaximized() && g_pActiveWindow->mdiParent()) { - QString tmp = g_pActiveWindow->plainTextCaption(); - tmp += QChar(' '); + TQString tmp = g_pActiveWindow->plainTextCaption(); + tmp += TQChar(' '); tmp += KVI_DEFAULT_FRAME_CAPTION; setCaption(tmp); return; @@ -945,7 +943,7 @@ void KviFrame::updateCaption() } -void KviFrame::closeEvent(QCloseEvent *e) +void KviFrame::closeEvent(TQCloseEvent *e) { if(KVI_OPTION_BOOL(KviOption_boolCloseInTray)) @@ -960,7 +958,7 @@ void KviFrame::closeEvent(QCloseEvent *e) { dockExtension()->setPrevWindowState(windowState()); - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } return; } @@ -984,12 +982,12 @@ void KviFrame::closeEvent(QCloseEvent *e) if(bGotRunningConnection) { - QString txt = "<p>"; + TQString txt = "<p>"; txt += __tr2qs("There are active connections, are you sure you wish to "); txt += __tr2qs("quit KVIrc?"); txt += "</p>"; - switch(QMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) + switch(TQMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) { case 0: // ok to close @@ -1012,9 +1010,9 @@ void KviFrame::closeEvent(QCloseEvent *e) g_pApp->destroyFrame(); } -void KviFrame::resizeEvent(QResizeEvent *e) +void KviFrame::resizeEvent(TQResizeEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KviTalMainWindow::resizeEvent(e); } @@ -1032,9 +1030,9 @@ void KviFrame::updatePseudoTransparency() #endif } -void KviFrame::moveEvent(QMoveEvent *e) +void KviFrame::moveEvent(TQMoveEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); #ifdef COMPILE_PSEUDO_TRANSPARENCY updatePseudoTransparency(); @@ -1076,8 +1074,8 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { p->clear(); - disconnect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); // just to be sure - connect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); + disconnect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); // just to be sure + connect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); int id; int cnt = 0; @@ -1087,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { - QString label = __tr2qs("Show %1").arg(d->visibleName()); + TQString label = __tr2qs("Show %1").tqarg(d->visibleName()); if(d->icon())id = p->insertItem(*(d->icon()),label); else id = p->insertItem(label); p->setItemChecked(id,moduleExtensionToolBar(d->id())); @@ -1097,14 +1095,14 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } // FIXME: Should this display "Hide %1" when the toolbar is already visible ? - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors())); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors())); if(it2.current()) { if(cnt > 0)p->insertSeparator(); while(KviCustomToolBarDescriptor * d = it2.current()) { - QString label = __tr2qs("Show %1").arg(d->label()); - QString ico = d->iconId(); + TQString label = __tr2qs("Show %1").tqarg(d->label()); + TQString ico = d->iconId(); // use the icon only if there is no check if(d->toolBar()) { @@ -1113,7 +1111,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } else { if(!ico.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(d->iconId()); + TQPixmap * pix = g_pIconManager->getImage(d->iconId()); if(pix) { id = p->insertItem(*pix,label); @@ -1131,7 +1129,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } if(cnt > 0)p->insertSeparator(); - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,SLOT(customizeToolBars())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,TQT_SLOT(customizeToolBars())); } void KviFrame::customizeToolBars() @@ -1141,7 +1139,7 @@ void KviFrame::customizeToolBars() void KviFrame::toolbarsPopupSelected(int id) { - const QObject * o = sender(); + const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); if(!o)return; if(!o->inherits("KviTalPopupMenu"))return; const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; @@ -1167,20 +1165,20 @@ void KviFrame::toolbarsPopupSelected(int id) bool KviFrame::focusNextPrevChild(bool next) { //debug("FOCUS NEXT PREV CHILD"); - QWidget * w = focusWidget(); + TQWidget * w = tqfocusWidget(); if(w) { #ifdef COMPILE_USE_QT4 - if(w->focusPolicy() == Qt::StrongFocus)return false; + if(w->focusPolicy() == TTQ_StrongFocus)return false; #else - if(w->focusPolicy() == QWidget::StrongFocus)return false; + if(w->focusPolicy() == TQ_StrongFocus)return false; #endif - //QVariant v = w->property("KviProperty_FocusOwner"); + //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->parent()) + if(w->tqparent()) { - QVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); + TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner"); if(v.isValid())return false; // Do NOT change the focus widget! } } @@ -1200,16 +1198,16 @@ bool KviFrame::focusNextPrevChild(bool next) void KviFrame::saveToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); if(f.open(IO_WriteOnly | IO_Truncate)) { #ifdef COMPILE_USE_QT4 f.write(saveState(1)); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts << *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1218,10 +1216,10 @@ void KviFrame::saveToolBarPositions() void KviFrame::restoreToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); bool bNeedDefaults = false; @@ -1231,7 +1229,7 @@ void KviFrame::restoreToolBarPositions() if(!restoreState(f.readAll(),1)) debug("Error while restoring toolbars position"); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts >> *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1247,7 +1245,7 @@ void KviFrame::restoreToolBarPositions() if(m_pTaskBar->width() > 600) m_pTaskBar->setFixedWidth(250); #else //!COMPILE_USE_QT4 - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == topDock()) || (a == bottomDock())) { // nope.... need to move it @@ -1256,7 +1254,7 @@ void KviFrame::restoreToolBarPositions() //int iMaxWidth = m_pTaskBar->maximumWidth(); leftDock()->moveDockWindow(m_pTaskBar); //m_pTaskBar->setMaximumWidth(iMaxWidth); - //m_pTaskBar->setOrientation(Vertical); + //m_pTaskBar->setOrientationQt::Vertical); } // ensure that it is not too wide if(m_pTaskBar->width() > 600) @@ -1264,7 +1262,7 @@ void KviFrame::restoreToolBarPositions() #endif //!COMPILE_USE_QT4 } /*else if(m_pTaskBar->inherits("KviClassicTaskBar")) { - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == leftDock()) || (a == rightDock())) { // nope.... need to move it @@ -1287,31 +1285,31 @@ void KviFrame::createTaskBar() { m_pTaskBar = new KviTreeTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - addDockWidget(Qt::LeftDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::LeftDockWidgetArea | TQt::RightDockWidgetArea); + addDockWidget(TQt::LeftDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,false); - setDockEnabled(m_pTaskBar,Qt::DockBottom,false); + setDockEnabled(m_pTaskBar,TQt::DockTop,false); + setDockEnabled(m_pTaskBar,TQt::DockBottom,false); #endif //!COMPILE_USE_QT4 } else { m_pTaskBar = new KviClassicTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::AllDockWidgetAreas); - addDockWidget(Qt::BottomDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::AllDockWidgetAreas); + addDockWidget(TQt::BottomDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,true); - setDockEnabled(m_pTaskBar,Qt::DockBottom,true); + setDockEnabled(m_pTaskBar,TQt::DockTop,true); + setDockEnabled(m_pTaskBar,TQt::DockBottom,true); #endif //!COMPILE_USE_QT4 } #ifndef COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockLeft,true); - setDockEnabled(m_pTaskBar,Qt::DockRight,true); + setDockEnabled(m_pTaskBar,TQt::DockLeft,true); + setDockEnabled(m_pTaskBar,TQt::DockRight,true); #endif //!COMPILE_USE_QT4 } void KviFrame::recreateTaskBar() { - QString szOldClass = m_pTaskBar->className(); + TQString szOldClass = m_pTaskBar->className(); saveToolBarPositions(); KviWindow * w; @@ -1332,14 +1330,14 @@ void KviFrame::recreateTaskBar() /* - QString szNewClass = m_pTaskBar->className(); + TQString szNewClass = m_pTaskBar->className(); if(szOldClass != szNewClass) { // the class changed... // make sure that the tree task bar is in the left or right dock // and the classic one is in the top or bottom on - Qt::Dock dock; + TQt::Dock dock; int index; bool nl; int eo; @@ -1347,11 +1345,11 @@ void KviFrame::recreateTaskBar() if(KVI_OPTION_BOOL(KviOption_boolUseTreeWindowListTaskBar)) { - if((dock == Qt::Bottom) || (dock == Qt::Top)) - moveDockWindow(m_pTaskBar,Qt::Left); + if((dock == TQt::Bottom) || (dock == TQt::Top)) + moveDockWindow(m_pTaskBar,TQt::Left); } else { - if((dock == Qt::Left) || (dock == Qt::Right)) - moveDockWindow(m_pTaskBar,Qt::Bottom); + if((dock == TQt::Left) || (dock == TQt::Right)) + moveDockWindow(m_pTaskBar,TQt::Bottom); } } */ @@ -1359,41 +1357,6 @@ void KviFrame::recreateTaskBar() if(g_pActiveWindow)m_pTaskBar->setActiveItem(g_pActiveWindow->taskBarItem()); } - -#if QT_VERSION == 0x030201 -unsigned int KviFrame::windowState() -{ - /* enum GNWindowState { WindowNoState = 0x00000000, WindowMinimized = 0x00000001, - WindowMaximized = 0x00000002, WindowFullScreen = 0x00000004, WindowActive = 0x00000008 }; - GNWindowState GNWState; - if(isMinimized()) GNWState=WindowMinimized; - else if(isMaximized()) GNWState=WindowMaximized; - else if(isActiveWindow()) GNWState=WindowActive; - else if(isFullScreen()) GNWState=WindowFullScreen; - else GNWState=WindowNoState; */ - -/* WindowNoState = 0x00000000 WindowMinimized = 0x00000001 - WindowMaximized = 0x00000002 WindowFullScreen = 0x00000004 WindowActive = 0x00000008*/ - if(isMinimized()) return 0x00000001; - else if(isMaximized()) return 0x00000002; - else if(isActiveWindow()) return 0x00000008; - else if(isFullScreen()) return 0x00000004; - else return 0x00000000; -} -void KviFrame::setWindowState(unsigned int GNWState) -{ - switch(GNWState) - { - case 0x00000001: - showMinimized(); - break; - case 0x00000002: - showMaximized(); - break; - } // switch -} -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// // Some accelerators //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1430,7 +1393,7 @@ void KviFrame::switchToNextWindowInContext(void) m_pTaskBar->switchWindow(true,true); } -void KviFrame::hideEvent ( QHideEvent * e) +void KviFrame::hideEvent ( TQHideEvent * e) { if(KVI_OPTION_BOOL(KviOption_boolMinimizeInTray)) { @@ -1441,7 +1404,7 @@ void KviFrame::hideEvent ( QHideEvent * e) { executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } } diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index d735a7c6..ebc7e67c 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -43,7 +43,7 @@ class KviMdiChild; class KviWindow; class KviConsole; class KviTaskBarBase; -class QSplitter; +class TQSplitter; class KviConfig; class KviMexToolBar; class KviIrcContext; @@ -91,12 +91,13 @@ class KVIRC_API KviFrame : public KviTalMainWindow // , public KviIrcContextMana friend class KviUserListView; friend class KviUserListViewArea; Q_OBJECT + TQ_OBJECT public: KviFrame(); ~KviFrame(); protected: // subwindows - QSplitter * m_pSplitter; // the frame is splitted vertically and thus can host widgets + TQSplitter * m_pSplitter; // the frame is splitted vertically and thus can host widgets KviMenuBar * m_pMenuBar; // the main menu bar KviMdiManager * m_pMdi; // the mdi manager widget (child of the splitter) KviPointerList<KviMexToolBar> * m_pModuleExtensionToolBarList; // the module extension toolbars @@ -109,10 +110,10 @@ protected: KviDockExtension * m_pDockExtension; // the frame's dock extension: this should be prolly moved ? KviAccel * m_pAccel; // the global accelelrator public: - // the mdi manager: handles mdi children + // the mdi manager: handles mdi tqchildren KviMdiManager * mdiManager(){ return m_pMdi; }; // the splitter is the central widget for this frame - QSplitter * splitter(){ return m_pSplitter; }; + TQSplitter * splitter(){ return m_pSplitter; }; // KviTaskBarBase is the base class for KviTreeTaskBar and the KviClassicTaskBar KviTaskBarBase * taskBar(){ return m_pTaskBar; }; // well.. the menu bar :D @@ -137,7 +138,7 @@ public: // window list. This is useful for asynchronous functions // that keep a window pointer and need to ensure that it is still // valid after an uncontrolled delay. (Think of a /timer implementation) - bool windowExists(KviWindow * wnd){ return (m_pWinList->findRef(wnd) != -1); }; + bool windowExists(KviWindow * wnd){ return (m_pWinList->tqfindRef(wnd) != -1); }; // The number of consoles in this frame unsigned int consoleCount(); // Creates a new console window. DON'T use the KviConsole constructor directly. @@ -167,16 +168,9 @@ public: // Helper to fill the toolbars popup // it is used by KviToolBar and KviMenuBar void fillToolBarsPopup(KviTalPopupMenu * p); - int registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot); + int registerAccelerator(const TQString &szKeySequence,TQObject * recv,const char * slot); void unregisterAccelerator(int id); -#if QT_VERSION == 0x030201 - - unsigned int windowState(); - void setWindowState(unsigned int GNWState); - -#endif - public slots: void newConsole(); void executeInternalCommand(int index); @@ -193,7 +187,7 @@ protected: void createTaskBar(); void recreateTaskBar(); - KviMdiChild * dockWindow(KviWindow *wnd,bool bShow = true,bool bCascade = true,QRect * setGeom = 0); + KviMdiChild * dockWindow(KviWindow *wnd,bool bShow = true,bool bCascade = true,TQRect * setGeom = 0); void undockWindow(KviWindow *wnd); void closeWindow(KviWindow *wnd); @@ -210,17 +204,17 @@ protected: void childConnectionServerInfoChange(KviIrcConnection * c); void childWindowSelectionStateChange(KviWindow * pWnd,bool bGotSelectionNow); - virtual void closeEvent(QCloseEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void moveEvent(QMoveEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void moveEvent(TQMoveEvent *e); virtual bool focusNextPrevChild(bool next); virtual void windowActivationChange(bool bOldActive); void updatePseudoTransparency(); - KviAccel * installAccelerators(QWidget * wnd); + KviAccel * installAccelerators(TQWidget * wnd); - virtual void hideEvent ( QHideEvent * e); + virtual void hideEvent ( TQHideEvent * e); protected slots: void switchToNextWindow(); void switchToPrevWindow(); diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index ba9ca315..6e8219fb 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -31,10 +31,10 @@ #include "kvi_input.h" #include "kvi_mirccntrl.h" -#include <qnamespace.h> +#include <tqnamespace.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif #include <ctype.h> @@ -43,18 +43,18 @@ extern KviInputHistory * g_pInputHistory; KviHistoryWindow::KviHistoryWindow() #ifdef COMPILE_USE_QT4 -: KviTalListBox(0,Qt::Popup) +: KviTalListBox(0,TQt::Popup) #else -: KviTalListBox(0,Qt::WType_Popup) +: KviTalListBox(0,TQt::WType_Popup) #endif { m_pOwner = 0; #ifdef COMPILE_USE_QT4 setHScrollBarMode(Q3ScrollView::AlwaysOff); #else - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); #endif - connect(this,SIGNAL(selected(const QString &)),this,SLOT(itemSelected(const QString &))); + connect(this,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(itemSelected(const TQString &))); m_iTimerId = -1; } @@ -71,7 +71,7 @@ KviHistoryWindow::~KviHistoryWindow() void KviHistoryWindow::fill() { clear(); - for(QString * s = g_pInputHistory->list()->last();s;s = g_pInputHistory->list()->prev()) + for(TQString * s = g_pInputHistory->list()->last();s;s = g_pInputHistory->list()->prev()) { insertItem(*s); } @@ -80,14 +80,14 @@ void KviHistoryWindow::fill() void KviHistoryWindow::popup(KviInput *owner) { - if(m_pOwner)disconnect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); m_pOwner = owner; - connect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); fill(); show(); } -void KviHistoryWindow::mousePressEvent(QMouseEvent *e) +void KviHistoryWindow::mousePressEvent(TQMouseEvent *e) { if(e->pos().x() < 0)goto hideme; if(e->pos().x() > width())goto hideme; @@ -136,24 +136,24 @@ got_mit: } */ -void KviHistoryWindow::keyPressEvent(QKeyEvent *e) +void KviHistoryWindow::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_PageUp: - case Qt::Key_PageDown: - case Qt::Key_Return: + case TQt::Key_Up: + case TQt::Key_Down: + case TQt::Key_PageUp: + case TQt::Key_PageDown: + case TQt::Key_Return: KviTalListBox::keyPressEvent(e); return; break; - case Qt::Key_Escape: + case TQt::Key_Escape: doHide(); return; break; /* - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(m_szTypedSeq.hasData()) { m_szTypedSeq.cutRight(1); @@ -166,7 +166,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent *e) break; */ /* - case Qt::Key_Space: + case TQt::Key_Space: doHide(); if(findTypedSeq()) { @@ -180,7 +180,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent *e) break; */ /* - case Qt::Key_Tab: + case TQt::Key_Tab: doHide(); findTypedSeq(); KviStr szItem = m_szCurFullSeq; @@ -214,10 +214,10 @@ void KviHistoryWindow::ownerDead() void KviHistoryWindow::show() { m_iTimerId = startTimer(100000); //100 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviHistoryWindow::timerEvent(QTimerEvent *) +void KviHistoryWindow::timerEvent(TQTimerEvent *) { m_pOwner = 0; // do not setFocus() to the owner after the timeout doHide(); @@ -235,14 +235,14 @@ void KviHistoryWindow::doHide() m_pOwner->setFocus(); } -void KviHistoryWindow::itemSelected(const QString &str) +void KviHistoryWindow::itemSelected(const TQString &str) { doHide(); if(m_pOwner)m_pOwner->setText(str); } -void KviHistoryWindow::hideEvent(QHideEvent *) +void KviHistoryWindow::hideEvent(TQHideEvent *) { if(m_iTimerId != -1) { diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/kvi_historywin.h index 9a17eecd..17cba603 100644 --- a/src/kvirc/ui/kvi_historywin.h +++ b/src/kvirc/ui/kvi_historywin.h @@ -35,6 +35,7 @@ class KviInput; class KVIRC_API KviHistoryWindow : public KviTalListBox { Q_OBJECT + TQ_OBJECT public: KviHistoryWindow(); ~KviHistoryWindow(); @@ -48,14 +49,14 @@ public: private: virtual void show(); // bool findTypedSeq(); // returns true if it is a complete word - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void timerEvent(QTimerEvent *); - virtual void hideEvent ( QHideEvent * ); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void timerEvent(TQTimerEvent *); + virtual void hideEvent ( TQHideEvent * ); void fill(); public slots: void ownerDead(); - void itemSelected(const QString &str); + void itemSelected(const TQString &str); }; #endif //_KVI_HISTORYWIN_H_ diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 6a8b4378..7c16fe5f 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -27,13 +27,13 @@ #include "kvi_locale.h" #include "kvi_tal_textedit.h" -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtextbrowser.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtextbrowser.h> -KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) -: QDialog(pParent) +KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) +: TQDialog(pParent) { m_pData = pData; @@ -45,18 +45,18 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(!pData->pixIcon.isNull()) setIcon(pData->pixIcon); - QGridLayout * g = new QGridLayout(this,4,3,7,7); + TQGridLayout * g = new TQGridLayout(this,4,3,7,7); - QLabel * l; - QTextBrowser * te; - QPushButton * pb; + TQLabel * l; + TQTextBrowser * te; + TQPushButton * pb; int iUp = 0; int iDown = 2; if(!pData->szUpperLabelText.isEmpty()) { - l = new QLabel(this); + l = new TQLabel(this); l->setText(pData->szUpperLabelText); g->addMultiCellWidget(l,0,0,0,2); iUp = 1; @@ -64,13 +64,13 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(!pData->szLowerLabelText.isEmpty()) { - l = new QLabel(this); + l = new TQLabel(this); l->setText(pData->szLowerLabelText); g->addMultiCellWidget(l,2,2,0,2); iDown = 1; } - te = new QTextBrowser(this); + te = new TQTextBrowser(this); te->setText(pData->szHtmlText); //te->setReadOnly(true); @@ -84,29 +84,29 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(pData->iCancelButton > iButtons)pData->iCancelButton = iButtons; if(pData->iDefaultButton > iButtons)pData->iDefaultButton = iButtons; - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton1Text.isEmpty() ? __tr2qs("OK") : pData->szButton1Text); pb->setDefault(pData->iDefaultButton == 1); int iCoord = iButtons == 1 ? 1 : 0; g->addWidget(pb,3,iCoord); - connect(pb,SIGNAL(clicked()),this,SLOT(button1Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button1Pressed())); if(!pData->szButton2Text.isEmpty()) { - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton2Text); pb->setDefault(pData->iDefaultButton == 2); iCoord = iButtons == 2 ? 2 : 1; g->addWidget(pb,3,iCoord); - connect(pb,SIGNAL(clicked()),this,SLOT(button2Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button2Pressed())); if(!pData->szButton3Text.isEmpty()) { - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton3Text); pb->setDefault(pData->iDefaultButton == 3); g->addWidget(pb,3,2); - connect(pb,SIGNAL(clicked()),this,SLOT(button3Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button3Pressed())); } } @@ -141,10 +141,10 @@ void KviHtmlDialog::button3Pressed() void KviHtmlDialog::reject() { m_pData->iSelectedButton = m_pData->iCancelButton; - QDialog::reject(); + TQDialog::reject(); } -int KviHtmlDialog::display(QWidget * pParent,KviHtmlDialogData * pData) +int KviHtmlDialog::display(TQWidget * pParent,KviHtmlDialogData * pData) { KviHtmlDialog * pDialog = new KviHtmlDialog(pParent,pData); pDialog->exec(); diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h index 3f9a6d2a..aa845eaf 100644 --- a/src/kvirc/ui/kvi_htmldialog.h +++ b/src/kvirc/ui/kvi_htmldialog.h @@ -28,8 +28,8 @@ #include "kvi_settings.h" -#include <qpixmap.h> -#include <qdialog.h> +#include <tqpixmap.h> +#include <tqdialog.h> class KviHtmlDialogData { @@ -41,39 +41,40 @@ public: int iFlags; // da flags :) int iDefaultButton; // the button to use when Enter is pressed (1,2 or 3) int iCancelButton; // the button to use when Esc is pressed (1,2 or 3) - QString szHtmlText; // Shouldn't be empty :D + TQString szHtmlText; // Shouldn't be empty :D // optional fields - QString szCaption; // KVIrc is used when this is empty - QString szUpperLabelText; // no label is shown if this is empty - QString szLowerLabelText; // no label is shown if this is empty - QString szButton1Text; // OK is used if this is empty - QString szButton2Text; // no button is shown if this is empty - QString szButton3Text; // no button is shown if this is empty + TQString szCaption; // KVIrc is used when this is empty + TQString szUpperLabelText; // no label is shown if this is empty + TQString szLowerLabelText; // no label is shown if this is empty + TQString szButton1Text; // OK is used if this is empty + TQString szButton2Text; // no button is shown if this is empty + TQString szButton3Text; // no button is shown if this is empty int iMinimumWidth; int iMinimumHeight; - QPixmap pixIcon; // may be null + TQPixmap pixIcon; // may be null // output int iSelectedButton; // returns 1,2 or 3 }; -class KVIRC_API KviHtmlDialog : public QDialog +class KVIRC_API KviHtmlDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: // the dialog does NOT delete this structure and assumes that // it remains alive until the dialog closes (i.e. it may access // the structure in the destructor - KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData); + KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData); ~KviHtmlDialog(); protected: KviHtmlDialogData * m_pData; public: // displays the dialog as modal and returns 1,2 or 3 - static int display(QWidget * pParent,KviHtmlDialogData * pData); + static int display(TQWidget * pParent,KviHtmlDialogData * pData); protected slots: void button1Pressed(); void button2Pressed(); diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index adb33a16..8ddb9b18 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -25,14 +25,14 @@ #include "kvi_locale.h" -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> -#include <qimage.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqdir.h> -#include <qpainter.h> +#include <tqpainter.h> #include "kvi_fileutils.h" @@ -53,30 +53,30 @@ int KviImageDialogItem::width(const KviTalListBox *lb) const w = lb->fontMetrics().width(text()) + 4; if(w > 100)w = 100; if(w < 24)w = 24; - return QMAX(pixmap()->width() + 10,w); + return TQMAX(pixmap()->width() + 10,w); } -void KviImageDialogItem::paint(QPainter * p) +void KviImageDialogItem::paint(TQPainter * p) { - const QPixmap *pm = pixmap(); + const TQPixmap *pm = pixmap(); if(pm && !pm->isNull())p->drawPixmap(5,5, *pm); if(!m_bIsFolder) { - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->drawRect(3,3,pm->width() + 4,pm->height() + 4); } - QRect daRect(listBox()->itemRect(this)); + TQRect daRect(listBox()->tqitemRect(this)); - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2); if(text().isEmpty())return; - QString t = text(); + TQString t = text(); - QFontMetrics fm(p->fontMetrics()); + TQFontMetrics fm(p->fontMetrics()); int wdth = fm.width(t); @@ -90,17 +90,17 @@ void KviImageDialogItem::paint(QPainter * p) idx--; } - p->drawText(3,pm->height() + 8,daRect.width() - 6,daRect.height() - (pm->height() + 6),Qt::AlignLeft | Qt::AlignTop,t); + p->drawText(3,pm->height() + 8,daRect.width() - 6,daRect.height() - (pm->height() + 6),TQt::AlignLeft | TQt::AlignTop,t); } -KviImageDialog::KviImageDialog(QWidget * par, - const QString &szCaption, +KviImageDialog::KviImageDialog(TQWidget * par, + const TQString &szCaption, int types, int initialType, - const QString &szInitialDir, + const TQString &szInitialDir, int maxPreviewFileSize,bool modal) -: QDialog(par) +: TQDialog(par) { m_szInitialPath = szInitialDir; setModal(modal); @@ -108,20 +108,20 @@ KviImageDialog::KviImageDialog(QWidget * par, setCaption(szCaption.isEmpty() ? __tr2qs("Choose image ...") : szCaption); - m_pTimer = new QTimer(this); - connect(m_pTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); + m_pTimer = new TQTimer(this); + connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); - QGridLayout * g = new QGridLayout(this,4,3,5,3); + TQGridLayout * g = new TQGridLayout(this,4,3,5,3); - m_pTypeComboBox = new QComboBox(this); + m_pTypeComboBox = new TQComboBox(this); g->addMultiCellWidget(m_pTypeComboBox,0,0,0,2); m_pTypeList = new KviValueList<int>; - QString bi = __tr2qs("Builtin images"); + TQString bi = __tr2qs("Builtin images"); - QString tmp = bi; + TQString tmp = bi; if((types & KID_TYPE_ALL) == 0)types = KID_TYPE_FULL_PATH; @@ -139,10 +139,10 @@ KviImageDialog::KviImageDialog(QWidget * par, m_pTypeList->append(KID_TYPE_FULL_PATH); } - int idx = m_pTypeList->findIndex(initialType); + int idx = m_pTypeList->tqfindIndex(initialType); if(idx < 0)idx = 0; - QWidget * l = new QWidget(this); + TQWidget * l = new TQWidget(this); g->addMultiCellWidget(l,1,1,0,2); @@ -154,20 +154,20 @@ KviImageDialog::KviImageDialog(QWidget * par, g->addMultiCellWidget(m_pListBox,2,2,0,2); - QPushButton * b = new QPushButton(__tr2qs("Cancel"),this); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + TQPushButton * b = new TQPushButton(__tr2qs("Cancel"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); g->addWidget(b,3,1); - b = new QPushButton(__tr2qs("Ok"),this); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + b = new TQPushButton(__tr2qs("Ok"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); g->addWidget(b,3,2); g->setRowStretch(2,1); g->setColStretch(0,1); - connect(m_pTypeComboBox,SIGNAL(activated(int)),this,SLOT(jobTypeSelected(int))); - connect(m_pListBox,SIGNAL(doubleClicked(KviTalListBoxItem *)),this,SLOT(itemDoubleClicked(KviTalListBoxItem *))); - connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pTypeComboBox,TQT_SIGNAL(activated(int)),this,TQT_SLOT(jobTypeSelected(int))); + connect(m_pListBox,TQT_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListBoxItem *))); + connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); m_pTypeComboBox->setCurrentItem(idx); jobTypeSelected(idx); @@ -193,7 +193,7 @@ void KviImageDialog::jobTypeSelected(int index) } } -void KviImageDialog::startJob(int type,const QString &szInitialPath) +void KviImageDialog::startJob(int type,const TQString &szInitialPath) { m_pTimer->stop(); m_iJobType = type; @@ -201,12 +201,12 @@ void KviImageDialog::startJob(int type,const QString &szInitialPath) m_iJobIndexHelper = 0; if(m_iJobType == KID_TYPE_FULL_PATH) { - QDir d(szInitialPath); - if(!d.exists())d = QDir::homeDirPath(); - if(!d.exists())d = QDir::rootDirPath(); + TQDir d(szInitialPath); + if(!d.exists())d = TQDir::homeDirPath(); + if(!d.exists())d = TQDir::rootDirPath(); m_szJobPath = d.absPath(); KVI_OPTION_STRING(KviOption_stringLastImageDialogPath) = m_szJobPath; - m_lJobFileList = d.entryList(QDir::Hidden | QDir::All,QDir::DirsFirst | QDir::Name | QDir::IgnoreCase); + m_lJobFileList = d.entryList(TQDir::Hidden | TQDir::All,TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase); } m_pTimer->start(100); @@ -235,11 +235,11 @@ void KviImageDialog::heartbeat() if(max > KVI_NUM_SMALL_ICONS)max = KVI_NUM_SMALL_ICONS; while(m_iJobIndexHelper < max) { - QString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); + TQString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); KviImageDialogItem * it; - QString tip; - KviQString::sprintf(tip,__tr2qs("Builtin $icon(%Q) [index %d]"),&id,m_iJobIndexHelper); - QString image_id = "$icon("; + TQString tip; + KviTQString::sprintf(tip,__tr2qs("Builtin $icon(%Q) [index %d]"),&id,m_iJobIndexHelper); + TQString image_id = "$icon("; image_id += id; image_id += ")"; it = new KviImageDialogItem(m_pListBox,*(g_pIconManager->getSmallIcon(m_iJobIndexHelper)),id,image_id,tip); @@ -258,18 +258,18 @@ void KviImageDialog::heartbeat() int idx = 0; while((idx < 20) && (!m_lJobFileList.isEmpty())) { - QString szFile = m_lJobFileList.first(); + TQString szFile = m_lJobFileList.first(); m_lJobFileList.remove(szFile); - QString szPath = m_szJobPath; + TQString szPath = m_szJobPath; szPath += KVI_PATH_SEPARATOR; szPath += szFile; - QFileInfo fi(szPath); + TQFileInfo fi(szPath); idx += fi.size() / 128000; // we do less entries when have big files to read if(fi.isDir()) { if(szFile != ".") { - QString tip = szFile; + TQString tip = szFile; tip += "<br><hr>"; tip += __tr2qs("directory"); KviImageDialogItem * it; @@ -278,19 +278,19 @@ void KviImageDialog::heartbeat() } else { if(((int)fi.size()) < m_iMaxPreviewFileSize) { - QImage i(szPath); + TQImage i(szPath); if(i.isNull())continue; - QPixmap pix; + TQPixmap pix; #ifdef COMPILE_USE_QT4 - if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,Qt::KeepAspectRatio); + if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,TQt::KeepAspectRatio); #else - if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,QImage::ScaleMin); + if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQ_ScaleMin); #endif else pix = i; - QString tip = szFile; + TQString tip = szFile; tip += "<br><hr>"; - QString sz; + TQString sz; sz.setNum(i.width()); tip += sz; tip += " x "; @@ -327,14 +327,14 @@ void KviImageDialog::okClicked() void KviImageDialog::cancelClicked() { - m_szSelectedImage = QString::null; + m_szSelectedImage = TQString(); reject(); } -void KviImageDialog::closeEvent(QCloseEvent * e) +void KviImageDialog::closeEvent(TQCloseEvent * e) { - m_szSelectedImage = QString::null; - QDialog::closeEvent(e); + m_szSelectedImage = TQString(); + TQDialog::closeEvent(e); } void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) @@ -345,10 +345,10 @@ void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) { startJob(KID_TYPE_FULL_PATH,i->imageId()); } else { - QString szImageId = i->imageId(); + TQString szImageId = i->imageId(); if(szImageId.length() > 0) { - if(szImageId.at(0) == QChar('$')) + if(szImageId.at(0) == TQChar('$')) m_szSelectedImage = szImageId; // it's $icon(something) else g_pApp->mapImageFile(m_szSelectedImage,i->imageId()); // it's a file and we need to map it to our filesystem view @@ -357,11 +357,11 @@ void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) } } -void KviImageDialog::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt); if(!it)return; - QRect r = m_pListBox->itemRect(it); + TQRect r = m_pListBox->tqitemRect(it); KviImageDialogItem * i = (KviImageDialogItem *)it; m_pTip->tip(r,i->tipText()); } diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 7e1da54d..c0fd71e2 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -27,12 +27,12 @@ -#include <qdialog.h> -#include <qcombobox.h> +#include <tqdialog.h> +#include <tqcombobox.h> #include "kvi_tal_listbox.h" #include "kvi_valuelist.h" -#include <qtimer.h> -#include <qstringlist.h> +#include <tqtimer.h> +#include <tqstringlist.h> #include "kvi_dynamictooltip.h" @@ -40,19 +40,19 @@ class KviImageDialogItem : public KviTalListBoxPixmap { public: bool m_bIsFolder; - QString m_szImageId; - QString m_szTipText; + TQString m_szImageId; + TQString m_szTipText; public: - KviImageDialogItem(KviTalListBox * b,const QPixmap &thumb,const QString &szFile,const QString &image_id,const QString &szTipText = QString::null,bool bIsFolder = false) + KviImageDialogItem(KviTalListBox * b,const TQPixmap &thumb,const TQString &szFile,const TQString &image_id,const TQString &szTipText = TQString(),bool bIsFolder = false) : KviTalListBoxPixmap(b,thumb,szFile) , m_bIsFolder(bIsFolder) , m_szImageId(image_id) , m_szTipText(szTipText) {}; ~KviImageDialogItem(){}; public: bool isFolder(){ return m_bIsFolder; }; - const QString & imageId(){ return m_szImageId; }; - const QString & tipText(){ return m_szTipText; }; + const TQString & imageId(){ return m_szImageId; }; + const TQString & tipText(){ return m_szTipText; }; virtual int height(const KviTalListBox *) const; virtual int width(const KviTalListBox *) const; - virtual void paint(QPainter * p); + virtual void paint(TQPainter * p); }; @@ -61,49 +61,50 @@ public: #define KID_TYPE_ALL 3 -class KVIRC_API KviImageDialog : public QDialog +class KVIRC_API KviImageDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KviImageDialog(QWidget * par, - const QString &szCaption = QString::null, + KviImageDialog(TQWidget * par, + const TQString &szCaption = TQString(), int types = KID_TYPE_ALL, int initialType = 0, - const QString &szInitialDir = QString::null, + const TQString &szInitialDir = TQString(), int maxPreviewFileSize = 256000, bool modal=false); virtual ~KviImageDialog(); protected: - QComboBox * m_pTypeComboBox; + TQComboBox * m_pTypeComboBox; KviValueList<int> * m_pTypeList; KviTalListBox * m_pListBox; - QTimer * m_pTimer; + TQTimer * m_pTimer; int m_iJobType; int m_iMaxPreviewFileSize; - QString m_szJobPath; - QStringList m_lJobFileList; + TQString m_szJobPath; + TQStringList m_lJobFileList; int m_iJobIndexHelper; - QString m_szSelectedImage; + TQString m_szSelectedImage; - QString m_szInitialPath; + TQString m_szInitialPath; KviDynamicToolTip * m_pTip; public: - const QString & selectedImage(){ return m_szSelectedImage; }; + const TQString & selectedImage(){ return m_szSelectedImage; }; protected: - void startJob(int type,const QString &szInitialPath = QString::null); + void startJob(int type,const TQString &szInitialPath = TQString()); void jobTerminated(); - virtual void closeEvent(QCloseEvent *e); + virtual void closeEvent(TQCloseEvent *e); protected slots: void okClicked(); void cancelClicked(); void heartbeat(); void jobTypeSelected(int index); void itemDoubleClicked(KviTalListBoxItem * it); - void tipRequest(KviDynamicToolTip *,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *,const TQPoint &pnt); }; #endif //_KVI_IMAGEDIALOG_H_ diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index c0fbbd9e..28ac74f2 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -55,39 +55,35 @@ #include "kvi_texticonmanager.h" #include "kvi_draganddrop.h" -#include <qlabel.h> +#include <tqlabel.h> #include <ctype.h> #include <stdlib.h> -#include <qfiledialog.h> +#include <tqfiledialog.h> #include "kvi_tal_popupmenu.h" -#include <qpainter.h> -#include <qclipboard.h> -#include <qstringlist.h> +#include <tqpainter.h> +#include <tqclipboard.h> +#include <tqstringlist.h> #include "kvi_pointerlist.h" -#include <qapplication.h> -#include <qclipboard.h> -#include <qmessagebox.h> +#include <tqapplication.h> +#include <tqclipboard.h> +#include <tqmessagebox.h> #include "kvi_tal_hbox.h" -#include <qlayout.h> -#include <qstyle.h> -#include <qevent.h> +#include <tqlayout.h> +#include <tqstyle.h> +#include <tqevent.h> #ifndef ACCEL_KEY -#define ACCEL_KEY(k) "\t" + QString(QKeySequence( Qt::CTRL | Qt::Key_ ## k )) +#define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #endif // FIXME: #warning "This hack is temporary...later remove it" -#if QT_VERSION >= 300 - #ifndef QT_CLEAN_NAMESPACE - #define QT_CLEAN_NAMESPACE - #include <qcursor.h> - #undef QT_CLEAN_NAMESPACE - #else - #include <qcursor.h> - #endif +#ifndef TQT_CLEAN_NAMESPACE + #define TQT_CLEAN_NAMESPACE + #include <tqcursor.h> + #undef TQT_CLEAN_NAMESPACE #else - #include <qcursor.h> + #include <tqcursor.h> #endif @@ -98,11 +94,11 @@ extern KviTextIconWindow * g_pTextIconWindow; extern KviHistoryWindow * g_pHistoryWindow; extern KviTalPopupMenu * g_pInputPopup; -static QFontMetrics * g_pLastFontMetrics = 0; +static TQFontMetrics * g_pLastFontMetrics = 0; #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -115,7 +111,7 @@ extern KviInputHistory * g_pInputHistory; KviInputHistory::KviInputHistory() { - m_pStringList = new KviPointerList<QString>; + m_pStringList = new KviPointerList<TQString>; m_pStringList->setAutoDelete(true); } @@ -124,7 +120,7 @@ KviInputHistory::~KviInputHistory() delete m_pStringList; } -void KviInputHistory::add(QString * s) +void KviInputHistory::add(TQString * s) { m_pStringList->insert(0,s); if(m_pStringList->count() > KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES)m_pStringList->removeLast(); @@ -143,8 +139,8 @@ void KviInputHistory::load(const char * filename) for(int i=0;i<cnt;i++) { tmp.sprintf("S%d",i); - QString entry = c.readQStringEntry(tmp.ptr(),""); - if(!entry.isEmpty())add(new QString(entry)); + TQString entry = c.readTQStringEntry(tmp.ptr(),""); + if(!entry.isEmpty())add(new TQString(entry)); } } @@ -158,7 +154,7 @@ void KviInputHistory::save(const char * filename) KviStr tmp; int idx = 0; - for(QString * s = m_pStringList->first();s;s = m_pStringList->next()) + for(TQString * s = m_pStringList->first();s;s = m_pStringList->next()) { if(!s->isEmpty()) { @@ -175,8 +171,8 @@ static int g_iInputFontCharWidth[256]; static bool g_bInputFontMetricsDirty = true; -KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * view) -:QFrame(par,"input") +KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * view) +:TQFrame(par,"input") { m_pIconMenu = 0; m_pInputParent = par; @@ -201,7 +197,7 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi m_bUpdatesEnabled = true; m_pKviWindow = wnd; m_pUserListView = view; - m_pHistory = new KviPointerList<QString>; + m_pHistory = new KviPointerList<TQString>; m_pHistory->setAutoDelete(true); m_bReadOnly = FALSE; @@ -209,20 +205,20 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); - setFocusPolicy(Qt::StrongFocus); + setFocusPolicy(TTQ_StrongFocus); #else - setBackgroundMode(Qt::NoBackground); - setFocusPolicy(QWidget::StrongFocus); + setBackgroundMode(TQt::NoBackground); + setFocusPolicy(TQ_StrongFocus); #endif setAcceptDrops(true); setFrameStyle( LineEditPanel ); setFrameShadow( Plain ); m_pIconMenu = new KviTalPopupMenu(); - connect(m_pIconMenu,SIGNAL(activated(int)),this,SLOT(iconPopupActivated(int))); + connect(m_pIconMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(iconPopupActivated(int))); #ifdef COMPILE_USE_QT4 - setCursor(Qt::IBeamCursor); + setCursor(TQt::IBeamCursor); #else setCursor(IbeamCursor); #endif @@ -238,19 +234,19 @@ KviInputEditor::~KviInputEditor() killDragTimer(); } -void KviInputEditor::recalcFontMetrics(QFontMetrics * pFm) +void KviInputEditor::recalcFontMetrics(TQFontMetrics * pFm) { - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); unsigned short i; for(i=1;i<32;i++) { - QChar c = getSubstituteChar(i); + TQChar c = getSubstituteChar(i); g_iInputFontCharWidth[i] = fm.width(c); - if(c != QChar(i))g_iInputFontCharWidth[i] += 4; + if(c != TQChar(i))g_iInputFontCharWidth[i] += 4; } for(i=32;i<256;i++) { - g_iInputFontCharWidth[i] = fm.width(QChar(i)); + g_iInputFontCharWidth[i] = fm.width(TQChar(i)); } g_bInputFontMetricsDirty = false; } @@ -261,7 +257,7 @@ void KviInputEditor::applyOptions() update(); } -void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) +void KviInputEditor::dragEnterEvent(TQDragEnterEvent *e) { if(KviUriDrag::canDecode(e)) { @@ -273,23 +269,23 @@ void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) } else e->accept(false); } -void KviInputEditor::dropEvent(QDropEvent *e) +void KviInputEditor::dropEvent(TQDropEvent *e) { - QStringList list; + TQStringList list; if(KviUriDrag::decodeLocalFiles(e,list)) { //debug("Local files decoded"); if(!list.isEmpty()) { //debug("List not empty"); - QStringList::ConstIterator it = list.begin(); //kewl ! :) + TQStringList::ConstIterator it = list.begin(); //kewl ! :) for( ; it != list.end(); ++it ) { - QString tmp = *it; //wow :) + TQString tmp = *it; //wow :) #ifndef COMPILE_ON_WINDOWS if(tmp.length() > 0) { - if(tmp[0] != QChar('/'))tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?) + if(tmp[0] != TQChar('/'))tmp.prepend("/"); //HACK HACK HACK for TQt bug (?!?) } #endif tmp.prepend("/PARSE \""); @@ -303,27 +299,27 @@ void KviInputEditor::dropEvent(QDropEvent *e) int KviInputEditor::heightHint() const { - return sizeHint().height(); + return tqsizeHint().height(); } -QSize KviInputEditor::sizeHint() const +TQSize KviInputEditor::tqsizeHint() const { //grabbed from qlineedit.cpp constPolish(); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); - int h = QMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + int h = TQMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - return (style()->sizeFromContents(QStyle::CT_LineEdit,&opt, - QSize( w + m, h + m ). - expandedTo(QApplication::globalStrut()),this)); + return (style()->sizeFromContents(TQStyle::CT_LineEdit,&opt, + TQSize( w + m, h + m ). + expandedTo(TQApplication::globalStrut()),this)); #else - return (style().sizeFromContents(QStyle::CT_LineEdit, this, - QSize( w + m, h + m ). - expandedTo(QApplication::globalStrut()))); + return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this, + TQSize( w + m, h + m ). + expandedTo(TQApplication::globalStrut()))); #endif } @@ -331,35 +327,35 @@ QSize KviInputEditor::sizeHint() const #define KVI_INPUT_DEF_FORE 101 #ifdef COMPILE_USE_QT4 -void KviInputEditor::paintEvent(QPaintEvent *e) +void KviInputEditor::paintEvent(TQPaintEvent *e) { - QPainter p(this); + TQPainter p(this); SET_ANTI_ALIASING(p); drawFrame(&p); drawContents(&p); } #endif -void KviInputEditor::drawContents(QPainter *p) +void KviInputEditor::drawContents(TQPainter *p) { if(!isVisible())return; - QRect rect = contentsRect(); + TQRect rect = contentsRect(); int widgetWidth = rect.width(); int widgetHeight = rect.height(); KviDoubleBuffer doublebuffer(widgetWidth,widgetHeight); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QPainter pa(pDoubleBufferPixmap); + TQPainter pa(pDoubleBufferPixmap); SET_ANTI_ALIASING(pa); pa.setFont(KVI_OPTION_FONT(KviOption_fontInput)); - QFontMetrics fm(pa.fontMetrics()); + TQFontMetrics fm(pa.fontMetrics()); if(!g_pLastFontMetrics) - g_pLastFontMetrics = new QFontMetrics(pa.fontMetrics()); + g_pLastFontMetrics = new TQFontMetrics(pa.fontMetrics()); if(g_bInputFontMetricsDirty) recalcFontMetrics(&fm); @@ -368,11 +364,11 @@ void KviInputEditor::drawContents(QPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(rect.topLeft()); + TQPoint pnt = mapToGlobal(rect.topLeft()); pa.drawTiledPixmap(0,0,widgetWidth,widgetHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap *pix=KVI_OPTION_PIXMAP(KviOption_pixmapInputBackground).pixmap(); + TQPixmap *pix=KVI_OPTION_PIXMAP(KviOption_pixmapInputBackground).pixmap(); pa.fillRect(0,0,widgetWidth,widgetHeight,KVI_OPTION_COLOR(KviOption_colorInputBackground)); if(pix) @@ -415,9 +411,9 @@ void KviInputEditor::drawContents(QPainter *p) int xLeft = xPositionFromCharIndex(fm,iSelStart,TRUE); int xRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,TRUE); -// pa.setRasterOp(Qt::NotROP); +// pa.setRasterOp(TQt::NotROP); pa.fillRect(xLeft,frameWidth(),xRight - xLeft,widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// pa.setRasterOp(TQt::CopyROP); } // When m_bIMComposing is true, the text between m_iIMStart and m_iIMStart+m_iIMLength should be highlighted to show that this is the active @@ -433,9 +429,9 @@ void KviInputEditor::drawContents(QPainter *p) if(iIMSelectionStart < m_iFirstVisibleChar) iIMSelectionStart = m_iFirstVisibleChar; int xIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,TRUE); int xIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,TRUE); -// pa.setRasterOp(Qt::NotROP); +// pa.setRasterOp(TQt::NotROP); pa.fillRect(xIMSelectionLeft,0,xIMSelectionRight - xIMSelectionLeft, widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// pa.setRasterOp(TQt::CopyROP); // highlight the IM selection int iIMStart = m_iIMStart; @@ -458,7 +454,7 @@ void KviInputEditor::drawContents(QPainter *p) { pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); - QString s = getSubstituteChar(m_szTextBuffer[charIdx].unicode()); + TQString s = getSubstituteChar(m_szTextBuffer[charIdx].tqunicode()); // the block width is 4 pixels more than the actual character @@ -525,11 +521,11 @@ void KviInputEditor::drawContents(QPainter *p) while(m_iBlockLen < m_iCursorPosition) { - QChar c = m_szTextBuffer.at(m_iBlockLen); + TQChar c = m_szTextBuffer.at(m_iBlockLen); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition+= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c); + m_iLastCursorXPosition+= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c); #else - m_iLastCursorXPosition+= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition+= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif m_iBlockLen++; } @@ -552,12 +548,12 @@ void KviInputEditor::drawContents(QPainter *p) #endif } -void KviInputEditor::drawTextBlock(QPainter * pa,QFontMetrics & fm,int curXPos,int textBaseline,int charIdx,int len,bool bSelected) +void KviInputEditor::drawTextBlock(TQPainter * pa,TQFontMetrics & fm,int curXPos,int textBaseline,int charIdx,int len,bool bSelected) { - QString tmp = m_szTextBuffer.mid(charIdx,len); + TQString tmp = m_szTextBuffer.mid(charIdx,len); m_iBlockWidth = fm.width(tmp); - QRect rect = contentsRect(); + TQRect rect = contentsRect(); int widgetHeight = rect.height(); if(m_iCurFore == KVI_INPUT_DEF_FORE) @@ -592,66 +588,66 @@ void KviInputEditor::drawTextBlock(QPainter * pa,QFontMetrics & fm,int curXPos,i } -QChar KviInputEditor::getSubstituteChar(unsigned short control_code) +TQChar KviInputEditor::getSubstituteChar(unsigned short control_code) { switch(control_code) { case KVI_TEXT_COLOR: - return QChar('K'); + return TQChar('K'); break; case KVI_TEXT_BOLD: - return QChar('B'); + return TQChar('B'); break; case KVI_TEXT_RESET: - return QChar('O'); + return TQChar('O'); break; case KVI_TEXT_REVERSE: - return QChar('R'); + return TQChar('R'); break; case KVI_TEXT_UNDERLINE: - return QChar('U'); + return TQChar('U'); break; case KVI_TEXT_CRYPTESCAPE: - return QChar('P'); + return TQChar('P'); break; case KVI_TEXT_ICON: - return QChar('I'); + return TQChar('I'); break; default: - return QChar(control_code); + return TQChar(control_code); break; } } -void KviInputEditor::extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int maxXPos) +void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int maxXPos) { m_iBlockLen = 0; m_iBlockWidth = 0; - QChar c = m_szTextBuffer[idx]; + TQChar c = m_szTextBuffer[idx]; - if((c.unicode() > 32) || - ((c != QChar(KVI_TEXT_COLOR)) && - (c != QChar(KVI_TEXT_BOLD)) && (c != QChar(KVI_TEXT_UNDERLINE)) && - (c != QChar(KVI_TEXT_RESET)) && (c != QChar(KVI_TEXT_REVERSE)) && - (c != QChar(KVI_TEXT_CRYPTESCAPE)) && (c != QChar(KVI_TEXT_ICON)))) + if((c.tqunicode() > 32) || + ((c != TQChar(KVI_TEXT_COLOR)) && + (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && + (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && + (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && (c != TQChar(KVI_TEXT_ICON)))) { m_bControlBlock = false; //Not a control code...run.. while((idx < ((int)(m_szTextBuffer.length()))) && (curXPos < maxXPos)) { c = m_szTextBuffer[idx]; - if((c.unicode() > 32) || - ((c != QChar(KVI_TEXT_COLOR)) && (c != QChar(KVI_TEXT_BOLD)) && - (c != QChar(KVI_TEXT_UNDERLINE)) && (c != QChar(KVI_TEXT_RESET)) && - (c != QChar(KVI_TEXT_REVERSE)) && (c != QChar(KVI_TEXT_CRYPTESCAPE)) && - (c != QChar(KVI_TEXT_ICON)))) + if((c.tqunicode() > 32) || + ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && + (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && + (c != TQChar(KVI_TEXT_REVERSE)) && (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && + (c != TQChar(KVI_TEXT_ICON)))) { m_iBlockLen++; #ifdef COMPILE_USE_QT4 - int xxx = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + int xxx = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - int xxx = (c.unicode() < 256 ? g_iInputFontCharWidth[c.unicode()] : fm.width(c)); + int xxx = (c.tqunicode() < 256 ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c)); #endif m_iBlockWidth +=xxx; curXPos +=xxx; @@ -662,9 +658,9 @@ void KviInputEditor::extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int } else { m_bControlBlock = true; m_iBlockLen = 1; - m_iBlockWidth = g_iInputFontCharWidth[c.unicode()]; + m_iBlockWidth = g_iInputFontCharWidth[c.tqunicode()]; //Control code - switch(c.unicode()) + switch(c.tqunicode()) { case KVI_TEXT_BOLD: m_bCurBold = ! m_bCurBold; @@ -720,7 +716,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() register int idx = 0; while(idx < m_iFirstVisibleChar) { - unsigned short c = m_szTextBuffer[idx].unicode(); + unsigned short c = m_szTextBuffer[idx].tqunicode(); if(c < 32) { switch(c) @@ -769,7 +765,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() } -void KviInputEditor::mousePressEvent(QMouseEvent *e) +void KviInputEditor::mousePressEvent(TQMouseEvent *e) { if(e->button() & Qt::LeftButton) { @@ -779,8 +775,8 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) if(anchorX > (width()-frameWidth()))m_iFirstVisibleChar++; m_iSelectionAnchorChar = m_iCursorPosition; selectOneChar(-1); - //grabMouse(QCursor(crossCursor)); - repaintWithCursorOn(); + //grabMouse(TQCursor(crossCursor)); + tqrepaintWithCursorOn(); killDragTimer(); m_iDragTimer = startTimer(KVI_INPUT_DRAG_TIMEOUT); @@ -791,17 +787,17 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) //Popup menu g_pInputPopup->clear(); - QString szClip; + TQString szClip; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(c) { - szClip = c->text(QClipboard::Clipboard); + szClip = c->text(TQClipboard::Clipboard); #ifdef COMPILE_USE_QT4 - int occ = szClip.count(QChar('\n')); + int occ = szClip.count(TQChar('\n')); #else - int occ = szClip.contains(QChar('\n')); + int occ = szClip.tqcontains(TQChar('\n')); #endif if(!szClip.isEmpty()) @@ -811,29 +807,29 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) szClip.truncate(60); szClip.append("..."); } - szClip.replace(QChar('&'),"&"); - szClip.replace(QChar('<'),"<"); - szClip.replace(QChar('>'),">"); - szClip.replace(QChar('\n'),"<br>"); + szClip.tqreplace(TQChar('&'),"&"); + szClip.tqreplace(TQChar('<'),"<"); + szClip.tqreplace(TQChar('>'),">"); + szClip.tqreplace(TQChar('\n'),"<br>"); - QString label = "<center><b>"; + TQString label = "<center><b>"; label += __tr2qs("Clipboard"); label += ":</b><br>"; label += szClip; label += "<br><b>"; - QString num; + TQString num; num.setNum(occ); label += num; - label += QChar(' '); + label += TQChar(' '); label += (occ == 1) ? __tr2qs("line break") : __tr2qs("line breaks"); label += "</b></center>"; - QLabel * l = new QLabel(label,g_pInputPopup); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + TQLabel * l = new TQLabel(label,g_pInputPopup); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); l->setMargin(5); - // FIXME: This does NOT work under Qt 4.x (they seem to consider it as bad UI design) + // FIXME: This does NOT work under TQt 4.x (they seem to consider it as bad UI design) #ifndef COMPILE_USE_QT4 g_pInputPopup->insertItem(l); #else @@ -842,39 +838,39 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) } } - int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,SLOT(cut())); + int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,TQT_SLOT(cut())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,SLOT(copyToClipboard())); + id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,TQT_SLOT(copyToClipboard())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,SLOT(pasteClipboardWithConfirmation())); + id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,TQT_SLOT(pasteClipboardWithConfirmation())); g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); - id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,SLOT(pasteSlow())); - if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_QUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT)) + id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,TQT_SLOT(pasteSlow())); + if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_TQUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); else g_pInputPopup->setItemEnabled(id,false); - id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,SLOT(pasteFile())); - if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_QUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT)) + id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,TQT_SLOT(pasteFile())); + if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_TQUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,false); else g_pInputPopup->setItemEnabled(id,!m_bReadOnly); if(m_bSpSlowFlag ==true) { - id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,SLOT(stopPasteSlow())); /*G&N 2005*/ + id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,TQT_SLOT(stopPasteSlow())); /*G&N 2005*/ } - id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,SLOT(clear())); + id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,TQT_SLOT(clear())); g_pInputPopup->setItemEnabled(id,!m_szTextBuffer.isEmpty() && !m_bReadOnly); g_pInputPopup->insertSeparator(); - id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,SLOT(selectAll())); + id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,TQT_SLOT(selectAll())); g_pInputPopup->setItemEnabled(id,(!m_szTextBuffer.isEmpty())); g_pInputPopup->insertSeparator(); m_pIconMenu->clear(); - KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); - KviPointerHashTableIterator<QString,KviTextIcon> it(*d); - QStringList strList; + KviPointerHashTable<TQString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); + KviPointerHashTableIterator<TQString,KviTextIcon> it(*d); + TQStringList strList; while(KviTextIcon * i = it.current()) { strList.append(it.currentKey()); @@ -882,9 +878,9 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) } strList.sort(); KviTextIcon * icon; - QPixmap *pix; + TQPixmap *pix; - for(QStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter) + for(TQStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter) { icon=g_pTextIconManager->lookupTextIcon(*iter); if(icon) @@ -904,7 +900,7 @@ void KviInputEditor::iconPopupActivated(int id) { if(!m_bReadOnly) { - QString text = m_pIconMenu->text(id); + TQString text = m_pIconMenu->text(id); if(!text.isEmpty()) { text.prepend(KVI_TEXT_ICON); @@ -922,24 +918,24 @@ bool KviInputEditor::hasSelection() void KviInputEditor::copyToClipboard() { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); - c->setText(szTxt,QClipboard::Clipboard); - repaintWithCursorOn(); + TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); + c->setText(szTxt,TQClipboard::Clipboard); + tqrepaintWithCursorOn(); } void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); + TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); if(c->supportsSelection()) - c->setText(szTxt,QClipboard::Selection); + c->setText(szTxt,TQClipboard::Selection); else if(!bDonNotCopyToClipboard) - c->setText(szTxt,QClipboard::Clipboard); - repaintWithCursorOn(); + c->setText(szTxt,TQClipboard::Clipboard); + tqrepaintWithCursorOn(); } @@ -958,7 +954,7 @@ void KviInputEditor::moveCursorTo(int idx,bool bRepaint) m_iCursorPosition = idx; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar = m_iCursorPosition; } - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); } void KviInputEditor::removeSelected() @@ -967,49 +963,49 @@ void KviInputEditor::removeSelected() m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::cut() { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),QClipboard::Clipboard); + c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),TQClipboard::Clipboard); m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::insertText(const QString &text) +void KviInputEditor::insertText(const TQString &text) { - QString szText = text; // crop away constness + TQString szText = text; // crop away constness if(szText.isEmpty())return; //szText.replaceAll('\t'," "); //Do not paste tabs - //szText.replace(QRegExp("\t")," "); // do not paste tabs + //szText.tqreplace(TQRegExp("\t")," "); // do not paste tabs m_bUpdatesEnabled = false; removeSelected(); m_bUpdatesEnabled = true; - if(szText.find('\n') == -1) + if(szText.tqfind('\n') == -1) { m_szTextBuffer.insert(m_iCursorPosition,szText); m_szTextBuffer.truncate(m_iMaxBufferSize); moveCursorTo(m_iCursorPosition + szText.length()); } else { //Multiline paste...do not execute commands here - QString szBlock; + TQString szBlock; while(!szText.isEmpty()) { - int idx = szText.find('\n'); + int idx = szText.tqfind('\n'); if(idx != -1) { szBlock = szText.left(idx); - //else szBlock = QChar(KVI_TEXT_RESET); + //else szBlock = TQChar(KVI_TEXT_RESET); szText.remove(0,idx+1); } else { szBlock = szText; @@ -1021,7 +1017,7 @@ void KviInputEditor::insertText(const QString &text) int pos = 0; while((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] < 33))pos++; - if((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] == QChar('/')))m_szTextBuffer.insert(pos,"\\"); + if((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] == TQChar('/')))m_szTextBuffer.insert(pos,"\\"); returnPressed(idx != -1); } @@ -1031,12 +1027,12 @@ void KviInputEditor::insertText(const QString &text) // Replace (length) characters in the buffer from (start) with (text), returns // the length of the text inserted (different from text.length() only if the // buffer was truncated. -int KviInputEditor::replaceSegment(int start, int length, const QString &text) +int KviInputEditor::replaceSegment(int start, int length, const TQString &text) { m_szTextBuffer.remove(start, length); m_szTextBuffer.insert(start, text); m_szTextBuffer.truncate(m_iMaxBufferSize); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); int iInsertedLength = text.length(); int iMaxInsertedLength = m_iMaxBufferSize - start; @@ -1046,11 +1042,11 @@ int KviInputEditor::replaceSegment(int start, int length, const QString &text) void KviInputEditor::pasteClipboardWithConfirmation() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szText = c->text(QClipboard::Clipboard); + TQString szText = c->text(TQClipboard::Clipboard); - if(szText.contains(QChar('\n')) > 0) + if(szText.tqcontains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1061,11 +1057,11 @@ void KviInputEditor::pasteClipboardWithConfirmation() void KviInputEditor::pasteSelectionWithConfirmation() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szText = c->text(c->supportsSelection() ? QClipboard::Selection : QClipboard::Clipboard); + TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard); - if(szText.contains(QChar('\n')) > 0) + if(szText.tqcontains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1088,10 +1084,10 @@ void KviInputEditor::stopPasteSlow() void KviInputEditor::pasteFile() { - QString stmp = QFileDialog::getOpenFileName("","",this,"Paste File", "Choose a file" ); + TQString stmp = TQFileDialog::getOpenFileName("","",this,"Paste File", "Choose a file" ); if(stmp!="") { - QString stmp1 = "spaste.file " + stmp ; + TQString stmp1 = "spaste.file " + stmp ; KviKvsScript::run(stmp1,g_pActiveWindow); m_bSpSlowFlag = true; } @@ -1114,7 +1110,7 @@ void KviInputEditor::clear() home(); } -void KviInputEditor::setText(const QString text) +void KviInputEditor::setText(const TQString text) { m_szTextBuffer = text; m_szTextBuffer.truncate(m_iMaxBufferSize); @@ -1122,7 +1118,7 @@ void KviInputEditor::setText(const QString text) end(); } -void KviInputEditor::mouseReleaseEvent(QMouseEvent *) +void KviInputEditor::mouseReleaseEvent(TQMouseEvent *) { if(m_iDragTimer) { @@ -1143,7 +1139,7 @@ void KviInputEditor::killDragTimer() } } -void KviInputEditor::timerEvent(QTimerEvent *e) +void KviInputEditor::timerEvent(TQTimerEvent *e) { if(e->timerId() == m_iCursorTimer) { @@ -1164,7 +1160,7 @@ void KviInputEditor::handleDragSelection() { if(m_iSelectionAnchorChar == -1)return; - QPoint pnt = mapFromGlobal(QCursor::pos()); + TQPoint pnt = mapFromGlobal(TQCursor::pos()); if(pnt.x() <= 0) @@ -1195,7 +1191,7 @@ void KviInputEditor::handleDragSelection() m_iSelectionEnd = m_iSelectionAnchorChar-1; } } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::returnPressed(bool bRepaint) @@ -1203,9 +1199,9 @@ void KviInputEditor::returnPressed(bool bRepaint) if (!m_szTextBuffer.isEmpty() /* && (!m_pHistory->current() || m_szTextBuffer.compare(*(m_pHistory->current())))*/) { if(m_pInputParent->inherits("KviInput")) - g_pInputHistory->add(new QString(m_szTextBuffer)); + g_pInputHistory->add(new TQString(m_szTextBuffer)); - m_pHistory->insert(0,new QString(m_szTextBuffer)); + m_pHistory->insert(0,new TQString(m_szTextBuffer)); } __range_valid(KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES > 1); //ABSOLUTELY NEEDED, if not, pHist will be destroyed... @@ -1213,16 +1209,16 @@ void KviInputEditor::returnPressed(bool bRepaint) m_iCurHistoryIdx = -1; - // FIXME: ALL THIS STUFF SHOULD BE CONVERTED TO QString + // FIXME: ALL THIS STUFF SHOULD BE CONVERTED TO TQString /* if(m_pInputParent->inherits("KviInput")) { - QString szBuffer(m_szTextBuffer); + TQString szBuffer(m_szTextBuffer); m_szTextBuffer=""; selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); KviUserInput::parse(szBuffer,m_pKviWindow); } else { */ @@ -1233,7 +1229,7 @@ void KviInputEditor::returnPressed(bool bRepaint) */ } -void KviInputEditor::focusInEvent(QFocusEvent *) +void KviInputEditor::focusInEvent(TQFocusEvent *) { if(m_iCursorTimer==0) { @@ -1243,12 +1239,12 @@ void KviInputEditor::focusInEvent(QFocusEvent *) } // XIM handling... #ifndef COMPILE_USE_QT4 - // THIS SEEMS TO BE GONE IN Qt4.x ? (even if the documentation states that it *should* be there) + // THIS SEEMS TO BE GONE IN TQt4.x ? (even if the documentation states that it *should* be there) setMicroFocusHint(1,1,width() - 2,height() - 2,true,0); #endif } -void KviInputEditor::focusOutEvent(QFocusEvent *) +void KviInputEditor::focusOutEvent(TQFocusEvent *) { if(m_iCursorTimer)killTimer(m_iCursorTimer); m_iCursorTimer = 0; @@ -1295,7 +1291,7 @@ void KviInputEditor::internalCursorLeft(bool bShift) // remember the text before and after the cursor at this point, and put them // before and after the text inserted by IM in imEndEvent. // hagabaka -void KviInputEditor::imStartEvent(QIMEvent *e) +void KviInputEditor::imStartEvent(TQIMEvent *e) { removeSelected(); m_iIMStart = m_iIMSelectionBegin = m_iCursorPosition; @@ -1306,12 +1302,12 @@ void KviInputEditor::imStartEvent(QIMEvent *e) // Whenever the IM's preedit changes, update the visuals and internal data. refer to <http://doc.trolltech.com/3.3/qimevent.html> */ // hagabaka -void KviInputEditor::imComposeEvent(QIMEvent *e) +void KviInputEditor::imComposeEvent(TQIMEvent *e) { // replace the old pre-edit string with e->text() m_bUpdatesEnabled = false; #ifdef COMPILE_USE_QT4 - // Qt 4.x ?????????? + // TQt 4.x ?????????? m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); // update selection inside the pre-edit @@ -1329,20 +1325,20 @@ void KviInputEditor::imComposeEvent(QIMEvent *e) #endif - // repaint + // tqrepaint m_bUpdatesEnabled = true; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); e->accept(); } // Input method is done; put its resulting text to where the preedit area was // hagabaka -void KviInputEditor::imEndEvent(QIMEvent *e) +void KviInputEditor::imEndEvent(TQIMEvent *e) { // replace the preedit area with the IM result text m_bUpdatesEnabled = false; #ifdef COMPILE_USE_QT4 - // Qt 4.x ?????????? + // TQt 4.x ?????????? m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); #else m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->text()); @@ -1351,9 +1347,9 @@ void KviInputEditor::imEndEvent(QIMEvent *e) // move cursor to after the IM result text moveCursorTo(m_iIMStart + m_iIMLength); - // repaint + // tqrepaint m_bUpdatesEnabled = true; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); // reset data m_bIMComposing = false; @@ -1363,7 +1359,7 @@ void KviInputEditor::imEndEvent(QIMEvent *e) // FIXME According to <http://www.kde.gr.jp/~asaki/how-to-support-input-method.html>, if the XIM // style used is OverTheTop, code needs to be added in keyPressEvent handler */ // hagabaka -void KviInputEditor::keyPressEvent(QKeyEvent *e) +void KviInputEditor::keyPressEvent(TQKeyEvent *e) { // disable the keyPress handling when IM is in composition. if(m_bIMComposing) @@ -1375,9 +1371,9 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(!m_bReadOnly) { - if((e->key() == Qt::Key_Tab) || (e->key() == Qt::Key_BackTab)) + if((e->key() == TQt::Key_Tab) || (e->key() == TQt::Key_BackTab)) { - completion(e->state() & Qt::ShiftButton); + completion(e->state() & TQt::ShiftButton); return; } else { m_bLastCompletionFinished=1; @@ -1385,17 +1381,17 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } - if(e->key() == Qt::Key_Escape) + if(e->key() == TQt::Key_Escape) { emit escapePressed(); return; } - if((e->state() & Qt::AltButton) || (e->state() & Qt::ControlButton)) + if((e->state() & TQt::AltButton) || (e->state() & TQt::ControlButton)) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(m_pInputParent->inherits("KviInput")) { ((KviInput*)(m_pInputParent))->multiLinePaste(m_szTextBuffer); @@ -1409,50 +1405,50 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) //Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX. //This way typical X11 and Apple shortcuts can be used simultanously within the input line. #ifndef Q_OS_MACX - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) #else - if((e->state() & Qt::ControlButton) || (e->state() & Qt::MetaButton)) + if((e->state() & TQt::ControlButton) || (e->state() & TQt::MetaButton)) #endif { switch(e->key()) { - case Qt::Key_Right: + case TQt::Key_Right: if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { // skip whitespace while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(!m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & Qt::ShiftButton); + internalCursorRight(e->state() & TQt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & Qt::ShiftButton); + internalCursorRight(e->state() & TQt::ShiftButton); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Left: + case TQt::Key_Left: if(m_iCursorPosition > 0) { // skip whitespace while(m_iCursorPosition > 0) { if(!m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & Qt::ShiftButton); + internalCursorLeft(e->state() & TQt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition > 0) { if(m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & Qt::ShiftButton); + internalCursorLeft(e->state() & TQt::ShiftButton); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_K: + case TQt::Key_K: { if(!m_bReadOnly) { @@ -1461,27 +1457,27 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(xPos > 24)xPos-=24; if(!g_pColorWindow)g_pColorWindow = new KviColorWindow(); if(xPos+g_pColorWindow->width() > width())xPos = width()-(g_pColorWindow->width()+2); - g_pColorWindow->move(mapToGlobal(QPoint(xPos,-35))); + g_pColorWindow->move(mapToGlobal(TQPoint(xPos,-35))); g_pColorWindow->popup(this); } } break; - case Qt::Key_B: + case TQt::Key_B: if(!m_bReadOnly) insertChar(KVI_TEXT_BOLD); break; - case Qt::Key_O: + case TQt::Key_O: if(!m_bReadOnly) insertChar(KVI_TEXT_RESET); break; - case Qt::Key_U: + case TQt::Key_U: if(!m_bReadOnly) insertChar(KVI_TEXT_UNDERLINE); break; - case Qt::Key_R: + case TQt::Key_R: if(!m_bReadOnly) insertChar(KVI_TEXT_REVERSE); break; - case Qt::Key_P: + case TQt::Key_P: if(!m_bReadOnly) insertChar(KVI_TEXT_CRYPTESCAPE); // DO NOT CRYPT THIS STUFF break; - case Qt::Key_I: + case TQt::Key_I: { if(!m_bReadOnly) { @@ -1490,22 +1486,22 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(xPos > 24)xPos-=24; if(!g_pTextIconWindow)g_pTextIconWindow = new KviTextIconWindow(); if(xPos+g_pTextIconWindow->width() > width())xPos = width()-(g_pTextIconWindow->width()+2); - g_pTextIconWindow->move(mapToGlobal(QPoint(xPos,-KVI_TEXTICON_WIN_HEIGHT))); + g_pTextIconWindow->move(mapToGlobal(TQPoint(xPos,-KVI_TEXTICON_WIN_HEIGHT))); g_pTextIconWindow->popup(this); } } break; - case Qt::Key_C: + case TQt::Key_C: copyToClipboard(); break; - case Qt::Key_X: + case TQt::Key_X: if(!m_bReadOnly) cut(); break; - case Qt::Key_V: + case TQt::Key_V: if(!m_bReadOnly) pasteClipboardWithConfirmation(); break; - //case Qt::Key_Backspace: - case Qt::Key_W: + //case TQt::Key_Backspace: + case TQt::Key_W: if(m_iCursorPosition > 0 && !m_bReadOnly && !hasSelection()) { // skip whitespace @@ -1524,39 +1520,39 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) m_iCursorPosition--; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) break; if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->historyButtonClicked(); break; - case Qt::Key_F: + case TQt::Key_F: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->toggleToolWidget(); break; - case Qt::Key_A: + case TQt::Key_A: m_iSelectionBegin=0; m_iSelectionEnd=m_szTextBuffer.length()-1; m_iCursorPosition=m_szTextBuffer.length(); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: if(m_pInputParent->inherits("KviInput")) { - QString szBuffer(m_szTextBuffer); + TQString szBuffer(m_szTextBuffer); m_szTextBuffer=""; selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); KviUserInput::parseNonCommand(szBuffer,m_pKviWindow); if (!szBuffer.isEmpty()) { - g_pInputHistory->add(new QString(szBuffer)); - m_pHistory->insert(0,new QString(szBuffer)); + g_pInputHistory->add(new TQString(szBuffer)); + m_pHistory->insert(0,new TQString(szBuffer)); } __range_valid(KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES > 1); //ABSOLUTELY NEEDED, if not, pHist will be destroyed... @@ -1572,10 +1568,10 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if((e->state() & Qt::AltButton) && (e->state() & Qt::Keypad)) + if((e->state() & TQt::AltButton) && (e->state() & TQt::Keypad)) { - // Qt::Key_Meta seems to substitute Qt::Key_Alt on some keyboards - if((e->key() == Qt::Key_Alt) || (e->key() == Qt::Key_Meta)) + // TQt::Key_Meta seems to substitute TQt::Key_Alt on some keyboards + if((e->key() == TQt::Key_Alt) || (e->key() == TQt::Key_Meta)) { m_szAltKeyCode = ""; return; @@ -1592,20 +1588,20 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { switch(e->key()) { - case Qt::Key_Insert: + case TQt::Key_Insert: if(!m_bReadOnly) pasteClipboardWithConfirmation(); return; break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->prevLine(); return; break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->nextLine(); return; @@ -1615,21 +1611,21 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) switch(e->key()) { - case Qt::Key_Right: + case TQt::Key_Right: if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { - internalCursorRight(e->state() & Qt::ShiftButton); - repaintWithCursorOn(); + internalCursorRight(e->state() & TQt::ShiftButton); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Left: + case TQt::Key_Left: if(m_iCursorPosition > 0) { - internalCursorLeft(e->state() & Qt::ShiftButton); - repaintWithCursorOn(); + internalCursorLeft(e->state() & TQt::ShiftButton); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(!m_bReadOnly) { if(hasSelection() && (m_iSelectionEnd >= m_iCursorPosition-1) && (m_iSelectionBegin <= m_iCursorPosition)) @@ -1644,10 +1640,10 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Delete: + case TQt::Key_Delete: if(!m_bReadOnly) { if(hasSelection()) removeSelected(); @@ -1655,14 +1651,14 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) { m_szTextBuffer.remove(m_iCursorPosition,1); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } } break; - case Qt::Key_Home: + case TQt::Key_Home: if(m_iCursorPosition > 0) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionEnd = m_iCursorPosition - 1; m_iSelectionBegin = 0; @@ -1672,8 +1668,8 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) home(); } break; - case Qt::Key_End://we should call it even the cursor is at the end for deselecting - if(e->state() & Qt::ShiftButton) + case TQt::Key_End://we should call it even the cursor is at the end for deselecting + if(e->state() & TQt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionBegin = m_iCursorPosition; m_iSelectionEnd = m_szTextBuffer.length()-1; @@ -1682,7 +1678,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } end(); break; - case Qt::Key_Up: + case TQt::Key_Up: if(!m_bReadOnly) { if(m_pHistory->count() > 0) @@ -1706,7 +1702,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } break; - case Qt::Key_Down: + case TQt::Key_Down: if(!m_bReadOnly) { if(m_pHistory->count() > 0) @@ -1730,20 +1726,20 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->prevPage(); break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->nextPage(); break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: returnPressed(); break; - case Qt::Key_Alt: - case Qt::Key_Meta: + case TQt::Key_Alt: + case TQt::Key_Meta: m_szAltKeyCode = ""; break; default: @@ -1753,9 +1749,9 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } -void KviInputEditor::keyReleaseEvent(QKeyEvent *e) +void KviInputEditor::keyReleaseEvent(TQKeyEvent *e) { - if((e->key() == Qt::Key_Alt) || (e->key() == Qt::Key_Meta)) + if((e->key() == TQt::Key_Alt) || (e->key() == TQt::Key_Meta)) { if(m_szAltKeyCode.hasData()) { @@ -1764,7 +1760,7 @@ void KviInputEditor::keyReleaseEvent(QKeyEvent *e) if(bOk && ch != 0) { //debug("INSERTING CHAR %d",ch); - insertChar(QChar(ch)); + insertChar(TQChar(ch)); e->accept(); } } @@ -1773,7 +1769,7 @@ void KviInputEditor::keyReleaseEvent(QKeyEvent *e) e->ignore(); } -void KviInputEditor::getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLine) +void KviInputEditor::getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInLine) { if(m_szTextBuffer.isEmpty() || m_iCursorPosition <= 0) { @@ -1783,10 +1779,10 @@ void KviInputEditor::getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLi buffer = m_szTextBuffer.left(m_iCursorPosition); - int idx = buffer.findRev(' '); - int idx2 = buffer.findRev(','); // This is for comma separated lists... - int idx3 = buffer.findRev('('); - int idx4 = buffer.findRev('"'); + int idx = buffer.tqfindRev(' '); + int idx2 = buffer.tqfindRev(','); // This is for comma separated lists... + int idx3 = buffer.tqfindRev('('); + int idx4 = buffer.tqfindRev('"'); if(idx2 > idx)idx = idx2; if(idx3 > idx)idx = idx3; if(idx4 > idx)idx = idx4; @@ -1801,8 +1797,8 @@ void KviInputEditor::completion(bool bShift) // On windows the KVI_PATH_SEPARATOR_CHARacters are breaking everything... // Well.... :D - QString word; - QString match; + TQString word; + TQString match; bool bFirstWordInLine; getWordBeforeCursor(word,&bFirstWordInLine); @@ -1812,18 +1808,18 @@ void KviInputEditor::completion(bool bShift) else { // this is standard nick completion continued standardNickCompletion(bShift,word,bFirstWordInLine); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } } - KviPointerList<QString> tmp; + KviPointerList<TQString> tmp; tmp.setAutoDelete(true); bool bIsCommand = false; bool bIsDir = false; bool bIsNick = false; - unsigned short uc = word[0].unicode(); + unsigned short uc = word[0].tqunicode(); if(uc == '/') { @@ -1849,12 +1845,12 @@ void KviInputEditor::completion(bool bShift) { if(m_pKviWindow) { - if( (word.length()==1) && (m_pKviWindow->windowName()[0].unicode()==uc)) + if( (word.length()==1) && (m_pKviWindow->windowName()[0].tqunicode()==uc)) { match=m_pKviWindow->windowName(); match.append(" "); replaceWordBeforeCursor(word,match,false); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } else { if(m_pKviWindow->console()) @@ -1863,7 +1859,7 @@ void KviInputEditor::completion(bool bShift) } //FIXME: Complete also on irc:// starting strings, not only irc.? - } else if(KviQString::equalCIN(word,"irc.",4)) + } else if(KviTQString::equalCIN(word,"irc.",4)) { // irc server name if(m_pKviWindow) @@ -1879,7 +1875,7 @@ void KviInputEditor::completion(bool bShift) bIsNick = true; } else { standardNickCompletion(bShift,word,bFirstWordInLine); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } } @@ -1902,8 +1898,8 @@ void KviInputEditor::completion(bool bShift) } } } else { - QString all; - QString * s = tmp.first(); + TQString all; + TQString * s = tmp.first(); match = *s; int wLen = word.length(); for(;s;s = tmp.next()) @@ -1911,12 +1907,12 @@ void KviInputEditor::completion(bool bShift) if(s->length() < match.length()) match.remove(s->length(),match.length() - s->length()); // All the matches here have length >= word.len()!!! - const QChar * b1 = KviQString::nullTerminatedArray(*s) + wLen; - const QChar * b2 = KviQString::nullTerminatedArray(match) + wLen; - const QChar * c1 = b1; - const QChar * c2 = b2; - if(bIsDir)while(c1->unicode() && (c1->unicode() == c2->unicode()))c1++,c2++; - else while(c1->unicode() && (c1->lower().unicode() == c2->lower().unicode()))c1++,c2++; + const TQChar * b1 = KviTQString::nullTerminatedArray(*s) + wLen; + const TQChar * b2 = KviTQString::nullTerminatedArray(match) + wLen; + const TQChar * c1 = b1; + const TQChar * c2 = b2; + if(bIsDir)while(c1->tqunicode() && (c1->tqunicode() == c2->tqunicode()))c1++,c2++; + else while(c1->tqunicode() && (c1->lower().tqunicode() == c2->lower().tqunicode()))c1++,c2++; int len = wLen + (c1 - b1); if(len < ((int)(match.length())))match.remove(len,match.length() - len); if(!all.isEmpty())all.append(", "); @@ -1937,10 +1933,10 @@ void KviInputEditor::completion(bool bShift) replaceWordBeforeCursor(word,match,false); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::replaceWordBeforeCursor(const QString &word,const QString &replacement,bool bRepaint) +void KviInputEditor::replaceWordBeforeCursor(const TQString &word,const TQString &replacement,bool bRepaint) { selectOneChar(-1); m_iCursorPosition -= word.length(); @@ -1948,16 +1944,16 @@ void KviInputEditor::replaceWordBeforeCursor(const QString &word,const QString & m_szTextBuffer.insert(m_iCursorPosition,replacement); m_szTextBuffer.truncate(m_iMaxBufferSize); moveCursorTo(m_iCursorPosition + replacement.length()); - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); } -void KviInputEditor::standardNickCompletion(bool bAddMask,QString &word,bool bFirstWordInLine) +void KviInputEditor::standardNickCompletion(bool bAddMask,TQString &word,bool bFirstWordInLine) { // FIXME: this could be really simplified... if(!m_pUserListView)return; selectOneChar(-1); - QString buffer; + TQString buffer; if(m_szLastCompletedNick.isEmpty()) { // New completion session: we NEED sth to complete @@ -2049,17 +2045,17 @@ void KviInputEditor::end() moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::home() { m_iFirstVisibleChar = 0; m_iCursorPosition = 0; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::insertChar(QChar c) +void KviInputEditor::insertChar(TQChar c) { if(m_szTextBuffer.length() >= m_iMaxBufferSize)return; @@ -2077,34 +2073,34 @@ void KviInputEditor::insertChar(QChar c) m_szTextBuffer.insert(m_iCursorPosition,c); moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::moveRightFirstVisibleCharToShowCursor() { // :) - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); - QChar c = m_szTextBuffer.at(m_iCursorPosition); + TQChar c = m_szTextBuffer.at(m_iCursorPosition); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif while(m_iLastCursorXPosition >= contentsRect().width()-2*KVI_INPUT_MARGIN) { c = m_szTextBuffer.at(m_iFirstVisibleChar); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition -= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition -= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition -= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition -= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif m_iFirstVisibleChar++; } } -void KviInputEditor::repaintWithCursorOn() +void KviInputEditor::tqrepaintWithCursorOn() { // :) if(m_bUpdatesEnabled) @@ -2126,14 +2122,14 @@ int KviInputEditor::charIndexFromXPosition(int xPos) int curChar = m_iFirstVisibleChar; int bufLen = m_szTextBuffer.length(); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); while(curChar < bufLen) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - int widthCh = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + int widthCh = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - int widthCh = (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + int widthCh = (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif if(xPos < (curXPos+(widthCh/2)))return curChar; else if(xPos < (curXPos+widthCh))return (curChar+1); @@ -2145,18 +2141,18 @@ int KviInputEditor::charIndexFromXPosition(int xPos) return curChar; } -int KviInputEditor::xPositionFromCharIndex(QFontMetrics& fm,int chIdx,bool bContentsCoords) +int KviInputEditor::xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords) { // FIXME: this could use fm.width(m_szTextBuffer,chIdx) int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN; int curChar = m_iFirstVisibleChar; while(curChar < chIdx) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + curXPos += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif curChar++; } @@ -2169,14 +2165,14 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN; int curChar = m_iFirstVisibleChar; //debug("%i",g_pLastFontMetrics); - if(!g_pLastFontMetrics) g_pLastFontMetrics = new QFontMetrics(KVI_OPTION_FONT(KviOption_fontInput)); + if(!g_pLastFontMetrics) g_pLastFontMetrics = new TQFontMetrics(KVI_OPTION_FONT(KviOption_fontInput)); while(curChar < chIdx) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.unicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.unicode())) + 3 : g_pLastFontMetrics->width(c); + curXPos += c.tqunicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.tqunicode())) + 3 : g_pLastFontMetrics->width(c); #else - curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : g_pLastFontMetrics->width(c); + curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : g_pLastFontMetrics->width(c); #endif curChar++; } @@ -2278,7 +2274,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) Ctrl+Shift+CursorLeft: Moves the selection one word left<br> Ctrl+Shift+CursorRight: Moves the selection one word right<br> Tab: Nickname, function/command, or filename completion (see below)<br> - Shift+Tab: Hostmask or function/command completion (see below)<br> + Shift+Tab: Hosttqmask or function/command completion (see below)<br> Alt+<numeric_sequence>: Inserts the character by ASCII/Unicode code<br> <example> Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space) @@ -2313,11 +2309,11 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) KviInput::KviInput(KviWindow *par,KviUserListView * view) -: QWidget(par,"input") +: TQWidget(par,"input") { - QBoxLayout* pLayout=new QHBoxLayout(this); + TQBoxLayout* pLayout=new TQHBoxLayout(this); pLayout->setAutoAdd(true); - pLayout->setDirection(QBoxLayout::RightToLeft); + pLayout->setDirection(TQBoxLayout::RightToLeft); pLayout->setMargin(0); pLayout->setSpacing(0); @@ -2333,51 +2329,51 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); m_pButtonContainer=new KviTalHBox(this); m_pButtonContainer->setSpacing(0); #ifdef COMPILE_USE_QT4 - m_pButtonContainer->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Preferred)); -// if(m_pButtonContainer->layout()) -// m_pButtonContainer->layout()->setSizeConstraint(QLayout::SetMinimumSize); + m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); +// if(m_pButtonContainer->tqlayout()) +// m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize); #endif m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); m_pHistoryButton->setUsesBigPixmap(false); //m_pHistoryButton->setUpdatesEnabled(TRUE); ??? - QIconSet is1; + TQIconSet is1; if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005 { - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small); + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); } else { - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small); + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); } m_pIconButton = new KviStyledToolButton(m_pButtonContainer,"iconbutton"); m_pIconButton->setUsesBigPixmap(false); - QIconSet is3; - is3.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),QIconSet::Small); + TQIconSet is3; + is3.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),TQIconSet::Small); m_pIconButton->setIconSet(is3); KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br><Ctrl+I><br>See also /help texticons")); - connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); + connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked())); m_pCommandlineModeButton = new KviStyledToolButton(m_pButtonContainer,"commandlinemodebutton"); m_pCommandlineModeButton->setUsesBigPixmap(false); m_pCommandlineModeButton->setToggleButton(true); - QIconSet is0; - is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is0; + is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); m_pCommandlineModeButton->setIconSet(is0); KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline")); if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault)) @@ -2387,22 +2383,22 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pMultiEditorButton = new KviStyledToolButton(m_pButtonContainer,"multieditorbutton"); m_pMultiEditorButton->setToggleButton(true); m_pMultiEditorButton->setUsesBigPixmap(false); - QIconSet is2; - is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is2; + is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); m_pMultiEditorButton->setIconSet(is2); - QString szTip = __tr2qs("Multi-line Editor<br><Alt+Backspace>"); + TQString szTip = __tr2qs("Multi-line Editor<br><Alt+Backspace>"); szTip += " - <Ctrl+Backspace>"; KviTalToolTip::add(m_pMultiEditorButton,szTip); - connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool))); + connect(m_pMultiEditorButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(multilineEditorButtonToggled(bool))); m_pInputEditor = new KviInputEditor(this,par,view); - connect(m_pInputEditor,SIGNAL(enterPressed()),this,SLOT(inputEditorEnterPressed())); + connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed())); #ifdef COMPILE_USE_QT4 - m_pInputEditor->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Ignored)); + m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); #else - m_pInputEditor->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored)); + m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); #endif @@ -2434,7 +2430,7 @@ void KviInput::setButtonsHidden(bool bHidden) if(!m_pHideToolsButton || !m_pButtonContainer) return; if(bHidden==m_pButtonContainer->isHidden()) return; m_pButtonContainer->setHidden(bHidden); - QPixmap* pix= bHidden ? + TQPixmap* pix= bHidden ? g_pIconManager->getBigIcon("kvi_horizontal_right.png") : g_pIconManager->getBigIcon("kvi_horizontal_left.png"); if(pix) @@ -2448,36 +2444,36 @@ void KviInput::toggleToolButtons() void KviInput::inputEditorEnterPressed() { - QString szText = m_pInputEditor->text(); - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn()); + TQString szText = m_pInputEditor->text(); + KviUserInput::parse(szText,m_pWindow,TQString(),m_pCommandlineModeButton->isOn()); m_pInputEditor->setText(""); } -void KviInput::keyPressEvent(QKeyEvent *e) +void KviInput::keyPressEvent(TQKeyEvent *e) { //debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); - if((e->state() & Qt::ControlButton) || (e->state() & Qt::AltButton) || (e->state() & Qt::MetaButton)) + if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton)) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: //if(m_pMultiLineEditor) multilineEditorButtonToggled(!m_pMultiLineEditor); break; } } - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { switch(e->key()) { - case Qt::Key_Enter: - case Qt::Key_Return: + case TQt::Key_Enter: + case TQt::Key_Return: { if(m_pMultiLineEditor) { - QString szText; + TQString szText; m_pMultiLineEditor->getText(szText); if(szText.isEmpty())return; if(KVI_OPTION_BOOL(KviOption_boolWarnAboutPastingMultipleLines)) @@ -2489,11 +2485,11 @@ void KviInput::keyPressEvent(QKeyEvent *e) #ifdef COMPILE_USE_QT4 int nLines = szText.count('\n') + 1; #else - int nLines = szText.contains('\n') + 1; + int nLines = szText.tqcontains('\n') + 1; #endif if(nLines > 15) { - int nRet = QMessageBox::question( + int nRet = TQMessageBox::question( this, __tr2qs("Confirm Multiline Message"), __tr2qs("You're about to send a message with %1 lines of text.<br><br>" \ @@ -2501,7 +2497,7 @@ void KviInput::keyPressEvent(QKeyEvent *e) "here to prevent you from accidentally sending<br>" \ "a really large message just because you didn't edit it<br>" \ "properly after pasting text from the clipboard.<br><br>" \ - "Do you want the message to be sent?").arg(nLines), + "Do you want the message to be sent?").tqarg(nLines), __tr2qs("Yes, always"), __tr2qs("Yes"), __tr2qs("No"), @@ -2521,19 +2517,19 @@ void KviInput::keyPressEvent(QKeyEvent *e) } } } - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn()); + KviUserInput::parse(szText,m_pWindow,TQString(),m_pCommandlineModeButton->isOn()); m_pMultiLineEditor->setText(""); } } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: historyButtonClicked(); break; } } } -void KviInput::multiLinePaste(const QString &text) +void KviInput::multiLinePaste(const TQString &text) { if(!m_pMultiLineEditor)multilineEditorButtonToggled(true); m_pMultiLineEditor->setText(text); @@ -2547,20 +2543,20 @@ void KviInput::multilineEditorButtonToggled(bool bOn) KviScriptEditor::destroyInstance(m_pMultiLineEditor); m_pMultiLineEditor = 0; m_pInputEditor->show(); - m_pWindow->childrenTreeChanged(0); + m_pWindow->tqchildrenTreeChanged(0); m_pInputEditor->setFocus(); m_pMultiEditorButton->setOn(false); } else { if(!bOn)return; m_pMultiLineEditor = KviScriptEditor::createInstance(this); - QString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor"); + TQString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor"); // compatibility entry to avoid breaking translation just before a release... :) - szText.replace("Alt+Backspace","Ctrl+Backspace"); + szText.tqreplace("Alt+Backspace","Ctrl+Backspace"); m_pMultiLineEditor->setFindText(szText); m_pMultiLineEditor->setFindLineeditReadOnly(true); m_pInputEditor->hide(); m_pMultiLineEditor->show(); - m_pWindow->childrenTreeChanged(m_pMultiLineEditor); + m_pWindow->tqchildrenTreeChanged(m_pMultiLineEditor); m_pMultiLineEditor->setFocus(); m_pMultiEditorButton->setOn(true); } @@ -2569,7 +2565,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) void KviInput::iconButtonClicked() { if(!g_pTextIconWindow)g_pTextIconWindow = new KviTextIconWindow(); - QPoint pnt = m_pIconButton->mapToGlobal(QPoint(m_pIconButton->width(),0)); + TQPoint pnt = m_pIconButton->mapToGlobal(TQPoint(m_pIconButton->width(),0)); g_pTextIconWindow->move(pnt.x()-g_pTextIconWindow->width(),pnt.y() - g_pTextIconWindow->height()); g_pTextIconWindow->popup(this,true); } @@ -2578,7 +2574,7 @@ void KviInput::historyButtonClicked() { if(!g_pHistoryWindow)g_pHistoryWindow = new KviHistoryWindow(); - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); g_pHistoryWindow->setGeometry(pnt.x(),pnt.y() - KVI_HISTORY_WIN_HEIGHT,width(),KVI_HISTORY_WIN_HEIGHT); g_pHistoryWindow->popup(this); @@ -2586,7 +2582,7 @@ void KviInput::historyButtonClicked() #define BUTTON_WIDTH 20 -/*void KviInput::resizeEvent(QResizeEvent *e) +/*void KviInput::resizeEvent(TQResizeEvent *e) { //m_pButtonContainer m_pInputEditor->setGeometry(0,0,m_pButtonContainer->isVisible() ? width() - (BUTTON_WIDTH * 4)-10 : width() - 10,height()); @@ -2595,19 +2591,19 @@ void KviInput::historyButtonClicked() m_pHideToolsButton->setGeometry(width() - 10,0,10,height()); - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); }*/ void KviInput::setFocus() { - // redirect setFocus() to the right children + // redirect setFocus() to the right tqchildren if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } -void KviInput::focusInEvent(QFocusEvent * e) +void KviInput::focusInEvent(TQFocusEvent * e) { - // if we get a focus in event , redirect the focus to the children + // if we get a focus in event , redirect the focus to the tqchildren if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } @@ -2618,9 +2614,9 @@ int KviInput::heightHint() const return m_pMultiLineEditor ? 120 : m_pInputEditor->heightHint(); } -void KviInput::setText(const QString &text) +void KviInput::setText(const TQString &text) { - // FIXME: Latin1 -> QString ? + // FIXME: Latin1 -> TQString ? if(m_pMultiLineEditor)m_pMultiLineEditor->setText(text); else m_pInputEditor->setText(text); } @@ -2630,7 +2626,7 @@ void KviInput::insertChar(char c) m_pInputEditor->insertChar(c); } -void KviInput::insertText(const QString& text) +void KviInput::insertText(const TQString& text) { m_pInputEditor->insertText(text); } @@ -2642,34 +2638,34 @@ void KviInput::applyOptions() if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005 { - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); - m_pHistoryButton->disconnect(SIGNAL(clicked())); + m_pHistoryButton->disconnect(TQT_SIGNAL(clicked())); } if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) { - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); } m_pInputEditor->applyOptions(); } -void KviInput::setFocusProxy(QWidget *) +void KviInput::setFocusProxy(TQWidget *) { /* do nothing */ } -//const QString & KviInput::text() -QString KviInput::text() +//const TQString & KviInput::text() +TQString KviInput::text() { - QString szText; + TQString szText; if(m_pMultiLineEditor) m_pMultiLineEditor->getText(szText); else diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 56ec5070..cc6e3e6b 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -28,21 +28,21 @@ #include "kvi_settings.h" -#include <qwidget.h> +#include <tqwidget.h> #include "kvi_tal_hbox.h" -#include <qpixmap.h> +#include <tqpixmap.h> #include "kvi_pointerlist.h" #include "kvi_string.h" -//#include <qdialog.h> -#include <qtoolbutton.h> +//#include <tqdialog.h> +#include <tqtoolbutton.h> class KviUserListView; class KviWindow; class KviInput; class KviTalHBox; -class QFontMetrics; +class TQFontMetrics; // Default maximum buffer size. #define KVI_INPUT_MAX_BUFFER_SIZE 400 @@ -63,31 +63,32 @@ public: KviInputHistory(); ~KviInputHistory(); protected: - KviPointerList<QString> * m_pStringList; + KviPointerList<TQString> * m_pStringList; public: - void add(QString * s); - KviPointerList<QString> * list(){ return m_pStringList; }; + void add(TQString * s); + KviPointerList<TQString> * list(){ return m_pStringList; }; void save(const char * filename); void load(const char * filename); }; #ifdef COMPILE_USE_QT4 - #define QIMEvent QInputMethodEvent + #define TQIMEvent TQInputMethodEvent #endif -class KVIRC_API KviInputEditor : public QFrame +class KVIRC_API KviInputEditor : public TQFrame { // friend class KviUserParser; - //Q_PROPERTY( int KviProperty_FocusOwner READ heightHint ) - Q_PROPERTY( int TransparencyCapable READ heightHint ) + //TQ_PROPERTY( int KviProperty_FocusOwner READ heightHint ) + TQ_PROPERTY( int TransparencyCapable READ heightHint ) Q_OBJECT + TQ_OBJECT public: - KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * view = 0); + KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * view = 0); ~KviInputEditor(); protected: - QString m_szTextBuffer; + TQString m_szTextBuffer; int m_iCursorPosition; int m_iFirstVisibleChar; int m_iSelectionBegin; @@ -96,7 +97,7 @@ protected: bool m_bSpSlowFlag; // <-- what is this ? // members for supporting input methods - QString m_szIMText; + TQString m_szIMText; int m_iIMStart; int m_iIMLength; int m_iIMSelectionBegin; @@ -121,15 +122,15 @@ protected: int m_iSelectionAnchorChar; // History stuff - KviPointerList<QString> * m_pHistory; + KviPointerList<TQString> * m_pHistory; int m_iCurHistoryIdx; KviStr m_szSaveTextBuffer; // Nick completion KviUserListView * m_pUserListView; - QString m_szLastCompletedNick; - QString m_szLastCompletionBuffer; + TQString m_szLastCompletedNick; + TQString m_szLastCompletionBuffer; int m_iLastCompletionCursorPosition; int m_iLastCompletionCursorXPosition; int m_iLastCompletionFirstVisibleChar; @@ -138,33 +139,33 @@ protected: bool m_bUpdatesEnabled; KviStr m_szAltKeyCode; KviWindow * m_pKviWindow; - QWidget * m_pInputParent; + TQWidget * m_pInputParent; KviTalPopupMenu * m_pIconMenu; bool m_bReadOnly; public: int heightHint() const; - virtual QSize sizeHint() const; - void setText(const QString text); - QString text() { return m_szTextBuffer; }; - void insertChar(QChar c); - void insertText(const QString &text); + virtual TQSize tqsizeHint() const; + void setText(const TQString text); + TQString text() { return m_szTextBuffer; }; + void insertChar(TQChar c); + void insertText(const TQString &text); void applyOptions(); void setMaxBufferSize(int size) { m_iMaxBufferSize = size; }; void setReadOnly(bool bReadOnly) {m_bReadOnly=bReadOnly; }; bool readOnly() {return m_bReadOnly; }; private: - void replaceWordBeforeCursor(const QString &word,const QString &replacement,bool bRepaint = true); - int replaceSegment(int start, int length, const QString &string); - void getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLine); + void replaceWordBeforeCursor(const TQString &word,const TQString &replacement,bool bRepaint = true); + int replaceSegment(int start, int length, const TQString &string); + void getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInLine); void runUpToTheFirstVisibleChar(); - void extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int maxXPos); - void drawTextBlock(QPainter *pa,QFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); - QChar getSubstituteChar(unsigned short control_code); + void extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int maxXPos); + void drawTextBlock(TQPainter *pa,TQFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); + TQChar getSubstituteChar(unsigned short control_code); void moveRightFirstVisibleCharToShowCursor(); - void repaintWithCursorOn(); + void tqrepaintWithCursorOn(); void selectOneChar(int pos); int charIndexFromXPosition(int xPos); - int xPositionFromCharIndex(QFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); + int xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); int xPositionFromCharIndex(int chIdx,bool bContentsCoords=FALSE); void killDragTimer(); void handleDragSelection(); @@ -174,8 +175,8 @@ private: void moveCursorTo(int idx,bool bRepaint = true); void returnPressed(bool bRepaint = true); void completion(bool bShift); - void standardNickCompletion(bool bAddMask,QString &word,bool bFirstWordInLine); - void recalcFontMetrics(QFontMetrics * pFm); + void standardNickCompletion(bool bAddMask,TQString &word,bool bFirstWordInLine); + void recalcFontMetrics(TQFontMetrics * pFm); void internalCursorRight(bool bShift); void internalCursorLeft(bool bShift); public slots: @@ -195,30 +196,31 @@ signals: void escapePressed(); void enterPressed(); protected: - virtual void drawContents(QPainter *); - //virtual void resizeEvent(QResizeEvent *); - virtual void timerEvent(QTimerEvent *e); - virtual void focusInEvent(QFocusEvent *); - virtual void focusOutEvent(QFocusEvent *); - virtual void keyPressEvent(QKeyEvent *e); - virtual void keyReleaseEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual void imStartEvent(QIMEvent *e); - virtual void imComposeEvent(QIMEvent *e); - virtual void imEndEvent(QIMEvent *e); + virtual void drawContents(TQPainter *); + //virtual void resizeEvent(TQResizeEvent *); + virtual void timerEvent(TQTimerEvent *e); + virtual void focusInEvent(TQFocusEvent *); + virtual void focusOutEvent(TQFocusEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void keyReleaseEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual void imStartEvent(TQIMEvent *e); + virtual void imComposeEvent(TQIMEvent *e); + virtual void imEndEvent(TQIMEvent *e); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); #endif }; class KviScriptEditor; -class KVIRC_API KviInput : public QWidget +class KVIRC_API KviInput : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviInput(KviWindow *par,KviUserListView * view = 0); ~KviInput(); @@ -227,16 +229,16 @@ public: KviInputEditor * m_pInputEditor; KviScriptEditor * m_pMultiLineEditor; KviTalHBox * m_pButtonContainer; - QToolButton * m_pMultiEditorButton; - QToolButton * m_pHistoryButton; - QToolButton * m_pIconButton; - QToolButton * m_pCommandlineModeButton; - QToolButton * m_pHideToolsButton; + TQToolButton * m_pMultiEditorButton; + TQToolButton * m_pHistoryButton; + TQToolButton * m_pIconButton; + TQToolButton * m_pCommandlineModeButton; + TQToolButton * m_pHideToolsButton; protected: -// virtual void resizeEvent(QResizeEvent * e); - virtual void focusInEvent(QFocusEvent * e); - virtual void setFocusProxy(QWidget * w); - virtual void keyPressEvent(QKeyEvent * e); +// virtual void resizeEvent(TQResizeEvent * e); + virtual void focusInEvent(TQFocusEvent * e); + virtual void setFocusProxy(TQWidget * w); + virtual void keyPressEvent(TQKeyEvent * e); public slots: void multilineEditorButtonToggled(bool bOn); void historyButtonClicked(); @@ -245,18 +247,18 @@ public slots: void toggleToolButtons(); public: virtual void setFocus(); - void multiLinePaste(const QString &text); + void multiLinePaste(const TQString &text); bool isUserFriendly() { return m_pCommandlineModeButton->isOn(); }; void setUserFriendly(bool bSet) { m_pCommandlineModeButton->setOn(bSet); }; int heightHint() const; - void setText(const QString &text); + void setText(const TQString &text); void insertChar(char c); - void insertText(const QString & text); + void insertText(const TQString & text); void applyOptions(); bool isButtonsHidden(); void setButtonsHidden(bool bHidden); - //const QString & text(); - QString text(); + //const TQString & text(); + TQString text(); }; #endif //_KVI_INPUT_H_ diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 13291c24..9d1b363e 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -23,18 +23,18 @@ #include "kvi_ipeditor.h" #include "kvi_qcstring.h" -#include <qapplication.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qframe.h> +#include <tqapplication.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqframe.h> #include <ctype.h> -#include <qevent.h> +#include <tqevent.h> // FIXME: #warning "THIS COULD GO INTO libkvioptions ?" -KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ipAddr,const char *name) -:QFrame(parent,name) +KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name) +:TQFrame(tqparent,name) { for(int i=0;i<7;i++) @@ -43,12 +43,12 @@ KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ip m_pLabel[i] = 0; } m_pEdit[7] = 0; - setFrameStyle(QFrame::Sunken|QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken|TQFrame::StyledPanel); #ifdef COMPILE_USE_QT4 - setBackgroundRole(QPalette::Base); + setBackgroundRole(TQPalette::Base); #else - setBackgroundMode(QWidget::PaletteBase); + setBackgroundMode(TQWidget::PaletteBase); #endif setAddressType(addrType); @@ -63,7 +63,7 @@ KviIpEditor::~KviIpEditor() void KviIpEditor::setEnabled(bool bEnabled) { - QFrame::setEnabled(bEnabled); + TQFrame::setEnabled(bEnabled); for(int i=0;i<8;i++) { if(m_pEdit[i])m_pEdit[i]->setEnabled(bEnabled); @@ -71,17 +71,17 @@ void KviIpEditor::setEnabled(bool bEnabled) { // Is this the right way ? #ifdef COMPILE_USE_QT4 - m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + m_pLabel[i]->setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + m_pLabel[i]->setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif m_pLabel[i]->setEnabled(bEnabled); } } #ifdef COMPILE_USE_QT4 - setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif } @@ -120,13 +120,13 @@ void KviIpEditor::clear() } } -bool KviIpEditor::setAddress(const QString &ipAddr) +bool KviIpEditor::setAddress(const TQString &ipAddr) { // FIXME We could check if the addres // is valid before effectively setting the fields clear(); - KviQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) + KviTQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) ip = ip.stripWhiteSpace(); const char * c = ip.data(); @@ -140,7 +140,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) const char *anchor = c; while(isdigit(*c))c++; if(c == anchor)return false; // Invalid empty field - KviQCString str(anchor,(c - anchor) + 1); + KviTQCString str(anchor,(c - anchor) + 1); bool bOk; int num = str.toInt(&bOk); if(!bOk)return false; // should never happen , but just to be sure @@ -156,7 +156,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) { const char *anchor = c; while(isdigit(*c) || ((tolower(*c) >= 'a') && (tolower(*c) <= 'f')) || ((tolower(*c) >= 'A') && (tolower(*c) <= 'F')))c++; - KviQCString str(anchor,(c - anchor) + 1); + KviTQCString str(anchor,(c - anchor) + 1); if(str.length() > 4)return false; // Too long m_pEdit[i]->setText(str.data()); if(i < 7){ @@ -169,9 +169,9 @@ bool KviIpEditor::setAddress(const QString &ipAddr) return true; } -QString KviIpEditor::address() const +TQString KviIpEditor::address() const { - QString ret; + TQString ret; if(m_addrType == IpV6) { @@ -183,7 +183,7 @@ QString KviIpEditor::address() const } else { for(int i=0;i<4;i++) { - QString tmp = m_pEdit[i]->text(); + TQString tmp = m_pEdit[i]->text(); bool bOk; int num = tmp.toInt(&bOk); if(!bOk)num = 0; @@ -200,29 +200,29 @@ void KviIpEditor::recreateChildren() // A bit slow , but compact bool bIpV4 = (m_addrType == IpV4); int max = bIpV4 ? 4 : 8; - QFontMetrics fm(font()); + TQFontMetrics fm(font()); //int minWidth = fm.width(bIpV4 ? "000" : "AAAA") + 4; for(int i=0;i<max;i++) { if(!m_pEdit[i]){ - m_pEdit[i] = new QLineEdit(this); + m_pEdit[i] = new TQLineEdit(this); m_pEdit[i]->installEventFilter(this); m_pEdit[i]->setFrame(false); - m_pEdit[i]->setAlignment(Qt::AlignCenter); + m_pEdit[i]->tqsetAlignment(TQt::AlignCenter); } //m_pEdit[i]->setMinimumWidth(minWidth); m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4); m_pEdit[i]->show(); if(i < (max - 1)) { - if(!m_pLabel[i])m_pLabel[i] = new QLabel(this); + if(!m_pLabel[i])m_pLabel[i] = new TQLabel(this); m_pLabel[i]->setText(bIpV4 ? "." : ":"); m_pLabel[i]->show(); // Is this the right way ? setBackgroundMode seems to not work well #ifdef COMPILE_USE_QT4 - m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + m_pLabel[i]->setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + m_pLabel[i]->setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif } } @@ -243,35 +243,35 @@ void KviIpEditor::recreateChildren() } } } - //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width())); - setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4); + //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width())); + setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4); resizeEvent(0); } -bool KviIpEditor::eventFilter(QObject * o,QEvent *e) +bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e) { - if(o->inherits("QLineEdit")) + if(o->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - if(e->type() == QEvent::KeyPress) + if(e->type() == TQEvent::KeyPress) { - QString s; + TQString s; // find the editor int edIdx = -1; for(int i=0;i<8;i++) { - if(m_pEdit[i] == o) + if(TQT_BASE_OBJECT(m_pEdit[i]) == TQT_BASE_OBJECT(o)) { edIdx = i; break; } } - if(edIdx == -1)return QFrame::eventFilter(o,e); // user added QLineEdit child ? + if(edIdx == -1)return TQFrame::eventFilter(o,e); // user added TQLineEdit child ? int edMax = (m_addrType == IpV4) ? 3 : 7; - int cursorPos = ((QLineEdit *)o)->cursorPosition(); - switch(((QKeyEvent *)e)->key()) + int cursorPos = ((TQLineEdit *)o)->cursorPosition(); + switch(((TQKeyEvent *)e)->key()) { - case Qt::Key_Right: - s = ((QLineEdit *)o)->text(); + case TQt::Key_Right: + s = ((TQLineEdit *)o)->text(); if(((unsigned int)cursorPos) == s.length()) { if(edIdx < edMax) @@ -282,8 +282,8 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } } break; - case Qt::Key_Left: - case Qt::Key_Backspace: + case TQt::Key_Left: + case TQt::Key_Backspace: if(cursorPos == 0) { if(edIdx > 0) @@ -294,26 +294,22 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) return true; } } - return QFrame::eventFilter(o,e); + return TQFrame::eventFilter(o,e); break; - case Qt::Key_End: - case Qt::Key_Home: - case Qt::Key_Delete: - case Qt::Key_Tab: - return QFrame::eventFilter(o,e); + case TQt::Key_End: + case TQt::Key_Home: + case TQt::Key_Delete: + case TQt::Key_Tab: + return TQFrame::eventFilter(o,e); break; default: - // a normal key (this part substitutes a QValidator) - const char c = tolower(((QKeyEvent *)e)->ascii()); + // a normal key (this part substitutes a TQValidator) + const char c = tolower(((TQKeyEvent *)e)->ascii()); if(m_addrType == IpV4) { if((c >= '0') && (c <= '9')) { -#if QT_VERSION >= 300 if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut(); -#else - if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut(); -#endif cursorPos = m_pEdit[edIdx]->cursorPosition(); s = m_pEdit[edIdx]->text(); s.insert(cursorPos,c); @@ -333,19 +329,11 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) return true; } } -#if QT_VERSION >= 300 m_pEdit[edIdx]->cursorForward(false); -#else - m_pEdit[edIdx]->cursorRight(false); -#endif } else { if((c == '.') && (edIdx < edMax)) { -#if QT_VERSION >= 300 if(!m_pEdit[edIdx]->hasSelectedText()) -#else - if(!m_pEdit[edIdx]->hasMarkedText()) -#endif { m_pEdit[++edIdx]->setFocus(); m_pEdit[edIdx]->selectAll(); @@ -355,11 +343,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } else { if( ((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ) { -#if QT_VERSION >= 300 if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut(); -#else - if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut(); -#endif cursorPos = m_pEdit[edIdx]->cursorPosition(); s = m_pEdit[edIdx]->text(); @@ -384,21 +368,13 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) m_pEdit[edIdx]->selectAll(); //m_pEdit[edIdx]->setCursorPosition(0); } else { -#if QT_VERSION >= 300 m_pEdit[edIdx]->cursorForward(false); -#else - m_pEdit[edIdx]->cursorRight(false); -#endif } } } else { if((c == ':') && (edIdx < edMax)) { -#if QT_VERSION >= 300 if(!m_pEdit[edIdx]->hasSelectedText()) -#else - if(!m_pEdit[edIdx]->hasMarkedText()) -#endif { m_pEdit[++edIdx]->setFocus(); m_pEdit[edIdx]->selectAll(); @@ -411,15 +387,15 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } } } - return QFrame::eventFilter(o,e); + return TQFrame::eventFilter(o,e); } -void KviIpEditor::resizeEvent(QResizeEvent *e) +void KviIpEditor::resizeEvent(TQResizeEvent *e) { if(m_pEdit[0]) { int maxW = (m_addrType == IpV4) ? 4 : 8; - int labHint = m_pLabel[0]->sizeHint().width(); + int labHint = m_pLabel[0]->tqsizeHint().width(); int hghHint = height() - 4; int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW; int curX = 2; @@ -434,19 +410,19 @@ void KviIpEditor::resizeEvent(QResizeEvent *e) curX += ediWdth; } } - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); } -QSize KviIpEditor::sizeHint() +TQSize KviIpEditor::tqsizeHint() { if(m_pEdit[0]) { - int labHint = m_pLabel[0]->sizeHint().width(); - int hghHint = m_pEdit[0]->sizeHint().height(); - int ediHint = m_pEdit[0]->sizeHint().width(); - if(m_addrType == IpV4)return QSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); - else return QSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); - } else return QFrame::sizeHint(); + int labHint = m_pLabel[0]->tqsizeHint().width(); + int hghHint = m_pEdit[0]->tqsizeHint().height(); + int ediHint = m_pEdit[0]->tqsizeHint().width(); + if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); + else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); + } else return TQFrame::tqsizeHint(); } diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 04574e61..3a398412 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -25,36 +25,37 @@ #include "kvi_settings.h" -#include <qwidget.h> -#include <qstring.h> -#include <qframe.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqframe.h> -class QLineEdit; -class QLabel; +class TQLineEdit; +class TQLabel; -class KVIRC_API KviIpEditor : public QFrame +class KVIRC_API KviIpEditor : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum AddressType { IpV4 , IpV6 }; - KviIpEditor(QWidget * parent,AddressType = IpV4,const QString &ipAddr = QString::null,const char *name = 0); + KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); ~KviIpEditor(); private: - QLabel * m_pLabel[7]; - QLineEdit * m_pEdit[8]; + TQLabel * m_pLabel[7]; + TQLineEdit * m_pEdit[8]; AddressType m_addrType; public: - bool setAddress(const QString &ipAddr); - QString address() const; + bool setAddress(const TQString &ipAddr); + TQString address() const; void setAddressType(AddressType addrType); AddressType addressType() const; bool hasEmptyFields() const; void clear(); virtual void setEnabled(bool bEnabled); protected: - virtual bool eventFilter(QObject * o,QEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual QSize sizeHint(); + virtual bool eventFilter(TQObject * o,TQEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual TQSize tqsizeHint(); private: void recreateChildren(); }; diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index a7e45f3f..b2af2cb3 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -41,43 +41,43 @@ #include "kvi_irccontext.h" #include "kvi_lagmeter.h" -#include <qstyle.h> -#include <qpainter.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" -#include <qlayout.h> +#include <tqlayout.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -static QPixmap * g_pIccMemBuffer = 0; +static TQPixmap * g_pIccMemBuffer = 0; static KviPointerList<KviToolBarGraphicalApplet> * g_pToolBarGraphicalAppletList = 0; -KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * name) -: QToolButton(par,name) +KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char * name) +: TQToolButton(par,name) { if(!g_pToolBarGraphicalAppletList) { g_pToolBarGraphicalAppletList = new KviPointerList<KviToolBarGraphicalApplet>(); g_pToolBarGraphicalAppletList->setAutoDelete(false); - g_pIccMemBuffer = new QPixmap(1,1); + g_pIccMemBuffer = new TQPixmap(1,1); } g_pToolBarGraphicalAppletList->append(this); #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif setMouseTracking(true); m_bResizeMode = false; - m_sizeHint = QSize(180,32); + m_tqsizeHint = TQSize(180,32); m_bSizeLoaded = false; } @@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth) void KviToolBarGraphicalApplet::setupSizeHint() { - m_sizeHint = QSize(loadAppletWidth(),22); + m_tqsizeHint = TQSize(loadAppletWidth(),22); m_bSizeLoaded = true; } -QSize KviToolBarGraphicalApplet::sizeHint() const +TQSize KviToolBarGraphicalApplet::tqsizeHint() const { // forget constness :( KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this; if(!m_bSizeLoaded)that->setupSizeHint(); - return m_sizeHint; + return m_tqsizeHint; } /* @@ -118,7 +118,7 @@ toolbar.define(default) */ -void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) { if(e->state() & Qt::LeftButton) { @@ -127,19 +127,19 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) int w = e->pos().x(); if(w < 32)w = 32; if(w > 480)w = 480; - m_sizeHint = QSize(w,22); + m_tqsizeHint = TQSize(w,22); resize(w,height()); - g_pApp->postEvent(parentWidget(),new QEvent(QEvent::LayoutHint)); + g_pApp->postEvent(tqparentWidget(),new TQEvent(TQEvent::LayoutHint)); } } else { if(e->pos().x() > width() - 4) - setCursor(Qt::sizeHorCursor); + setCursor(TQt::sizeHorCursor); else - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); } } -void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mousePressEvent(TQMouseEvent * e) { if(e->button() & Qt::LeftButton) { @@ -147,7 +147,7 @@ void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) } } -void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e) { m_bResizeMode = false; } @@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent * e) KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet() { - saveAppletWidth(m_sizeHint.width()); + saveAppletWidth(m_tqsizeHint.width()); g_pToolBarGraphicalAppletList->removeRef(this); if(g_pToolBarGraphicalAppletList->isEmpty()) { @@ -181,22 +181,22 @@ void KviToolBarGraphicalApplet::resizeMemBuffer() g_pIccMemBuffer->resize(uMaxW,uMaxH); } -void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) +void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e) { if(!isVisible())return; - QPainter pa(g_pIccMemBuffer); + TQPainter pa(g_pIccMemBuffer); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); pa.drawTiledPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif if(KVI_OPTION_PIXMAP(KviOption_pixmapIrcToolBarAppletBackground).pixmap()) { - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); pa.drawTiledPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*(KVI_OPTION_PIXMAP(KviOption_pixmapIrcToolBarAppletBackground).pixmap()),pnt.x(),pnt.y()); } else { pa.fillRect(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),KVI_OPTION_COLOR(KviOption_colorIrcToolBarAppletBackground)); @@ -208,27 +208,27 @@ void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) drawContents(&pa); //Need to draw the sunken rect around the view now... - pa.setPen(colorGroup().dark()); + pa.setPen(tqcolorGroup().dark()); pa.drawLine(0,0,width(),0); pa.drawLine(0,0,0,width()); - pa.setPen(colorGroup().light()); + pa.setPen(tqcolorGroup().light()); pa.drawLine(1,height() - 1,width() - 1,height() - 1); pa.drawLine(width() - 1,1,width() - 1,height()); #ifdef COMPILE_USE_QT4 - QPainter qt4SucksBecauseItNeedsAnAdditionalQPainter(this); - qt4SucksBecauseItNeedsAnAdditionalQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height()); + TQPainter qt4SucksBecauseItNeedsAnAdditionalTQPainter(this); + qt4SucksBecauseItNeedsAnAdditionalTQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height()); #else - bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),Qt::CopyROP); + bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),TQt::CopyROP); #endif } -void KviToolBarGraphicalApplet::drawContents(QPainter *) +void KviToolBarGraphicalApplet::drawContents(TQPainter *) { // nothing here } -void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *e) +void KviToolBarGraphicalApplet::resizeEvent(TQResizeEvent *e) { unsigned int uBufferW = g_pIccMemBuffer->width(); unsigned int uBufferH = g_pIccMemBuffer->height(); @@ -253,11 +253,11 @@ void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *e) // ////////////////////////////////////////////////////////////////////////////// -KviIrcContextDisplay::KviIrcContextDisplay(QWidget * par,const char * name) +KviIrcContextDisplay::KviIrcContextDisplay(TQWidget * par,const char * name) : KviToolBarGraphicalApplet(par,name) { KviDynamicToolTip * tip = new KviDynamicToolTip(this); - connect(tip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(tip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } @@ -265,15 +265,15 @@ KviIrcContextDisplay::~KviIrcContextDisplay() { } -void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) +void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &) { - QString txt; + TQString txt; KviConsole * c = g_pActiveWindow->console(); - static QString b = "<b>"; - static QString nb = "</b>"; - static QString br = "<br>"; + static TQString b = "<b>"; + static TQString nb = "</b>"; + static TQString br = "<br>"; if(c) { @@ -297,14 +297,14 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) txt += br; } - QString szNum; + TQString szNum; szNum.setNum(c->ircContextId()); - QString szIrcContext = QChar('('); + TQString szIrcContext = TQChar('('); szIrcContext += __tr2qs("IRC Context"); - szIrcContext += QChar(' '); + szIrcContext += TQChar(' '); szIrcContext += szNum; - szIrcContext += QChar(')'); + szIrcContext += TQChar(')'); txt += szIrcContext; if(ic && ic->lagMeter() && (KVI_OPTION_BOOL(KviOption_boolShowLagOnContextDisplay))) @@ -316,7 +316,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(txt,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(txt,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); } else { txt += __tr2qs("Lag: ?.??"); } @@ -332,15 +332,15 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) /* -QSize KviIrcContextDisplay::sizeHint() const +TQSize KviIrcContextDisplay::tqsizeHint() const { - return QSize(160,22); + return TQSize(160,22); } */ #define KVI_APPLETIRCCONTEXTINDICATORWIDTH 12 -void KviIrcContextDisplay::drawContents(QPainter * p) +void KviIrcContextDisplay::drawContents(TQPainter * p) { // The context indicator KviWindow * wnd = g_pActiveWindow; @@ -348,8 +348,8 @@ void KviIrcContextDisplay::drawContents(QPainter * p) if(c) { - QString serv,nick; - QString tmp; + TQString serv,nick; + TQString tmp; if(!c->connection()) { serv = __tr2qs("Not connected"); @@ -360,22 +360,22 @@ void KviIrcContextDisplay::drawContents(QPainter * p) nick = ic->currentNickName(); if(!ic->userInfo()->userMode().isEmpty()) { - static QString spp(" (+"); + static TQString spp(" (+"); nick += spp; nick += ic->userInfo()->userMode(); if(ic->userInfo()->isAway()) { - nick += QChar(' '); + nick += TQChar(' '); nick += __tr2qs("away"); } - nick += QChar(')'); + nick += TQChar(')'); } else { if(ic->userInfo()->isAway()) { - static QString ugly(" ("); + static TQString ugly(" ("); nick += ugly; nick += __tr2qs("away"); - nick += QChar(')'); + nick += TQChar(')'); } } serv = ic->currentServerName(); @@ -388,7 +388,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(nick,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(nick,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); } else { nick += __tr2qs("Lag: ?.??"); } @@ -404,10 +404,10 @@ void KviIrcContextDisplay::drawContents(QPainter * p) if(height() < 30) { - static QString xxx(" ["); + static TQString xxx(" ["); serv += xxx; serv += nick; - serv += QChar(']'); + serv += TQChar(']'); p->drawText(KVI_APPLETIRCCONTEXTINDICATORWIDTH + 4,16,serv,serv.length()); } else { p->drawText(KVI_APPLETIRCCONTEXTINDICATORWIDTH + 4,16,serv,serv.length()); @@ -416,8 +416,8 @@ void KviIrcContextDisplay::drawContents(QPainter * p) p->setClipping(false); - QColor base = colorGroup().background(); - QColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor base = tqcolorGroup().background(); + TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h index a9030650..dd6c93e2 100644 --- a/src/kvirc/ui/kvi_irctoolbar.h +++ b/src/kvirc/ui/kvi_irctoolbar.h @@ -30,10 +30,10 @@ #include "kvi_console.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqtoolbutton.h> #include "kvi_tal_widgetstack.h" -#include <qlabel.h> +#include <tqlabel.h> class KviTalPopupMenu; @@ -45,16 +45,17 @@ class KviTalPopupMenu; // Can be a child of any AppletContainer // -class KVIRC_API KviToolBarGraphicalApplet : public QToolButton +class KVIRC_API KviToolBarGraphicalApplet : public TQToolButton { Q_OBJECT + TQ_OBJECT public: - KviToolBarGraphicalApplet(QWidget * par,const char * name = 0); + KviToolBarGraphicalApplet(TQWidget * par,const char * name = 0); ~KviToolBarGraphicalApplet(); private: bool m_bResizeMode; bool m_bSizeLoaded; - QSize m_sizeHint; + TQSize m_tqsizeHint; private: void resizeMemBuffer(); protected: @@ -62,14 +63,14 @@ protected: virtual unsigned int loadAppletWidth(); virtual void saveAppletWidth(unsigned int uWidth); - virtual QSize sizeHint() const; - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - - virtual void paintEvent(QPaintEvent *e); - virtual void drawContents(QPainter * p); - virtual void resizeEvent(QResizeEvent *e); + virtual TQSize tqsizeHint() const; + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + + virtual void paintEvent(TQPaintEvent *e); + virtual void drawContents(TQPainter * p); + virtual void resizeEvent(TQResizeEvent *e); }; @@ -78,13 +79,14 @@ class KviDynamicToolTip; class KVIRC_API KviIrcContextDisplay : public KviToolBarGraphicalApplet { Q_OBJECT + TQ_OBJECT public: - KviIrcContextDisplay(QWidget * par,const char * name = 0); + KviIrcContextDisplay(TQWidget * par,const char * name = 0); ~KviIrcContextDisplay(); protected: - virtual void drawContents(QPainter * p); + virtual void drawContents(TQPainter * p); protected slots: - void tipRequest(KviDynamicToolTip * tip,const QPoint &); + void tipRequest(KviDynamicToolTip * tip,const TQPoint &); }; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index e09edee1..330ae099 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -61,7 +61,7 @@ // 25 Sep 2001 // This stuff is going to be ported to Windoze -// A conditionally compiled code will use only Qt calls...let's see :) +// A conditionally compiled code will use only TQt calls...let's see :) // @@ -108,47 +108,43 @@ #include "kvi_qcstring.h" // FIXME: #warning "There should be an option to preserve control codes in copied text (clipboard) (mIrc = CTRL+Copy->with colors)" -#include <qbitmap.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qfile.h> -#include <qtoolbutton.h> -#include <qfontmetrics.h> // needed -#include <qapplication.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqfile.h> +#include <tqtoolbutton.h> +#include <tqfontmetrics.h> // needed +#include <tqapplication.h> #include "kvi_tal_popupmenu.h" -#include <qmessagebox.h> -#include <qtextcodec.h> -#include <qdatetime.h> -#include <qevent.h> +#include <tqmessagebox.h> +#include <tqtextcodec.h> +#include <tqdatetime.h> +#include <tqevent.h> -//#include <qcolor.h> // needed +//#include <tqcolor.h> // needed // FIXME: #warning "There are problems with the selection and wrapped lines: you can select something on the first line and get the second highlighted" // FIXME: #warning "This hack is temporary...later remove it" -#if QT_VERSION >= 300 - #ifndef QT_CLEAN_NAMESPACE - #define QT_CLEAN_NAMESPACE - #include <qcursor.h> - #undef QT_CLEAN_NAMESPACE - #else - #include <qcursor.h> - #endif +#ifndef TQT_CLEAN_NAMESPACE + #define TQT_CLEAN_NAMESPACE + #include <tqcursor.h> + #undef TQT_CLEAN_NAMESPACE #else - #include <qcursor.h> + #include <tqcursor.h> #endif -#include <qclipboard.h> -#include <qdatetime.h> -#include <qmessagebox.h> -#include <qscrollbar.h> -#include <qfontdialog.h> +#include <tqclipboard.h> +#include <tqdatetime.h> +#include <tqmessagebox.h> +#include <tqscrollbar.h> +#include <tqfontdialog.h> #include <time.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> - #define QMimeSourceFactory Q3MimeSourceFactory + #include <tq3mimefactory.h> + #define TQMimeSourceFactory Q3MimeSourceFactory #endif @@ -169,7 +165,7 @@ #define KVI_DEF_BACK 200 -// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)" +// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)" // // FIXME: PgUp and PgDn scrolls a fixed number of lines! @@ -189,7 +185,7 @@ #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -207,7 +203,7 @@ #define KVI_IRCVIEW_HORIZONTAL_BORDER 4 #define KVI_IRCVIEW_VERTICAL_BORDER 4 // A little bit more than the scroll-bar... -// Qt+X have strange interactions that I can not understand when I try to move the splitter +// TQt+X have strange interactions that I can not understand when I try to move the splitter // to the maximum on the left , Maybe the cache pixmap size becomes negative ? (I don't think so) // Anyway , when the scroll bar position becomes negative (or the IrcView has smaller width than // the scroll bar) X aborts with a funny @@ -238,25 +234,25 @@ #define KVI_IRCVIEW_ESCAPE_TAG_GENERICESCAPE '[' // FIXME: Get rid of this!!!!!!!!! -#define WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR +#define WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR #define _WSTRING_WMEMCPY(_dst,_src,_len) kvi_fastmoveodd((void *)(_dst),(const void *)(_src),sizeof(kvi_wchar_t) * (_len)) -void kvi_appendWCharToQStringWithLength(QString * qstrptr,const kvi_wchar_t * ptr,kvi_wslen_t len) +void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * ptr,kvi_wslen_t len) { kvi_wslen_t oldLen = qstrptr->length(); qstrptr->setLength(oldLen + len); - #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR - _WSTRING_WMEMCPY(qstrptr->unicode() + oldLen,ptr,len); - #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR - QChar * c = (qstrptr->unicode() + oldLen); + #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR + _WSTRING_WMEMCPY(qstrptr->tqunicode() + oldLen,ptr,len); + #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR + TQChar * c = (qstrptr->tqunicode() + oldLen); while(*ptr) { - c->unicode() = *ptr; + c->tqunicode() = *ptr; ptr++; c++; } - #endif // !WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR + #endif // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR } @@ -285,16 +281,16 @@ void kvi_appendWCharToQStringWithLength(QString * qstrptr,const kvi_wchar_t * pt // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) -: QWidget(parent,"irc_view") +KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd) +: TQWidget(tqparent,"irc_view") { // Ok...here we go // initialize the initializable #ifdef COMPILE_USE_QT4 - setAttribute(Qt::WA_NoSystemBackground); // This disables automatic qt double buffering - setAttribute(Qt::WA_OpaquePaintEvent); - //setAttribute(Qt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0)) + setAttribute(TQt::WA_NoSystemBackground); // This disables automatic qt double buffering + setAttribute(TQt::WA_OpaquePaintEvent); + //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger tqrepaint() instead of the 10 times faster paintEvent(0)) #endif m_iFlushTimer = 0; @@ -350,7 +346,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>; m_pMessagesStoppedWhileSelecting->setAutoDelete(false); - // say qt to avoid erasing on repaint + // say qt to avoid erasing on tqrepaint #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else @@ -363,9 +359,9 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) // Create the scroll bar #ifdef COMPILE_USE_QT4 - m_pScrollBar = new QScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); + m_pScrollBar = new TQScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); #else - m_pScrollBar = new QScrollBar(0,0,1,10,0,QScrollBar::Vertical,this,"irc_view_scrollbar"); + m_pScrollBar = new TQScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); #endif m_pScrollBar->setTracking(true); m_pScrollBar->show(); @@ -375,20 +371,20 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pToolsButton = new KviStyledToolButton(this,"btntools"); #ifdef COMPILE_USE_QT4 - QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); + TQIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); m_pToolsButton->setAutoRaise(true); #else - QIconSet is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)),QIconSet::Small); + TQIconSet is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)),TQIconSet::Small); #endif m_pToolsButton->setIconSet(is1); KviTalToolTip::add(m_pToolsButton,__tr2qs("Search tools")); m_pToolsButton->setFocusProxy(this); - connect(m_pToolsButton,SIGNAL(clicked()),this,SLOT(showToolsPopup())); + connect(m_pToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showToolsPopup())); m_pToolsButton->show(); - connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarPositionChanged(int))); + connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarPositionChanged(int))); m_iLastScrollBarValue = 0; // set the minimum width @@ -454,7 +450,7 @@ KviIrcView::~KviIrcView() // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviIrcView::setFont(const QFont &f) +void KviIrcView::setFont(const TQFont &f) { if(m_pFm) { @@ -468,7 +464,7 @@ void KviIrcView::setFont(const QFont &f) l->iMaxLineWidth = -1; l = l->pNext; } - QWidget::setFont(f); + TQWidget::setFont(f); update(); } @@ -496,27 +492,27 @@ void KviIrcView::enableDnd(bool bEnable) m_bAcceptDrops = bEnable; } -void KviIrcView::dragEnterEvent(QDragEnterEvent *e) +void KviIrcView::dragEnterEvent(TQDragEnterEvent *e) { if(!m_bAcceptDrops)return; e->accept(KviUriDrag::canDecode(e)); emit dndEntered(); } -void KviIrcView::dropEvent(QDropEvent *e) +void KviIrcView::dropEvent(TQDropEvent *e) { if(!m_bAcceptDrops)return; - QStringList list; + TQStringList list; if(KviUriDrag::decodeLocalFiles(e,list)) { if(!list.isEmpty()) { - QStringList::ConstIterator it = list.begin(); //kewl ! :) + TQStringList::ConstIterator it = list.begin(); //kewl ! :) for( ; it != list.end(); ++it ) { - QString tmp = *it; //wow :) + TQString tmp = *it; //wow :) #ifndef COMPILE_ON_WINDOWS - if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?) + if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for TQt bug (?!?) #endif emit fileDropped(tmp); } @@ -535,8 +531,8 @@ void KviIrcView::stopLogging() { if(m_pLogFile) { - QString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),QDateTime::currentDateTime().toString().utf8().data()); + TQString szLogEnd; + szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); add2Log(szLogEnd); m_pLogFile->close(); @@ -545,12 +541,12 @@ void KviIrcView::stopLogging() { if(m_pLogFile->open(IO_ReadOnly)) { - QByteArray bytes; + TQByteArray bytes; bytes=m_pLogFile->readAll(); m_pLogFile->close(); - QFileInfo fi(*m_pLogFile); - QString szFname=fi.dirPath(true)+QString("/")+fi.baseName(true); - gzFile file=gzopen(QTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); + TQFileInfo fi(*m_pLogFile); + TQString szFname=fi.dirPath(true)+TQString("/")+fi.baseName(true); + gzFile file=gzopen(TQTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); if(file) { gzwrite(file,bytes.data(),bytes.size()); @@ -572,12 +568,12 @@ void KviIrcView::getLogFileName(KviStr &buffer) if(m_pLogFile)buffer.append(m_pLogFile->name()); } -void KviIrcView::getLogFileName(QString &buffer) +void KviIrcView::getLogFileName(TQString &buffer) { if(m_pLogFile) buffer=m_pLogFile->name(); } -void KviIrcView::getTextBuffer(QString &buffer) +void KviIrcView::getTextBuffer(TQString &buffer) { // FIXME: #warning "This does not merge the KviChannel::m_pMessageView buffer!" buffer = ""; @@ -598,12 +594,12 @@ void KviIrcView::flushLog() m_pLogFile->close(); if(m_pLogFile->open(IO_ReadOnly)) { - QByteArray bytes; + TQByteArray bytes; bytes=m_pLogFile->readAll(); m_pLogFile->close(); - QFileInfo fi(*m_pLogFile); - QString szFname=fi.dirPath(true)+QString("/")+fi.baseName(true); - gzFile file=gzopen(QTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); + TQFileInfo fi(*m_pLogFile); + TQString szFname=fi.dirPath(true)+TQString("/")+fi.baseName(true); + gzFile file=gzopen(TQTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); if(file) { gzwrite(file,bytes.data(),bytes.size()); @@ -621,7 +617,7 @@ void KviIrcView::flushLog() else if(m_pMasterView)m_pMasterView->flushLog(); } -const QString & KviIrcView::lastMessageText() +const TQString & KviIrcView::lastMessageText() { KviIrcViewLine * pCur=m_pLastLine; while(pCur) @@ -640,12 +636,12 @@ const QString & KviIrcView::lastMessageText() } pCur=pCur->pPrev; } - return KviQString::empty; + return KviTQString::empty; } -const QString & KviIrcView::lastLineOfText() +const TQString & KviIrcView::lastLineOfText() { - if(!m_pLastLine)return KviQString::empty; + if(!m_pLastLine)return KviTQString::empty; return m_pLastLine->szText; } @@ -664,9 +660,9 @@ const QString & KviIrcView::lastLineOfText() void KviIrcView::setMasterView(KviIrcView * v) { - if(m_pMasterView)disconnect(this,SLOT(masterDead())); + if(m_pMasterView)disconnect(this,TQT_SLOT(masterDead())); m_pMasterView = v; - if(m_pMasterView)connect(m_pMasterView,SIGNAL(destroyed()),this,SLOT(masterDead())); + if(m_pMasterView)connect(m_pMasterView,TQT_SIGNAL(destroyed()),this,TQT_SLOT(masterDead())); } void KviIrcView::masterDead() @@ -674,10 +670,10 @@ void KviIrcView::masterDead() m_pMasterView = 0; } -bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) +bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) { stopLogging(); - QString szFname(fname); + TQString szFname(fname); if(fname.isEmpty()) { @@ -690,7 +686,7 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) szFname+=".tmp"; #endif - m_pLogFile = new QFile(szFname); + m_pLogFile = new TQFile(szFname); if(m_pLogFile->exists()) { @@ -709,13 +705,13 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) } } - QString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),QDateTime::currentDateTime().toString().utf8().data()); + TQString szLogStart; + szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); add2Log(szLogStart); if(bPrependCurBuffer) { add2Log(__tr2qs("### Existing data buffer:")); - QString buffer; + TQString buffer; getTextBuffer(buffer); add2Log(buffer); add2Log(__tr2qs("### End of existing data buffer.")); @@ -725,10 +721,10 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) return true; } -void KviIrcView::add2Log(const QString &szBuffer,int iMsgType) +void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType) { - QString szToWrite=QString("%1 %2\n").arg(iMsgType).arg(szBuffer); - KviQCString szTmp = KviQString::toUtf8(szToWrite); + TQString szToWrite=TQString("%1 %2\n").tqarg(iMsgType).tqarg(szBuffer); + KviTQCString szTmp = KviTQString::toUtf8(szToWrite); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); } @@ -762,11 +758,11 @@ void KviIrcView::clearBuffer() bool KviIrcView::saveBuffer(const char *filename) { - QFile f(QString::fromUtf8(filename)); + TQFile f(TQString::fromUtf8(filename)); if(!f.open(IO_WriteOnly|IO_Truncate))return false; - QString tmp; + TQString tmp; getTextBuffer(tmp); - KviQCString tmpx = KviQString::toUtf8(tmp); + KviTQCString tmpx = KviTQString::toUtf8(tmp); f.writeBlock(tmpx.data(),tmpx.length()); f.close(); return true; @@ -777,14 +773,14 @@ void KviIrcView::nextLine(){ m_pScrollBar->addLine(); } void KviIrcView::prevPage(){ m_pScrollBar->subtractPage(); } void KviIrcView::nextPage(){ m_pScrollBar->addPage(); } -void KviIrcView::setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint) +void KviIrcView::setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint) { if(m_pPrivateBackgroundPixmap) { delete m_pPrivateBackgroundPixmap; m_pPrivateBackgroundPixmap=0; } - if(!pixmap.isNull())m_pPrivateBackgroundPixmap = new QPixmap(pixmap); + if(!pixmap.isNull())m_pPrivateBackgroundPixmap = new TQPixmap(pixmap); if(bRepaint) update(); @@ -807,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint) void KviIrcView::checkLogDate() { - QDate::currentDate(); + TQDate::tqcurrentDate(); } void KviIrcView::clearUnreaded() @@ -904,31 +900,31 @@ void KviIrcView::scrollBarPositionChanged(int newValue) } } if(!m_bSkipScrollBarRepaint) - repaint(); + tqrepaint(); //update(); // if(!m_bSkipScrollBarRepaint)postUpdateEvent(); } -bool KviIrcView::event(QEvent *e) +bool KviIrcView::event(TQEvent *e) { - if(e->type() == QEvent::User) + if(e->type() == TQEvent::User) { __range_valid(m_bPostedPaintEventPending); if(m_iUnprocessedPaintEventRequests) - repaint(); + tqrepaint(); // else we just had a pointEvent that did the job m_bPostedPaintEventPending = false; return true; } - return QWidget::event(e); + return TQWidget::event(e); } -void KviIrcView::wheelEvent(QWheelEvent *e) +void KviIrcView::wheelEvent(TQWheelEvent *e) { #ifdef COMPILE_USE_QT4 static bool bHere = false; if(bHere)return; - bHere = true; // Qt4 tends to jump into infinite recursion here + bHere = true; // TQt4 tends to jump into infinite recursion here #endif g_pApp->sendEvent(m_pScrollBar,e); #ifdef COMPILE_USE_QT4 @@ -939,12 +935,12 @@ void KviIrcView::wheelEvent(QWheelEvent *e) void KviIrcView::postUpdateEvent() { - // This will post a QEvent with a full repaint request + // This will post a TQEvent with a full tqrepaint request if(!m_bPostedPaintEventPending) { m_bPostedPaintEventPending = true; - QEvent *e = new QEvent(QEvent::User); - g_pApp->postEvent(this,e); // queue a repaint + TQEvent *e = new TQEvent(TQEvent::User); + g_pApp->postEvent(this,e); // queue a tqrepaint } m_iUnprocessedPaintEventRequests++; // paintEvent() will set it to 0 @@ -960,7 +956,7 @@ void KviIrcView::postUpdateEvent() fastScroll(3); #endif else - repaint(); + tqrepaint(); } } @@ -1097,7 +1093,7 @@ void KviIrcView::removeHeadLine(bool bRepaint) m_pLastLine = 0; } if(bRepaint) - repaint(); + tqrepaint(); } void KviIrcView::splitMessagesTo(KviIrcView *v) @@ -1154,12 +1150,12 @@ void KviIrcView::splitMessagesTo(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); v->m_iLastScrollBarValue = v->m_iNumLines; v->m_pScrollBar->setRange(0,v->m_iNumLines); v->m_pScrollBar->setValue(v->m_iNumLines); - v->repaint(); + v->tqrepaint(); } @@ -1187,7 +1183,7 @@ void KviIrcView::appendMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); } void KviIrcView::joinMessagesFrom(KviIrcView *v) @@ -1247,7 +1243,7 @@ void KviIrcView::joinMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); } void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) @@ -1266,9 +1262,9 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) if(!KVI_OPTION_BOOL(KviOption_boolStripControlCodesInLogs)) { - QString szBuffer; - kvi_appendWCharToQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); - szBuffer.prepend(QDateTime::currentDateTime().toString("[h:mm:ss] ")); + TQString szBuffer; + kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); + szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] ")); if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled()) { add2Log(szBuffer,iMsgType); @@ -1303,15 +1299,15 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) } -void KviIrcView::getLinkEscapeCommand(QString &buffer,const QString &szPayload,const QString &escape_label) +void KviIrcView::getLinkEscapeCommand(TQString &buffer,const TQString &szPayload,const TQString &escape_label) { if(szPayload.isEmpty())return; - int idx = szPayload.find(escape_label); + int idx = szPayload.tqfind(escape_label); if(idx == -1)return; idx += escape_label.length(); - int idx2 = szPayload.find("[!",idx); + int idx2 = szPayload.tqfind("[!",idx); int len = idx2 == -1 ? szPayload.length() - idx : idx2 - idx; buffer = szPayload.mid(idx,len); @@ -1922,12 +1918,12 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[0].iTextStart = 0; line_ptr->pChunks[0].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back(); line_ptr->pChunks[0].colors.fore = KVI_OPTION_MSGTYPE(iMsgType).fore(); - line_ptr->pChunks[0].customFore=QColor(); + line_ptr->pChunks[0].customFore=TQColor(); if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)) { - QString szTimestamp; - szTimestamp=QDateTime::currentDateTime ( + TQString szTimestamp; + szTimestamp=TQDateTime::tqcurrentDateTime ( KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString( KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) ); szTimestamp.append(' '); @@ -1954,7 +1950,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[2].iTextLen = 1; line_ptr->pChunks[2].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back(); line_ptr->pChunks[2].colors.fore = KVI_OPTION_MSGTYPE(iMsgType).fore(); - line_ptr->pChunks[2].customFore=QColor(); + line_ptr->pChunks[2].customFore=TQColor(); iCurChunk+=2; } else { // only one chunk @@ -1968,8 +1964,8 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, iTextIdx = iTimeStampLength; // the rest of the string will begin 11 chars later // throw away const: we WANT to set the chars :D - register QChar * data_ptr_aux = (QChar *)line_ptr->szText.unicode(); - register QChar * stamp_ptr_aux = (QChar *)szTimestamp.unicode(); + register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.tqunicode(); + register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.tqunicode(); for(int i=0;i<iTimeStampLength;i++) *data_ptr_aux++ = *stamp_ptr_aux++; @@ -1988,12 +1984,12 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, #define APPEND_LAST_TEXT_BLOCK(__data_ptr,__data_len) \ blockLen = (__data_len); \ line_ptr->pChunks[iCurChunk].iTextLen += blockLen; \ - kvi_appendWCharToQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ + kvi_appendWCharToTQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ iTextIdx+=blockLen; #define APPEND_LAST_TEXT_BLOCK_HIDDEN_FROM_NOW(__data_ptr,__data_len) \ blockLen = (__data_len); \ - kvi_appendWCharToQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ + kvi_appendWCharToTQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ iTextIdx+=blockLen; @@ -2007,7 +2003,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[iCurChunk].type = _chunk_type; \ line_ptr->pChunks[iCurChunk].iTextStart = iTextIdx; \ line_ptr->pChunks[iCurChunk].iTextLen = 0; \ - line_ptr->pChunks[iCurChunk].customFore=iCurChunk ? line_ptr->pChunks[iCurChunk-1].customFore : QColor(); + line_ptr->pChunks[iCurChunk].customFore=iCurChunk ? line_ptr->pChunks[iCurChunk-1].customFore : TQColor(); // EOF Macros @@ -2132,7 +2128,7 @@ highlighting_check_loop: // yet more optimized if(*((unsigned short *)p) < 0xff) if(void * jmp_address = char_to_check_jump_table[*((unsigned short *)p)])goto *jmp_address; - // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- replace 0 with ¬hing_found + // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- tqreplace 0 with ¬hing_found //nothing_found: p++; goto highlighting_check_loop; @@ -2281,7 +2277,7 @@ found_command_escape: { if(line_ptr->pChunks[iCurChunk].szPayload[1]=='c' && ((KviChannel*)m_pKviWindow)->userListView()) { - KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(QString((QChar*)next_cr,term_cr-next_cr)); + KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(TQString((TQChar*)next_cr,term_cr-next_cr)); if(e) { line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_CUSTOM; e->color(line_ptr->pChunks[iCurChunk].customFore); @@ -2289,9 +2285,9 @@ found_command_escape: } } } - else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_QUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c') + else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_TQUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c') { - QString m_szNick = QString((QChar*)next_cr,term_cr-next_cr); + TQString m_szNick = TQString((TQChar*)next_cr,term_cr-next_cr); if(m_szNick==m_pKviWindow->connection()->currentNickName()) { line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_OWN; bColorSetted=true; @@ -2340,7 +2336,7 @@ found_icon_escape: // throw away constness! *((kvi_wchar_t *)p) = 0; // FIXME: this has to be changed! : lookupTextIcon must use wide characters! - QString tmpQ; + TQString tmpQ; tmpQ.setUnicodeCodes(icon_name,datalen); KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(tmpQ); // throw away constness! @@ -2560,7 +2556,7 @@ got_url: if(m_pKviWindow) { - QString tmp; + TQString tmp; tmp.setUnicodeCodes(data_ptr,p-data_ptr); KVS_TRIGGER_EVENT_1(KviEvent_OnUrl,m_pKviWindow,tmp); } @@ -2590,10 +2586,10 @@ check_emoticon_char: case KVI_OUT_CHANPRIVMSG: case KVI_OUT_ACTION: case KVI_OUT_OWNPRIVMSG: - case KVI_OUT_QUERYPRIVMSG: - case KVI_OUT_QUERYPRIVMSGCRYPTED: - case KVI_OUT_QUERYNOTICE: - case KVI_OUT_QUERYNOTICECRYPTED: + case KVI_OUT_TQUERYPRIVMSG: + case KVI_OUT_TQUERYPRIVMSGCRYPTED: + case KVI_OUT_TQUERYNOTICE: + case KVI_OUT_TQUERYNOTICECRYPTED: case KVI_OUT_CHANPRIVMSGCRYPTED: case KVI_OUT_CHANNELNOTICE: case KVI_OUT_CHANNELNOTICECRYPTED: @@ -2602,7 +2598,7 @@ check_emoticon_char: case KVI_OUT_DCCCHATMSG: { // Pragma: 31.05.2002 : I had to kill the 8 prefix - // It happens really too often to have an 8 followed by a parenthesis + // It happens really too often to have an 8 followed by a tqparenthesis // that is not an emoticon // *begin can be one of ':' , ';' , '=' @@ -2641,7 +2637,7 @@ check_emoticon_char: // We lookup simplified versions of the emoticons... // FIXME: this sould become UNICODE!!! - QString lookupstring; + TQString lookupstring; kvi_wchar_t ng[3]; ng[0] = *begin; ng[1] = *item; @@ -2717,13 +2713,13 @@ void KviIrcView::fastScroll(int lines) if(!m_pFm) { // We must get the metrics from a real paint event :/ - // must do a full repaint to get them... - repaint(); + // must do a full tqrepaint to get them... + tqrepaint(); return; } // Ok...the current line is the last one here - // It is the only one that needs to be repainted + // It is the only one that needs to be tqrepainted int widgetWidth = width()-m_pScrollBar->width(); if(widgetWidth < KVI_IRCVIEW_PIXMAP_SEPARATOR_AND_DOUBLEBORDER_WIDTH+10)return; //can't show stuff here int widgetHeight = height(); @@ -2751,14 +2747,14 @@ void KviIrcView::fastScroll(int lines) } #ifdef COMPILE_USE_QT4 - scroll(0,-(heightToPaint-1),QRect(1,1,widgetWidth-2,widgetHeight-2)); + scroll(0,-(heightToPaint-1),TQRect(1,1,widgetWidth-2,widgetHeight-2)); #else bitBlt(this,1,1,this,1,heightToPaint,widgetWidth -2,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER)); - QRect r(0,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER), + TQRect r(0,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER), widgetWidth,heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER); - QPaintEvent * e = new QPaintEvent(r); + TQPaintEvent * e = new TQPaintEvent(r); paintEvent(e); delete e; #endif @@ -2782,7 +2778,7 @@ void KviIrcView::fastScroll(int lines) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviIrcView::paintEvent(QPaintEvent *p) +void KviIrcView::paintEvent(TQPaintEvent *p) { // // THIS FUNCTION IS A MONSTER @@ -2792,7 +2788,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) int widgetWidth = width() - scrollbarWidth; if(!isVisible() || (widgetWidth < 20)) { - m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... return; //can't show stuff here } @@ -2804,22 +2800,22 @@ void KviIrcView::paintEvent(QPaintEvent *p) (m_pKviWindow->mdiParent() != g_pFrame->mdiManager()->topChild()) && (m_pKviWindow->mdiParent())) { - m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... return; // totally hidden behind other windows } int widgetHeight = height(); - static QRect r; // static: avoid calling constructor and destructor every time... + static TQRect r; // static: avoid calling constructor and destructor every time... if(p) { r=p->rect(); // app triggered , or self triggered from fastScroll (in that case m_iUnprocessedPaintEventRequests is set to 0 there) if(r == rect()) - m_iUnprocessedPaintEventRequests = 0; // only full repaints reset + m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset } else { // A self triggered event - m_iUnprocessedPaintEventRequests = 0; // only full repaints reset + m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset r = rect(); } @@ -2831,32 +2827,32 @@ void KviIrcView::paintEvent(QPaintEvent *p) if(rectWidth > widgetWidth)rectWidth = widgetWidth; #ifdef COMPILE_USE_QT4 - QPainter pa(this); // we use qt4 double buffering + TQPainter pa(this); // we use qt4 double buffering #else KviDoubleBuffer doublebuffer(width(),height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QPainter pa(pDoubleBufferPixmap); + TQPainter pa(pDoubleBufferPixmap); #endif SET_ANTI_ALIASING(pa); pa.setFont(font()); if(!m_pFm) { - // note that QFontMetrics(pa.font()) may be not the same as QFontMetrics(font()) - // because the painter might effectively use an approximation of the QFont specified + // note that TQFontMetrics(pa.font()) may be not the same as TQFontMetrics(font()) + // because the painter might effectively use an approximation of the TQFont specified // by font(). - recalcFontVariables(QFontMetrics(pa.font()),pa.fontInfo()); + recalcFontVariables(TQFontMetrics(pa.font()),pa.fontInfo()); } #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(rectLeft,rectTop)); + TQPoint pnt = mapToGlobal(TQPoint(rectLeft,rectTop)); pa.drawTiledPixmap(rectLeft,rectTop,rectWidth,rectHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap * pix = m_pPrivateBackgroundPixmap; + TQPixmap * pix = m_pPrivateBackgroundPixmap; if(!pix) pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap(); @@ -2924,7 +2920,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) //Calculate the position of the image //imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) ); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the mask if needed + //Set the tqmask if needed int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId(); if(iPixId > 0) pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId))); @@ -3124,7 +3120,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) } #define DRAW_SELECTED_TEXT(_text_str,_text_idx,_text_len,_text_width) \ - SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).fore(),block->pChunk ? block->pChunk->customFore : QColor()); \ + SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).fore(),block->pChunk ? block->pChunk->customFore : TQColor()); \ { \ int theWdth = _text_width; \ if(theWdth < 0) \ @@ -3136,7 +3132,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) curLeftCoord += _text_width; #define DRAW_NORMAL_TEXT(_text_str,_text_idx,_text_len,_text_width) \ - SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor()); \ + SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : TQColor()); \ if(curBack != KVI_TRANSPARENT){ \ int theWdth = _text_width; \ if(theWdth < 0) \ @@ -3176,20 +3172,20 @@ void KviIrcView::paintEvent(QPaintEvent *p) case KVI_TEXT_UNDERLINE: case KVI_TEXT_REVERSE: case KVI_TEXT_RESET: - m_szLastSelectionLine.append(QChar(block->pChunk->type)); + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); break; case KVI_TEXT_COLOR: - m_szLastSelectionLine.append(QChar(block->pChunk->type)); + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); if((block->pChunk->colors.fore != KVI_NOCHANGE) && (block->pChunk->colors.fore != KVI_TRANSPARENT)) { - if(curFore > 9)m_szLastSelectionLine.append(QChar('1')); - m_szLastSelectionLine.append(QChar((curFore%10)+'0')); + if(curFore > 9)m_szLastSelectionLine.append(TQChar('1')); + m_szLastSelectionLine.append(TQChar((curFore%10)+'0')); } if((block->pChunk->colors.back != KVI_NOCHANGE) && (block->pChunk->colors.back != KVI_TRANSPARENT) ) { - m_szLastSelectionLine.append(QChar(',')); - if(curBack > 9)m_szLastSelectionLine.append(QChar('1')); - m_szLastSelectionLine.append(QChar((curBack%10)+'0')); + m_szLastSelectionLine.append(TQChar(',')); + if(curBack > 9)m_szLastSelectionLine.append(TQChar('1')); + m_szLastSelectionLine.append(TQChar((curBack%10)+'0')); } break; } @@ -3234,8 +3230,8 @@ void KviIrcView::paintEvent(QPaintEvent *p) if(theWdth < 0)theWdth=width()-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER+scrollbarWidth); pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,theWdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).back())); kvi_wslen_t the_len = kvi_wstrlen(block->pChunk->szPayload); - m_szLastSelectionLine.append(QChar(block->pChunk->type)); - QString tmp; + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); + TQString tmp; tmp.setUnicodeCodes(block->pChunk->szPayload,the_len); m_szLastSelectionLine.append(tmp); goto no_selection_paint; @@ -3267,14 +3263,14 @@ no_selection_paint: int wdth = block->block_width; if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the mask if needed + //Set the tqmask if needed if(curBack != KVI_TRANSPARENT && curBack < 16) { pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack)); } - QString tmpQ; + TQString tmpQ; tmpQ.setUnicodeCodes(block->pChunk->szSmileId,kvi_wstrlen(block->pChunk->szSmileId)); - QPixmap * daIcon =0; + TQPixmap * daIcon =0; KviTextIcon* pIcon = g_pTextIconManager->lookupTextIcon(tmpQ); if(pIcon) { @@ -3301,7 +3297,7 @@ no_selection_paint: // FIXME: We could avoid this XSetForeground if the curFore was not changed.... - SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor()); + SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : TQColor()); if(curBack != KVI_TRANSPARENT && curBack < 16 ) { @@ -3310,7 +3306,7 @@ no_selection_paint: if(curLink) { - SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_LINK).fore(),block->pChunk ? block->pChunk->customFore : QColor()); + SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_LINK).fore(),block->pChunk ? block->pChunk->customFore : TQColor()); pa.drawText(curLeftCoord,curBottomCoord,pCurTextLine->szText,block->block_start,block->block_len); pa.drawText(curLeftCoord+1,curBottomCoord,pCurTextLine->szText,block->block_start,block->block_len); pa.drawLine(curLeftCoord,curBottomCoord+2,curLeftCoord+wdth,curBottomCoord+2); @@ -3337,13 +3333,13 @@ no_selection_paint: // paint the cursor line int iH = lineWrapsHeight + m_iFontLineSpacing; #ifdef COMPILE_USE_QT4 - pa.setCompositionMode(QPainter::CompositionMode_SourceOut); + pa.setCompositionMode(TQPainter::CompositionMode_SourceOut); #else pa.setRasterOp(NotROP); #endif - pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),Qt::black); + pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),TQt::black); #ifdef COMPILE_USE_QT4 - pa.setCompositionMode(QPainter::CompositionMode_SourceOver); + pa.setCompositionMode(TQPainter::CompositionMode_SourceOver); #else pa.setRasterOp(CopyROP); #endif @@ -3369,9 +3365,9 @@ no_selection_paint: bLineMarkPainted = true; //pa.setRasterOp(NotROP); #ifdef COMPILE_USE_QT4 - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQt::DotLine)); #else - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQPen::DotLine)); #endif pa.drawLine(0,curBottomCoord,widgetWidth,curBottomCoord); //pa.setRasterOp(CopyROP); @@ -3413,11 +3409,11 @@ no_selection_paint: { // need to mark it! //pa.setRasterOp(NotROP); - //pa.setPen(Qt::black); + //pa.setPen(TQt::black); #ifdef COMPILE_USE_QT4 - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQt::DotLine)); #else - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQPen::DotLine)); #endif int x = widgetWidth - 8; int y = KVI_IRCVIEW_VERTICAL_BORDER; @@ -3432,19 +3428,19 @@ no_selection_paint: } //Need to draw the sunken rect around the view now... - pa.setPen(colorGroup().dark()); + pa.setPen(tqcolorGroup().dark()); pa.drawLine(0,0,widgetWidth,0); pa.drawLine(0,0,0,widgetHeight); - pa.setPen(colorGroup().light()); + pa.setPen(tqcolorGroup().light()); widgetWidth--; pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1); pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight); // COPY TO THE DISPLAY #ifndef COMPILE_USE_QT4 - bitBlt(this,rectLeft,rectTop,pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight,Qt::CopyROP); + bitBlt(this,rectLeft,rectTop,pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight,TQt::CopyROP); #endif -// else we use the Qt4 native double buffering +// else we use the TQt4 native double buffering } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -3453,7 +3449,7 @@ no_selection_paint: // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#define IRCVIEW_WCHARWIDTH(__c) (((__c).unicode() < 0xff) ? m_iFontCharacterWidth[(__c).unicode()] : m_pFm->width(__c)) +#define IRCVIEW_WCHARWIDTH(__c) (((__c).tqunicode() < 0xff) ? m_iFontCharacterWidth[(__c).tqunicode()] : m_pFm->width(__c)) void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) { @@ -3480,12 +3476,12 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) int maxBlockLen = ptr->pChunks->iTextLen; // ptr->pChunks[0].iTextLen - const QChar * unicode = ptr->szText.unicode(); + const TQChar * tqunicode = ptr->szText.tqunicode(); for(;;) { //Calculate the block_width - register const QChar * p = unicode + ptr->pBlocks[ptr->iBlockCount].block_start; + register const TQChar * p = tqunicode + ptr->pBlocks[ptr->iBlockCount].block_start; int curBlockLen = 0; int curBlockWidth = 0; @@ -3550,7 +3546,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = &(ptr->pChunks[curAttrBlock]); @@ -3583,7 +3579,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) maxBlockLen-=curBlockLen; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = 0; @@ -3636,8 +3632,8 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i // // Yahoo!!!! // - const QChar * unicode = line->szText.unicode(); - register const QChar * p = unicode + line->pBlocks[bufIndex].block_start; + const TQChar * tqunicode = line->szText.tqunicode(); + register const TQChar * p = tqunicode + line->pBlocks[bufIndex].block_start; int top = bottom-m_iFontLineSpacing; int right = ((line->pBlocks[bufIndex].block_width >= 0) ? \ @@ -3824,11 +3820,11 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i //============ recalcFontVariables ==============// -void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) +void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &fi) { // FIXME: #warning "OPTIMIZE THIS: GLOBAL VARIABLES" if(m_pFm)delete m_pFm; - m_pFm = new QFontMetrics(fm); + m_pFm = new TQFontMetrics(fm); m_iFontLineSpacing = m_pFm->lineSpacing(); if(m_iFontLineSpacing < KVI_IRCVIEW_PIXMAP_SIZE && KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages)) { @@ -3839,7 +3835,7 @@ void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) // cache the first 256 characters for(unsigned short i=0;i<256;i++) { - m_iFontCharacterWidth[i]=m_pFm->width(QChar(i)); + m_iFontCharacterWidth[i]=m_pFm->width(TQChar(i)); } if(m_iFontLineWidth==0)m_iFontLineWidth=1; m_iWrapMargin = m_pFm->width("wwww"); @@ -3860,9 +3856,9 @@ void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) //================ resizeEvent ===============// -void KviIrcView::resizeEvent(QResizeEvent *) +void KviIrcView::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->sizeHint().width(); + int iScr = m_pScrollBar->tqsizeHint().width(); int iLeft = width()-iScr; m_pToolsButton->setGeometry(iLeft,0,iScr,iScr); m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr); @@ -3877,9 +3873,9 @@ void KviIrcView::resizeEvent(QResizeEvent *) } } -QSize KviIrcView::sizeHint() const +TQSize KviIrcView::tqsizeHint() const { - QSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); + TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); return ret; } @@ -3891,34 +3887,34 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->clear(); if(m_pToolWidget) - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,TQT_SLOT(toggleToolWidget())); else - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,TQT_SLOT(toggleToolWidget())); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,SLOT(increaseFontSize())); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,SLOT(decreaseFontSize())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,SLOT(chooseFont())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,SLOT(chooseBackground())); - int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,SLOT(resetBackground())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,TQT_SLOT(increaseFontSize())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,TQT_SLOT(decreaseFontSize())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,TQT_SLOT(chooseFont())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,TQT_SLOT(chooseBackground())); + int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,TQT_SLOT(resetBackground())); m_pToolsPopup->setItemEnabled(id,m_pPrivateBackgroundPixmap != 0); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,SLOT(clearBuffer())); + m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer())); - QSize s = m_pToolsPopup->sizeHint(); + TQSize s = m_pToolsPopup->tqsizeHint(); - m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(QPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); + m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); } void KviIrcView::increaseFontSize() { - QFont f = font(); + TQFont f = font(); f.setPointSize(f.pointSize() + 1); setFont(f); } void KviIrcView::decreaseFontSize() { - QFont f = font(); + TQFont f = font(); int p = f.pointSize(); if(p > 2)p--; f.setPointSize(p); @@ -3928,20 +3924,20 @@ void KviIrcView::decreaseFontSize() void KviIrcView::chooseFont() { bool bOk; - QFont f = QFontDialog::getFont(&bOk,font(),this); + TQFont f = TQFontDialog::getFont(&bOk,font(),this); if(!bOk)return; setFont(f); } void KviIrcView::chooseBackground() { - QString f; + TQString f; if(!KviFileDialog::askForOpenFileName(f,__tr2qs("Choose the background image...")))return; if(f.isEmpty())return; - QPixmap p(f); + TQPixmap p(f); if(p.isNull()) { - QMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok")); + TQMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok")); return; } setPrivateBackgroundPixmap(p); @@ -3959,11 +3955,11 @@ void KviIrcView::toggleToolWidget() delete m_pToolWidget; m_pToolWidget = 0; m_pCursorLine = 0; - repaint(); + tqrepaint(); } else { m_pToolWidget = new KviIrcViewToolWidget(this); - int w = m_pToolWidget->sizeHint().width(); + int w = m_pToolWidget->tqsizeHint().width(); m_pToolWidget->move(width() - (w + 40),10); m_pToolWidget->show(); } @@ -3972,7 +3968,7 @@ void KviIrcView::toggleToolWidget() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // -// The IrcView : find +// The IrcView : tqfind // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -3983,7 +3979,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) if(m_pCursorLine == m_pCurLine) { - repaint(); + tqrepaint(); return; } @@ -4004,7 +4000,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - repaint(); + tqrepaint(); } } else { // The cursor line is over the current line @@ -4038,12 +4034,12 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - repaint(); + tqrepaint(); } } } -void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bExtended) +void KviIrcView::findNext(const TQString& szText,bool bCaseS,bool bRegExp,bool bExtended) { KviIrcViewLine * l = m_pCursorLine; if(!l)l = m_pCurLine; @@ -4063,15 +4059,11 @@ void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bE if(bRegExp) { - QRegExp re(szText,bCaseS,!bExtended); -#if QT_VERSION >= 300 + TQRegExp re(szText,bCaseS,!bExtended); idx = re.search(l->szText,0); -#else - idx = re.find(l->szText,0); -#endif } else { - QString tmp = l->szText; - idx = tmp.find(szText,0,bCaseS); + TQString tmp = l->szText; + idx = tmp.tqfind(szText,0,bCaseS); } if(idx != -1) @@ -4079,8 +4071,8 @@ void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bE setCursorLine(l); if(m_pToolWidget) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Pos %d"),idx); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Pos %d"),idx); m_pToolWidget->setFindResult(tmp); } return; @@ -4094,12 +4086,12 @@ do_pNext: } while(l != start); } m_pCursorLine = 0; - repaint(); + tqrepaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } -void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bExtended) +void KviIrcView::findPrev(const TQString& szText,bool bCaseS,bool bRegExp,bool bExtended) { KviIrcViewLine * l = m_pCursorLine; if(!l)l = m_pCurLine; @@ -4120,15 +4112,11 @@ void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bE if(bRegExp) { - QRegExp re(szText,bCaseS,!bExtended); -#if QT_VERSION >= 300 + TQRegExp re(szText,bCaseS,!bExtended); idx = re.search(l->szText,0); -#else - idx = re.find(l->szText,0); -#endif } else { - QString tmp = l->szText; - idx = tmp.find(szText,0,bCaseS);; + TQString tmp = l->szText; + idx = tmp.tqfind(szText,0,bCaseS);; } if(idx != -1) @@ -4136,8 +4124,8 @@ void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bE setCursorLine(l); if(m_pToolWidget) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Pos %d"),idx); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Pos %d"),idx); m_pToolWidget->setFindResult(tmp); } return; @@ -4152,7 +4140,7 @@ do_pPrev: } m_pCursorLine = 0; - repaint(); + tqrepaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4181,7 +4169,7 @@ KviIrcViewLine * KviIrcView::getVisibleLineAt(int xPos,int yPos) return 0; } -KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * pRect,QString * linkCmd,QString * linkText) +KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect * pRect,TQString * linkCmd,TQString * linkText) { KviIrcViewLine * l = m_pCurLine; int iTop = height() + m_iFontDescent - KVI_IRCVIEW_VERTICAL_BORDER; @@ -4282,7 +4270,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * } if(pRect) { - *pRect = QRect(iLeftBorder, + *pRect = TQRect(iLeftBorder, bHadWordWraps ? iLastEscapeBlockTop : iTop, iRightBorder, ((uLineWraps + 1) * m_iFontLineSpacing) + m_iFontDescent); @@ -4295,7 +4283,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * } if(linkText) { - QString szLink; + TQString szLink; int iEndOfLInk = iLastEscapeBlock; while(1) { @@ -4308,18 +4296,18 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * case KVI_TEXT_UNDERLINE: case KVI_TEXT_REVERSE: case KVI_TEXT_RESET: - szLink.append(QChar(l->pBlocks[iEndOfLInk].pChunk->type)); + szLink.append(TQChar(l->pBlocks[iEndOfLInk].pChunk->type)); break; case KVI_TEXT_COLOR: - szLink.append(QChar(KVI_TEXT_COLOR)); + szLink.append(TQChar(KVI_TEXT_COLOR)); if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE) { - szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); + szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); } if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE) { - szLink.append(QChar(',')); - szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); + szLink.append(TQChar(',')); + szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); } break; } @@ -4346,7 +4334,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * { if(pRect) { - *pRect = QRect(iLastLeft, + *pRect = TQRect(iLastLeft, bHadWordWraps ? firstRowTop : iTop, iBlockWidth, ((l->uLineWraps + 1) * m_iFontLineSpacing) + m_iFontDescent); @@ -4354,7 +4342,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * if(linkCmd) { *linkCmd = "[!txt]"; - QString tmp; + TQString tmp; tmp.setUnicodeCodes(l->pBlocks[i].pChunk->szPayload,kvi_wstrlen(l->pBlocks[i].pChunk->szPayload)); linkCmd->append(tmp); linkCmd->stripWhiteSpace(); @@ -4441,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * These links are used internally in KVIrc , but you can use them too.[br] The <escape_command> is a single letter this time: it defines the type of the link.[br] Currently KVIrc uses six types of builtin links : 'n' for nickname links, 'u' for url links, - 'c' for channel links, 'h' for hostname links, 'm' for mask links and 's' for server links.[br] + 'c' for channel links, 'h' for hostname links, 'm' for tqmask links and 's' for server links.[br] Theoretically you can also use your own link types: just use any other letter or digit (you can't use ']' and <cr>), but probably you will prefer a completely user defined link in that case anyway.[br] Once the user interacts with the link , kvirc executes the predefined events:[br] @@ -4459,11 +4447,11 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * // FIXME: #warning "Finish the doc above!! Maybe some examples ?!" -void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) +void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) { - QString cmd; - QString linkCmd; - QString linkText; + TQString cmd; + TQString linkCmd; + TQString linkText; if(m_iMouseTimer) { @@ -4481,7 +4469,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) return; } - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); KviKvsVariantList * pParams = new KviKvsVariantList(); @@ -4491,7 +4479,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) pParams->append(szCmd); - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'n': { @@ -4504,8 +4492,8 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) KVS_TRIGGER_EVENT(KviEvent_OnChannelNickDefaultActionRequest,m_pKviWindow,pParams); } else bTrigger = true; break; - case KVI_WINDOW_TYPE_QUERY: - if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) + case KVI_WINDOW_TYPE_TQUERY: + if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { KVS_TRIGGER_EVENT(KviEvent_OnQueryNickDefaultActionRequest,m_pKviWindow,pParams); } else bTrigger = true; @@ -4528,17 +4516,17 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) { if(((KviChannel *)m_pKviWindow)->isMeOp()) { - QChar plmn = linkCmd[1]; - if((plmn.unicode() == '+') || (plmn.unicode() == '-')) + TQChar plmn = linkCmd[1]; + if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) { - QString target(m_pKviWindow->windowName()); - target.replace("\\","\\\\"); - target.replace("\"","\\\""); - target.replace(";","\\;"); - target.replace("$","\\$"); - target.replace("%","\\%"); - QChar flag = linkCmd[2]; - switch(flag.unicode()) + TQString target(m_pKviWindow->windowName()); + target.tqreplace("\\","\\\\"); + target.tqreplace("\"","\\\""); + target.tqreplace(";","\\;"); + target.tqreplace("$","\\$"); + target.tqreplace("%","\\%"); + TQChar flag = linkCmd[2]; + switch(flag.tqunicode()) { case 'o': case 'v': @@ -4549,10 +4537,10 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) case 'I': case 'e': case 'k': - KviQString::sprintf(cmd,"mode %Q %c%c $0",&target,plmn.latin1(),flag.latin1()); + KviTQString::sprintf(cmd,"mode %Q %c%c $0",&target,plmn.latin1(),flag.latin1()); break; default: - KviQString::sprintf(cmd,"mode %Q %c%c",&target,plmn.latin1(),flag.latin1()); + KviTQString::sprintf(cmd,"mode %Q %c%c",&target,plmn.latin1(),flag.latin1()); break; } } @@ -4565,14 +4553,14 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) break; case 'u': { - QString urlText; + TQString urlText; if(!szCmd.isEmpty()) urlText=szCmd; else urlText=linkText; if( - !KviQString::cmpCIN(urlText,"irc://",6) || - !KviQString::cmpCIN(urlText,"irc6://",7) || - !KviQString::cmpCIN(urlText,"ircs://",7) || - !KviQString::cmpCIN(urlText,"ircs6://",8) + !KviTQString::cmpCIN(urlText,"irc://",6) || + !KviTQString::cmpCIN(urlText,"irc6://",7) || + !KviTQString::cmpCIN(urlText,"ircs://",7) || + !KviTQString::cmpCIN(urlText,"ircs6://",8) ) { KviIrcUrl::run(urlText,KviIrcUrl::TryCurrentContext | KviIrcUrl::DoNotPartChans, console()); @@ -4585,7 +4573,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) { if(console() && console()->connection()) { - QString szChan=linkText; + TQString szChan=linkText; if(szCmd.length()>0) szChan=szCmd; if(KviChannel * c = console()->connection()->findChannel(szChan)) { @@ -4593,7 +4581,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) c->raise(); c->setFocus(); } else { - cmd = QString("join %1").arg(szChan); + cmd = TQString("join %1").tqarg(szChan); } } } @@ -4618,7 +4606,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) delete pParams; } -void KviIrcView::mousePressEvent(QMouseEvent *e) +void KviIrcView::mousePressEvent(TQMouseEvent *e) { if(m_pKviWindow->input()) m_pKviWindow->input()->setFocus(); @@ -4631,7 +4619,7 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) if(m_pToolWidget) { m_pCursorLine = getVisibleLineAt(e->pos().x(),e->pos().y()); - repaint(); + tqrepaint(); } m_mousePressPos = e->pos(); @@ -4639,7 +4627,7 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) m_bMouseIsDown = true; - m_bShiftPressed = (e->state() & Qt::ShiftButton); + m_bShiftPressed = (e->state() & TQt::ShiftButton); calculateSelectionBounds(); } @@ -4653,21 +4641,21 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) delete m_pLastEvent; m_pLastEvent = 0; } else { - m_iMouseTimer = startTimer(QApplication::doubleClickInterval()); - m_pLastEvent = new QMouseEvent(*e); + m_iMouseTimer = startTimer(TQApplication::doubleClickInterval()); + m_pLastEvent = new TQMouseEvent(*e); } } else { mouseRealPressEvent(e); } } -void KviIrcView::mouseRealPressEvent(QMouseEvent *e) +void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) { - QString linkCmd; - QString linkText; + TQString linkCmd; + TQString linkText; getLinkUnderMouse(e->pos().x(),e->pos().y(),0,&linkCmd,&linkText); - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); KviKvsVariantList * pParams = new KviKvsVariantList(); @@ -4677,11 +4665,11 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) pParams->append(szCmd); - if(!(e->state() & Qt::ControlButton))//(e->button() & Qt::RightButton) && ( + if(!(e->state() & TQt::ControlButton))//(e->button() & Qt::RightButton) && ( { if(!linkCmd.isEmpty()) { - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'n': { @@ -4699,7 +4687,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) { if(m_pKviWindow->inherits("KviChannel")) { KviChannel *c = (KviChannel*)m_pKviWindow; - QString nick; + TQString nick; if(pParams->firstAsString(nick)) c->userListView()->select(nick); } @@ -4707,8 +4695,8 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) } } else bTrigger = true; break; - case KVI_WINDOW_TYPE_QUERY: - if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) + case KVI_WINDOW_TYPE_TQUERY: + if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickPopupRequest,m_pKviWindow,pParams); @@ -4760,7 +4748,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) { if(e->button() & Qt::RightButton) { - QString tmp; + TQString tmp; getLinkEscapeCommand(tmp,linkCmd,"[!rbt]"); if(!tmp.isEmpty()) { @@ -4772,10 +4760,10 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) } } else if(e->button() & Qt::RightButton) emit rightClicked(); - } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & Qt::ControlButton))) + } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & TQt::ControlButton))) { - QString tmp; - getLinkEscapeCommand(tmp,linkCmd,QString("[!mbt]")); + TQString tmp; + getLinkEscapeCommand(tmp,linkCmd,TQString("[!mbt]")); if(!tmp.isEmpty()) { KviKvsScript::run(tmp,m_pKviWindow,pParams); @@ -4788,19 +4776,19 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) //================ mouseReleaseEvent ===============// -void KviIrcView::mouseReleaseEvent(QMouseEvent *) +void KviIrcView::mouseReleaseEvent(TQMouseEvent *) { if(m_iSelectTimer) { killTimer(m_iSelectTimer); m_iSelectTimer = 0; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(c) { // copy to both! - c->setText(m_szLastSelection,QClipboard::Clipboard); + c->setText(m_szLastSelection,TQClipboard::Clipboard); if(c->supportsSelection()) - c->setText(m_szLastSelection,QClipboard::Selection); + c->setText(m_szLastSelection,TQClipboard::Selection); } } @@ -4814,13 +4802,13 @@ void KviIrcView::mouseReleaseEvent(QMouseEvent *) m_pMessagesStoppedWhileSelecting->removeFirst(); appendLine(l,false); } - repaint(); + tqrepaint(); } } // FIXME: #warning "The tooltip timeout should be small, because the view scrolls!" -void KviIrcView::mouseMoveEvent(QMouseEvent *e) +void KviIrcView::mouseMoveEvent(TQMouseEvent *e) { // debug("Pos : %d,%d",e->pos().x(),e->pos().y()); if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) @@ -4846,7 +4834,7 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) int yPos = e->pos().y(); int rectTop; int rectHeight; - QRect rctLink; + TQRect rctLink; KviIrcViewWrappedBlock * newLinkUnderMouse = getLinkUnderMouse(e->pos().x(),yPos,&rctLink); rectTop = rctLink.y(); @@ -4859,7 +4847,7 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) m_pLastLinkUnderMouse = newLinkUnderMouse; if(m_pLastLinkUnderMouse) { - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); if(rectTop < 0)rectTop = 0; if((rectTop + rectHeight) > height())rectHeight = height() - rectTop; @@ -4869,22 +4857,22 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) int top = (rectTop < m_iLastLinkRectTop) ? rectTop : m_iLastLinkRectTop; int lastBottom = m_iLastLinkRectTop + m_iLastLinkRectHeight; int thisBottom = rectTop + rectHeight; - QRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); - repaint(r); + TQRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); + tqrepaint(r); } else { // no prev link - QRect r(0,rectTop,width(),rectHeight); - repaint(r); + TQRect r(0,rectTop,width(),rectHeight); + tqrepaint(r); } m_iLastLinkRectTop = rectTop; m_iLastLinkRectHeight = rectHeight; } else { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); if(m_iLastLinkRectHeight > -1) { // There was a previous bottom rect - QRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); - repaint(r); + TQRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); + tqrepaint(r); m_iLastLinkRectTop = -1; m_iLastLinkRectHeight = -1; } @@ -4899,16 +4887,16 @@ KviConsole * KviIrcView::console() return m_pKviWindow->console(); } -void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText) +void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &linkText) { if(linkCmd.isEmpty())return; - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); - QString tip; + TQString tip; - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'u': // url link { @@ -4922,7 +4910,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip += linkText; } tip+="</nowrap></font></u></td></tr><tr><td>"; - QMimeSourceFactory::defaultFactory()->setPixmap("url_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); + TQMimeSourceFactory::defaultFactory()->setPixmap("url_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); tip += __tr2qs("Double-click to open this link"); tip += "</td></tr></table>"; } @@ -4939,11 +4927,11 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip += linkText; } tip+="</nowrap></font></u></td></tr><tr><td>"; - QMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); + TQMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); - if(linkText.find('*') != -1) + if(linkText.tqfind('*') != -1) { - if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked"); + if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be tqmasked"); else tip += __tr2qs("Unable to look it up hostname: Unknown host"); } else { tip += __tr2qs("Double-click to look up this hostname<br>Right-click to view other options"); @@ -4957,7 +4945,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip = "<table width=\"100%\">" \ "<tr><td valign=\"center\"><img src=\"server_icon\"> <u><font color=\"blue\"><nowrap>"; - QMimeSourceFactory::defaultFactory()->setPixmap("server_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC))); + TQMimeSourceFactory::defaultFactory()->setPixmap("server_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC))); if(linkText.length() > 50) { tip += linkText.left(47); @@ -4967,7 +4955,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe } tip+="</nowrap></font></u></td></tr><tr><td>"; - if(linkText.find('*') != -1) + if(linkText.tqfind('*') != -1) { if(linkText.length() > 1)tip += __tr2qs("Server appears to be a network hub<br>"); else tip += __tr2qs("Unknown server<br>"); // might happen... @@ -4983,12 +4971,12 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(((KviChannel *)m_pKviWindow)->isMeOp()) { - QChar plmn = linkCmd[1]; - if((plmn.unicode() == '+') || (plmn.unicode() == '-')) + TQChar plmn = linkCmd[1]; + if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) { tip = __tr2qs("Double-click to set<br>"); - QChar flag = linkCmd[2]; - switch(flag.unicode()) + TQChar flag = linkCmd[2]; + switch(flag.tqunicode()) { case 'o': case 'v': @@ -4999,10 +4987,10 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe case 'I': case 'e': case 'k': - KviQString::appendFormatted(tip,QString("<b>mode %Q %c%c %Q</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1(),&linkText); + KviTQString::appendFormatted(tip,TQString("<b>mode %Q %c%c %Q</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1(),&linkText); break; default: - KviQString::appendFormatted(tip,QString("<b>mode %Q %c%c</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1()); + KviTQString::appendFormatted(tip,TQString("<b>mode %Q %c%c</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1()); break; } } @@ -5019,14 +5007,14 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(console()->connection()) { - KviIrcUserEntry * e = console()->connection()->userDataBase()->find(linkText); + KviIrcUserEntry * e = console()->connection()->userDataBase()->tqfind(linkText); if(e) { - QString buffer; + TQString buffer; console()->getUserTipText(linkText,e,buffer); tip = buffer; - } else KviQString::sprintf(tip,__tr2qs("Nothing known about %Q"),&linkText); - } else KviQString::sprintf(tip,__tr2qs("Nothing known about %Q (no connection)"),&linkText); + } else KviTQString::sprintf(tip,__tr2qs("Nothing known about %Q"),&linkText); + } else KviTQString::sprintf(tip,__tr2qs("Nothing known about %Q (no connection)"),&linkText); } } break; @@ -5034,30 +5022,30 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(console() && console()->connection()) { - QString szChan = linkText; - QString buf; + TQString szChan = linkText; + TQString buf; tip = "<img src=\"chan_icon\"> "; - QMimeSourceFactory::defaultFactory()->setPixmap("chan_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + TQMimeSourceFactory::defaultFactory()->setPixmap("chan_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); if(szCmd.length()>0) szChan=szCmd; KviChannel * c = console()->connection()->findChannel(szChan); - QString szUrl; + TQString szUrl; if(c) { - QString chanMode; + TQString chanMode; c->getChannelModeString(chanMode); - QString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic()); - topic.replace("<","<"); - topic.replace(">",">"); + TQString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic()); + topic.tqreplace("<","<"); + topic.tqreplace(">",">"); KviIrcUrl::join(szUrl,console()->connection()->target()->server()); szUrl.append(szChan); - KviQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" + KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" "%Q</nowrap></font></u>): <br><nowrap>+%Q (%u users)<hr>%Q</nowrap>"),&szChan,&szUrl,&chanMode, c->count(),&topic); } else { KviIrcUrl::join(szUrl,console()->connection()->target()->server()); szUrl.append(szChan); - KviQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" + KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" "%Q</nowrap></font></u>)<hr>Double-click to join %Q<br>Right click to view other options"),&szChan,&szUrl,&szChan); } @@ -5067,7 +5055,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe break; default: { - QString dbl,rbt,txt,mbt; + TQString dbl,rbt,txt,mbt; getLinkEscapeCommand(dbl,linkCmd,"[!dbl]"); getLinkEscapeCommand(rbt,linkCmd,"[!rbt]"); getLinkEscapeCommand(txt,linkCmd,"[!txt]"); @@ -5077,17 +5065,17 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe if(tip.isEmpty() && (!dbl.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Double-click:</b><br>%Q"),&dbl); + KviTQString::appendFormatted(tip,__tr2qs("<b>Double-click:</b><br>%Q"),&dbl); } if(tip.isEmpty() && (!mbt.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Middle-click:</b><br>%Q"),&mbt); + KviTQString::appendFormatted(tip,__tr2qs("<b>Middle-click:</b><br>%Q"),&mbt); } if(tip.isEmpty() && (!rbt.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Right-click:</b><br>%Q"),&rbt); + KviTQString::appendFormatted(tip,__tr2qs("<b>Right-click:</b><br>%Q"),&rbt); } } break; @@ -5097,7 +5085,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe m_pToolTip->doTip(rct,tip); } -void KviIrcView::leaveEvent ( QEvent * ) +void KviIrcView::leaveEvent ( TQEvent * ) { if(m_pLastLinkUnderMouse) { @@ -5105,14 +5093,14 @@ void KviIrcView::leaveEvent ( QEvent * ) update(); } } -void KviIrcView::timerEvent(QTimerEvent *e) +void KviIrcView::timerEvent(TQTimerEvent *e) { - m_mouseCurrentPos = mapFromGlobal(QCursor::pos()); + m_mouseCurrentPos = mapFromGlobal(TQCursor::pos()); if(e->timerId() == m_iSelectTimer) { calculateSelectionBounds(); - repaint(); + tqrepaint(); } if(e->timerId() == m_iMouseTimer) { @@ -5128,15 +5116,15 @@ void KviIrcView::timerEvent(QTimerEvent *e) } } -void KviIrcView::keyPressEvent(QKeyEvent *e) +void KviIrcView::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_PageUp: + case TQt::Key_PageUp: prevPage(); e->accept(); break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: nextPage(); e->accept(); break; @@ -5145,12 +5133,12 @@ void KviIrcView::keyPressEvent(QKeyEvent *e) } } -void KviIrcView::maybeTip(const QPoint &pnt) +void KviIrcView::maybeTip(const TQPoint &pnt) { - QString linkCmd; - QString linkText; + TQString linkCmd; + TQString linkText; - QRect rctLink; + TQRect rctLink; KviIrcViewWrappedBlock * linkUnderMouse = getLinkUnderMouse(pnt.x(),pnt.y(),&rctLink,&linkCmd,&linkText); diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 62ee3e75..e462a736 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -28,14 +28,14 @@ #include "kvi_string.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qpixmap.h> // needed - -class QScrollBar; -class QLineEdit; -class QFile; -class QToolButton; -class QFontMetrics; +#include <tqwidget.h> +#include <tqpixmap.h> // needed + +class TQScrollBar; +class TQLineEdit; +class TQFile; +class TQToolButton; +class TQFontMetrics; class KviTalPopupMenu; class KviWindow; @@ -51,30 +51,31 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag KviIrcViewWrappedBlockSel #define KVI_IRCVIEW_INVALID_LINE_MARK_INDEX 0xffffffff -class KVIRC_API KviIrcView : public QWidget +class KVIRC_API KviIrcView : public TQWidget { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) - // we cannot #ifdef due to a bug in moc - Q_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) + // we cannot #ifdef due to a bug in tqmoc + TQ_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen) public: friend class KviIrcViewToolTip; friend class KviIrcViewToolWidget; public: - KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd); + KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd); ~KviIrcView(); public: int dummyRead() const { return 0; }; #ifdef COMPILE_USE_QT4 - bool getPaintOnScreen() const { return testAttribute(Qt::WA_PaintOnScreen);}; - void setPaintOnScreen(bool bFlag){setAttribute(Qt::WA_PaintOnScreen,bFlag);} ; + bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);}; + void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ; #else - // hack to fix moc bug on win qt4 + // hack to fix tqmoc bug on win qt4 bool getPaintOnScreen() const { return 0;}; void setPaintOnScreen(bool bFlag){} ; #endif private: -// QDate m_lastLogDay; +// TQDate m_lastLogDay; int m_iFlushTimer; KviIrcViewLine * m_pFirstLine; KviIrcViewLine * m_pCurLine; // Bottom line in the view @@ -92,9 +93,9 @@ private: unsigned int m_uNextLineIndex; - QPixmap * m_pPrivateBackgroundPixmap; - QScrollBar * m_pScrollBar; - QToolButton * m_pToolsButton; + TQPixmap * m_pPrivateBackgroundPixmap; + TQScrollBar * m_pScrollBar; + TQToolButton * m_pToolsButton; KviTalPopupMenu * m_pToolsPopup; KviIrcViewToolWidget * m_pToolWidget; @@ -113,8 +114,8 @@ private: int m_iIconWidth; int m_iIconSideSpacing; - QPoint m_mousePressPos; - QPoint m_mouseCurrentPos; + TQPoint m_mousePressPos; + TQPoint m_mouseCurrentPos; // Selection int m_iSelectionBegin; @@ -131,20 +132,20 @@ private: int m_iSelectTimer; int m_iMouseTimer; //int m_iTipTimer; - QString m_szLastSelection; - QString m_szLastSelectionLine; + TQString m_szLastSelection; + TQString m_szLastSelectionLine; KviWindow * m_pKviWindow; KviIrcViewWrappedBlockSelectionInfo * m_pWrappedBlockSelectionInfo; - QFile * m_pLogFile; + TQFile * m_pLogFile; KviFrame * m_pFrm; bool m_bAcceptDrops; int m_iUnprocessedPaintEventRequests; bool m_bPostedPaintEventPending; KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting; KviIrcView * m_pMasterView; - QFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances) + TQFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances) - QMouseEvent * m_pLastEvent; + TQMouseEvent * m_pLastEvent; KviIrcViewToolTip * m_pToolTip; bool m_bHaveUnreadedHighlightedMessages; @@ -162,28 +163,28 @@ public: bool hasLineMark(){ return m_uLineMarkLineIndex != KVI_IRCVIEW_INVALID_LINE_MARK_INDEX; }; void removeHeadLine(bool bRepaint=false); void emptyBuffer(bool bRepaint=true); - void getTextBuffer(QString &buffer); + void getTextBuffer(TQString &buffer); void setMaxBufferSize(int maxBufSize,bool bRepaint=true); int maxBufferSize(){ return m_iMaxLines; }; //Never used ? bool saveBuffer(const char *filename); - void findNext(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); - void findPrev(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); - KviWindow * parentKviWindow(){ return m_pKviWindow; }; + void findNext(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); + void findPrev(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); + KviWindow * tqparentKviWindow(){ return m_pKviWindow; }; KviConsole * console(); // A null pixmap passed here unsets the private backgrdound. - void setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint=true); + void setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint=true); bool hasPrivateBackgroundPixmap(){ return (m_pPrivateBackgroundPixmap != 0); }; //============================================================================================== // Logging // Stops previous logging session too... - bool startLogging(const QString& fname = QString::null,bool bPrependCurBuffer = false); + bool startLogging(const TQString& fname = TQString(),bool bPrependCurBuffer = false); void stopLogging(); bool isLogging(){ return (m_pLogFile != 0); }; void getLogFileName(KviStr &buffer); - void getLogFileName(QString &buffer); + void getLogFileName(TQString &buffer); //void add2Log(const char *buffer,int buf_len=-1); - void add2Log(const QString &szBuffer,int iMsgType=0); + void add2Log(const TQString &szBuffer,int iMsgType=0); //============================================================================================== // Channel view splitting @@ -196,10 +197,10 @@ public: void nextLine(); void nextPage(); void prevPage(); - virtual QSize sizeHint() const; - const QString & lastLineOfText(); - const QString & lastMessageText(); - virtual void setFont(const QFont &f); + virtual TQSize tqsizeHint() const; + const TQString & lastLineOfText(); + const TQString & lastMessageText(); + virtual void setFont(const TQFont &f); public slots: void flushLog(); void showToolsPopup(); @@ -217,33 +218,33 @@ signals: private: void setCursorLine(KviIrcViewLine * l); KviIrcViewLine * getVisibleLineAt(int xPos,int yPos); - void getLinkEscapeCommand(QString &buffer,const QString &escape_cmd,const QString &escape_label); + void getLinkEscapeCommand(TQString &buffer,const TQString &escape_cmd,const TQString &escape_label); void appendLine(KviIrcViewLine *ptr,bool bRepaint); void postUpdateEvent(); void fastScroll(int lines = 1); const kvi_wchar_t * getTextLine(int msg_type,const kvi_wchar_t * data_ptr,KviIrcViewLine *line_ptr,bool bEnableTimeStamp = true); void calculateLineWraps(KviIrcViewLine *ptr,int maxWidth); - void recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi); + void recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &fi); bool checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,int bufIndex); void calculateSelectionBounds(); - KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,QRect * pRect = 0,QString * linkCmd = 0,QString * linkText = 0); - void doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText); + KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,TQRect * pRect = 0,TQString * linkCmd = 0,TQString * linkText = 0); + void doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &linkText); protected: - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseRealPressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void timerEvent(QTimerEvent *e); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual bool event(QEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void keyPressEvent(QKeyEvent *e); - void maybeTip(const QPoint &pnt); - virtual void leaveEvent ( QEvent * ); + virtual void paintEvent(TQPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseRealPressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void timerEvent(TQTimerEvent *e); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual bool event(TQEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); + void maybeTip(const TQPoint &pnt); + virtual void leaveEvent ( TQEvent * ); protected slots: virtual void scrollBarPositionChanged(int newValue); void masterDead(); diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h index 0a2dea20..790976bd 100644 --- a/src/kvirc/ui/kvi_ircviewprivate.h +++ b/src/kvirc/ui/kvi_ircviewprivate.h @@ -25,7 +25,7 @@ //========================================================================================================= #include "kvi_settings.h" -#include <qstring.h> +#include <tqstring.h> //========================================================================================================= // Internal data structures @@ -83,8 +83,8 @@ typedef struct _KviIrcViewLineChunk unsigned char back; // optional background color for KVI_TEXT_COLOR attribute unsigned char fore; // optional foreground color for KVI_TEXT_COLOR attribute (used also for KVI_TEXT_ESCAPE!!!) } _KVI_PACKED colors; // anonymous -// QColor customBack; - QColor customFore; +// TQColor customBack; + TQColor customFore; } /*_KVI_PACKED*/ KviIrcViewLineChunk; // @@ -104,7 +104,7 @@ typedef struct _KviIrcViewLine { // this is a text line in the IrcView's memory unsigned int uIndex; // index of the text line (needed for find and splitting) - QString szText; // data string without color codes nor escapes... + TQString szText; // data string without color codes nor escapes... int iMsgType; // type of the line (defines icon and colors) // At line instert time the szData text is splitted in parts which @@ -148,7 +148,7 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag #endif //!COMPILE_ON_WINDOWS //========================================================================================================= -// Screen layout +// Screen tqlayout //========================================================================================================= //FIRST LINE (prev_line = 0) <---m_pFirstLine diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index ea473107..c6f41381 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -36,21 +36,21 @@ #include "kvi_app.h" #include "kvi_memmove.h" -#include <qtoolbutton.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> + #include <tq3header.h> #else - #include <qheader.h> + #include <tqheader.h> #endif -#include <qlineedit.h> -#include <qcursor.h> +#include <tqlineedit.h> +#include <tqcursor.h> #include "kvi_accel.h" -#include <qevent.h> +#include <tqevent.h> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -60,7 +60,7 @@ KviIrcMessageCheckListItem::KviIrcMessageCheckListItem(KviTalListView * par,KviIrcViewToolWidget * w,int id) -: KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox) +: KviTalCheckListItem(par,TQString(),KviTalCheckListItem::CheckBox) { m_iId = id; m_pToolWidget = 0; @@ -83,37 +83,37 @@ void KviIrcMessageCheckListItem::stateChange(bool bOn) KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) -: QFrame(par) +: TQFrame(par) { m_pIrcView = par; - setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); - QGridLayout * gl = new QGridLayout(this,2,2,4,2); + TQGridLayout * gl = new TQGridLayout(this,2,2,4,2); - QLabel * l = new QLabel(__tr2qs("<b><font color=\"#EAEAEA\" size=\"-1\">Find Text</font></b>"),this); + TQLabel * l = new TQLabel(__tr2qs("<b><font color=\"#EAEAEA\" size=\"-1\">Find Text</font></b>"),this); l->setMaximumHeight(14); - l->setBackgroundColor(Qt::black); + l->setBackgroundColor(TQt::black); gl->addWidget(l,0,0); - QToolButton *tb = new QToolButton(Qt::DownArrow,this,"down_arrow"); + TQToolButton *tb = new TQToolButton(TQt::DownArrow,this,"down_arrow"); tb->setFixedSize(14,14); tb->setAutoRepeat(false); - connect(tb,SIGNAL(clicked()),m_pIrcView,SLOT(toggleToolWidget())); + connect(tb,TQT_SIGNAL(clicked()),m_pIrcView,TQT_SLOT(toggleToolWidget())); gl->addWidget(tb,0,1); - QTabWidget * tw = new QTabWidget(this); + TQTabWidget * tw = new TQTabWidget(this); // Find tab - QWidget * w = new QWidget(tw); + TQWidget * w = new TQWidget(tw); - QGridLayout * g = new QGridLayout(w,6,2,2,1); + TQGridLayout * g = new TQGridLayout(w,6,2,2,1); - m_pStringToFind = new QLineEdit(w); + m_pStringToFind = new TQLineEdit(w); g->addMultiCellWidget(m_pStringToFind,0,0,0,2); - connect(m_pStringToFind,SIGNAL(returnPressed()),this,SLOT(findNext())); + connect(m_pStringToFind,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(findNext())); m_pRegExp = new KviStyledCheckBox(__tr2qs("&Regular expression"),w); g->addMultiCellWidget(m_pRegExp,1,1,0,2); @@ -121,37 +121,37 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pExtendedRegExp = new KviStyledCheckBox(__tr2qs("E&xtended regexp."),w); g->addMultiCellWidget(m_pExtendedRegExp,2,2,0,2); m_pExtendedRegExp->setEnabled(false); - connect(m_pRegExp,SIGNAL(toggled(bool)),m_pExtendedRegExp,SLOT(setEnabled(bool))); + connect(m_pRegExp,TQT_SIGNAL(toggled(bool)),m_pExtendedRegExp,TQT_SLOT(setEnabled(bool))); m_pCaseSensitive = new KviStyledCheckBox(__tr2qs("C&ase sensitive"),w); g->addMultiCellWidget(m_pCaseSensitive,3,3,0,2); - QPushButton * pb = new QPushButton(__tr2qs("Find &Prev."),w); - connect(pb,SIGNAL(clicked()),this,SLOT(findPrev())); + TQPushButton * pb = new TQPushButton(__tr2qs("Find &Prev."),w); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findPrev())); g->addWidget(pb,4,0); - pb = new QPushButton(__tr2qs("&Find Next"),w); + pb = new TQPushButton(__tr2qs("&Find Next"),w); pb->setDefault(true); - connect(pb,SIGNAL(clicked()),this,SLOT(findNext())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findNext())); g->addMultiCellWidget(pb,4,4,1,2); - m_pFindResult = new QLabel(w); - m_pFindResult->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pFindResult = new TQLabel(w); + m_pFindResult->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); g->addMultiCellWidget(m_pFindResult,5,5,0,2); - //g->setResizeMode(QGridLayout::Fixed); + //g->setResizeMode(TQGridLayout::Fixed); tw->addTab(w,__tr2qs("Find")); // Filter tab - QWidget * w1 = new QWidget(tw); + TQWidget * w1 = new TQWidget(tw); - g = new QGridLayout(w1,5,2,2,1); + g = new TQGridLayout(w1,5,2,2,1); m_pFilterView = new KviTalListView(w1); m_pFilterView->addColumn(__tr2qs("Type")); m_pFilterView->header()->hide(); - m_pFilterView->setMinimumSize(QSize(10,10)); + m_pFilterView->setMinimumSize(TQSize(10,10)); g->addMultiCellWidget(m_pFilterView,0,4,0,0); @@ -163,31 +163,31 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pFilterItems[i] = new KviIrcMessageCheckListItem(m_pFilterView,this,i); } - pb = new QPushButton(__tr2qs("Set &All"),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterEnableAll())); + pb = new TQPushButton(__tr2qs("Set &All"),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableAll())); g->addWidget(pb,0,1); - pb = new QPushButton(__tr2qs("Set &None"),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterEnableNone())); + pb = new TQPushButton(__tr2qs("Set &None"),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableNone())); g->addWidget(pb,1,1); - pb = new QPushButton(__tr2qs("&Load From..."),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterLoad())); + pb = new TQPushButton(__tr2qs("&Load From..."),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterLoad())); g->addWidget(pb,2,1); - pb = new QPushButton(__tr2qs("&Save As..."),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterSave())); + pb = new TQPushButton(__tr2qs("&Save As..."),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterSave())); g->addWidget(pb,3,1); tw->addTab(w1,__tr2qs("Filter")); gl->addMultiCellWidget(tw,1,1,0,1); - gl->setResizeMode(QGridLayout::Fixed); + gl->setResizeMode(TQGridLayout::Fixed); m_pStringToFind->setFocus(); tw->showPage(w); KviAccel *a = new KviAccel( this ); - a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) ); } KviIrcViewToolWidget::~KviIrcViewToolWidget() @@ -217,23 +217,23 @@ void KviIrcViewToolWidget::filterEnableNone() forceRepaint(); } -void KviIrcViewToolWidget::hideEvent ( QHideEvent * ){ +void KviIrcViewToolWidget::hideEvent ( TQHideEvent * ){ m_pIrcView->toggleToolWidget(); } -void KviIrcViewToolWidget::closeEvent ( QCloseEvent * e ){ +void KviIrcViewToolWidget::closeEvent ( TQCloseEvent * e ){ m_pIrcView->toggleToolWidget(); } void KviIrcViewToolWidget::filterLoad() { - QString szFile; - QString szInit; + TQString szFile; + TQString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters); if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Select a Filter File"),szInit)) { - QFile f(szFile); + TQFile f(szFile); if(f.open(IO_ReadOnly)) { char buffer[KVI_NUM_MSGTYPE_OPTIONS]; @@ -255,12 +255,12 @@ void KviIrcViewToolWidget::filterLoad() void KviIrcViewToolWidget::filterSave() { - QString szFile; - QString szInit; + TQString szFile; + TQString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters,"filter.kvf"); if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Select a Name for the Filter File"),szInit,0,false,true)) { - QFile f(szFile); + TQFile f(szFile); if(f.open(IO_WriteOnly)) { char buffer[KVI_NUM_MSGTYPE_OPTIONS]; @@ -278,14 +278,14 @@ void KviIrcViewToolWidget::filterSave() void KviIrcViewToolWidget::forceRepaint() { #if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) - m_pIrcView->repaint(); + m_pIrcView->tqrepaint(); #else m_pIrcView->paintEvent(0); #endif } -void KviIrcViewToolWidget::setFindResult(const QString & text) +void KviIrcViewToolWidget::setFindResult(const TQString & text) { m_pFindResult->setText(text); } @@ -303,14 +303,14 @@ void KviIrcViewToolWidget::findNext() } -void KviIrcViewToolWidget::mousePressEvent(QMouseEvent *e) +void KviIrcViewToolWidget::mousePressEvent(TQMouseEvent *e) { m_pressPoint = e->pos(); } -void KviIrcViewToolWidget::mouseMoveEvent(QMouseEvent *) +void KviIrcViewToolWidget::mouseMoveEvent(TQMouseEvent *) { - QPoint p=m_pIrcView->mapFromGlobal(QCursor::pos()); + TQPoint p=m_pIrcView->mapFromGlobal(TQCursor::pos()); p-=m_pressPoint; if(p.x() < 1)p.setX(1); else { @@ -341,7 +341,7 @@ KviIrcViewToolTip::~KviIrcViewToolTip() { } -void KviIrcViewToolTip::maybeTip(const QPoint &pnt) +void KviIrcViewToolTip::maybeTip(const TQPoint &pnt) { m_pView->maybeTip(pnt); } diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index 248c180d..8cf5781c 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -27,14 +27,14 @@ #include "kvi_settings.h" #include "kvi_tal_tooltip.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_tal_listview.h" -#include <qstring.h> +#include <tqstring.h> -class QLabel; +class TQLabel; //class KviStyledCheckBox; #include "kvi_styled_controls.h" -class QLineEdit; +class TQLineEdit; class KviIrcView; @@ -46,9 +46,9 @@ public: protected: KviIrcView * m_pView; protected: - virtual void maybeTip(const QPoint &pnt); + virtual void maybeTip(const TQPoint &pnt); public: - void doTip(const QRect &rct,const QString &str){ tip(rct,str); }; + void doTip(const TQRect &rct,const TQString &str){ tip(rct,str); }; }; //========================================================================================================= @@ -76,30 +76,31 @@ public: class KviIrcView; -class KviIrcViewToolWidget : public QFrame +class KviIrcViewToolWidget : public TQFrame { friend class KviIrcView; Q_OBJECT + TQ_OBJECT protected: KviIrcViewToolWidget(KviIrcView * par); ~KviIrcViewToolWidget(); protected: KviIrcView * m_pIrcView; - QLineEdit * m_pStringToFind; - QPoint m_pressPoint; + TQLineEdit * m_pStringToFind; + TQPoint m_pressPoint; KviStyledCheckBox * m_pCaseSensitive; KviStyledCheckBox * m_pRegExp; KviStyledCheckBox * m_pExtendedRegExp; - QLabel * m_pFindResult; + TQLabel * m_pFindResult; KviTalListView * m_pFilterView; KviIrcMessageCheckListItem ** m_pFilterItems; public: - void setFindResult(const QString & text); + void setFindResult(const TQString & text); inline bool messageEnabled(int msg_type){ return m_pFilterItems[msg_type]->isOn(); } void forceRepaint(); protected slots: @@ -110,10 +111,10 @@ protected slots: void filterSave(); void filterLoad(); protected: - virtual void hideEvent( QHideEvent * ); - virtual void closeEvent( QCloseEvent * e ); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void mousePressEvent(QMouseEvent *); + virtual void hideEvent( TQHideEvent * ); + virtual void closeEvent( TQCloseEvent * e ); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void mousePressEvent(TQMouseEvent *); }; #endif //!_KVI_IRCVIEWTOOLS_H_ diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index e9c4b233..7665287e 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -27,16 +27,16 @@ #include "kvi_listview.h" -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include "kvi_doublebuffer.h" -KviListView::KviListView( QWidget * parent, const char * name) -:KviTalListView(parent) +KviListView::KviListView( TQWidget * tqparent, const char * name) +:KviTalListView(tqparent) { m_pBackgroundOverlayPixmap=0; - m_iBackgroundOverlayAlignment=Qt::AlignAuto; + m_iBackgroundOverlayAlignment=TQt::AlignAuto; } KviListView::~KviListView() @@ -45,22 +45,22 @@ KviListView::~KviListView() delete m_pBackgroundOverlayPixmap; } -void KviListView::setBackgroundOverlayPixmap(QPixmap * pix,int iAlignmentFlags) +void KviListView::setBackgroundOverlayPixmap(TQPixmap * pix,int iAlignmentFlags) { setStaticBackground(TRUE); #ifdef COMPILE_USE_QT4 viewport()->setAutoFillBackground(false); #else - viewport()->setBackgroundMode(QWidget::NoBackground); + viewport()->setBackgroundMode(TQWidget::NoBackground); #endif - m_pBackgroundOverlayPixmap=new QPixmap(*pix); - m_iBackgroundOverlayAlignment= Qt::AlignRight | Qt::AlignBottom; - repaintContents(); + m_pBackgroundOverlayPixmap=new TQPixmap(*pix); + m_iBackgroundOverlayAlignment= TQt::AlignRight | TQt::AlignBottom; + tqrepaintContents(); } -void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,int cw,int ch) +void KviListView::drawContentsOffset(TQPainter * p,int ox,int oy,int cx,int cy,int cw,int ch) { if(!m_pBackgroundOverlayPixmap) { @@ -73,36 +73,36 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in KviDoubleBuffer pix(viewport()->width(),viewport()->height()); - QPixmap * pMemPixmap = pix.pixmap(); + TQPixmap * pMemPixmap = pix.pixmap(); - QPainter pa(pMemPixmap); + TQPainter pa(pMemPixmap); int xx = cx - ox; int yy = cy - oy; - pa.fillRect(QRect(xx,yy,cw,ch),viewport()->backgroundColor()); + pa.fillRect(TQRect(xx,yy,cw,ch),viewport()->backgroundColor()); //KviTalListView::paintEmptyArea(&pa,); // compute the pixmap position int x,y; - if(m_iBackgroundOverlayAlignment == Qt::AlignAuto) + if(m_iBackgroundOverlayAlignment == TQt::AlignAuto) x=y=0; else { - if(m_iBackgroundOverlayAlignment & Qt::AlignLeft) + if(m_iBackgroundOverlayAlignment & TQt::AlignLeft) x=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignRight ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignRight ) x=viewport()->width() - m_pBackgroundOverlayPixmap->width(); - else if( m_iBackgroundOverlayAlignment & Qt::AlignHCenter ) + else if( m_iBackgroundOverlayAlignment & TQt::AlignHCenter ) x=(viewport()->width() - m_pBackgroundOverlayPixmap->width())/2; else x=0; - if( m_iBackgroundOverlayAlignment & Qt::AlignTop ) + if( m_iBackgroundOverlayAlignment & TQt::AlignTop ) y=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignBottom ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignBottom ) y=viewport()->height() - m_pBackgroundOverlayPixmap->height(); - else if ( m_iBackgroundOverlayAlignment & Qt::AlignVCenter ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignVCenter ) y=(viewport()->height() - m_pBackgroundOverlayPixmap->height())/2; else y=0; @@ -110,16 +110,16 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in pa.drawPixmap(xx,yy,*m_pBackgroundOverlayPixmap,xx-x,yy-y,cw,ch); - // Qt's auto double buffering is buggy and can't be disabled... too bad :/ + // TQt's auto double buffering is buggy and can't be disabled... too bad :/ // - // The Qt source for the listview painting is also totally unreadable - // (maybe that's why they have thrown this cool widget away in Qt4: unmantainable) + // The TQt source for the listview painting is also totally unreadable + // (maybe that's why they have thrown this cool widget away in TQt4: unmantainable) // // Anyway, I've noticed that when double buffering is choosen (and - // Qt seems to have a really complex logic to choose when to enable it + // TQt seems to have a really complex logic to choose when to enable it // and when not) then the painter passed to paintCell() of the // list view items is NOT this painter. It's the internal painter - // of the QSharedDoubleBuffer private Qt class. It's screwed + // of the TQSharedDoubleBuffer private TQt class. It's screwed // because of the multiple coordinate translations. With this // widget we screw it even more just because our paintEmptyArea() // does nothing and we do double buffering ourselves. @@ -133,7 +133,7 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in } -void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) +void KviListView::paintEmptyArea(TQPainter * p,const TQRect & rect) { if(!m_pBackgroundOverlayPixmap) { @@ -146,35 +146,35 @@ void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) /* KviDoubleBuffer pix(rect.right()+1,rect.bottom()+1); - QPixmap * pMemPixmap = pix.pixmap(); + TQPixmap * pMemPixmap = pix.pixmap(); - QPainter pa(pMemPixmap); + TQPainter pa(pMemPixmap); pa.fillRect(rect,viewport()->backgroundColor()); KviTalListView::paintEmptyArea(&pa,rect); - QPoint realTopLeft = p->xForm(rect.topLeft()); + TQPoint realTopLeft = p->xForm(rect.topLeft()); // compute the pixmap position int x,y; - if(m_iBackgroundOverlayAlignment == Qt::AlignAuto) + if(m_iBackgroundOverlayAlignment == TQt::AlignAuto) x=y=0; else { - if(m_iBackgroundOverlayAlignment & Qt::AlignLeft) + if(m_iBackgroundOverlayAlignment & TQt::AlignLeft) x=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignRight ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignRight ) x=viewport()->width() - m_pBackgroundOverlayPixmap->width(); - else if( m_iBackgroundOverlayAlignment & Qt::AlignHCenter ) + else if( m_iBackgroundOverlayAlignment & TQt::AlignHCenter ) x=(viewport()->width() - m_pBackgroundOverlayPixmap->width())/2; else x=0; - if( m_iBackgroundOverlayAlignment & Qt::AlignTop ) + if( m_iBackgroundOverlayAlignment & TQt::AlignTop ) y=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignBottom ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignBottom ) y=viewport()->height() - m_pBackgroundOverlayPixmap->height(); - else if ( m_iBackgroundOverlayAlignment & Qt::AlignVCenter ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignVCenter ) y=(viewport()->height() - m_pBackgroundOverlayPixmap->height())/2; else y=0; @@ -186,27 +186,27 @@ void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) */ } -void KviListView::resizeEvent(QResizeEvent * e) +void KviListView::resizeEvent(TQResizeEvent * e) { KviTalListView::resizeEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); // force a full repaint (otherwise qt does not honor static background here) + tqrepaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) } #ifdef COMPILE_ON_WINDOWS -void KviListView::focusInEvent(QFocusEvent * e) +void KviListView::focusInEvent(TQFocusEvent * e) { KviTalListView::focusInEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); + tqrepaintContents(); } -void KviListView::focusOutEvent(QFocusEvent * e) +void KviListView::focusOutEvent(TQFocusEvent * e) { KviTalListView::focusOutEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); + tqrepaintContents(); } #endif diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h index 8d39529b..6f86d80e 100644 --- a/src/kvirc/ui/kvi_listview.h +++ b/src/kvirc/ui/kvi_listview.h @@ -30,28 +30,29 @@ #include "kvi_tal_listview.h" -class QPainter; +class TQPainter; class KVIRC_API KviListView : public KviTalListView { Q_OBJECT + TQ_OBJECT public: - KviListView( QWidget * parent = 0, const char * name = 0); + KviListView( TQWidget * tqparent = 0, const char * name = 0); ~KviListView(); protected: - QPixmap * m_pBackgroundOverlayPixmap; + TQPixmap * m_pBackgroundOverlayPixmap; int m_iBackgroundOverlayAlignment; public: - virtual void setBackgroundOverlayPixmap(QPixmap* pix,int iAlignmentFlags = Qt::AlignAuto); + virtual void setBackgroundOverlayPixmap(TQPixmap* pix,int iAlignmentFlags = TQt::AlignAuto); public: void publicUpdateContents(){ updateContents(); }; // <-- unscrewContents(); :D protected: - virtual void paintEmptyArea(QPainter * p, const QRect & rect ); - virtual void drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,int cw,int ch); - virtual void resizeEvent(QResizeEvent * e); + virtual void paintEmptyArea(TQPainter * p, const TQRect & rect ); + virtual void drawContentsOffset(TQPainter * p,int ox,int oy,int cx,int cy,int cw,int ch); + virtual void resizeEvent(TQResizeEvent * e); #ifdef COMPILE_ON_WINDOWS - virtual void focusInEvent(QFocusEvent * e); - virtual void focusOutEvent(QFocusEvent * e); + virtual void focusInEvent(TQFocusEvent * e); + virtual void focusOutEvent(TQFocusEvent * e); #endif }; diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 744df1ca..6a78a70e 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_maskeditor.cpp +// File : kvi_tqmaskeditor.cpp // Creation date : Tue Aug 30 2000 12:24:59 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -32,17 +32,17 @@ #include "kvi_toolwindows_container.h" #include "kvi_channel.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qvalidator.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvalidator.h> -KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry) -:KviTalListViewItem(parent), m_Mask(*entry) +KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry) +:KviTalListViewItem(tqparent), m_Mask(*entry) { - QDateTime date; - date.setTime_t(mask()->uSetAt); - setText(0,mask()->szMask); - setText(1,mask()->szSetBy); + TQDateTime date; + date.setTime_t(tqmask()->uSetAt); + setText(0,tqmask()->szMask); + setText(1,tqmask()->szSetBy); setText(2,date.toString()); } @@ -52,20 +52,20 @@ KviMaskItem::~KviMaskItem() #ifdef COMPILE_USE_QT4 int KviMaskItem::compare ( KviTalListViewItem * i, int col, bool ascending ) const #else -int KviMaskItem::compare ( QListViewItem * i, int col, bool ascending ) const +int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const #endif { if(col==2) { - if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt ) return -1; - if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return 0; - if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt ) return 1; + if( ((KviMaskItem*)i)->tqmask()->uSetAt > m_Mask.uSetAt ) return -1; + if( ((KviMaskItem*)i)->tqmask()->uSetAt == m_Mask.uSetAt ) return 0; + if( ((KviMaskItem*)i)->tqmask()->uSetAt < m_Mask.uSetAt ) return 1; } return KviTalListViewItem::compare(i,col,ascending); } -KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel) -:QDialog(pEditor) +KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel) +:TQDialog(pEditor) { m_pChannel=pChannel; m_pEditor=pEditor; @@ -74,26 +74,26 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi setCaption(__tr2qs("Mask editor - KVirc")); - QGridLayout * g = new QGridLayout(this,2,3,5,5); + TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - QLabel * tl = new QLabel(__tr2qs("New mask must match an *!*@* expression"),this); + TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this); g->addMultiCellWidget(tl,0,0,0,3); - m_pEdit=new QLineEdit(szMask,this); + m_pEdit=new TQLineEdit(szMask,this); g->addMultiCellWidget(m_pEdit,1,1,0,3); - m_pOkButton= new QPushButton(__tr2qs("Ok"),this); - connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept())); + m_pOkButton= new TQPushButton(__tr2qs("Ok"),this); + connect(m_pOkButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); g->addWidget(m_pOkButton,2,1); m_pOkButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); - m_pChancelButton= new QPushButton(__tr2qs("Cancel"),this); - connect(m_pChancelButton,SIGNAL(clicked()), this, SLOT(reject())); + m_pChancelButton= new TQPushButton(__tr2qs("Cancel"),this); + connect(m_pChancelButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); g->addWidget(m_pChancelButton,2,2); m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); - QRegExp rx( "*!*@*", false,true ); - QValidator* validator = new QRegExpValidator( rx, this ); + TQRegExp rx( "*!*@*", false,true ); + TQValidator* validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); m_pEdit->setValidator( validator ); } @@ -120,15 +120,15 @@ void KviMaskInputDialog::accept() m_pChannel->connection()->encodeText(m_pEdit->text()).data() ); } - QDialog::accept(); + TQDialog::accept(); } -KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char * nam) +KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList,char flag,const char * nam) : KviWindowToolWidget(par,button) { bool isEnabled=1; - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -137,20 +137,20 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->parent(); + w = w->tqparent(); } #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif - QGridLayout *g = new QGridLayout(this,4,2,2,2); + TQGridLayout *g = new TQGridLayout(this,4,2,2,2); m_cFlag = flag; - QString txt; + TQString txt; switch(flag) { case 'b': @@ -171,32 +171,32 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo break; } - QLabel * l = new QLabel("",this); + TQLabel * l = new TQLabel("",this); l->setPixmap(*(g_pIconManager->getSmallIcon(m_iIconId))); g->addWidget(l,0,0); - l = new QLabel(txt,this); + l = new TQLabel(txt,this); g->addWidget(l,0,1); KviTalHBox * hb = new KviTalHBox(this); g->addMultiCellWidget(hb,1,1,0,1); - new QLabel(__tr2qs("Filter:"),hb); - m_pSearch = new QLineEdit(hb); - connect(m_pSearch,SIGNAL(textChanged ( const QString & ) ),this,SLOT(searchTextChanged ( const QString & ))); + new TQLabel(__tr2qs("Filter:"),hb); + m_pSearch = new TQLineEdit(hb); + connect(m_pSearch,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(searchTextChanged ( const TQString & ))); - l = new QLabel(__tr2qs("Use doubleclick to edit item"),this); + l = new TQLabel(__tr2qs("Use doubleclick to edit item"),this); g->addWidget(l,1,1); g->addMultiCellWidget(l,2,2,0,1); m_pMaskBox = new KviTalListView(this); #ifdef COMPILE_USE_QT4 - m_pMaskBox->setFocusPolicy(Qt::ClickFocus); + m_pMaskBox->setFocusPolicy(TTQ_ClickFocus); #else - m_pMaskBox->setFocusPolicy(QWidget::ClickFocus); + m_pMaskBox->setFocusPolicy(TQ_ClickFocus); #endif m_pMaskBox->setFocusProxy(this); - m_pMaskBox->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); + m_pMaskBox->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); m_pMaskBox->addColumn(__tr2qs("Mask")); m_pMaskBox->addColumn(__tr2qs("Set by")); m_pMaskBox->addColumn(__tr2qs("Set at")); @@ -204,36 +204,36 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo m_pMaskBox->setAllColumnsShowFocus(true); m_pMaskBox->setShowSortIndicator(true); m_pMaskBox->setSorting(2,false); - connect(m_pMaskBox,SIGNAL(doubleClicked ( KviTalListViewItem * )),this,SLOT(listViewDoubleClicked( KviTalListViewItem * ))); + connect(m_pMaskBox,TQT_SIGNAL(doubleClicked ( KviTalListViewItem * )),this,TQT_SLOT(listViewDoubleClicked( KviTalListViewItem * ))); g->addMultiCellWidget(m_pMaskBox,3,3,0,1); - m_pRemoveMask = new QPushButton(__tr2qs("Re&move"),this); + m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this); m_pRemoveMask->setEnabled(isEnabled); #ifdef COMPILE_USE_QT4 - m_pRemoveMask->setFocusPolicy(Qt::ClickFocus); + m_pRemoveMask->setFocusPolicy(TTQ_ClickFocus); #else - m_pRemoveMask->setFocusPolicy(QWidget::ClickFocus); + m_pRemoveMask->setFocusPolicy(TQ_ClickFocus); #endif m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,4,1); - connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked())); + connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pRemoveMask->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); - m_pAddButton = new QPushButton(__tr2qs("Add"),this); + m_pAddButton = new TQPushButton(__tr2qs("Add"),this); m_pAddButton->setEnabled(isEnabled); #ifdef COMPILE_USE_QT4 - m_pAddButton->setFocusPolicy(Qt::ClickFocus); + m_pAddButton->setFocusPolicy(TTQ_ClickFocus); #else - m_pAddButton->setFocusPolicy(QWidget::ClickFocus); + m_pAddButton->setFocusPolicy(TQ_ClickFocus); #endif m_pAddButton->setFocusProxy(this); g->addWidget(m_pAddButton,4,0); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); g->setColStretch(3,1); - for(KviMaskEntry * e = maskList->first();e;e = maskList->next()) addMask(e); + for(KviMaskEntry * e = tqmaskList->first();e;e = tqmaskList->next()) addMask(e); registerSelf(); } @@ -242,7 +242,7 @@ KviMaskEditor::~KviMaskEditor() } -void KviMaskEditor::searchTextChanged ( const QString & text) +void KviMaskEditor::searchTextChanged ( const TQString & text) { KviTalListViewItem *pItem=m_pMaskBox->firstChild(); KviMaskItem *pMaskItem; @@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const QString & text) { pMaskItem->setVisible(true); } else { - if(pMaskItem->mask()->szMask.contains(text)) + if(pMaskItem->tqmask()->szMask.tqcontains(text)) pMaskItem->setVisible(true); else pMaskItem->setVisible(false); @@ -273,9 +273,9 @@ void KviMaskEditor::removeClicked() if(it->isSelected()) { KviMaskEntry * e = new KviMaskEntry; - e->szMask = it->mask()->szMask; - e->szSetBy = it->mask()->szSetBy; - e->uSetAt = it->mask()->uSetAt; + e->szMask = it->tqmask()->szMask; + e->szSetBy = it->tqmask()->szSetBy; + e->uSetAt = it->tqmask()->uSetAt; l->append(e); } it = (KviMaskItem *)(it->nextSibling()); @@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked() void KviMaskEditor::addClicked() { - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -299,7 +299,7 @@ void KviMaskEditor::addClicked() } break; } - w = w->parent(); + w = w->tqparent(); } } @@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e) KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild()); while(it) { - if(KviQString::equalCI(it->mask()->szMask,e->szMask)) + if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask)) { delete it; return; @@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) { if(pItem) { - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) } break; } - w = w->parent(); + w = w->tqparent(); } } } diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h index de281377..9c6c77be 100644 --- a/src/kvirc/ui/kvi_maskeditor.h +++ b/src/kvirc/ui/kvi_maskeditor.h @@ -2,7 +2,7 @@ #define _KVI_MASKEDITOR_H_ // -// File : kvi_maskeditor.h +// File : kvi_tqmaskeditor.h // Creation date : Tue Aug 30 2000 12:20:10 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -24,11 +24,11 @@ // #include "kvi_settings.h" -#include <qdialog.h> -#include <qlineedit.h> -#include <qwidget.h> +#include <tqdialog.h> +#include <tqlineedit.h> +#include <tqwidget.h> #include "kvi_tal_listview.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "kvi_pointerlist.h" #include "kvi_string.h" @@ -39,39 +39,40 @@ class KviChannel; typedef struct _KviMaskEntry { - QString szMask; - QString szSetBy; + TQString szMask; + TQString szSetBy; unsigned int uSetAt; } KviMaskEntry; class KviMaskItem: public KviTalListViewItem { public: - KviMaskItem(KviTalListView* parent,KviMaskEntry* entry); + KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry); ~KviMaskItem(); - KviMaskEntry* mask() { return &m_Mask; }; + KviMaskEntry* tqmask() { return &m_Mask; }; #ifdef COMPILE_USE_QT4 virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const; #else - virtual int compare ( QListViewItem * i, int col, bool ascending ) const; + virtual int compare ( TQListViewItem * i, int col, bool ascending ) const; #endif protected: KviMaskEntry m_Mask; }; -class KviMaskInputDialog : public QDialog +class KviMaskInputDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel); + KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel); ~KviMaskInputDialog(); protected: - QLineEdit * m_pEdit; - QPushButton * m_pOkButton; - QPushButton * m_pChancelButton; - QString m_szOldMask; + TQLineEdit * m_pEdit; + TQPushButton * m_pOkButton; + TQPushButton * m_pChancelButton; + TQString m_szOldMask; KviChannel * m_pChannel; KviMaskEditor * m_pEditor; protected slots: @@ -81,15 +82,16 @@ protected slots: class KVIRC_API KviMaskEditor : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList, + KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList, char flag,const char * nam); ~KviMaskEditor(); protected: KviTalListView * m_pMaskBox; - QPushButton * m_pRemoveMask; - QPushButton * m_pAddButton; - QLineEdit * m_pSearch; + TQPushButton * m_pRemoveMask; + TQPushButton * m_pAddButton; + TQLineEdit * m_pSearch; char m_cFlag; int m_iIconId; public: @@ -100,7 +102,7 @@ protected slots: void removeClicked(); void addClicked(); void listViewDoubleClicked( KviTalListViewItem * ); - void searchTextChanged ( const QString & ); + void searchTextChanged ( const TQString & ); signals: void removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *); }; diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index ba4aea40..08f3af2a 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -36,27 +36,27 @@ #include "kvi_window.h" #include "kvi_mdicaption.h" -#include <qcursor.h> -#include <qnamespace.h> -#include <qapplication.h> -#include <qfontmetrics.h> +#include <tqcursor.h> +#include <tqnamespace.h> +#include <tqapplication.h> +#include <tqfontmetrics.h> #include "kvi_pointerlist.h" -#include <qpixmap.h> -#include <qstyle.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" #ifdef COMPILE_USE_QT4 - #include <q3simplerichtext.h> - #define QSimpleRichText Q3SimpleRichText - #include <qstyleoption.h> + #include <tq3simplerichtext.h> + #define TQSimpleRichText Q3SimpleRichText + #include <tqstyleoption.h> #else - #include <qsimplerichtext.h> + #include <tqsimplerichtext.h> #endif -#include <qdrawutil.h> -#include <qevent.h> +#include <tqdrawutil.h> +#include <tqevent.h> -KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name) -: QToolButton(parent,name) +KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name) +: TQToolButton(tqparent,name) { setPixmap(pix); //setAutoRaise(true); @@ -69,23 +69,23 @@ KviMdiCaptionButton::~KviMdiCaptionButton() #ifdef COMPILE_USE_QT4 -void KviMdiCaptionButton::paintEvent(QPaintEvent *e) +void KviMdiCaptionButton::paintEvent(TQPaintEvent *e) { - QPainter painter(this); + TQPainter painter(this); drawButton(&painter); } #endif -void KviMdiCaptionButton::drawButton(QPainter *p) +void KviMdiCaptionButton::drawButton(TQPainter *p) { #ifdef COMPILE_USE_QT4 - QBrush b(parentWidget()->palette().window()); + TQBrush b(tqparentWidget()->palette().window()); #else - QBrush b(parentWidget()->colorGroup().background()); + TQBrush b(tqparentWidget()->tqcolorGroup().background()); #endif if(isDown()) - qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b); + qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b); else p->fillRect(0,0,width(),height(),b); @@ -104,19 +104,19 @@ void KviMdiCaptionButton::drawButton(QPainter *p) -KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name) -: QWidget(parent,name) +KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name) +: TQWidget(tqparent,name) { m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button"); - connect(m_pMaximizeButton,SIGNAL(clicked()),parent,SLOT(maximize())); + connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize())); m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button"); - connect(m_pMinimizeButton,SIGNAL(clicked()),parent,SLOT(minimize())); + connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize())); m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button"); - connect(m_pCloseButton,SIGNAL(clicked()),parent,SLOT(closeRequest())); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest())); m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button"); - connect(m_pSystemButton,SIGNAL(clicked()),parent,SLOT(systemPopupSlot())); + connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot())); - m_lastMousePos = QPoint(-1,-1); + m_lastMousePos = TQPoint(-1,-1); m_bMouseGrabbed = true; m_bActive = false; calcLineSpacing(); @@ -138,7 +138,7 @@ void KviMdiCaption::reloadImages() void KviMdiCaption::calcLineSpacing() { - QFontMetrics fm(font()); + TQFontMetrics fm(font()); m_iLineSpacing = fm.lineSpacing() + 3; if(m_iLineSpacing < 20)m_iLineSpacing = 20; } @@ -152,7 +152,7 @@ void KviMdiCaption::setActive(bool bActive) { m_bActive = bActive; - QPalette pal(Qt::white,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); + TQPalette pal(TQt::white,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); setPalette(pal); //update(); m_pSystemButton->update(); @@ -161,33 +161,33 @@ void KviMdiCaption::setActive(bool bActive) m_pMaximizeButton->update(); } -void KviMdiCaption::fontChange(const QFont &old) +void KviMdiCaption::fontChange(const TQFont &old) { calcLineSpacing(); - QWidget::fontChange(old); - ((KviMdiChild *)parent())->resizeEvent(0); + TQWidget::fontChange(old); + ((KviMdiChild *)tqparent())->resizeEvent(0); } -void KviMdiCaption::mousePressEvent(QMouseEvent *e) +void KviMdiCaption::mousePressEvent(TQMouseEvent *e) { m_bMouseGrabbed = true; - m_lastMousePos = QCursor::pos(); + m_lastMousePos = TQCursor::pos(); #ifdef COMPILE_USE_QT4 - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); #else - setCursor(QCursor::sizeAllCursor); + setCursor(TQCursor::sizeAllCursor); #endif - ((KviMdiChild *)parent())->activate(true); + ((KviMdiChild *)tqparent())->activate(true); } -void KviMdiCaption::mouseMoveEvent(QMouseEvent *) +void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) { if(m_bMouseGrabbed) { - QPoint p = QCursor::pos(); + TQPoint p = TQCursor::pos(); int dx = m_lastMousePos.x() - p.x(); int dy = m_lastMousePos.y() - p.y(); - KviMdiChild * c = (KviMdiChild *)parent(); + KviMdiChild * c = (KviMdiChild *)tqparent(); int nx = c->manager()->childX(c) - dx; int ny = c->manager()->childY(c) - dy; @@ -207,8 +207,8 @@ void KviMdiCaption::mouseMoveEvent(QMouseEvent *) ny = 0; } - QCursor::setPos(cx,cy); - m_lastMousePos = QPoint(cx,cy); + TQCursor::setPos(cx,cy); + m_lastMousePos = TQPoint(cx,cy); } else { m_lastMousePos = p; } @@ -218,41 +218,41 @@ void KviMdiCaption::mouseMoveEvent(QMouseEvent *) } } -void KviMdiCaption::mouseDoubleClickEvent(QMouseEvent *e) +void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e) { - ((KviMdiChild *)parent())->maximize(); + ((KviMdiChild *)tqparent())->maximize(); } -void KviMdiCaption::paintEvent(QPaintEvent * e) +void KviMdiCaption::paintEvent(TQPaintEvent * e) { - QRect r = e->rect(); - QPainter p(this); + TQRect r = e->rect(); + TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); - QSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); - rt.draw(&p,height() + 2,-1,rect(),colorGroup()); + TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font()); + rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); } -void KviMdiCaption::mouseReleaseEvent(QMouseEvent *) +void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *) { m_bMouseGrabbed = false; #ifdef COMPILE_USE_QT4 - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); #else - setCursor(QCursor::arrowCursor); + setCursor(TQCursor::arrowCursor); #endif // releaseMouse(); } -void KviMdiCaption::setFocusProxy(QWidget * w) +void KviMdiCaption::setFocusProxy(TQWidget * w) { - QWidget::setFocusProxy(w); + TQWidget::setFocusProxy(w); m_pSystemButton->setFocusProxy(w); m_pMinimizeButton->setFocusProxy(w); m_pMaximizeButton->setFocusProxy(w); m_pCloseButton->setFocusProxy(w); } -void KviMdiCaption::resizeEvent(QResizeEvent * e) +void KviMdiCaption::resizeEvent(TQResizeEvent * e) { int s = height() - 2; m_pSystemButton->setGeometry(1,1,s,s); @@ -266,7 +266,7 @@ void KviMdiCaption::resizeEvent(QResizeEvent * e) -KviMenuBarToolButton::KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name) +KviMenuBarToolButton::KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name) : KviStyledToolButton(par) { setProperty("name","name"); @@ -278,8 +278,8 @@ KviMenuBarToolButton::~KviMenuBarToolButton() { } -QSize KviMenuBarToolButton::sizeHint() const +TQSize KviMenuBarToolButton::tqsizeHint() const { - return QSize(20,20); + return TQSize(20,20); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index 6bec4051..d070e194 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -26,24 +26,25 @@ #include "kvi_settings.h" -#include <qtoolbutton.h> -#include <qlabel.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> #include "kvi_styled_controls.h" class KviMdiManager; class KviMdiChild; -class KVIRC_API KviMdiCaptionButton : public QToolButton +class KVIRC_API KviMdiCaptionButton : public TQToolButton { Q_OBJECT + TQ_OBJECT public: - KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name); + KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name); ~KviMdiCaptionButton(); protected: - virtual void drawButton(QPainter * p); + virtual void drawButton(TQPainter * p); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); #endif }; @@ -51,23 +52,25 @@ protected: class KviMenuBarToolButton : public KviStyledToolButton { Q_OBJECT + TQ_OBJECT public: - KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name); + KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name); ~KviMenuBarToolButton(); public: - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; }; -class KVIRC_API KviMdiCaption : public QWidget +class KVIRC_API KviMdiCaption : public TQWidget { friend class KviMdiChild; Q_OBJECT + TQ_OBJECT public: - KviMdiCaption(KviMdiChild * parent,const char * name); + KviMdiCaption(KviMdiChild * tqparent,const char * name); ~KviMdiCaption(); protected: - QPoint m_lastMousePos; + TQPoint m_lastMousePos; bool m_bMouseGrabbed; int m_iLineSpacing; bool m_bActive; @@ -75,25 +78,25 @@ protected: KviMdiCaptionButton * m_pMinimizeButton; KviMdiCaptionButton * m_pMaximizeButton; KviMdiCaptionButton * m_pCloseButton; - QPixmap m_pixSystemIcon; + TQPixmap m_pixSystemIcon; public: int heightHint(); void setActive(bool bActive); bool active(){ return m_bActive; }; - void setSystemIcon(const QPixmap &pix){ m_pSystemButton->setPixmap(pix); m_pixSystemIcon = pix; }; - const QPixmap * systemIcon(){ return &m_pixSystemIcon; }; + void setSystemIcon(const TQPixmap &pix){ m_pSystemButton->setPixmap(pix); m_pixSystemIcon = pix; }; + const TQPixmap * systemIcon(){ return &m_pixSystemIcon; }; void enableClose(bool bEnable){ m_pCloseButton->setEnabled(bEnable); }; bool closeEnabled(){ return m_pCloseButton->isEnabled(); }; - virtual void setFocusProxy(QWidget * w); + virtual void setFocusProxy(TQWidget * w); protected: void calcLineSpacing(); - virtual void fontChange(const QFont &old); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void paintEvent(QPaintEvent * e); - virtual void resizeEvent(QResizeEvent * e); + virtual void fontChange(const TQFont &old); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void paintEvent(TQPaintEvent * e); + virtual void resizeEvent(TQResizeEvent * e); void reloadImages(); }; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 9b92c563..b559be87 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -35,29 +35,29 @@ #include "kvi_window.h" #include "kvi_mdicaption.h" -#include <qcursor.h> -#include <qnamespace.h> -#include <qapplication.h> -#include <qfontmetrics.h> +#include <tqcursor.h> +#include <tqnamespace.h> +#include <tqapplication.h> +#include <tqfontmetrics.h> #include "kvi_pointerlist.h" -#include <qpixmap.h> -#include <qstyle.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" #ifndef COMPILE_USE_QT4 - #include <qobjectlist.h> + #include <tqobjectlist.h> #endif -#include <qevent.h> +#include <tqevent.h> #ifdef Q_OS_MACX #include "kvi_app.h" //Needed for g_pApp #ifdef COMPILE_USE_QT4 - #include <QDesktopWidget> + #include <TQDesktopWidget> #endif #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -73,9 +73,9 @@ KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name) -: QFrame(par->viewport(),name ? name : "mdi_child") +: TQFrame(par->viewport(),name ? name : "mdi_child") { - setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); setFrameShape(NoFrame); m_pManager = par; @@ -87,7 +87,7 @@ KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name) m_pClient = 0; m_state = Normal; - m_restoredGeometry = QRect(10,10,100,100); + m_restoredGeometry = TQRect(10,10,100,100); setMouseTracking(true); setMinimumSize(KVI_MDICHILD_MIN_WIDTH,KVI_MDICHILD_MIN_HEIGHT); @@ -108,29 +108,29 @@ void KviMdiChild::reloadImages() m_pCaption->reloadImages(); } -QRect KviMdiChild::restoredGeometry() +TQRect KviMdiChild::restoredGeometry() { if(m_state == Maximized)return m_restoredGeometry; - else return QRect(x(),y(),width(),height()); -// else return geometry(); + else return TQRect(x(),y(),width(),height()); +// else return tqgeometry(); } #ifdef COMPILE_USE_QT4 -void KviMdiChild::setBackgroundRole(QPalette::ColorRole) +void KviMdiChild::setBackgroundRole(TQPalette::ColorRole) { // hack - QFrame::setBackgroundRole(QPalette::Window); + TQFrame::setBackgroundRole(TQPalette::Window); } #else -void KviMdiChild::setBackgroundMode(QWidget::BackgroundMode) +void KviMdiChild::setBackgroundMode(TQWidget::BackgroundMode) { // hack - QFrame::setBackgroundMode(QWidget::PaletteBackground); + TQFrame::setBackgroundMode(TQWidget::PaletteBackground); } #endif -void KviMdiChild::setIcon(const QPixmap &pix) +void KviMdiChild::setIcon(const TQPixmap &pix) { m_pCaption->setSystemIcon(pix); @@ -140,7 +140,7 @@ void KviMdiChild::setIcon(const QPixmap &pix) } } -const QPixmap * KviMdiChild::icon() +const TQPixmap * KviMdiChild::icon() { return m_pCaption->systemIcon(); } @@ -160,7 +160,7 @@ bool KviMdiChild::closeEnabled() return m_pCaption->closeEnabled(); } -void KviMdiChild::setCaption(const QString & plain,const QString & xmlActive,const QString & xmlInactive) +void KviMdiChild::setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive) { m_szPlainCaption = plain; m_szXmlActiveCaption = xmlActive; @@ -172,7 +172,7 @@ void KviMdiChild::setCaption(const QString & plain,const QString & xmlActive,con void KviMdiChild::maximize() { if(m_state == Minimized)restore(); // restore first - if(m_state == Normal)m_restoredGeometry = geometry(); + if(m_state == Normal)m_restoredGeometry = tqgeometry(); m_state = Maximized; manager()->maximizeChild(this); } @@ -225,7 +225,7 @@ void KviMdiChild::minimize() m_pManager->childMinimized(this,true); break; case Normal: - m_restoredGeometry = geometry(); + m_restoredGeometry = tqgeometry(); hide(); m_state = Minimized; m_pManager->childMinimized(this,false); @@ -246,17 +246,17 @@ void KviMdiChild::closeRequest() void KviMdiChild::systemPopupAboutToShow() { m_pSystemPopup->clear(); - if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,SLOT(maximize())); - if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,SLOT(minimize())); - if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,SLOT(restore())); + if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,TQT_SLOT(maximize())); + if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,TQT_SLOT(minimize())); + if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,TQT_SLOT(restore())); if(closeEnabled()) { m_pSystemPopup->insertSeparator(); - m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,SLOT(closeRequest())); + m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,TQT_SLOT(closeRequest())); } } */ -void KviMdiChild::moveEvent(QMoveEvent *e) +void KviMdiChild::moveEvent(TQMoveEvent *e) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(m_pClient && g_pShadedChildGlobalDesktopBackground) @@ -267,20 +267,20 @@ void KviMdiChild::moveEvent(QMoveEvent *e) } } #endif - QFrame::moveEvent(e); + TQFrame::moveEvent(e); } void KviMdiChild::systemPopupSlot() { - if(sender()->inherits("QToolButton")) + if(sender()->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING)) { - emit systemPopupRequest(((QToolButton *)sender())->mapToGlobal(QPoint(0,((QToolButton *)sender())->height()))); + emit systemPopupRequest(((TQToolButton *)sender())->mapToGlobal(TQPoint(0,((TQToolButton *)sender())->height()))); } else { - emit systemPopupRequest(m_pCaption->mapToGlobal(QPoint(5,5))); + emit systemPopupRequest(m_pCaption->mapToGlobal(TQPoint(5,5))); } } -void KviMdiChild::resizeEvent(QResizeEvent *e) +void KviMdiChild::resizeEvent(TQResizeEvent *e) { int s = m_pCaption->heightHint(); m_pCaption->setGeometry(KVI_MDICHILD_BORDER,KVI_MDICHILD_BORDER, @@ -292,10 +292,10 @@ void KviMdiChild::resizeEvent(QResizeEvent *e) m_pClient->setGeometry(KVI_MDICHILD_BORDER,yPos, width() - (KVI_MDICHILD_BORDER << 1),height() - (yPos + KVI_MDICHILD_BORDER)); } - QFrame::resizeEvent(e); + TQFrame::resizeEvent(e); } -void KviMdiChild::mousePressEvent(QMouseEvent *e) +void KviMdiChild::mousePressEvent(TQMouseEvent *e) { if(m_state == Maximized)return; m_iResizeCorner=getResizeCorner(e->pos().x(),e->pos().y()); @@ -306,7 +306,7 @@ void KviMdiChild::mousePressEvent(QMouseEvent *e) } } -void KviMdiChild::mouseReleaseEvent(QMouseEvent *) +void KviMdiChild::mouseReleaseEvent(TQMouseEvent *) { m_iResizeCorner=KVI_MDI_NORESIZE; m_iLastCursorCorner=KVI_MDI_NORESIZE; @@ -317,36 +317,36 @@ void KviMdiChild::mouseReleaseEvent(QMouseEvent *) releaseMouse(); } - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } -QCursor KviMdiChild::getResizeCursor(int resizeCorner) +TQCursor KviMdiChild::getResizeCursor(int resizeCorner) { switch (resizeCorner) { case KVI_MDI_RESIZE_LEFT: case KVI_MDI_RESIZE_RIGHT: - return Qt::sizeHorCursor; + return TQt::sizeHorCursor; break; case KVI_MDI_RESIZE_TOP: case KVI_MDI_RESIZE_BOTTOM: - return Qt::sizeVerCursor; + return TQt::sizeVerCursor; break; case KVI_MDI_RESIZE_TOPLEFT: case KVI_MDI_RESIZE_BOTTOMRIGHT: - return Qt::sizeFDiagCursor; + return TQt::sizeFDiagCursor; break; case KVI_MDI_RESIZE_BOTTOMLEFT: case KVI_MDI_RESIZE_TOPRIGHT: - return Qt::sizeBDiagCursor; + return TQt::sizeBDiagCursor; break; default: - return Qt::arrowCursor; + return TQt::arrowCursor; break; } } -void KviMdiChild::mouseMoveEvent(QMouseEvent *e) +void KviMdiChild::mouseMoveEvent(TQMouseEvent *e) { if(e->state() & Qt::LeftButton) { @@ -364,29 +364,29 @@ void KviMdiChild::setResizeCursor(int resizeCorner) if(resizeCorner == KVI_MDI_NORESIZE) { setCursor(getResizeCursor(resizeCorner)); - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } else { if(m_state != Maximized) { setCursor(getResizeCursor(resizeCorner)); - //QApplication::setOverrideCursor(getResizeCursor(resizeCorner),true); + //TQApplication::setOverrideCursor(getResizeCursor(resizeCorner),true); } } } -void KviMdiChild::leaveEvent(QEvent *) +void KviMdiChild::leaveEvent(TQEvent *) { if(!m_bResizeMode) { m_iResizeCorner=KVI_MDI_NORESIZE; m_iLastCursorCorner=KVI_MDI_NORESIZE; - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } else { if(m_iResizeCorner != KVI_MDI_NORESIZE)resizeWindowOpaque(m_iResizeCorner); } } -void KviMdiChild::calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &resizeRect,int minWidth,int minHeight) +void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &resizeRect,int minWidth,int minHeight) { switch(resizeCorner) { @@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &re void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight) { if(m_pClient){ - minWidth = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1); - minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ + minWidth = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1); + minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ m_pCaption->heightHint() + KVI_MDICHILD_SPACING; } if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH; @@ -454,9 +454,9 @@ void KviMdiChild::resizeWindowOpaque(int resizeCorner) { int minWidth=0; int minHeight=0; - QRect resizeRect(m_pManager->childX(this),m_pManager->childY(this),width(),height()); + TQRect resizeRect(m_pManager->childX(this),m_pManager->childY(this),width(),height()); calculateMinimumSize(minWidth,minHeight); - QPoint mousePos = m_pManager->viewportToContents(m_pManager->viewport()->mapFromGlobal(QCursor::pos())); + TQPoint mousePos = m_pManager->viewportToContents(m_pManager->viewport()->mapFromGlobal(TQCursor::pos())); calculateResizeRect(resizeCorner,mousePos,resizeRect,minWidth,minHeight); m_pManager->moveChild(this,resizeRect.x(),resizeRect.y()); resize(resizeRect.width(),resizeRect.height()); @@ -480,7 +480,7 @@ int KviMdiChild::getResizeCorner(int ax,int ay) return ret; } -void KviMdiChild::setClient(QWidget *w) +void KviMdiChild::setClient(TQWidget *w) { __range_valid(m_pClient==0); __range_valid(w!=0); @@ -490,10 +490,10 @@ void KviMdiChild::setClient(QWidget *w) int clientYPos=m_pCaption->heightHint()+KVI_MDICHILD_SPACING+KVI_MDICHILD_BORDER; resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos); - //Reparent if needed - if(w->parent()!=this){ + //Retqparent if needed + if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){ //reparent to this widget , no flags , point , show it - QPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); + TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); w->reparent(this,pnt2,true); } else w->move(KVI_MDICHILD_BORDER,clientYPos); @@ -508,10 +508,10 @@ void KviMdiChild::setClient(QWidget *w) */ //linkChildren(w); - if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && - m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ - setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1)); - setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + + if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && + m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ + setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1)); + setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + m_pCaption->heightHint() + KVI_MDICHILD_SPACING); } @@ -529,9 +529,9 @@ void KviMdiChild::unsetClient() //Kewl...the reparent function has a small prob now.. //the new toplelvel widgets gets not reenabled for dnd #ifndef Q_OS_MACX - m_pClient->reparent(0,m_pClient->mapToGlobal(QPoint(0,0)),true); + m_pClient->reparent(0,m_pClient->mapToGlobal(TQPoint(0,0)),true); #else - QRect r = g_pApp->desktop()->availableGeometry(m_pClient); + TQRect r = g_pApp->desktop()->availableGeometry(m_pClient); r.moveBy(0, 22); m_pClient->reparent(0,r.topLeft(),true); #endif @@ -549,28 +549,28 @@ void KviMdiChild::activate(bool bSetFocus) else if(bSetFocus)setFocus(); } -void KviMdiChild::focusInEvent(QFocusEvent *) +void KviMdiChild::focusInEvent(TQFocusEvent *) { // We gained focus by click , tab or from the caption label // Bring this child to top m_pCaption->setActive(true); m_pManager->setTopChild(this,false); //Do not focus by now... - /*The client is our focusProxy ! it should be focused by Qt !*/ + /*The client is our focusProxy ! it should be focused by TQt !*/ #ifdef _KVI_DEBUG_CLASS_NAME_ __range_valid(focusProxy() == m_pClient); #endif } -QSize KviMdiChild::sizeHint() +TQSize KviMdiChild::tqsizeHint() { if(m_pClient) { - QSize s = m_pClient->sizeHint(); - QSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), + TQSize s = m_pClient->tqsizeHint(); + TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint()); return ret; } - return QFrame::sizeHint(); + return TQFrame::tqsizeHint(); } diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index 7915a3bb..feac48bb 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -27,24 +27,25 @@ #include "kvi_settings.h" #include "kvi_string.h" -#include <qframe.h> -#include <qtoolbutton.h> -#include <qlabel.h> +#include <tqframe.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> class KviMdiManager; class KviMdiChild; class KviMdiCaption; -class QCursor; +class TQCursor; -class KVIRC_API KviMdiChild : public QFrame +class KVIRC_API KviMdiChild : public TQFrame { friend class KviMdiManager; friend class KviMdiCaption; Q_OBJECT + TQ_OBJECT public: KviMdiChild(KviMdiManager* par,const char * name = 0); ~KviMdiChild(); @@ -57,28 +58,28 @@ private: int m_iResizeCorner; int m_iLastCursorCorner; bool m_bResizeMode; - QWidget * m_pClient; + TQWidget * m_pClient; MdiChildState m_state; - QRect m_restoredGeometry; + TQRect m_restoredGeometry; - QString m_szXmlActiveCaption; - QString m_szXmlInactiveCaption; - QString m_szPlainCaption; + TQString m_szXmlActiveCaption; + TQString m_szXmlInactiveCaption; + TQString m_szPlainCaption; public: - QRect restoredGeometry(); - void setRestoredGeometry(const QRect &r){ m_restoredGeometry = r; }; - void setClient(QWidget * w); - QWidget * client(){ return m_pClient; }; + TQRect restoredGeometry(); + void setRestoredGeometry(const TQRect &r){ m_restoredGeometry = r; }; + void setClient(TQWidget * w); + TQWidget * client(){ return m_pClient; }; void unsetClient(); KviMdiCaption * captionLabel(){ return m_pCaption; }; MdiChildState state(){ return m_state; }; - const QString & plainCaption(){ return m_szPlainCaption; }; - const QString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; - const QString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; - void setCaption(const QString & plain,const QString & xmlActive,const QString & xmlInactive); - virtual QSize sizeHint(); - void setIcon(const QPixmap &pix); - const QPixmap * icon(); + const TQString & plainCaption(){ return m_szPlainCaption; }; + const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; + const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; + void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive); + virtual TQSize tqsizeHint(); + void setIcon(const TQPixmap &pix); + const TQPixmap * icon(); void enableClose(bool bEnable); bool closeEnabled(); KviMdiManager * manager(){ return m_pManager; }; @@ -91,31 +92,31 @@ public slots: void systemPopupSlot(); void closeRequest(); signals: - void systemPopupRequest(const QPoint & pnt); + void systemPopupRequest(const TQPoint & pnt); protected: #ifdef COMPILE_USE_QT4 - virtual void setBackgroundRole(QPalette::ColorRole); + virtual void setBackgroundRole(TQPalette::ColorRole); #else - virtual void setBackgroundMode(QWidget::BackgroundMode bgmd); + virtual void setBackgroundMode(TQWidget::BackgroundMode bgmd); #endif - virtual void resizeEvent(QResizeEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void leaveEvent(QEvent *e); - virtual void focusInEvent(QFocusEvent *); - virtual void moveEvent(QMoveEvent *e); -// bool eventFilter(QObject *o,QEvent *e); - void emitSystemPopupRequest(const QPoint & pnt){ emit systemPopupRequest(pnt); }; + virtual void resizeEvent(TQResizeEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void leaveEvent(TQEvent *e); + virtual void focusInEvent(TQFocusEvent *); + virtual void moveEvent(TQMoveEvent *e); +// bool eventFilter(TQObject *o,TQEvent *e); + void emitSystemPopupRequest(const TQPoint & pnt){ emit systemPopupRequest(pnt); }; private: -// void linkChildren(QWidget *w); -// void unlinkChildren(QWidget *w); - QCursor getResizeCursor(int resizeCorner); +// void linkChildren(TQWidget *w); +// void unlinkChildren(TQWidget *w); + TQCursor getResizeCursor(int resizeCorner); void resizeWindowOpaque(int resizeCorner); int getResizeCorner(int ax,int ay); void calculateMinimumSize(int &minWidth,int &minHeight); void setResizeCursor(int resizeCorner); - void calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &resizeRect,int minWidth,int minHeight); + void calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &resizeRect,int minWidth,int minHeight); }; diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index feddca11..9dcafaf6 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -37,28 +37,28 @@ #include "kvi_app.h" #include "kvi_tal_popupmenu.h" -#include <qmenubar.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqmenubar.h> +#include <tqlayout.h> +#include <tqpainter.h> #include <math.h> -#include <qcursor.h> -#include <qdrawutil.h> -#include <qevent.h> +#include <tqcursor.h> +#include <tqdrawutil.h> +#include <tqevent.h> #ifdef COMPILE_USE_QT4 #include "kvi_tal_hbox.h" #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - #include <qpixmap.h> - extern QPixmap * g_pShadedParentGlobalDesktopBackground; + #include <tqpixmap.h> + extern TQPixmap * g_pShadedParentGlobalDesktopBackground; #endif -KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) -: KviTalScrollView(parent) +KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name) +: KviTalScrollView(tqparent) { setFrameShape(NoFrame); m_pZ = new KviPointerList<KviMdiChild>; @@ -79,28 +79,28 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) #endif m_pWindowPopup = new KviTalPopupMenu(this); - connect(m_pWindowPopup,SIGNAL(activated(int)),this,SLOT(menuActivated(int))); - connect(m_pWindowPopup,SIGNAL(aboutToShow()),this,SLOT(fillWindowPopup())); + connect(m_pWindowPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuActivated(int))); + connect(m_pWindowPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillWindowPopup())); m_pTileMethodPopup = new KviTalPopupMenu(this); - connect(m_pTileMethodPopup,SIGNAL(activated(int)),this,SLOT(tileMethodMenuActivated(int))); + connect(m_pTileMethodPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tileMethodMenuActivated(int))); #ifdef COMPILE_USE_QT4 viewport()->setAutoFillBackground(false); #else - viewport()->setBackgroundMode(QWidget::NoBackground); + viewport()->setBackgroundMode(TQWidget::NoBackground); #endif setStaticBackground(true); resizeContents(width(),height()); #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::NoFocus); - viewport()->setFocusPolicy(Qt::NoFocus); + setFocusPolicy(TTQ_NoFocus); + viewport()->setFocusPolicy(TTQ_NoFocus); #else - setFocusPolicy(QWidget::NoFocus); - viewport()->setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); + viewport()->setFocusPolicy(TQ_NoFocus); #endif - connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } KviMdiManager::~KviMdiManager() @@ -119,20 +119,20 @@ void KviMdiManager::reloadImages() bool KviMdiManager::focusNextPrevChild(bool bNext) { //bug("FFFFFF"); - // this is a QScrollView bug... it doesn't pass this + // this is a TQScrollView bug... it doesn't pass this // event to the toplevel window return m_pFrm->focusNextPrevChild(bNext); } -void KviMdiManager::drawContents(QPainter *p,int x,int y,int w,int h) +void KviMdiManager::drawContents(TQPainter *p,int x,int y,int w,int h) { //debug("MY DRAW CONTENTS (%d,%d,%d,%d)",x,y,w,h); - QRect r(x,y,w,h); + TQRect r(x,y,w,h); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedParentGlobalDesktopBackground) { - QPoint pnt = viewport()->mapToGlobal(contentsToViewport(r.topLeft())); + TQPoint pnt = viewport()->mapToGlobal(contentsToViewport(r.topLeft())); p->drawTiledPixmap(r,*(g_pShadedParentGlobalDesktopBackground),pnt); return; } @@ -146,7 +146,7 @@ void KviMdiManager::drawContents(QPainter *p,int x,int y,int w,int h) } } -void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,QRect *setGeom) +void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,TQRect *setGeom) { __range_valid(lpC); @@ -154,11 +154,11 @@ void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,QRect *setGeom) if(bCascade) { - QPoint p = getCascadePoint(m_pZ->count()-1); + TQPoint p = getCascadePoint(m_pZ->count()-1); addChild(lpC,p.x(),p.y()); } else { // FIXME: is this right ? - QPoint p = lpC->pos(); + TQPoint p = lpC->pos(); if(p.x() < 0)p.setX(0); if(p.y() < 0)p.setY(0); addChild(lpC,p.x(),p.y()); @@ -199,7 +199,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) return; // no such child ? } - // disable the labels of all the other children + // disable the labels of all the other tqchildren //for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) //{ // pC->captionLabel()->setActive(false); @@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) { lpC->setFocus(); /* - if(topLevelWidget()->isActiveWindow()) + if(tqtopLevelWidget()->isActiveWindow()) { } @@ -234,7 +234,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) } } -void KviMdiManager::focusInEvent(QFocusEvent *) +void KviMdiManager::focusInEvent(TQFocusEvent *) { focusTopChild(); } @@ -278,14 +278,14 @@ KviMdiChild * KviMdiManager::highestChildExcluding(KviMdiChild * pChild) return c; } -QPoint KviMdiManager::getCascadePoint(int indexOfWindow) +TQPoint KviMdiManager::getCascadePoint(int indexOfWindow) { - QPoint pnt(0,0); + TQPoint pnt(0,0); if(indexOfWindow==0)return pnt; KviMdiChild *lpC=m_pZ->first(); int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20); - int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); - int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH); + int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); + int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH); int ax=0; int ay=0; for(int i=0;i<indexOfWindow;i++) @@ -300,7 +300,7 @@ QPoint KviMdiManager::getCascadePoint(int indexOfWindow) return pnt; } -void KviMdiManager::mousePressEvent(QMouseEvent *e) +void KviMdiManager::mousePressEvent(TQMouseEvent *e) { //Popup the window menu if(e->button() & Qt::RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); @@ -313,8 +313,8 @@ void KviMdiManager::childMoved(KviMdiChild *) void KviMdiManager::maximizeChild(KviMdiChild * lpC) { - // the children must be moved once by the means of QScrollView::moveChild() - // so the QScrollView internal structures get updated with the negative + // the tqchildren must be moved once by the means of TQScrollView::moveChild() + // so the TQScrollView internal structures get updated with the negative // position of the widget, otherwise, when restoring with moveChild() // it will refuse to move it back to the original position resizeContents(visibleWidth(),visibleHeight()); @@ -338,14 +338,14 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC) lpC->setFocus(); } - // fixme: we could hide all the other children now! + // fixme: we could hide all the other tqchildren now! } -void KviMdiManager::resizeEvent(QResizeEvent *e) +void KviMdiManager::resizeEvent(TQResizeEvent *e) { - //If we have a maximized children at the top , adjust its size + //If we have a maximized tqchildren at the top , adjust its size KviTalScrollView::resizeEvent(e); KviMdiChild *lpC=m_pZ->last(); if(lpC) @@ -378,7 +378,7 @@ void KviMdiManager::childMaximized(KviMdiChild * lpC) void KviMdiManager::childMinimized(KviMdiChild * lpC,bool bWasMaximized) { __range_valid(lpC); - if(m_pZ->findRef(lpC) == -1)return; + if(m_pZ->tqfindRef(lpC) == -1)return; if(m_pZ->count() > 1) { m_pZ->setAutoDelete(false); @@ -431,7 +431,7 @@ void KviMdiManager::focusTopChild() if(!lpC->isVisible())return; // if(lpC->state()==KviMdiChild::Minimized)return; // debug("Focusing top child %s",lpC->name()); - //disable the labels of all the other children + //disable the labels of all the other tqchildren for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) { if(pC != lpC) @@ -506,23 +506,23 @@ void KviMdiManager::updateSDIMode() #ifndef Q_OS_MACX KviMenuBar * b = m_pFrm->mainMenuBar(); - const QPixmap * pix = lpC ? lpC->icon() : 0; + const TQPixmap * pix = lpC ? lpC->icon() : 0; if(!pix)pix = g_pIconManager->getSmallIcon(KVI_SMALLICON_NONE); else if(pix->isNull())pix = g_pIconManager->getSmallIcon(KVI_SMALLICON_NONE); if(!m_pSdiIconButton) { m_pSdiIconButton = new KviMenuBarToolButton(b,*pix,"nonne"); - connect(m_pSdiIconButton,SIGNAL(clicked()),this,SLOT(activeChildSystemPopup())); + connect(m_pSdiIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(activeChildSystemPopup())); #ifdef COMPILE_USE_QT4 - // This is an obscure, undocumented and internal function in QT4 QMenuBar + // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... - b->setCornerWidget(m_pSdiIconButton,Qt::TopLeftCorner); + b->setCornerWidget(m_pSdiIconButton,TQt::TopLeftCorner); m_pSdiIconButton->show(); #else m_iSdiIconItemId = b->insertItem(m_pSdiIconButton,-1,0); #endif - connect(m_pSdiIconButton,SIGNAL(destroyed()),this,SLOT(sdiIconButtonDestroyed())); + connect(m_pSdiIconButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiIconButtonDestroyed())); } else { m_pSdiIconButton->setPixmap(*pix); } @@ -533,12 +533,12 @@ void KviMdiManager::activeChildSystemPopup() { KviMdiChild * lpC = m_pZ->last(); if(!lpC)return; - QPoint pnt; + TQPoint pnt; if(m_pSdiIconButton) { - pnt = m_pSdiIconButton->mapToGlobal(QPoint(0,m_pSdiIconButton->height())); + pnt = m_pSdiIconButton->mapToGlobal(TQPoint(0,m_pSdiIconButton->height())); } else { - pnt = QCursor::pos(); + pnt = TQCursor::pos(); } lpC->emitSystemPopupRequest(pnt); } @@ -555,7 +555,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) { KviMenuBar * b = m_pFrm->mainMenuBar(); - QWidget * pButtonParent; + TQWidget * pButtonParent; #ifdef COMPILE_USE_QT4 m_pSdiControls = new KviTalHBox(b); @@ -567,31 +567,31 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) pButtonParent = b; #endif m_pSdiMinimizeButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),"btnminimize"); - connect(m_pSdiMinimizeButton,SIGNAL(clicked()),this,SLOT(minimizeActiveChild())); + connect(m_pSdiMinimizeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(minimizeActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiMinimizeItemId = b->insertItem(m_pSdiMinimizeButton,-1,b->count()); #endif - connect(m_pSdiMinimizeButton,SIGNAL(destroyed()),this,SLOT(sdiMinimizeButtonDestroyed())); + connect(m_pSdiMinimizeButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiMinimizeButtonDestroyed())); m_pSdiRestoreButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),"btnrestore"); - connect(m_pSdiRestoreButton,SIGNAL(clicked()),this,SLOT(restoreActiveChild())); + connect(m_pSdiRestoreButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(restoreActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiRestoreItemId = b->insertItem(m_pSdiRestoreButton,-1,b->count()); #endif - connect(m_pSdiRestoreButton,SIGNAL(destroyed()),this,SLOT(sdiRestoreButtonDestroyed())); + connect(m_pSdiRestoreButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiRestoreButtonDestroyed())); m_pSdiCloseButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),"btnclose"); - connect(m_pSdiCloseButton,SIGNAL(clicked()),this,SLOT(closeActiveChild())); + connect(m_pSdiCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiCloseItemId = b->insertItem(m_pSdiCloseButton,-1,b->count()); #endif - connect(m_pSdiCloseButton,SIGNAL(destroyed()),this,SLOT(sdiCloseButtonDestroyed())); + connect(m_pSdiCloseButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiCloseButtonDestroyed())); #ifdef COMPILE_USE_QT4 - // This is an obscure, undocumented and internal function in QT4 QMenuBar + // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... - b->setCornerWidget(m_pSdiControls,Qt::TopRightCorner); - // The show below SHOULD force a re-layout of the menubar.. + b->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); + // The show below SHOULD force a re-tqlayout of the menubar.. // but it doesn't work when the KviFrame is still hidden (at startup) // We handle this BUG in showEvent() m_pSdiControls->show(); @@ -608,15 +608,15 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) updateSDIMode(); } -void KviMdiManager::relayoutMenuButtons() +void KviMdiManager::retqlayoutMenuButtons() { #ifdef COMPILE_USE_QT4 - // force a re-layout of the menubar in Qt4 (see the note in enterSDIMode()) + // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget if(m_pSdiControls) { - m_pFrm->mainMenuBar()->setCornerWidget(0,Qt::TopRightCorner); - m_pFrm->mainMenuBar()->setCornerWidget(m_pSdiControls,Qt::TopRightCorner); + m_pFrm->mainMenuBar()->setCornerWidget(0,TQt::TopRightCorner); + m_pFrm->mainMenuBar()->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); } // also force an activation of the top MdiChild since it probably didn't get it yet KviMdiChild * c = topChild(); @@ -662,7 +662,7 @@ void KviMdiManager::leaveSDIMode() } if(m_pSdiIconButton) { - m_pSdiIconButton->hide(); // this will force a QMenuBar relayout + m_pSdiIconButton->hide(); // this will force a TQMenuBar retqlayout delete m_pSdiIconButton; m_pSdiIconButton = 0; } @@ -693,31 +693,31 @@ void KviMdiManager::fillWindowPopup() { m_pWindowPopup->clear(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,SLOT(cascadeWindows())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,SLOT(cascadeMaximized())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,TQT_SLOT(cascadeWindows())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,TQT_SLOT(cascadeMaximized())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,SLOT(tile())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,TQT_SLOT(tile())); m_pTileMethodPopup->clear(); - int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,SLOT(toggleAutoTile())); + int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,TQT_SLOT(toggleAutoTile())); m_pTileMethodPopup->setItemChecked(id,KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)); m_pTileMethodPopup->setItemParameter(id,-1); m_pTileMethodPopup->insertSeparator(); int ids[KVI_NUM_TILE_METHODS]; ids[KVI_TILE_METHOD_ANODINE] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Anodine's Full Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_ANODINE],KVI_TILE_METHOD_ANODINE); - ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4HOR],KVI_TILE_METHOD_PRAGMA4HOR); - ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4VER],KVI_TILE_METHOD_PRAGMA4VER); - ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6HOR],KVI_TILE_METHOD_PRAGMA6HOR); - ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6VER],KVI_TILE_METHOD_PRAGMA6VER); - ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9HOR],KVI_TILE_METHOD_PRAGMA9HOR); - ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9VER],KVI_TILE_METHOD_PRAGMA9VER); if(KVI_OPTION_UINT(KviOption_uintTileMethod) >= KVI_NUM_TILE_METHODS)KVI_OPTION_UINT(KviOption_uintTileMethod) = KVI_TILE_METHOD_PRAGMA9HOR; @@ -726,17 +726,17 @@ void KviMdiManager::fillWindowPopup() m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Tile Met&hod")),m_pTileMethodPopup); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,SLOT(expandVertical())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,SLOT(expandHorizontal())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,TQT_SLOT(expandVertical())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,TQT_SLOT(expandHorizontal())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,SLOT(minimizeAll())); -// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,SLOT(restoreAll())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,TQT_SLOT(minimizeAll())); +// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,TQT_SLOT(restoreAll())); // m_pWindowPopup->insertSeparator(); int i=100; - QString szItem; - QString szCaption; + TQString szItem; + TQString szCaption; for(KviMdiChild *lpC=m_pZ->first();lpC;lpC=m_pZ->next()) { szItem.setNum(((uint)i)-99); @@ -745,7 +745,7 @@ void KviMdiManager::fillWindowPopup() szCaption = lpC->plainCaption(); if(szCaption.length() > 30) { - QString trail = szCaption.right(12); + TQString trail = szCaption.right(12); szCaption.truncate(12); szCaption+="..."; szCaption+=trail; @@ -757,7 +757,7 @@ void KviMdiManager::fillWindowPopup() szItem+=szCaption; szItem+=")"; } else szItem+=szCaption; - const QPixmap * pix = lpC->icon(); + const TQPixmap * pix = lpC->icon(); if(pix && !(pix->isNull()))m_pWindowPopup->insertItem(*pix,szItem,i); else m_pWindowPopup->insertItem(szItem,i); m_pWindowPopup->setItemChecked(i,((uint)i)==(m_pZ->count()+99)); @@ -812,9 +812,9 @@ void KviMdiManager::cascadeWindows() KviMdiChild *lpC=list.first(); if(lpC->state() != KviMdiChild::Minimized) { - QPoint p = getCascadePoint(idx); + TQPoint p = getCascadePoint(idx); moveChild(lpC,p.x(),p.y()); - lpC->resize(lpC->sizeHint()); + lpC->resize(lpC->tqsizeHint()); idx++; } list.removeFirst(); @@ -841,11 +841,11 @@ void KviMdiManager::cascadeMaximized() KviMdiChild *lpC=list.first(); if(lpC->state() != KviMdiChild::Minimized) { - QPoint pnt(getCascadePoint(idx)); + TQPoint pnt(getCascadePoint(idx)); moveChild(lpC,pnt.x(),pnt.y()); - QSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); - if((lpC->minimumSize().width() > curSize.width()) || - (lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize()); + TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); + if((lpC->tqminimumSize().width() > curSize.width()) || + (lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize()); else lpC->resize(curSize); idx++; } @@ -930,7 +930,7 @@ void KviMdiManager::restoreAll() while(!list.isEmpty()) { KviMdiChild *lpC=list.first(); - if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).contains("CONSOLE") )) + if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).tqcontains("CONSOLE") )) lpC->restore(); list.removeFirst(); } @@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal) int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible); int xQuantum=viewport()->width()/pColstable[numToHandle-1]; - if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ + if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space"); else tileAllInternal(pColrecall[numToHandle-1],bHorizontal); return; } int yQuantum=viewport()->height()/pRowstable[numToHandle-1]; - if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ + if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space"); else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal); return; @@ -1073,7 +1073,7 @@ void KviMdiManager::tileAnodine() int numVisible=getVisibleChildCount(); // count visible windows if(numVisible<1)return; int numCols=int(sqrt((double)numVisible)); // set columns to square root of visible count - // create an array to form grid layout + // create an array to form grid tqlayout int *numRows=new int[numCols]; int numCurCol=0; while(numCurCol<numCols) diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index 17202fa0..cd5e84d8 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -28,10 +28,10 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qframe.h> -#include <qpixmap.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqframe.h> +#include <tqpixmap.h> +#include <tqtoolbutton.h> #include "kvi_tal_scrollview.h" @@ -59,13 +59,14 @@ class KVIRC_API KviMdiManager : public KviTalScrollView friend class KviMdiChild; friend class KviMdiCaption; Q_OBJECT + TQ_OBJECT public: - KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name); + KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name); ~KviMdiManager(); public: KviMdiChild * topChild(){ return m_pZ->last(); }; KviMdiChild * highestChildExcluding(KviMdiChild * pChild); - void manageChild(KviMdiChild * lpC,bool bCascade = true,QRect * setGeom = 0); + void manageChild(KviMdiChild * lpC,bool bCascade = true,TQRect * setGeom = 0); void setTopChild(KviMdiChild *lpC,bool bSetFocus); void showAndActivate(KviMdiChild * lpC); KviTalPopupMenu * windowPopup(){ return m_pWindowPopup; }; @@ -99,13 +100,13 @@ protected: void childRestored(KviMdiChild *lpC,bool bWasMaximized); void childMoved(KviMdiChild * lpC); void maximizeChild(KviMdiChild * lpC); - virtual void focusInEvent(QFocusEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void drawContents(QPainter * p,int x,int y,int w,int h); + virtual void focusInEvent(TQFocusEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void drawContents(TQPainter * p,int x,int y,int w,int h); virtual bool focusNextPrevChild(bool pNext); public slots: - void relayoutMenuButtons(); + void retqlayoutMenuButtons(); void cascadeWindows(); void cascadeMaximized(); void expandVertical(); @@ -132,7 +133,7 @@ protected slots: private: void ensureNoMaximized(); void tileAllInternal(int maxWnds,bool bHorizontal); - QPoint getCascadePoint(int indexOfWindow); + TQPoint getCascadePoint(int indexOfWindow); void enterSDIMode(KviMdiChild *lpC); void leaveSDIMode(); void updateSDIMode(); diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index a382f738..6401ed85 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -51,39 +51,39 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name) m_pDefaultItemId = 0; KviTalPopupMenu * pop = new KviTalPopupMenu(this,"KVIrc"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupMainPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMainPopup())); #ifndef Q_OS_MACX addDefaultItem("&KVIrc",pop); #else - // Qt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-) + // TQt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-) addDefaultItem("&IRC",pop); #endif //Q_OS_MACX m_pRecentServersPopup = new KviTalPopupMenu(this,"recentservers"); - connect(m_pRecentServersPopup,SIGNAL(aboutToShow()),this,SLOT(setupRecentServersPopup())); - connect(m_pRecentServersPopup,SIGNAL(activated(int)),this,SLOT(newConnectionToServer(int))); + connect(m_pRecentServersPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupRecentServersPopup())); + connect(m_pRecentServersPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(newConnectionToServer(int))); m_pScriptItemList = 0; pop = new KviTalPopupMenu(this,"scripting"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupScriptingPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupScriptingPopup())); addDefaultItem(__tr2qs("Scri&pting"),pop); pop = new KviTalPopupMenu(this,"tools"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupToolsPopup())); - connect(pop,SIGNAL(activated(int)),this,SLOT(toolsPopupSelected(int))); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolsPopup())); + connect(pop,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolsPopupSelected(int))); addDefaultItem(__tr2qs("&Tools"),pop); m_pToolbarsPopup = new KviTalPopupMenu(this,"toolbars"); - connect(m_pToolbarsPopup,SIGNAL(aboutToShow()),this,SLOT(setupToolbarsPopup())); + connect(m_pToolbarsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolbarsPopup())); pop = new KviTalPopupMenu(this,"settings"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupSettingsPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupSettingsPopup())); addDefaultItem(__tr2qs("&Settings"),pop); addDefaultItem(__tr2qs("&Window"),par->mdiManager()->windowPopup()); pop = new KviTalPopupMenu(this,"help"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupHelpPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupHelpPopup())); addDefaultItem(__tr2qs("&Help"),pop); } @@ -93,17 +93,17 @@ KviMenuBar::~KviMenuBar() if(m_pDefaultItemId)kvi_free(m_pDefaultItemId); } -void KviMenuBar::showEvent(QShowEvent *e) +void KviMenuBar::showEvent(TQShowEvent *e) { #ifdef COMPILE_USE_QT4 debug("menubar show"); - // force a re-layout of the menubar in Qt4 (see the note in enterSDIMode()) + // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget - m_pFrm->mdiManager()->relayoutMenuButtons(); + m_pFrm->mdiManager()->retqlayoutMenuButtons(); #endif } -void KviMenuBar::addDefaultItem(const QString &text,KviTalPopupMenu * pop) +void KviMenuBar::addDefaultItem(const TQString &text,KviTalPopupMenu * pop) { m_iNumDefaultItems++; m_pDefaultItemId = (int *)kvi_realloc((void *)m_pDefaultItemId,sizeof(int) * m_iNumDefaultItems); @@ -116,52 +116,52 @@ void KviMenuBar::setupHelpPopup() help->clear(); // FIXME: Convert these to actions! - int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWSTATICWINDOW); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWMDIWINDOW); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_TIP_OPEN); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE); if(kvi_strEqualCIN(KviLocale::localeName(),"ru",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_FR); } help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_MAILINGLIST); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_BUGTRACK); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET); if(kvi_strEqualCIN(KviLocale::localeName(),"it",2)) { // join #kvirc.net on azzurra - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { // join #kvirc-fr on freenode - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_FREENODE); // join #kvirc on europnet - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_EUROPNET); } // add your localized #kvirc channels here... @@ -176,7 +176,7 @@ void KviMenuBar::setupSettingsPopup() opt->insertItem(__tr2qs("Toolbars"),m_pToolbarsPopup); - int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,SLOT(toggleStatusBar())); + int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,TQT_SLOT(toggleStatusBar())); opt->setItemChecked(id,m_pFrm->mainStatusBar()); @@ -191,7 +191,7 @@ void KviMenuBar::setupSettingsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EDITREGUSERS,opt) opt->insertSeparator(); - opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration())); + opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,TQT_SLOT(saveConfiguration())); } void KviMenuBar::setupScriptingPopup() @@ -210,7 +210,7 @@ void KviMenuBar::setupScriptingPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EXECUTEKVS,script) script->insertSeparator(); - script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,SLOT(restoreDefaultScript())); + script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,TQT_SLOT(restoreDefaultScript())); } void KviMenuBar::setupMainPopup() @@ -222,8 +222,8 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->activeContext()) if(m_pFrm->activeContext()->state()==KviIrcContext::Connected) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,SLOT(executeInternalCommand(int))); - main->setItemParameter(id,KVI_INTERNALCOMMAND_QUIT); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs("Disconnect"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + main->setItemParameter(id,KVI_INTERNALCOMMAND_TQUIT); } main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs("New &Connection To"),m_pRecentServersPopup); @@ -231,18 +231,18 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->dockExtension()) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE); } else { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } -// Qt/Mac creates a Quit item on its own +// TQt/Mac creates a Quit item on its own #ifndef Q_OS_MACX main->insertSeparator(); - main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,SLOT(quit())); + main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit())); #endif //Q_OS_MACX } @@ -257,7 +257,7 @@ void KviMenuBar::setupRecentServersPopup() void KviMenuBar::newConnectionToServer(int id) { - QString text = m_pRecentServersPopup->text(id); + TQString text = m_pRecentServersPopup->text(id); if(!text.isEmpty()) { // the gentoo qt 3.3.4-r2 is broken @@ -266,7 +266,7 @@ void KviMenuBar::newConnectionToServer(int id) { KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole()); } else { - text.replace(QString("&"),QString("")); + text.tqreplace(TQString("&"),TQString("")); KviStr szCommand; if(KviIrcUrl::parse(text.utf8().data(),szCommand,KVI_IRCURL_CONTEXT_NEW)) KviKvsScript::run(szCommand.ptr(),m_pFrm->firstConsole()); @@ -302,10 +302,10 @@ void KviMenuBar::setupToolsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_SCREENSHOT,m) // moved the old tools here - m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,SLOT(showIconWidget())); + m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQT_SLOT(showIconWidget())); #ifdef COMPILE_KDE_SUPPORT int id; - id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,SLOT(executeInternalCommand(int))); + id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN); #endif @@ -351,12 +351,12 @@ int KviMenuBar::getDefaultItemRealIndex(int iDefaultIndex) return indexOf(m_pDefaultItemId[iDefaultIndex]); } -KviScriptMenuBarItem * KviMenuBar::findMenu(const QString &text) +KviScriptMenuBarItem * KviMenuBar::findMenu(const TQString &text) { if(!m_pScriptItemList)return 0; for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next()) { - if(KviQString::equalCI(i->szText,text))return i; + if(KviTQString::equalCI(i->szText,text))return i; } return 0; } @@ -371,12 +371,12 @@ KviScriptMenuBarItem * KviMenuBar::findMenu(KviKvsPopupMenu * p) return 0; } -bool KviMenuBar::removeMenu(const QString &text) +bool KviMenuBar::removeMenu(const TQString &text) { KviScriptMenuBarItem * i = findMenu(text); if(i) { - disconnect(i->pPopup,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); + disconnect(i->pPopup,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); removeItem(i->id); m_pScriptItemList->removeRef(i); return true; @@ -394,7 +394,7 @@ void KviMenuBar::menuDestroyed() } } -void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) +void KviMenuBar::addMenu(const TQString &text,KviKvsPopupMenu * p,int index) { if(!m_pScriptItemList) { @@ -408,7 +408,7 @@ void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) it->szPopupName = p->name(); it->pPopup = p; it->id = insertItem(text,p,-1,index); - connect(p,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); + connect(p,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); m_pScriptItemList->append(it); } diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h index 3095913b..ba723ea1 100644 --- a/src/kvirc/ui/kvi_menubar.h +++ b/src/kvirc/ui/kvi_menubar.h @@ -48,6 +48,7 @@ typedef struct _KviScriptMenuBarItem class KVIRC_API KviMenuBar : public KviTalMenuBar { Q_OBJECT + TQ_OBJECT public: KviMenuBar(KviFrame * par,const char * name); ~KviMenuBar(); @@ -59,14 +60,14 @@ protected: int m_iNumDefaultItems; int * m_pDefaultItemId; protected: - KviScriptMenuBarItem * findMenu(const QString &text); + KviScriptMenuBarItem * findMenu(const TQString &text); KviScriptMenuBarItem * findMenu(KviKvsPopupMenu * p); - void addDefaultItem(const QString &text,KviTalPopupMenu * pop); - virtual void showEvent(QShowEvent *e); + void addDefaultItem(const TQString &text,KviTalPopupMenu * pop); + virtual void showEvent(TQShowEvent *e); public: int getDefaultItemRealIndex(int iDefaultIndex); - void addMenu(const QString &text,KviKvsPopupMenu * p,int index); - bool removeMenu(const QString &text); + void addMenu(const TQString &text,KviKvsPopupMenu * p,int index); + bool removeMenu(const TQString &text); protected slots: void menuDestroyed(); void setupMainPopup(); diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index f72d0a22..11f781b4 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -33,8 +33,8 @@ #include "kvi_toolwindows_container.h" #include "kvi_tal_scrollview.h" -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> ////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ // FIXME: This widget should use a KviTalScrollView! -KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit) +KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit) : KviWindowToolWidget(par,button) { m_szMode = mode; @@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const m_szLimit = limit; bool isEnabled=1; - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -63,80 +63,80 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->parent(); + w = w->tqparent(); } - QGridLayout *pMasterLayout = new QGridLayout(this,2,1,2,2); + TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif KviTalScrollView *pScrollView = new KviTalScrollView(this); #ifdef COMPILE_USE_QT4 - pScrollView->viewport()->setBackgroundRole(QPalette::Background); + pScrollView->viewport()->setBackgroundRole(TQPalette::Background); #else - pScrollView->viewport()->setBackgroundMode(QWidget::PaletteBackground); + pScrollView->viewport()->setBackgroundMode(TQWidget::PaletteBackground); #endif pMasterLayout->addWidget(pScrollView,0,0); pMasterLayout->setRowStretch(1,1); - QPushButton * b; - if(isEnabled) b = new QPushButton(__tr2qs("&Apply"),this); - else b = new QPushButton(__tr2qs("Close"),this); + TQPushButton * b; + if(isEnabled) b = new TQPushButton(__tr2qs("&Apply"),this); + else b = new TQPushButton(__tr2qs("Close"),this); pMasterLayout->addWidget(b,1,0); - connect(b,SIGNAL(clicked()),this,SLOT(commit())); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(commit())); - QWidget * pBackground = new QWidget(pScrollView->viewport()); + TQWidget * pBackground = new TQWidget(pScrollView->viewport()); - QGridLayout *g = new QGridLayout(pBackground,20,3,2,2); + TQGridLayout *g = new TQGridLayout(pBackground,20,3,2,2); - QLabel * l = new QLabel("",pBackground); + TQLabel * l = new TQLabel("",pBackground); l->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE))); g->addWidget(l,0,0); - l = new QLabel(__tr2qs("Channel Modes"),pBackground); + l = new TQLabel(__tr2qs("Channel Modes"),pBackground); g->addMultiCellWidget(l,0,0,1,2); - QFrame * f = new QFrame(pBackground); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * f = new TQFrame(pBackground); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(f,1,1,0,2); int i = 1; - QString tmp; + TQString tmp; m_pCheckBoxes = new KviPointerList<KviStyledCheckBox>; m_pCheckBoxes->setAutoDelete(false); // first che basic checkable modes pstnmi - QString szModes = "pstnmi"; + TQString szModes = "pstnmi"; while(!szModes.isEmpty()) { - QChar ccc = szModes[0]; + TQChar ccc = szModes[0]; szModes.remove(0,1); - KviQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.unicode())); + cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } - KviQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); + KviTQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); m_pLimitBox = new KviStyledCheckBox(tmp,pBackground); m_pLimitBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pLimitBox,i,i,0,2); - connect(m_pLimitBox,SIGNAL(toggled(bool)),this,SLOT(limitBoxToggled(bool))); - m_pLimitEdit = new QLineEdit(pBackground); + connect(m_pLimitBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(limitBoxToggled(bool))); + m_pLimitEdit = new TQLineEdit(pBackground); m_pLimitEdit->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pLimitEdit,i,i,1,2); @@ -149,13 +149,13 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const m_pLimitEdit->setEnabled(false); } - KviQString::sprintf(tmp,"k: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('k'))); + KviTQString::sprintf(tmp,"k: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('k'))); m_pKeyBox = new KviStyledCheckBox(tmp,pBackground); m_pKeyBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pKeyBox,i,i,0,2); - connect(m_pKeyBox,SIGNAL(toggled(bool)),this,SLOT(keyBoxToggled(bool))); - m_pKeyEdit = new QLineEdit(pBackground); + connect(m_pKeyBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(keyBoxToggled(bool))); + m_pKeyEdit = new TQLineEdit(pBackground); m_pKeyEdit->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pKeyEdit,i,i,1,2); @@ -174,30 +174,30 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const szModes = c->connection()->serverInfo()->supportedChannelModes(); } - int idx = szModes.findRev(','); + int idx = szModes.tqfindRev(','); if(idx != -1)szModes.remove(0,idx+1); - szModes.replace("p",""); - szModes.replace("s",""); - szModes.replace("t",""); - szModes.replace("n",""); - szModes.replace("m",""); - szModes.replace("i",""); - szModes.replace(",",""); - szModes.replace("b",""); - szModes.replace("k",""); - szModes.replace("l",""); + szModes.tqreplace("p",""); + szModes.tqreplace("s",""); + szModes.tqreplace("t",""); + szModes.tqreplace("n",""); + szModes.tqreplace("m",""); + szModes.tqreplace("i",""); + szModes.tqreplace(",",""); + szModes.tqreplace("b",""); + szModes.tqreplace("k",""); + szModes.tqreplace("l",""); while(!szModes.isEmpty()) { - QChar ccc = szModes[0]; + TQChar ccc = szModes[0]; szModes.remove(0,1); - KviQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.unicode())); + cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -310,16 +310,16 @@ void KviModeEditor::commit() for(KviStyledCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next()) { - QString sz = cb->text(); - sz.replace("&",""); + TQString sz = cb->text(); + sz.tqreplace("&",""); if(sz.length() > 0) { - QChar ccc = sz[0]; + TQChar ccc = sz[0]; if(cb->isChecked()) { - if(!m_szMode.contains((char)ccc.unicode()))szPlusModes.append((char)ccc.unicode()); + if(!m_szMode.tqcontains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); } else { - if(m_szMode.contains((char)ccc.unicode()))szMinusModes.append((char)ccc.unicode()); + if(m_szMode.tqcontains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); } } } diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h index 06512d9b..72057070 100644 --- a/src/kvirc/ui/kvi_modeeditor.h +++ b/src/kvirc/ui/kvi_modeeditor.h @@ -25,11 +25,11 @@ #include "kvi_settings.h" -#include <qwidget.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "kvi_string.h" #include "kvi_pointerlist.h" @@ -46,8 +46,9 @@ class KviConsole; class KVIRC_API KviModeEditor : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit); + KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit); ~KviModeEditor(); protected: // fields KviStr m_szMode; @@ -55,9 +56,9 @@ protected: // fields KviStr m_szLimit; KviPointerList<KviStyledCheckBox> * m_pCheckBoxes; KviStyledCheckBox * m_pLimitBox; - QLineEdit * m_pLimitEdit; + TQLineEdit * m_pLimitEdit; KviStyledCheckBox * m_pKeyBox; - QLineEdit * m_pKeyEdit; + TQLineEdit * m_pKeyEdit; signals: void setMode(const char *); void done(); diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index a0cf85e4..8725933a 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -29,13 +29,13 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_qcstring.h" -#include <qframe.h> -#include <qlineedit.h> +#include <tqframe.h> +#include <tqlineedit.h> #include "kvi_tal_hbox.h" -#include <qevent.h> +#include <tqevent.h> -KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) -:QFrame(par,name) +KviModeWidget::KviModeWidget(TQWidget * par,KviChannel* chan,const char * name) +:TQFrame(par,name) { m_pChannel=chan; m_pLabel=0; @@ -43,7 +43,7 @@ KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif reset(); } @@ -63,8 +63,8 @@ void KviModeWidget::reset() m_pLabel=new KviThemedLabel(this,0); refreshModes(); m_pLabel->show(); - connect(m_pLabel,SIGNAL(doubleClicked()),this,SLOT(labelDoubleClick())); - QResizeEvent* ev=new QResizeEvent(size(),size()); + connect(m_pLabel,TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(labelDoubleClick())); + TQResizeEvent* ev=new TQResizeEvent(size(),size()); resizeEvent(ev); delete ev; if(m_pChannel->input()) @@ -73,11 +73,11 @@ void KviModeWidget::reset() void KviModeWidget::refreshModes() { - QString szMode=m_pChannel->channelMode(); + TQString szMode=m_pChannel->channelMode(); if(!m_pChannel->channelKey().isEmpty()) - szMode+=QString(" k:%1").arg(m_pChannel->channelKey()); + szMode+=TQString(" k:%1").tqarg(m_pChannel->channelKey()); if(!m_pChannel->channelLimit().isEmpty()) - szMode+=QString(" l:%1").arg(m_pChannel->channelLimit().ptr()); + szMode+=TQString(" l:%1").tqarg(m_pChannel->channelLimit().ptr()); if(m_pLabel) m_pLabel->setText(szMode); } @@ -88,9 +88,9 @@ void KviModeWidget::applyOptions() m_pLabel->applyOptions(); } -void KviModeWidget::resizeEvent(QResizeEvent *e) +void KviModeWidget::resizeEvent(TQResizeEvent *e) { - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); if(m_pLabel) { m_pLabel->setGeometry(0,0,width(),height()); @@ -107,66 +107,66 @@ void KviModeWidget::labelDoubleClick() { delete m_pLabel; m_pLabel=0; - m_pLineEdit = new QLineEdit(this,0); + m_pLineEdit = new TQLineEdit(this,0); m_pLineEdit->setText(m_pChannel->channelMode()); m_pLineEdit->show(); m_pLineEdit->setFocus(); - resizeEvent(new QResizeEvent(size(),size())); + resizeEvent(new TQResizeEvent(size(),size())); m_pLineEdit->installEventFilter( this ); - connect(m_pLineEdit,SIGNAL(textChanged ( const QString & ) ),this,SLOT(editorTextChanged( const QString & ))); + connect(m_pLineEdit,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(editorTextChanged( const TQString & ))); } } -bool KviModeWidget::eventFilter( QObject *obj, QEvent *ev ) +bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev ) { - if( (obj==m_pLineEdit) && ( ev->type() == QEvent::KeyPress ) ) + if( (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_pLineEdit)) && ( ev->type() == TQEvent::KeyPress ) ) { - QKeyEvent *keyEvent = (QKeyEvent*)ev; + TQKeyEvent *keyEvent = (TQKeyEvent*)ev; switch(keyEvent->key()) { - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: editorReturnPressed(); return TRUE; - case Qt::Key_Escape: + case TQt::Key_Escape: reset(); return TRUE; } } - return QFrame::eventFilter( obj, ev ); + return TQFrame::eventFilter( obj, ev ); } void KviModeWidget::editorReturnPressed() { - QString szCurModes=m_pChannel->channelMode(); - QString szNewModes=m_pLineEdit->text(); - QString szMinusModes; + TQString szCurModes=m_pChannel->channelMode(); + TQString szNewModes=m_pLineEdit->text(); + TQString szMinusModes; for(int i=0; i<szCurModes.length(); i++) { - if(szNewModes.contains(szCurModes[i])) + if(szNewModes.tqcontains(szCurModes[i])) szNewModes.remove(szCurModes[i]); else szMinusModes+=szCurModes[i]; } - QString mode; - if(!szMinusModes.isEmpty()) mode+=QString("-"+szMinusModes); - if(!szNewModes.isEmpty()) mode+=QString("+"+szNewModes); + TQString mode; + if(!szMinusModes.isEmpty()) mode+=TQString("-"+szMinusModes); + if(!szNewModes.isEmpty()) mode+=TQString("+"+szNewModes); if(!mode.isEmpty()) { - KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); + KviTQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); m_pChannel->connection()->sendFmtData("MODE %s %s",chan.data(),mode.utf8().data()); } reset(); } -void KviModeWidget::editorTextChanged( const QString & text) +void KviModeWidget::editorTextChanged( const TQString & text) { int i = 0; - QString szText=text; + TQString szText=text; for(i=0;i<szText.length();i++) { - if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || - szText.find(szText[i])<i ) + if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().tqcontains(szText[i]) || + szText.tqfind(szText[i])<i ) szText.remove(i,1); } m_pLineEdit->setText(szText); diff --git a/src/kvirc/ui/kvi_modew.h b/src/kvirc/ui/kvi_modew.h index 7efbc961..5799535a 100755 --- a/src/kvirc/ui/kvi_modew.h +++ b/src/kvirc/ui/kvi_modew.h @@ -27,16 +27,17 @@ #include "kvi_themedlabel.h" #include "kvi_channel.h" -#include <qframe.h> -#include <qlineedit.h> +#include <tqframe.h> +#include <tqlineedit.h> #include "kvi_tal_hbox.h" -class KVIRC_API KviModeWidget : public QFrame +class KVIRC_API KviModeWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KviModeWidget(QWidget * par,KviChannel* chan,const char * name=0); + KviModeWidget(TQWidget * par,KviChannel* chan,const char * name=0); ~KviModeWidget(); void reset(); void refreshModes(); @@ -44,14 +45,14 @@ public: private: KviChannel * m_pChannel; KviThemedLabel * m_pLabel; - QLineEdit * m_pLineEdit; + TQLineEdit * m_pLineEdit; protected: - void resizeEvent(QResizeEvent *e); - bool eventFilter( QObject *obj, QEvent *ev ); + void resizeEvent(TQResizeEvent *e); + bool eventFilter( TQObject *obj, TQEvent *ev ); public slots: void labelDoubleClick(); void editorReturnPressed(); - void editorTextChanged( const QString & ); + void editorTextChanged( const TQString & ); }; #endif //_KVI_MODEW_H_ diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp index 81cea104..5d02fab7 100644 --- a/src/kvirc/ui/kvi_msgbox.cpp +++ b/src/kvirc/ui/kvi_msgbox.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_KDE_SUPPORT #include <kmessagebox.h> #else - #include <qmessagebox.h> + #include <tqmessagebox.h> #endif //!COMPILE_WITH_KDE #include "kvi_malloc.h" @@ -38,48 +38,48 @@ namespace KviMessageBox { - void warning(const QString &fmt,...) + void warning(const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); #ifdef COMPILE_KDE_SUPPORT KMessageBox::error(0,s,"KVIrc"); #else - QMessageBox::warning(0,"KVIrc",s); + TQMessageBox::warning(0,"KVIrc",s); #endif } - void information(const QString &fmt,...) + void information(const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); #ifdef COMPILE_KDE_SUPPORT KMessageBox::information(0,s,"KVIrc"); #else - QMessageBox::information(0,"KVIrc",s); + TQMessageBox::information(0,"KVIrc",s); #endif } - bool yesNo(const QString &caption,const QString &fmt,...) + bool yesNo(const TQString &caption,const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); bool bRet; #ifdef COMPILE_KDE_SUPPORT bRet = (KMessageBox::questionYesNo(0,s,caption) == KMessageBox::Yes); #else - bRet = (QMessageBox::information(0,caption,s, - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No | QMessageBox::Escape) == QMessageBox::Yes); + bRet = (TQMessageBox::information(0,caption,s, + TQMessageBox::Yes | TQMessageBox::Default, + TQMessageBox::No | TQMessageBox::Escape) == TQMessageBox::Yes); #endif return bRet; } diff --git a/src/kvirc/ui/kvi_msgbox.h b/src/kvirc/ui/kvi_msgbox.h index 71b22a26..ddc338a7 100644 --- a/src/kvirc/ui/kvi_msgbox.h +++ b/src/kvirc/ui/kvi_msgbox.h @@ -45,9 +45,9 @@ class KviMessageBox : public KviTalMessageBox namespace KviMessageBox { - KVIRC_API void warning(const QString &fmt,...); - KVIRC_API void information(const QString &fmt,...); - KVIRC_API bool yesNo(const QString &caption,const QString &fmt,...); + KVIRC_API void warning(const TQString &fmt,...); + KVIRC_API void information(const TQString &fmt,...); + KVIRC_API bool yesNo(const TQString &caption,const TQString &fmt,...); }; #endif //!_KVI_MSGBOX_H_ diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 546d4b1e..28d986f4 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -38,11 +38,11 @@ #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE 6 -QString KviOptionsWidget::m_szBasicTipStart; // empty decl -QString KviOptionsWidget::m_szBasicTipEnd; +TQString KviOptionsWidget::m_szBasicTipStart; // empty decl +TQString KviOptionsWidget::m_szBasicTipEnd; -KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunken) -: QFrame(parent,name), KviSelectorInterface() +KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken) +: TQFrame(tqparent,name), KviSelectorInterface() { if(m_szBasicTipStart.isEmpty()) { @@ -53,8 +53,8 @@ KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunk } // FIXME: The bSunken value is ignored! - //if(bSunken)setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); - //setFrameStyle(QFrame::StyledPanel | QFrame::Plain); + //if(bSunken)setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); + //setFrameStyle(TQFrame::StyledPanel | TQFrame::Plain); m_pLayout = 0; m_pTabWidget = 0; m_iResetFlags = 0; @@ -68,19 +68,19 @@ KviOptionsWidget::~KviOptionsWidget() delete m_pSelectorInterfaceList; } -void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip) +void KviOptionsWidget::mergeTip(TQWidget * w,const TQString &tip) { - static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">"; - static QString mid = "</td></tr><tr><td>"; - static QString end = "</td></tr></table>"; + static TQString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">"; + static TQString mid = "</td></tr><tr><td>"; + static TQString end = "</td></tr></table>"; #ifdef COMPILE_USE_QT4 - QString s = w->toolTip(); + TQString s = w->toolTip(); #else - QString s = KviTalToolTip::textFor(w); + TQString s = KviTalToolTip::textFor(w); #endif if(s.isEmpty())KviTalToolTip::add(w,tip); else { - QString tmp = begin; + TQString tmp = begin; tmp += tip; tmp += mid; tmp += s; @@ -92,36 +92,36 @@ void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip) void KviOptionsWidget::createLayout(int rows,int cols) { if(m_pLayout)delete m_pLayout; - m_pLayout = new QGridLayout(this,rows,cols,KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER,KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE); + m_pLayout = new TQGridLayout(this,rows,cols,KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER,KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE); } void KviOptionsWidget::createTabbedPage() { createLayout(1,1); - layout()->setMargin(0); - layout()->setSpacing(0); - m_pTabWidget = new QTabWidget(this); + tqlayout()->setMargin(0); + tqlayout()->setSpacing(0); + m_pTabWidget = new TQTabWidget(this); addWidgetToLayout(m_pTabWidget,0,0,0,0); } -void KviOptionsWidget::addOptionsWidget(const QString &szText,const QIconSet &iconSet,KviOptionsWidget * pWidget) +void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget) { - if(pWidget->layout()) - pWidget->layout()->setMargin(10); + if(pWidget->tqlayout()) + pWidget->tqlayout()->setMargin(10); m_pTabWidget->addTab(pWidget,iconSet,szText); m_pSelectorInterfaceList->append(pWidget); } -void KviOptionsWidget::addWidgetToLayout(QWidget * w,int x1,int y1,int x2,int y2) +void KviOptionsWidget::addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2) { - if((x1 == x2) && (y1 == y2))layout()->addWidget(w,y1,x1); - else layout()->addMultiCellWidget(w,y1,y2,x1,x2); + if((x1 == x2) && (y1 == y2))tqlayout()->addWidget(w,y1,x1); + else tqlayout()->addMultiCellWidget(w,y1,y2,x1,x2); } /////////////////////////////////////////////////////////////////////////////////////////////////// -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviDirectorySelector * d = new KviDirectorySelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -129,7 +129,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviDirectorySelector * d = new KviDirectorySelector(pParent,txt,pOption,bEnabled); //addWidgetToLayout(d,x1,y1,x2,y2); @@ -137,12 +137,12 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent, return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviDirectorySelector * d = addDirectorySelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -150,12 +150,12 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviDirectorySelector * d = addDirectorySelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -167,7 +167,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent, /////////////////////////////////////////////////////////////////////////////////////////////////// -KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviFileSelector * d = new KviFileSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -175,19 +175,19 @@ KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2, return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviFileSelector * d = new KviFileSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviFileSelector * d = addFileSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -195,12 +195,12 @@ KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2, return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviFileSelector * d = addFileSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -211,7 +211,7 @@ KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QStr /////////////////////////////////////////////////////////////////////////////////////////////////// -KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviSoundSelector * d = new KviSoundSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -219,19 +219,19 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviSoundSelector * d = new KviSoundSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviSoundSelector * d = addSoundSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -239,12 +239,12 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviSoundSelector * d = addSoundSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -255,7 +255,7 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QS /////////////////////////////////////////////////////////////////////////////////////////////////// -KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,bool *pOption,bool bEnabled) { KviBoolSelector * b = new KviBoolSelector(this,txt,pOption,bEnabled); addWidgetToLayout(b,x1,y1,x2,y2); @@ -263,29 +263,29 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2, return b; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(TQWidget * pParent,const TQString & txt,bool *pOption,bool bEnabled) { KviBoolSelector * b = new KviBoolSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(b); return b; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_boolOptionsTable[optId].flags & KviOption_resetMask); KviBoolSelector * d = addBoolSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_BOOL(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_boolOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_boolOptionsTable[optId].flags & KviOption_resetMask); KviBoolSelector * d = addBoolSelector(pParent,txt,&(KVI_OPTION_BOOL(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_boolOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -295,7 +295,7 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QStr /////////////////////////////////////////////////////////////////////////////////////////////////// -KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap *pOption,bool bEnabled) +KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,KviPixmap *pOption,bool bEnabled) { KviPixmapSelector * b = new KviPixmapSelector(this,txt,pOption,bEnabled); addWidgetToLayout(b,x1,y1,x2,y2); @@ -303,11 +303,11 @@ KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int return b; } -KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_pixmapOptionsTable[optId].flags & KviOption_resetMask); KviPixmapSelector * d = addPixmapSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_PIXMAP(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_pixmapOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -317,7 +317,7 @@ KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int /////////////////////////////////////////////////////////////////////////////////////////////////// -KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, unsigned int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -327,7 +327,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2, return u; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(TQWidget * pParent,const TQString & txt, unsigned int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -336,26 +336,26 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QStr return u; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, int optId,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optId].flags & KviOption_resetMask); KviUIntSelector * d = addUIntSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_UINT(optId)),uLowBound,uHighBound,uDefault,bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(TQWidget * pParent,const TQString & txt, int optId,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optId].flags & KviOption_resetMask); KviUIntSelector * d = addUIntSelector(pParent,txt,&(KVI_OPTION_UINT(optId)),uLowBound,uHighBound,uDefault,bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -364,7 +364,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QStr //////////////////////////////////////////////////////////////////////////////////////////////// -KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, unsigned short int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -377,7 +377,7 @@ KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,in //////////////////////////////////////////////////////////////////////////////////////////////// -KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviStringSelector * d = new KviStringSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -385,29 +385,29 @@ KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviStringSelector * d = new KviStringSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviStringSelector * d = addStringSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviStringSelector * d = addStringSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -417,7 +417,7 @@ KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const //////////////////////////////////////////////////////////////////////////////////////////////// -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviPasswordSelector * d = new KviPasswordSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -425,29 +425,29 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2 return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviPasswordSelector * d = new KviPasswordSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviPasswordSelector * d = addPasswordSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviPasswordSelector * d = addPasswordSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -457,7 +457,7 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,co //////////////////////////////////////////////////////////////////////////////////////////////// -KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,QStringList * pOption,bool bEnabled) +KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQStringList * pOption,bool bEnabled) { KviStringListSelector * d = new KviStringListSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -465,11 +465,11 @@ KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,in return d; } -KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringlistOptionsTable[optId].flags & KviOption_resetMask); KviStringListSelector * d = addStringListSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRINGLIST(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringlistOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -479,7 +479,7 @@ KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,in //////////////////////////////////////////////////////////////////////////////////////////////// -KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQColor * pOption,bool bEnabled) { KviColorSelector * s = new KviColorSelector(this,txt,pOption,bEnabled); addWidgetToLayout(s,x1,y1,x2,y2); @@ -487,29 +487,29 @@ KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y return s; } -KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(TQWidget * pParent,const TQString & txt,TQColor * pOption,bool bEnabled) { KviColorSelector * s = new KviColorSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(s); return s; } -KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_colorOptionsTable[optId].flags & KviOption_resetMask); KviColorSelector * d = addColorSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_COLOR(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_colorOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_colorOptionsTable[optId].flags & KviOption_resetMask); KviColorSelector * d = addColorSelector(pParent,txt,&(KVI_OPTION_COLOR(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_colorOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -519,7 +519,7 @@ KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QS ///////////////////////////////////////////////////////////////////////////////////////////////// -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) { KviMircTextColorSelector * s = new KviMircTextColorSelector(this,txt,uFore,uBack,bEnabled); addWidgetToLayout(s,x1,y1,x2,y2); @@ -527,31 +527,31 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int return s; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * pParent,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(TQWidget * pParent,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) { KviMircTextColorSelector * s = new KviMircTextColorSelector(pParent,txt,uFore,uBack,bEnabled); m_pSelectorInterfaceList->append(s); return s; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optForeId,int optBackId,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optForeId,int optBackId,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optForeId].flags & KviOption_resetMask); m_iResetFlags |= (g_uintOptionsTable[optBackId].flags & KviOption_resetMask); KviMircTextColorSelector * d = addMircTextColorSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_UINT(optForeId)),&(KVI_OPTION_UINT(optBackId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optForeId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * pParent,const QString & txt,int optForeId,int optBackId,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(TQWidget * pParent,const TQString & txt,int optForeId,int optBackId,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optForeId].flags & KviOption_resetMask); m_iResetFlags |= (g_uintOptionsTable[optBackId].flags & KviOption_resetMask); KviMircTextColorSelector * d = addMircTextColorSelector(pParent,txt,&(KVI_OPTION_UINT(optForeId)),&(KVI_OPTION_UINT(optBackId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optForeId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -562,7 +562,7 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * //////////////////////////////////////////////////////////////////////////////////////////////// -KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQFont * pOption,bool bEnabled) { KviFontSelector * f = new KviFontSelector(this,txt,pOption,bEnabled); addWidgetToLayout(f,x1,y1,x2,y2); @@ -570,29 +570,29 @@ KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2, return f; } -KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(TQWidget * pParent,const TQString & txt,TQFont * pOption,bool bEnabled) { KviFontSelector * f = new KviFontSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(f); return f; } -KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_fontOptionsTable[optId].flags & KviOption_resetMask); KviFontSelector * d = addFontSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_FONT(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_fontOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_fontOptionsTable[optId].flags & KviOption_resetMask); KviFontSelector * d = addFontSelector(pParent,txt,&(KVI_OPTION_FONT(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_fontOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -602,9 +602,9 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr //#define DECLARE_COMMIT_FUNCTION(__fnc,__class,__classString) // void KviOptionsWidget::__fnc() // { -// QObjectList * l = queryList(__classString); +// TQObjectList * l = queryList(__classString); // if(!l)return; -// QObjectListIt it(*l); +// TQObjectListIt it(*l); // while(it.current()) // { // ((__class *)it.current())->commit(); @@ -620,14 +620,14 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2) { - QWidget * w = new QWidget(this); + TQWidget * w = new TQWidget(this); addWidgetToLayout(w,x1,y1,x2,y2); - layout()->setRowStretch(y1,1); + tqlayout()->setRowStretch(y1,1); } -QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled) +TQLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled) { - QLabel * l = new QLabel(text,this); + TQLabel * l = new TQLabel(text,this); #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif @@ -636,9 +636,9 @@ QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString & return l; } -QLabel * KviOptionsWidget::addLabel(QWidget * pParent,const QString & text,bool bEnabled) +TQLabel * KviOptionsWidget::addLabel(TQWidget * pParent,const TQString & text,bool bEnabled) { - QLabel * l = new QLabel(text,pParent); + TQLabel * l = new TQLabel(text,pParent); #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif @@ -646,26 +646,26 @@ QLabel * KviOptionsWidget::addLabel(QWidget * pParent,const QString & text,bool return l; } -QLineEdit * KviOptionsWidget::addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled) +TQLineEdit * KviOptionsWidget::addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled) { - QLineEdit * l = new QLineEdit(this); + TQLineEdit * l = new TQLineEdit(this); l->setEnabled(bEnabled); addWidgetToLayout(l,x1,y1,x2,y2); return l; } -QFrame * KviOptionsWidget::addSeparator(int x1,int y1,int x2,int y2) +TQFrame * KviOptionsWidget::addSeparator(int x1,int y1,int x2,int y2) { - QFrame * f = new QFrame(this); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * f = new TQFrame(this); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); addWidgetToLayout(f,x1,y1,x2,y2); return f; } #ifdef COMPILE_USE_QT4 -KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled) +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const TQString &txt,bool bEnabled) #else -KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled) +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const TQString &txt,bool bEnabled) #endif { KviTalGroupBox * g = new KviTalGroupBox(nStrips,o,txt,this); @@ -676,12 +676,12 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2) { - QWidget * w = topLevelWidget(); + TQWidget * w = tqtopLevelWidget(); if(!w)return; if(!w->inherits("KviGeneralOptionsDialog"))return; - QPushButton * b = new QPushButton(__tr2qs("Advanced..."),this); - connect(b,SIGNAL(clicked()),this,SLOT(switchToAdvancedPage())); + TQPushButton * b = new TQPushButton(__tr2qs("Advanced..."),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(switchToAdvancedPage())); addWidgetToLayout(b,x1,y1,x2,y2); } diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 84660939..463cc828 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -27,122 +27,123 @@ #include "kvi_settings.h" -#include <qframe.h> -#include <qlayout.h> +#include <tqframe.h> +#include <tqlayout.h> #include "kvi_pointerlist.h" -#include <qlineedit.h> +#include <tqlineedit.h> #include <kvi_tal_groupbox.h> -#include <qtabwidget.h> +#include <tqtabwidget.h> #include "kvi_tal_groupbox.h" #include "kvi_selectors.h" -class KVIRC_API KviOptionsWidget : public QFrame, public KviSelectorInterface +class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviOptionsWidget(QWidget * parent,const char * name = 0,bool bSunken = true); + KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true); ~KviOptionsWidget(); private: - QGridLayout * m_pLayout; - QTabWidget * m_pTabWidget; + TQGridLayout * m_pLayout; + TQTabWidget * m_pTabWidget; int m_iResetFlags; int m_iSelectors; KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList; - static QString m_szBasicTipStart; - static QString m_szBasicTipEnd; + static TQString m_szBasicTipStart; + static TQString m_szBasicTipEnd; public: void mergeResetFlag(int flag){ m_iResetFlags |= flag; }; void createLayout(int rows,int columns); - QGridLayout * layout(){ return m_pLayout; }; + TQGridLayout * tqlayout(){ return m_pLayout; }; protected: void commitSelectors(); void commitOptionsReset(); public: - void mergeTip(QWidget * w,const QString &tip); + void mergeTip(TQWidget * w,const TQString &tip); // tabbed page paradigm void createTabbedPage(); - void addOptionsWidget(const QString &szText,const QIconSet &iconSet,KviOptionsWidget * pWidget); - QTabWidget * tabWidget(){ return m_pTabWidget; }; + void addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget); + TQTabWidget * tabWidget(){ return m_pTabWidget; }; // non tabbed page paradigm - KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,bool * pOption,bool bEnabled = true); - KviBoolSelector * addBoolSelector(QWidget * pParent,const QString & txt,bool * pOption,bool bEnabled = true); - KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviBoolSelector * addBoolSelector(QWidget * pParnt,const QString & txt,int optId,bool bEnabled = true); - - KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,QColor * pOption,bool bEnabled = true); - KviColorSelector * addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled = true); - KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviColorSelector * addColorSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optForeId,int optBackId,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,int optForeId,int optBackId,bool bEnabled = true); - - KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviFileSelector * addFileSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviFileSelector * addFileSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviSoundSelector * addSoundSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviSoundSelector * addSoundSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - - KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,QFont * pOption,bool bEnabled = true); - KviFontSelector * addFontSelector(QWidget * pParent,const QString & txt,QFont * pOption,bool bEnabled = true); - KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviFontSelector * addFontSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); + KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,bool * pOption,bool bEnabled = true); + KviBoolSelector * addBoolSelector(TQWidget * pParent,const TQString & txt,bool * pOption,bool bEnabled = true); + KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviBoolSelector * addBoolSelector(TQWidget * pParnt,const TQString & txt,int optId,bool bEnabled = true); + + KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQColor * pOption,bool bEnabled = true); + KviColorSelector * addColorSelector(TQWidget * pParent,const TQString & txt,TQColor * pOption,bool bEnabled = true); + KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviColorSelector * addColorSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true); + + KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviFileSelector * addFileSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviFileSelector * addFileSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviSoundSelector * addSoundSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviSoundSelector * addSoundSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + + KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQFont * pOption,bool bEnabled = true); + KviFontSelector * addFontSelector(TQWidget * pParent,const TQString & txt,TQFont * pOption,bool bEnabled = true); + KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviFontSelector * addFontSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); - KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap * pOption,bool bEnabled = true); + KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,KviPixmap * pOption,bool bEnabled = true); - KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,QStringList * pOption,bool bEnabled = true); - KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); + KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQStringList * pOption,bool bEnabled = true); + KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); - KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviStringSelector * addStringSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviStringSelector * addStringSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); + KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviStringSelector * addStringSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviStringSelector * addStringSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); - KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int * pOption, + KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(QWidget * pParent,const QString & txt,unsigned int * pOption, + KviUIntSelector * addUIntSelector(TQWidget * pParent,const TQString & txt,unsigned int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId, + KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(QWidget * pParent,const QString & txt,int optId, + KviUIntSelector * addUIntSelector(TQWidget * pParent,const TQString & txt,int optId, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUShortIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned short int * pOption, + KviUIntSelector * addUShortIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned short int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - QLabel * addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled = true); - QLabel * addLabel(QWidget * pParent,const QString & text,bool bEnabled = true); - QLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true); + TQLabel * addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled = true); + TQLabel * addLabel(TQWidget * pParent,const TQString & text,bool bEnabled = true); + TQLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true); #ifdef COMPILE_USE_QT4 - KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled = true); + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const TQString &txt,bool bEnabled = true); #else - KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled = true); + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const TQString &txt,bool bEnabled = true); #endif - QFrame * addSeparator(int x1,int y1,int x2,int y2); + TQFrame * addSeparator(int x1,int y1,int x2,int y2); void addRowSpacer(int x1,int y1,int x2,int y2); - void addWidgetToLayout(QWidget * w,int x1,int y1,int x2,int y2); + void addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2); // this does NOT add the advanced button if this page is not inside a KviGeneralOptionsDialog // this is because nobody listens to the "switchToAdvancedPage" requests.... diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index c32c33f8..ed1801f2 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -55,21 +55,21 @@ #include "kvi_kvs_eventtriggers.h" -#include <qpixmap.h> -#include <qsplitter.h> +#include <tqpixmap.h> +#include <tqsplitter.h> #include "kvi_tal_hbox.h" -#include <qtoolbutton.h> +#include <tqtoolbutton.h> #include "kvi_draganddrop.h" #include "kvi_valuelist.h" -KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) -: KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole) +KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) +: KviWindow(KVI_WINDOW_TYPE_TQUERY,lpFrm,nick,lpConsole) { m_iFlags = 0; connection()->registerQuery(this); - //m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter"); + //m_pTopSplitter = new TQSplitter(TQSplitter::Horizontal,this,"top_splitter"); m_pButtonBox = new KviTalHBox(this); m_pLabel = new KviThemedLabel(m_pButtonBox,"query_label"); m_pLabel->setAutoHeight(1); @@ -79,24 +79,24 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) // The button box on the right //KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box"); if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) - m_pButtonGrid= (QFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox); else - m_pButtonGrid= (QFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox); createTextEncodingButton(m_pButtonGrid); #ifdef COMPILE_USE_QT4 - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); #else - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); #endif m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); + connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); #ifdef COMPILE_CRYPT_SUPPORT createCryptControllerButton(m_pButtonGrid); @@ -110,7 +110,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." m_pIrcView->enableDnd(TRUE); - connect(m_pIrcView,SIGNAL(fileDropped(const char *)),this,SLOT(slotDndEvents(const char *))); + connect(m_pIrcView,TQT_SIGNAL(fileDropped(const char *)),this,TQT_SLOT(slotDndEvents(const char *))); updateCaption(); } @@ -118,7 +118,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) KviQuery::~KviQuery() { m_pUserListView->partAll(); - if(type() == KVI_WINDOW_TYPE_DEADQUERY) + if(type() == KVI_WINDOW_TYPE_DEADTQUERY) context()->unregisterDeadQuery(this); else connection()->unregisterQuery(this); @@ -126,7 +126,7 @@ KviQuery::~KviQuery() void KviQuery::updateLabelText() { - QString szText=getInfoLabelText(); + TQString szText=getInfoLabelText(); if(szText!=m_pLabel->text()) { m_pLabel->setText(szText); @@ -134,14 +134,14 @@ void KviQuery::updateLabelText() } } -QString KviQuery::getInfoLabelTipText() +TQString KviQuery::getInfoLabelTipText() { - QString txt; - KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); + TQString txt; + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); if(e) { - QString tmp; - QString szMask; + TQString tmp; + TQString szMask; if(e->hasUser()) szMask+=e->user(); else @@ -152,7 +152,7 @@ QString KviQuery::getInfoLabelTipText() else szMask+="*"; tmp+="\n"; - QString szChans; + TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); if(console()->connection()) { @@ -167,13 +167,13 @@ QString KviQuery::getInfoLabelTipText() txt += "<tr><td>"; if(e->hasRealName()) - tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask); + tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask); - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); txt += tmp; @@ -183,25 +183,25 @@ QString KviQuery::getInfoLabelTipText() { txt+="<tr><td>"; if(e->hasHops()) - txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops()); + txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops()); else - txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server()); + txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server()); txt+="</td></tr>"; } if(e->isAway()) { txt+="<tr><td>"; - txt+=__tr2qs("%1 is probably away").arg(m_szName); + txt+=__tr2qs("%1 is probably away").tqarg(m_szName); txt+="</td></tr>"; } txt+="<tr><td>"; - tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans); + tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans); - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); txt+=tmp; txt +="</td></tr>"; @@ -216,15 +216,15 @@ QString KviQuery::getInfoLabelTipText() return txt; } -QString KviQuery::getInfoLabelText() +TQString KviQuery::getInfoLabelText() { - QString tmp; + TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) { - KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); if(e) { - QString szMask; + TQString szMask; if(console()->connection()) { if(e->hasUser()) @@ -237,19 +237,19 @@ QString KviQuery::getInfoLabelText() else szMask+="*"; if(e->hasRealName()) - tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask); + tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask); if(e->hasServer()) - tmp+=__tr2qs(", using server %1").arg(e->server()); + tmp+=__tr2qs(", using server %1").tqarg(e->server()); if(e->hasHops()) - tmp+=__tr2qs(" (%1 hops)").arg(e->hops()); + tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops()); if(e->isAway()) tmp+=__tr2qs(", probably away"); tmp+="\n"; - QString szChans; + TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); - tmp+=__tr2qs("Common channels: %2").arg(szChans); + tmp+=__tr2qs("Common channels: %2").tqarg(szChans); } else { tmp=__tr2qs("[Dead Query]"); } @@ -259,7 +259,7 @@ QString KviQuery::getInfoLabelText() } void KviQuery::slotDndEvents(const char *file) { - KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,QString(file)); + KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,TQString(file)); } void KviQuery::triggerCreationEvents() @@ -268,7 +268,7 @@ void KviQuery::triggerCreationEvents() KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this); } -void KviQuery::getBaseLogFileName(QString &buffer) +void KviQuery::getBaseLogFileName(TQString &buffer) { if(console()->connection()) { @@ -311,24 +311,24 @@ void KviQuery::loadProperties(KviConfig *cfg) showListView(cfg->readBoolEntry("UserListViewVisible",false)); } -void KviQuery::notifyTargetChange(const QString &oldNick,const QString &oldUser,const QString &oldHost,const QString &nick,const QString &user,const QString &host) +void KviQuery::notifyTargetChange(const TQString &oldNick,const TQString &oldUser,const TQString &oldHost,const TQString &nick,const TQString &user,const TQString &host) { - QString oldN = oldNick.isEmpty() ? QString("*") : oldNick; - QString oldU = oldUser.isEmpty() ? QString("*") : oldUser; - QString oldH = oldHost.isEmpty() ? QString("*") : oldHost; - output(KVI_OUT_QUERYTRACE, + TQString oldN = oldNick.isEmpty() ? TQString("*") : oldNick; + TQString oldU = oldUser.isEmpty() ? TQString("*") : oldUser; + TQString oldH = oldHost.isEmpty() ? TQString("*") : oldHost; + output(KVI_OUT_TQUERYTRACE, __tr2qs("The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), &oldN,&oldU,&oldH,&nick,&user,&host); updateLabelText(); } -void KviQuery::userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType) +void KviQuery::userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString oldUser,oldHost; + TQString oldUser,oldHost; if(!m_pUserListView->userActionVerifyMask(nick,user,host,iTemperature,oldUser,oldHost)) notifyTargetChange(nick,oldUser,oldHost,nick,user,host); } else { @@ -338,7 +338,7 @@ void KviQuery::userAction(const QString &nick,const QString &user,const QString } -void KviQuery::userAction(const QString &nick,unsigned int uActionType) +void KviQuery::userAction(const TQString &nick,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); m_pUserListView->userAction(nick,iTemperature); @@ -350,7 +350,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType) int iTemperature = kvi_getUserActionTemperature(uActionType); if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString oldUser,oldHost; + TQString oldUser,oldHost; if(!m_pUserListView->userActionVerifyMask(user->nick(),user->user(),user->host(),iTemperature,oldUser,oldHost)) notifyTargetChange(user->nick(),oldUser,oldHost,user->nick(),user->user(),user->host()); } else { @@ -360,7 +360,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType) } -KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,const QString &host) +KviUserListEntry * KviQuery::setTarget(const TQString &nick,const TQString &user,const TQString &host) { KviUserListEntry * e = m_pUserListView->join(nick,user,host); if((!e->globalData()->avatar()) && (!user.isEmpty()) && (user != "*")) @@ -371,7 +371,7 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString szChans; + TQString szChans; int iChans = m_pConsole->connection()->getCommonChannels(nick,szChans); notifyCommonChannels(nick,user,host,iChans,szChans); } @@ -381,15 +381,15 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c return e; } -void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans) +void KviQuery::notifyCommonChannels(const TQString &nick,const TQString &user,const TQString &host,int iChans,const TQString &szChans) { - static QString star("*"); + static TQString star("*"); if(iChans > 0) { - output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"), + output(KVI_OUT_TQUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"), &nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host,&szChans); } else { - output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), + output(KVI_OUT_TQUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), &nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host); } updateLabelText(); @@ -400,11 +400,11 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons /*void KviQuery::updateTargets() { - QString szName; + TQString szName; if(targetCount() > 0) { - KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pUserListView->entryDict())); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*(m_pUserListView->entryDict())); if(it.current())szName = it.currentKey(); } @@ -417,15 +417,15 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons void KviQuery::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); if(!console()->connection()) { - QString dead = __tr2qs("[Dead query]"); + TQString dead = __tr2qs("[Dead query]"); m_szPlainTextCaption = windowName(); m_szPlainTextCaption += " : "; @@ -454,14 +454,14 @@ void KviQuery::fillCaptionBuffers() return; } - QString szNickOnServer = QChar('['); + TQString szNickOnServer = TQChar('['); szNickOnServer += connection()->currentNickName(); szNickOnServer += __tr2qs(" on "); szNickOnServer += connection()->currentServerName(); - szNickOnServer += QChar(']'); + szNickOnServer += TQChar(']'); m_szPlainTextCaption = windowName(); - m_szPlainTextCaption += QChar(' '); + m_szPlainTextCaption += TQChar(' '); m_szPlainTextCaption += szNickOnServer; m_szHtmlActiveCaption = begin; @@ -485,7 +485,7 @@ void KviQuery::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -bool KviQuery::nickChange(const QString &oldNick,const QString &newNick) +bool KviQuery::nickChange(const TQString &oldNick,const TQString &newNick) { bool bRet = m_pUserListView->nickChange(oldNick,newNick); if(!bRet)return false; // ugh!! ? @@ -514,7 +514,7 @@ void KviQuery::toggleListView() void KviQuery::setDeadQuery() { - m_iFlags |= KVI_QUERY_FLAG_DEAD; + m_iFlags |= KVI_TQUERY_FLAG_DEAD; m_pUserListView->enableUpdates(false); m_pUserListView->partAll(); @@ -522,7 +522,7 @@ void KviQuery::setDeadQuery() m_pUserListView->setUserDataBase(0); connection()->unregisterQuery(this); context()->registerDeadQuery(this); - setType(KVI_WINDOW_TYPE_DEADQUERY); + setType(KVI_WINDOW_TYPE_DEADTQUERY); updateIcon(); updateCaption(); @@ -531,9 +531,9 @@ void KviQuery::setDeadQuery() void KviQuery::setAliveQuery() { - m_iFlags &= ~KVI_QUERY_FLAG_DEAD; + m_iFlags &= ~KVI_TQUERY_FLAG_DEAD; m_pUserListView->setUserDataBase(connection()->userDataBase()); - setType(KVI_WINDOW_TYPE_QUERY); + setType(KVI_WINDOW_TYPE_TQUERY); context()->unregisterDeadQuery(this); connection()->registerQuery(this); // Update log file name @@ -547,31 +547,31 @@ void KviQuery::applyOptions() { m_pUserListView->applyOptions(); updateLabelText(); - // this applies options for IrcView and Input and forces the window to relayout + // this applies options for IrcView and Input and forces the window to retqlayout KviWindow::applyOptions(); } -QPixmap * KviQuery::myIconPtr() +TQPixmap * KviQuery::myIconPtr() { - return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY); + return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADTQUERY : KVI_SMALLICON_TQUERY); } -void KviQuery::resizeEvent(QResizeEvent *e) +void KviQuery::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviQuery::sizeHint() const +TQSize KviQuery::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } -void KviQuery::ownMessage(const QString &buffer) +void KviQuery::ownMessage(const TQString &buffer) { if(!connection()) { @@ -579,8 +579,8 @@ void KviQuery::ownMessage(const QString &buffer) return; } - KviQCString szName = connection()->encodeText(windowName()); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(windowName()); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -599,20 +599,20 @@ void KviQuery::ownMessage(const QString &buffer) case KviCryptEngine::Encrypted: if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; // ugly ,but we must redecode here - QString szRedecoded = decodeText(encrypted.ptr()); + TQString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError { - QString szEngineError = cryptSessionInfo()->pEngine->lastError(); + TQString szEngineError = cryptSessionInfo()->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, __tr2qs("The crypto engine was unable to encrypt the current message (%Q): %s, no data sent to the server"), &buffer,&szEngineError); @@ -623,9 +623,9 @@ void KviQuery::ownMessage(const QString &buffer) return; } else { d++; //eat the escape code - QString tmp = buffer.right(buffer.length() - 1); + TQString tmp = buffer.right(buffer.length() - 1); if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,tmp,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),tmp,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); return; } @@ -634,23 +634,23 @@ void KviQuery::ownMessage(const QString &buffer) #endif if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } -void KviQuery::ownAction(const QString &buffer) +void KviQuery::ownAction(const TQString &buffer) { if(!connection()) { outputNoFmt(KVI_OUT_SYSTEMWARNING,__tr2qs("This query has no active targets, no message sent")); } else { - KviQCString szBuffer = encodeText(buffer); + KviTQCString szBuffer = encodeText(buffer); if(!szBuffer.data())return; - KviQCString sz = connection()->encodeText(windowName()); + KviTQCString sz = connection()->encodeText(windowName()); if(sz.isEmpty())return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", sz.data(),0x01,szBuffer.data(),0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(szBuffer.data())))return; + if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,TQString(szBuffer.data())))return; output(KVI_OUT_ACTION,"\r!nc\r%Q\r %Q",&(connection()->currentNickName()),&buffer); m_pUserListView->userAction(connection()->currentNickName(),KVI_USERACTION_ACTION); } diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index ba087acb..3b1a81bc 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -1,5 +1,5 @@ -#ifndef _KVI_QUERY_H_ -#define _KVI_QUERY_H_ +#ifndef _KVI_TQUERY_H_ +#define _KVI_TQUERY_H_ //============================================================================= // // File : kvi_query.h @@ -36,56 +36,57 @@ class KviConsole; class KviConfig; -class QSplitter; +class TQSplitter; class KviWindowToolPageButton; -#define KVI_QUERY_FLAG_DEAD 1 +#define KVI_TQUERY_FLAG_DEAD 1 class KVIRC_API KviQuery : public KviWindow { Q_OBJECT + TQ_OBJECT public: - KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick); + KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick); ~KviQuery(); protected: KviUserListView * m_pUserListView; KviWindowToolPageButton * m_pListViewButton; int m_iFlags; KviThemedLabel * m_pLabel; - QFrame * m_pButtonGrid; + TQFrame * m_pButtonGrid; protected: - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); + virtual void resizeEvent(TQResizeEvent *e); virtual void loadProperties(KviConfig * cfg); virtual void saveProperties(KviConfig * cfg); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void triggerCreationEvents(); public: void setDeadQuery(); void setAliveQuery(); - bool isDeadQuery(){ return m_iFlags & KVI_QUERY_FLAG_DEAD; }; - virtual QSize sizeHint() const; - virtual const QString & target(){ return windowName(); }; + bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; }; + virtual TQSize tqsizeHint() const; + virtual const TQString & target(){ return windowName(); }; virtual void applyOptions(); - KviUserListEntry * setTarget(const QString &nick,const QString &user,const QString &host); + KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host); void userAction(KviIrcMask *user,unsigned int uActionType); - void userAction(const QString &nick,unsigned int uActionType); - void userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType); - bool nickChange(const QString &oldNick,const QString &newNick); - void ownMessage(const QString &buffer); - void ownAction(const QString &buffer); + void userAction(const TQString &nick,unsigned int uActionType); + void userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType); + bool nickChange(const TQString &oldNick,const TQString &newNick); + void ownMessage(const TQString &buffer); + void ownAction(const TQString &buffer); int selectedCount(){ return m_pUserListView->selectedCount(); }; - bool avatarChanged(const QString &nick){ return m_pUserListView->avatarChanged(nick); }; - void notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans); + bool avatarChanged(const TQString &nick){ return m_pUserListView->avatarChanged(nick); }; + void notifyCommonChannels(const TQString &nick,const TQString &user,const TQString &host,int iChans,const TQString &szChans); void showListView(bool bShow); void mergeQuery(KviQuery * q); void updateLabelText(); - QFrame * buttonContainer() { return (QFrame*)m_pButtonGrid; }; + TQFrame * buttonContainer() { return (TQFrame*)m_pButtonGrid; }; protected: - void notifyTargetChange(const QString &oldNick,const QString &oldUser,const QString &oldHost,const QString &nick,const QString &user,const QString &host); - QString getInfoLabelText(); - QString getInfoLabelTipText(); + void notifyTargetChange(const TQString &oldNick,const TQString &oldUser,const TQString &oldHost,const TQString &nick,const TQString &user,const TQString &host); + TQString getInfoLabelText(); + TQString getInfoLabelTipText(); protected slots: void textViewRightClicked(); void toggleListView(); diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index 7b4a8e71..d26c7237 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -30,12 +30,12 @@ #include "kvi_kvs_script.h" -KviScriptUserButton::KviScriptUserButton(QWidget * par,const char * name) +KviScriptUserButton::KviScriptUserButton(TQWidget * par,const char * name) : KviStyledToolButton(par,name) { m_pScript = 0; // setAutoRaise(true); - connect(this,SIGNAL(clicked()),this,SLOT(btnClicked())); + connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(btnClicked())); setAutoRaise(true); } @@ -60,7 +60,7 @@ void KviScriptUserButton::btnClicked() { KviWindow * pWnd = window(); if(!pWnd)return; // ops... - QPoint pos = mapToGlobal(QPoint(0,height())); + TQPoint pos = mapToGlobal(TQPoint(0,height())); KviKvsVariantList vList; vList.append((kvs_int_t)pos.x()); @@ -69,7 +69,7 @@ void KviScriptUserButton::btnClicked() } /* -KviIrcToolBarScriptButton::KviIrcToolBarScriptButton(QToolBar * p,const char * name) +KviIrcToolBarScriptButton::KviIrcToolBarScriptButton(TQToolBar * p,const char * name) : KviScriptUserButton(p,name) { setAutoRaise(true); @@ -85,7 +85,7 @@ KviWindow * KviIrcToolBarScriptButton::window() } */ -KviWindowScriptButton::KviWindowScriptButton(QWidget * p,KviWindow * wnd,const char * name) +KviWindowScriptButton::KviWindowScriptButton(TQWidget * p,KviWindow * wnd,const char * name) : KviScriptUserButton(p,name) { m_pWnd = wnd; diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h index 79740c86..a973416a 100644 --- a/src/kvirc/ui/kvi_scriptbutton.h +++ b/src/kvirc/ui/kvi_scriptbutton.h @@ -26,8 +26,8 @@ #include "kvi_string.h" #include "kvi_styled_controls.h" -#include <qtoolbutton.h> -#include <qtoolbar.h> +#include <tqtoolbutton.h> +#include <tqtoolbar.h> class KviKvsScript; class KviWindow; @@ -35,14 +35,15 @@ class KviWindow; class KVIRC_API KviScriptUserButton : public KviStyledToolButton { Q_OBJECT + TQ_OBJECT public: - KviScriptUserButton(QWidget * par,const char * name); + KviScriptUserButton(TQWidget * par,const char * name); ~KviScriptUserButton(); protected: KviKvsScript * m_pScript; public: void setButtonCode(KviKvsScript * pScript); - virtual void setButtonPixmap(const QPixmap & pix){ setIconSet(pix); }; + virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); }; void setButtonText(const char * text){ setTextLabel(text); }; virtual KviWindow * window(); protected slots: @@ -53,8 +54,9 @@ protected slots: class KVIRC_API KviIrcToolBarScriptButton : public KviScriptUserButton { Q_OBJECT + TQ_OBJECT public: - KviIrcToolBarScriptButton(QToolBar * p,const char * name); + KviIrcToolBarScriptButton(TQToolBar * p,const char * name); ~KviIrcToolBarScriptButton(); protected: KviStr m_szCode; @@ -66,13 +68,14 @@ public: class KVIRC_API KviWindowScriptButton : public KviScriptUserButton { Q_OBJECT + TQ_OBJECT public: - KviWindowScriptButton(QWidget * p,KviWindow * wnd,const char * name); + KviWindowScriptButton(TQWidget * p,KviWindow * wnd,const char * name); ~KviWindowScriptButton(); protected: KviWindow * m_pWnd; public: - virtual void setButtonPixmap(const QPixmap & pix){ setIconSet(pix); setUsesBigPixmap(false); }; + virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); setUsesBigPixmap(false); }; virtual KviWindow * window(){ return m_pWnd; }; }; diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index f94000da..7f557934 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -31,8 +31,8 @@ #include "kvi_modulemanager.h" -KviScriptEditor::KviScriptEditor(QWidget * par) -: QWidget(par) +KviScriptEditor::KviScriptEditor(TQWidget * par) +: TQWidget(par) { } @@ -43,22 +43,22 @@ KviScriptEditor::~KviScriptEditor() void KviScriptEditor::setText(const char * txt) { - setText(KviQCString(txt)); + setText(KviTQCString(txt)); } -void KviScriptEditor::setText(const KviQCString &txt) +void KviScriptEditor::setText(const KviTQCString &txt) { } -void KviScriptEditor::setText(const QString &txt) +void KviScriptEditor::setText(const TQString &txt) { - setText(KviQCString(txt.utf8())); + setText(KviTQCString(txt.utf8())); } -void KviScriptEditor::setFindText(const QString &text) +void KviScriptEditor::setFindText(const TQString &text) { } -void KviScriptEditor::setInfoText(const QString &text) +void KviScriptEditor::setInfoText(const TQString &text) { } @@ -66,11 +66,11 @@ void KviScriptEditor::setFindLineeditReadOnly(bool b) { } -void KviScriptEditor::getText(KviQCString &txt) +void KviScriptEditor::getText(KviTQCString &txt) { } -void KviScriptEditor::setCursorPosition(QPoint) +void KviScriptEditor::setCursorPosition(TQPoint) { } @@ -79,28 +79,28 @@ bool KviScriptEditor::isModified() return false; } -QPoint KviScriptEditor::getCursor() +TQPoint KviScriptEditor::getCursor() { - return QPoint(0,0); + return TQPoint(0,0); } -void KviScriptEditor::getText(QString &txt) +void KviScriptEditor::getText(TQString &txt) { - KviQCString tmp; + KviTQCString tmp; getText(tmp); - txt = QString::fromUtf8(tmp.data()); + txt = TQString::fromUtf8(tmp.data()); } -KviScriptEditor * KviScriptEditor::getDummyEditor(QWidget * par) +KviScriptEditor * KviScriptEditor::getDummyEditor(TQWidget * par) { return new KviScriptEditor(par); } -static KviScriptEditor * (*editorModuleCreateScriptEditor)(QWidget *); +static KviScriptEditor * (*editorModuleCreateScriptEditor)(TQWidget *); static void (*editorModuleDestroyScriptEditor)(KviScriptEditor *); -KviScriptEditor * KviScriptEditor::createInstance(QWidget * par) +KviScriptEditor * KviScriptEditor::createInstance(TQWidget * par) { KviModule * m = g_pModuleManager->getModule("editor"); // If the module can't be loaded...return a dummy widget @@ -108,7 +108,7 @@ KviScriptEditor * KviScriptEditor::createInstance(QWidget * par) if(!m)return KviScriptEditor::getDummyEditor(par); // dummy implementation - editorModuleCreateScriptEditor = (KviScriptEditor * (*)(QWidget *)) m->getSymbol("editor_module_createScriptEditor"); + editorModuleCreateScriptEditor = (KviScriptEditor * (*)(TQWidget *)) m->getSymbol("editor_module_createScriptEditor"); if(!editorModuleCreateScriptEditor)return KviScriptEditor::getDummyEditor(par); diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h index e9f04c26..0039d24b 100644 --- a/src/kvirc/ui/kvi_scripteditor.h +++ b/src/kvirc/ui/kvi_scripteditor.h @@ -24,8 +24,8 @@ // #include "kvi_settings.h" -#include <qwidget.h> -#include <qlineedit.h> +#include <tqwidget.h> +#include <tqlineedit.h> #include "kvi_qcstring.h" // @@ -39,29 +39,30 @@ // -class KVIRC_API KviScriptEditor : public QWidget +class KVIRC_API KviScriptEditor : public TQWidget { Q_OBJECT + TQ_OBJECT protected: - KviScriptEditor(QWidget * par); + KviScriptEditor(TQWidget * par); ~KviScriptEditor(); protected: - QLineEdit * m_pFindLineedit; + TQLineEdit * m_pFindLineedit; public: virtual void setText(const char * txt); - virtual void setText(const KviQCString &txt); - virtual void setText(const QString &txt); - virtual void getText(KviQCString &txt); - virtual void getText(QString &txt); - virtual void setInfoText(const QString &text); - virtual void setFindText(const QString &text); - virtual void setCursorPosition(QPoint); - virtual QPoint getCursor(); + virtual void setText(const KviTQCString &txt); + virtual void setText(const TQString &txt); + virtual void getText(KviTQCString &txt); + virtual void getText(TQString &txt); + virtual void setInfoText(const TQString &text); + virtual void setFindText(const TQString &text); + virtual void setCursorPosition(TQPoint); + virtual TQPoint getCursor(); virtual void setFindLineeditReadOnly(bool b); virtual bool isModified(); - static KviScriptEditor * getDummyEditor(QWidget * par); - static KviScriptEditor * createInstance(QWidget * par); + static KviScriptEditor * getDummyEditor(TQWidget * par); + static KviScriptEditor * createInstance(TQWidget * par); static void destroyInstance(KviScriptEditor * e); }; diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index f8c9af9f..17a9ddf8 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -33,15 +33,15 @@ #include "kvi_filedialog.h" #include "kvi_kvs_script.h" -#include <qlabel.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qcolordialog.h> -#include <qpalette.h> -#include <qfontdialog.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqcolordialog.h> +#include <tqpalette.h> +#include <tqfontdialog.h> #include "kvi_tal_popupmenu.h" -KviBoolSelector::KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector::KviBoolSelector(TQWidget * par,const TQString & txt,bool *pOption,bool bEnabled) : KviStyledCheckBox(txt,par), KviSelectorInterface() { setEnabled(bEnabled); @@ -59,14 +59,14 @@ void KviBoolSelector::commit() *m_pOption = isChecked(); } -KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int *pOption, +KviUIntSelector::KviUIntSelector(TQWidget * par,const TQString & txt,unsigned int *pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled,bool bShortInt) : KviTalHBox(par) , KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); - //m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + //m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMaximumWidth(150); - m_pSpinBox = new QSpinBox(this); + m_pSpinBox = new TQSpinBox(this); m_bIsShortInt = bShortInt; @@ -89,12 +89,12 @@ KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int setStretchFactor(m_pLabel,1); } -void KviUIntSelector::setPrefix(const QString & txt) +void KviUIntSelector::setPrefix(const TQString & txt) { m_pSpinBox->setPrefix(txt); } -void KviUIntSelector::setSuffix(const QString & txt) +void KviUIntSelector::setSuffix(const TQString & txt) { m_pSpinBox->setSuffix(txt); } @@ -125,13 +125,13 @@ void KviUIntSelector::setEnabled(bool bEnabled) -KviStringSelector::KviStringSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviStringSelector::KviStringSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) : KviTalHBox(par) , KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); - m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMinimumWidth(200); - QString tmp = *pOption; + TQString tmp = *pOption; m_pLineEdit->setText(tmp); setSpacing(4); @@ -148,7 +148,7 @@ KviStringSelector::~KviStringSelector() void KviStringSelector::commit() { - QString tmp = m_pLineEdit->text(); + TQString tmp = m_pLineEdit->text(); *m_pOption = tmp; } @@ -159,20 +159,20 @@ void KviStringSelector::setEnabled(bool bEnabled) m_pLabel->setEnabled(bEnabled); } -void KviStringSelector::setText(const QString& text){ +void KviStringSelector::setText(const TQString& text){ m_pLineEdit->setText(text); } -KviPasswordSelector::KviPasswordSelector(QWidget * par,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector::KviPasswordSelector(TQWidget * par,const TQString & txt,TQString *pOption,bool bEnabled) : KviStringSelector(par,txt,pOption,bEnabled) { - m_pLineEdit->setEchoMode(QLineEdit::Password); + m_pLineEdit->setEchoMode(TQLineEdit::Password); } -KviPixmapPreview::KviPixmapPreview(QWidget * par) +KviPixmapPreview::KviPixmapPreview(TQWidget * par) : KviTalScrollView(par) { m_pPixmap = 0; @@ -200,7 +200,7 @@ void KviPixmapPreview::setPixmap(KviPixmap * pix) update(); } -void KviPixmapPreview::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph) +void KviPixmapPreview::drawContents(TQPainter * p, int clipx, int clipy, int clipw, int cliph) { if(m_pPixmap) { @@ -212,31 +212,31 @@ void KviPixmapPreview::drawContents(QPainter * p, int clipx, int clipy, int clip } -KviPixmapSelector::KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap * pOption,bool bEnabled) -: QWidget(par), KviSelectorInterface() +KviPixmapSelector::KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixmap * pOption,bool bEnabled) +: TQWidget(par), KviSelectorInterface() { - QGridLayout * g = new QGridLayout(this,3,2,4,8); + TQGridLayout * g = new TQGridLayout(this,3,2,4,8); m_pOption = pOption; m_localPixmap = *pOption; m_pCheckBox = new KviStyledCheckBox(txt,this); m_pCheckBox->setChecked(m_localPixmap.pixmap()); - connect(m_pCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + connect(m_pCheckBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(checkBoxToggled(bool))); g->addMultiCellWidget(m_pCheckBox,0,0,0,1); m_pPreview = new KviPixmapPreview(this); m_pPreview->setPixmap(&m_localPixmap); g->addMultiCellWidget(m_pPreview,1,1,0,1); - m_pFileNameLabel = new QLabel(this); - m_pFileNameLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + m_pFileNameLabel = new TQLabel(this); + m_pFileNameLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); if(m_localPixmap.pixmap())m_pFileNameLabel->setText(m_localPixmap.path()); g->addWidget(m_pFileNameLabel,2,0); - m_pChooseButton = new QPushButton("...",this); + m_pChooseButton = new TQPushButton("...",this); g->addWidget(m_pChooseButton,2,1); - connect(m_pChooseButton,SIGNAL(clicked()),this,SLOT(choosePixmap())); + connect(m_pChooseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(choosePixmap())); g->setRowStretch(1,1); g->setColStretch(0,1); @@ -267,7 +267,7 @@ void KviPixmapSelector::commit() void KviPixmapSelector::choosePixmap() { // KviStr tmp; - QString tmp; + TQString tmp; if(KviFileDialog::askForOpenFileName(tmp,__tr("Choose an Image File - KVIrc"))) { setImagePath(tmp); @@ -294,7 +294,7 @@ void KviPixmapSelector::setImagePath(const char * path) void KviPixmapSelector::setEnabled(bool bEnabled) { - QWidget::setEnabled(bEnabled); + TQWidget::setEnabled(bEnabled); m_pCheckBox->setEnabled(bEnabled); m_pPreview->setEnabled(bEnabled && m_pCheckBox->isChecked()); m_pFileNameLabel->setEnabled(bEnabled && m_pCheckBox->isChecked()); @@ -304,17 +304,17 @@ void KviPixmapSelector::setEnabled(bool bEnabled) // FIXME: #warning "Option for DIR_MUST_EXISTS...(this widget could be turned into a file selector too)" -KviFileSelector::KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags,const QString &szFilter) +KviFileSelector::KviFileSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled,unsigned int uFlags,const TQString &szFilter) : KviTalHBox(par), KviSelectorInterface() { m_uFlags = uFlags; m_szFilter = szFilter; - m_pLabel = new QLabel(txt,this); - m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMinimumWidth(200); m_pLineEdit->setText(*pOption); - m_pButton = new QPushButton(__tr2qs("&Browse..."),this); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(browseClicked())); + m_pButton = new TQPushButton(__tr2qs("&Browse..."),this); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browseClicked())); setSpacing(4); setStretchFactor(m_pLineEdit,1); @@ -343,7 +343,7 @@ void KviFileSelector::browseClicked() select(); } -void KviFileSelector::setSelection(const QString &szSelection) +void KviFileSelector::setSelection(const TQString &szSelection) { m_pLineEdit->setText(szSelection); } @@ -352,7 +352,7 @@ void KviFileSelector::setSelection(const QString &szSelection) void KviFileSelector::select() { //KviStr tmp; - QString tmp = *m_pOption; + TQString tmp = *m_pOption; if(m_uFlags & ChooseSaveFileName) { if(KviFileDialog::askForSaveFileName(tmp,__tr2qs("Choose a File - KVIrc"),tmp,m_szFilter,true,!(m_uFlags & DontConfirmOverwrite))) @@ -371,14 +371,14 @@ void KviFileSelector::select() } -KviDirectorySelector::KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviDirectorySelector::KviDirectorySelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) : KviFileSelector(par,txt,pOption,bEnabled) { } void KviDirectorySelector::select() { - QString tmp; + TQString tmp; if(KviFileDialog::askForDirectoryName(tmp,__tr2qs("Choose a Directory - KVIrc"),"")) { m_pLineEdit->setText(tmp); @@ -393,23 +393,23 @@ void KviDirectorySelector::select() -KviStringListSelector::KviStringListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) +KviStringListSelector::KviStringListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) : KviTalVBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); m_pListBox = new KviTalListBox(this); - m_pLineEdit = new QLineEdit(this); - connect(m_pLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pLineEdit = new TQLineEdit(this); + connect(m_pLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); - m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); + m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); + connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pOption = pOption; m_pListBox->insertStringList(*pOption); m_pListBox->setSelectionMode(KviTalListBox::Extended); - connect(m_pListBox,SIGNAL(selectionChanged()),this,SLOT(selectionChanged())); + connect(m_pListBox,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListBox,1); setEnabled(bEnabled); @@ -434,7 +434,7 @@ void KviStringListSelector::selectionChanged() m_pRemoveButton->setEnabled(isEnabled() && bSomeSelected); } -void KviStringListSelector::textChanged(const QString &str) +void KviStringListSelector::textChanged(const TQString &str) { str.stripWhiteSpace(); m_pAddButton->setEnabled((str.length() > 0) && isEnabled()); @@ -445,7 +445,7 @@ void KviStringListSelector::setEnabled(bool bEnabled) KviTalVBox::setEnabled(bEnabled); m_pLineEdit->setEnabled(bEnabled); m_pLabel->setEnabled(bEnabled); - QString txt = m_pLineEdit->text(); + TQString txt = m_pLineEdit->text(); txt.stripWhiteSpace(); m_pAddButton->setEnabled(bEnabled && (txt.length() > 0)); unsigned int uCount = m_pListBox->count(); @@ -468,7 +468,7 @@ void KviStringListSelector::commit() m_pOption->clear(); for(unsigned int u=0;u<uCount;u++) { - QString str = m_pListBox->text(u); + TQString str = m_pListBox->text(u); str.stripWhiteSpace(); if(str.length() > 0)m_pOption->append(str); } @@ -476,7 +476,7 @@ void KviStringListSelector::commit() void KviStringListSelector::addClicked() { - QString str = m_pLineEdit->text(); + TQString str = m_pLineEdit->text(); str.stripWhiteSpace(); if(str.length() > 0)m_pListBox->insertItem(str); m_pLineEdit->setText(""); @@ -492,14 +492,14 @@ void KviStringListSelector::removeClicked() } -KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor * pOption,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton(" ",this); + m_pButton = new TQPushButton(" ",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(changeClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -511,25 +511,25 @@ KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pO setEnabled(bEnabled); } -void KviColorSelector::setButtonPalette(QColor * pOption) +void KviColorSelector::setButtonPalette(TQColor * pOption) { - QPalette pal(*pOption,colorGroup().background()); + TQPalette pal(*pOption,tqcolorGroup().background()); m_memColor = *pOption; m_pButton->setPalette(pal); - QPixmap pix(16,16); + TQPixmap pix(16,16); pix.fill(*pOption); m_pButton->setIconSet(pix); } -void KviColorSelector::forceColor(QColor clr) +void KviColorSelector::forceColor(TQColor clr) { setButtonPalette(&clr); } void KviColorSelector::changeClicked() { - QColor tmp = QColorDialog::getColor(m_memColor); + TQColor tmp = TQColorDialog::getColor(m_memColor); if(tmp.isValid())setButtonPalette(&tmp); } @@ -546,14 +546,14 @@ void KviColorSelector::setEnabled(bool bEnabled) } -KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector::KviFontSelector(TQWidget * par,const TQString & txt,TQFont * pOption,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton("",this); + m_pButton = new TQPushButton("",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(changeClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -565,7 +565,7 @@ KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOpti setEnabled(bEnabled); } -void KviFontSelector::setButtonFont(QFont * pOption) +void KviFontSelector::setButtonFont(TQFont * pOption) { m_pButton->setText(pOption->family()); m_pButton->setFont(*pOption); @@ -574,7 +574,7 @@ void KviFontSelector::setButtonFont(QFont * pOption) void KviFontSelector::changeClicked() { bool bOk; - QFont tmp = QFontDialog::getFont(&bOk,m_pButton->font()); + TQFont tmp = TQFontDialog::getFont(&bOk,m_pButton->font()); if(bOk)setButtonFont(&tmp); } @@ -594,14 +594,14 @@ void KviFontSelector::setEnabled(bool bEnabled) -KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled) +KviMircTextColorSelector::KviMircTextColorSelector(TQWidget * par,const TQString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton(__tr2qs("Sample Text"),this); + m_pButton = new TQPushButton(__tr2qs("Sample Text"),this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(buttonClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(buttonClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -619,14 +619,14 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & m_pContextPopup = new KviTalPopupMenu(this); m_pForePopup = new KviTalPopupMenu(this); - connect(m_pForePopup,SIGNAL(activated(int)),this,SLOT(foreSelected(int))); + connect(m_pForePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(foreSelected(int))); int i; for(i=0;i<KVI_MIRCCOLOR_MAX_FOREGROUND;i++) { - QPixmap tmp(120,16); + TQPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); #ifdef COMPILE_USE_QT4 - int id = m_pForePopup->insertItem(tmp,QString("x")); + int id = m_pForePopup->insertItem(tmp,TQString("x")); #else int id = m_pForePopup->insertItem(tmp); #endif @@ -635,15 +635,15 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & m_pContextPopup->insertItem(__tr2qs("Foreground"),m_pForePopup); m_pBackPopup = new KviTalPopupMenu(this); - connect(m_pBackPopup,SIGNAL(activated(int)),this,SLOT(backSelected(int))); + connect(m_pBackPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(backSelected(int))); i = m_pBackPopup->insertItem(__tr2qs("Transparent")); m_pBackPopup->setItemParameter(i,KVI_TRANSPARENT); for(i=0;i<KVI_MIRCCOLOR_MAX_BACKGROUND;i++) { - QPixmap tmp(120,16); + TQPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); #ifdef COMPILE_USE_QT4 - int id = m_pForePopup->insertItem(tmp,QString("x")); + int id = m_pForePopup->insertItem(tmp,TQString("x")); #else int id = m_pBackPopup->insertItem(tmp); #endif @@ -671,27 +671,27 @@ void KviMircTextColorSelector::setEnabled(bool bEnabled) void KviMircTextColorSelector::setButtonPalette() { - QPalette pal; + TQPalette pal; if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND) { if(m_uBack != KVI_TRANSPARENT)m_uBack = KVI_TRANSPARENT; pal = palette(); } else { - pal = QPalette(KVI_OPTION_MIRCCOLOR(m_uBack)); + pal = TQPalette(KVI_OPTION_MIRCCOLOR(m_uBack)); } if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND; - pal.setColor(QColorGroup::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore)); - pal.setColor(QColorGroup::Text,KVI_OPTION_MIRCCOLOR(m_uFore)); + pal.setColor(TQColorGroup::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore)); + pal.setColor(TQColorGroup::Text,KVI_OPTION_MIRCCOLOR(m_uFore)); m_pButton->setPalette(pal); } void KviMircTextColorSelector::buttonClicked() { - QPoint p = m_pButton->mapToGlobal(QPoint(0,m_pButton->height())); + TQPoint p = m_pButton->mapToGlobal(TQPoint(0,m_pButton->height())); m_pContextPopup->popup(p); } @@ -709,11 +709,11 @@ void KviMircTextColorSelector::backSelected(int id) setButtonPalette(); } -KviSoundSelector::KviSoundSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviSoundSelector::KviSoundSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) :KviFileSelector(par,txt,pOption,bEnabled) { - m_pPlayButton = new QPushButton(__tr2qs("Play"),this); - connect(m_pPlayButton,SIGNAL(clicked()),this,SLOT(playSound())); + m_pPlayButton = new TQPushButton(__tr2qs("Play"),this); + connect(m_pPlayButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(playSound())); } KviSoundSelector::~KviSoundSelector() @@ -731,49 +731,49 @@ void KviSoundSelector::setEnabled(bool bEnabled) m_pPlayButton->setEnabled(bEnabled); } -KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,QString szChan,QString szPass) +KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,TQString szPass) :KviTalListViewItem(pList,szChan) { m_szPass=szPass; - QString mask; - mask.fill('*',szPass.length()); - setText(1,mask); + TQString tqmask; + tqmask.fill('*',szPass.length()); + setText(1,tqmask); } -KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) +KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) : KviTalVBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); m_pListView = new KviTalListView(this); m_pListView->addColumn(__tr2qs("Channel name")); m_pListView->addColumn(__tr2qs("Channel password")); KviTalHBox* pEditsHBox = new KviTalHBox(this); - m_pChanLineEdit = new QLineEdit(pEditsHBox); - connect(m_pChanLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pChanLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pChanLineEdit = new TQLineEdit(pEditsHBox); + connect(m_pChanLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pChanLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); - m_pPassLineEdit = new QLineEdit(pEditsHBox); - m_pPassLineEdit->setEchoMode(QLineEdit::Password); - connect(m_pPassLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pPassLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pPassLineEdit = new TQLineEdit(pEditsHBox); + m_pPassLineEdit->setEchoMode(TQLineEdit::Password); + connect(m_pPassLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pPassLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); - m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); + m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); + connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pOption = pOption; - for ( QStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { + for ( TQStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { new KviChanListViewItem(m_pListView,(*it).section(':',0,0),(*it).section(':',1)); } m_pListView->setSelectionMode(KviTalListView::Extended); m_pListView->setAllColumnsShowFocus(TRUE); - connect(m_pListView,SIGNAL(selectionChanged()),this,SLOT(selectionChanged())); + connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListView,1); setEnabled(bEnabled); @@ -805,7 +805,7 @@ void KviCahnnelListSelector::setEnabled(bool bEnabled) m_pRemoveButton->setEnabled(bEnabled); } -void KviCahnnelListSelector::textChanged(const QString &str) +void KviCahnnelListSelector::textChanged(const TQString &str) { m_pAddButton->setEnabled(!m_pChanLineEdit->text().isEmpty()); } diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 3e620127..ad37ed53 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -28,27 +28,27 @@ #include "kvi_settings.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "kvi_tal_hbox.h" #include "kvi_tal_vbox.h" -#include <qlineedit.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "kvi_tal_scrollview.h" -#include <qpushbutton.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqpushbutton.h> +#include <tqcolor.h> +#include <tqfont.h> #include "kvi_tal_listbox.h" #include "kvi_tal_listview.h" -#include <qspinbox.h> -#include <qstringlist.h> -#include <qvalidator.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqvalidator.h> #include "kvi_string.h" #include "kvi_pixmap.h" #include "kvi_styled_controls.h" //#ifndef _KVI_SELECTORS_CPP_ -// extern void commitAllSelectors(QWidget * par,const char * classname); +// extern void commitAllSelectors(TQWidget * par,const char * classname); //#endif @@ -57,7 +57,7 @@ // // Note: I'm always learning // Today I have discovered that: -// QObject * o = new KviBoolSelector(...) +// TQObject * o = new KviBoolSelector(...) // ((KviSelectorInterface *)o)->commit() // Does not work (SIGSEGV when jumping into commit(): bad vtable entry) // But the following works fine: @@ -80,8 +80,9 @@ public: class KVIRC_API KviBoolSelector : public KviStyledCheckBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled); + KviBoolSelector(TQWidget * par,const TQString & txt,bool *pOption,bool bEnabled); ~KviBoolSelector(){}; private: bool * m_pOption; @@ -94,56 +95,60 @@ public slots: class KVIRC_API KviStringSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviStringSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviStringSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviStringSelector(); protected: - QLabel * m_pLabel; - QLineEdit * m_pLineEdit; - QString * m_pOption; + TQLabel * m_pLabel; + TQLineEdit * m_pLineEdit; + TQString * m_pOption; public: - void setValidator(QValidator * v){ m_pLineEdit->setValidator(v); }; + void setValidator(TQValidator * v){ m_pLineEdit->setValidator(v); }; void setMinimumLabelWidth(unsigned int uWidth){ m_pLabel->setMinimumWidth(uWidth); }; virtual void commit(); virtual void setEnabled(bool bEnabled); - void setText(const QString& text); + void setText(const TQString& text); }; class KVIRC_API KviPasswordSelector : public KviStringSelector { Q_OBJECT + TQ_OBJECT public: - KviPasswordSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviPasswordSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviPasswordSelector(){}; }; class KVIRC_API KviPixmapPreview : public KviTalScrollView { Q_OBJECT + TQ_OBJECT public: - KviPixmapPreview(QWidget * par); + KviPixmapPreview(TQWidget * par); ~KviPixmapPreview(); protected: KviPixmap * m_pPixmap; public: void setPixmap(KviPixmap * pix); protected: - virtual void drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph); + virtual void drawContents(TQPainter * p, int clipx, int clipy, int clipw, int cliph); }; -class KVIRC_API KviPixmapSelector : public QWidget, public KviSelectorInterface +class KVIRC_API KviPixmapSelector : public TQWidget, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap * pOption,bool bEnabled); + KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixmap * pOption,bool bEnabled); ~KviPixmapSelector(); private: KviStyledCheckBox * m_pCheckBox; - QLabel * m_pFileNameLabel; + TQLabel * m_pFileNameLabel; KviPixmapPreview * m_pPreview; - QPushButton * m_pChooseButton; + TQPushButton * m_pChooseButton; KviPixmap * m_pOption; KviPixmap m_localPixmap; public: @@ -158,21 +163,22 @@ protected slots: class KVIRC_API KviUIntSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviUIntSelector(QWidget * par,const QString & txt,unsigned int *pOption, + KviUIntSelector(TQWidget * par,const TQString & txt,unsigned int *pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled,bool bShortInt = false); ~KviUIntSelector(){}; private: - QLabel * m_pLabel; - QSpinBox * m_pSpinBox; + TQLabel * m_pLabel; + TQSpinBox * m_pSpinBox; unsigned int * m_pOption; unsigned int m_uLowBound; unsigned int m_uHighBound; unsigned int m_uDefault; bool m_bIsShortInt; public: - virtual void setPrefix(const QString & txt); - virtual void setSuffix(const QString & txt); + virtual void setPrefix(const TQString & txt); + virtual void setSuffix(const TQString & txt); virtual void commit(); virtual void setEnabled(bool bEnabled); }; @@ -181,8 +187,9 @@ public: class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString::null); + KviFileSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled,unsigned int uFlags = 0,const TQString &szFilter = TQString()); ~KviFileSelector(){}; public: enum Flags { @@ -190,18 +197,18 @@ public: DontConfirmOverwrite = 2 }; protected: - QLabel * m_pLabel; - QLineEdit * m_pLineEdit; - QPushButton * m_pButton; - QString * m_pOption; + TQLabel * m_pLabel; + TQLineEdit * m_pLineEdit; + TQPushButton * m_pButton; + TQString * m_pOption; unsigned int m_uFlags; - QString m_szFilter; + TQString m_szFilter; public: virtual void commit(); virtual void setEnabled(bool bEnabled); - void setSelection(const QString &szSelection); + void setSelection(const TQString &szSelection); signals: - void selectionChanged(const QString &szNewValue); + void selectionChanged(const TQString &szNewValue); private slots: void browseClicked(); protected: @@ -211,8 +218,9 @@ protected: class KVIRC_API KviDirectorySelector : public KviFileSelector { Q_OBJECT + TQ_OBJECT public: - KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviDirectorySelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviDirectorySelector(){}; protected: virtual void select(); @@ -222,21 +230,22 @@ protected: class KVIRC_API KviColorSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviColorSelector(QWidget * par,const QString & txt,QColor * pOption,bool bEnabled); + KviColorSelector(TQWidget * par,const TQString & txt,TQColor * pOption,bool bEnabled); ~KviColorSelector(){}; private: - QLabel * m_pLabel; - QColor * m_pOption; - QColor m_memColor; - QPushButton * m_pButton; + TQLabel * m_pLabel; + TQColor * m_pOption; + TQColor m_memColor; + TQPushButton * m_pButton; public: virtual void commit(); virtual void setEnabled(bool bEnabled); - QColor getColor(){ return m_memColor; }; - void forceColor(QColor clr); + TQColor getColor(){ return m_memColor; }; + void forceColor(TQColor clr); private: - void setButtonPalette(QColor * pOption); + void setButtonPalette(TQColor * pOption); private slots: void changeClicked(); }; @@ -244,18 +253,19 @@ private slots: class KVIRC_API KviFontSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviFontSelector(QWidget * par,const QString & txt,QFont * pOption,bool bEnabled); + KviFontSelector(TQWidget * par,const TQString & txt,TQFont * pOption,bool bEnabled); ~KviFontSelector(){}; private: - QLabel * m_pLabel; - QFont * m_pOption; - QPushButton * m_pButton; + TQLabel * m_pLabel; + TQFont * m_pOption; + TQPushButton * m_pButton; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private: - void setButtonFont(QFont * pOption); + void setButtonFont(TQFont * pOption); private slots: void changeClicked(); }; @@ -263,21 +273,22 @@ private slots: class KVIRC_API KviStringListSelector : public KviTalVBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviStringListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); + KviStringListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled); ~KviStringListSelector(); private: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviTalListBox * m_pListBox; - QLineEdit * m_pLineEdit; - QPushButton * m_pAddButton; - QPushButton * m_pRemoveButton; - QStringList * m_pOption; + TQLineEdit * m_pLineEdit; + TQPushButton * m_pAddButton; + TQPushButton * m_pRemoveButton; + TQStringList * m_pOption; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private slots: - void textChanged(const QString &str); + void textChanged(const TQString &str); void selectionChanged(); void addClicked(); void removeClicked(); @@ -288,12 +299,13 @@ class KviTalPopupMenu; class KVIRC_API KviMircTextColorSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviMircTextColorSelector(QWidget * par,const QString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled); + KviMircTextColorSelector(TQWidget * par,const TQString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled); ~KviMircTextColorSelector(); private: - QLabel *m_pLabel; - QPushButton * m_pButton; + TQLabel *m_pLabel; + TQPushButton * m_pButton; unsigned int * m_pUFore; unsigned int * m_pUBack; unsigned int m_uFore; @@ -316,11 +328,12 @@ protected: class KVIRC_API KviSoundSelector : public KviFileSelector { Q_OBJECT + TQ_OBJECT public: - KviSoundSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviSoundSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviSoundSelector(); protected: - QPushButton *m_pPlayButton; + TQPushButton *m_pPlayButton; private slots: void playSound(); public: @@ -330,33 +343,34 @@ public: class KVIRC_API KviChanListViewItem : public KviTalListViewItem { private: - QString m_szPass; + TQString m_szPass; public: - KviChanListViewItem(KviTalListView* pList,QString szChan,QString szPass); + KviChanListViewItem(KviTalListView* pList,TQString szChan,TQString szPass); ~KviChanListViewItem() {}; - const QString& pass() { return m_szPass; } + const TQString& pass() { return m_szPass; } }; class KVIRC_API KviCahnnelListSelector : public KviTalVBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); + KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled); ~KviCahnnelListSelector(); private: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviTalListView * m_pListView; - QLineEdit * m_pChanLineEdit; - QLineEdit * m_pPassLineEdit; - QPushButton * m_pAddButton; - QPushButton * m_pRemoveButton; - QStringList * m_pOption; + TQLineEdit * m_pChanLineEdit; + TQLineEdit * m_pPassLineEdit; + TQPushButton * m_pAddButton; + TQPushButton * m_pRemoveButton; + TQStringList * m_pOption; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private slots: - void textChanged(const QString &str); + void textChanged(const TQString &str); void selectionChanged(); void addClicked(); void removeClicked(); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 7b6b7177..d91be01e 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -29,38 +29,38 @@ #include "kvi_splash.h" #include "kvi_locale.h" #include "kvi_fileutils.h" -#include <qsplashscreen.h> +#include <tqsplashscreen.h> #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> + #include <tqdesktopwidget.h> #endif -#include <qpixmap.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlayout.h> #include <stdio.h> KviSplashScreen::KviSplashScreen() -: QSplashScreen(QPixmap(1,1),Qt::WStyle_NoBorder | Qt::WType_TopLevel | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop | Qt::WStyle_Splash) +: TQSplashScreen(TQPixmap(1,1),TQt::WStyle_NoBorder | TQt::WType_TopLevel | TQt::WStyle_Customize | TQt::WStyle_StaysOnTop | TQt::WStyle_Splash) { - QString szPix; - QPixmap * pix = 0; + TQString szPix; + TQPixmap * pix = 0; // check for the current theme splash screen pointer - QString szPointerFile; + TQString szPointerFile; g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash"); if(KviFileUtils::fileExists(szPointerFile)) { - QString szBuf; + TQString szBuf; KviFileUtils::readFile(szPointerFile,szBuf); if(!szBuf.isEmpty()) { g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf); - KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); szPix.append("kvi_splash.png"); - pix = new QPixmap(szPix); + pix = new TQPixmap(szPix); if(pix->isNull()) { // no way.. @@ -69,9 +69,9 @@ KviSplashScreen::KviSplashScreen() } else { // else we might have a themed splash screen // g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf); - KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); szPix.append("kvi_splash_overlay.png"); - m_pOverlay = new QPixmap(szPix); + m_pOverlay = new TQPixmap(szPix); if(m_pOverlay->isNull()) { // no way.. @@ -88,39 +88,39 @@ KviSplashScreen::KviSplashScreen() { if(g_pApp->findImage(szPix,"kvi_splash.png")) { - pix = new QPixmap(szPix); + pix = new TQPixmap(szPix); } else { // dummy image - pix = new QPixmap(300,200); + pix = new TQPixmap(300,200); } if(g_pApp->findImage(szPix,"kvi_splash_overlay.png")) { - m_pOverlay = new QPixmap(szPix); + m_pOverlay = new TQPixmap(szPix); } else { - m_pOverlay = new QPixmap(300,20); + m_pOverlay = new TQPixmap(300,20); } } setPixmap(*pix); - m_pTimer = new QTimer(this); - connect(m_pTimer,SIGNAL(timeout()),this,SLOT(suicide())); + m_pTimer = new TQTimer(this); + connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(suicide())); delete pix; #ifdef COMPILE_USE_QT4 setWindowOpacity(0); m_bIncreasing=true; m_rTransparency=0; - m_pFadeTimer= new QTimer(this); - connect(m_pFadeTimer,SIGNAL(timeout()),this,SLOT(fadeTimerShot())); + m_pFadeTimer= new TQTimer(this); + connect(m_pFadeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(fadeTimerShot())); m_pFadeTimer->start(6); #endif } // We don't need messages on the splash: they just add work to the translators and nobody can read them anyway :D -//void KviSplashScreen::message(QString szMessage) +//void KviSplashScreen::message(TQString szMessage) //{ - //QSplashScreen::message(szMessage, Qt::AlignRight | Qt::AlignBottom, Qt::white); + //TQSplashScreen::message(szMessage, TQt::AlignRight | TQt::AlignBottom, TQt::white); //} KviSplashScreen::~KviSplashScreen() @@ -131,14 +131,14 @@ KviSplashScreen::~KviSplashScreen() } -void KviSplashScreen::showEvent(QShowEvent *e) +void KviSplashScreen::showEvent(TQShowEvent *e) { move((g_pApp->desktop()->width() - width())/2, (g_pApp->desktop()->height() - height())/2); - m_creationTime = QTime::currentTime(); + m_creationTime = TQTime::currentTime(); } -void KviSplashScreen::hideEvent(QHideEvent *e) +void KviSplashScreen::hideEvent(TQHideEvent *e) { suicide(); } @@ -146,21 +146,21 @@ void KviSplashScreen::hideEvent(QHideEvent *e) void KviSplashScreen::setProgress(int progress) { #ifdef COMPILE_USE_QT4 - QPixmap slowQt4Copy = pixmap(); - QPainter painter(&slowQt4Copy); - QSize size = slowQt4Copy.size(); + TQPixmap slowTQt4Copy = pixmap(); + TQPainter painter(&slowTQt4Copy); + TQSize size = slowTQt4Copy.size(); int w = (m_pOverlay->width() * progress) / 100; painter.drawPixmap(0,size.height() - m_pOverlay->height(),w,m_pOverlay->height(),*m_pOverlay,0,0,w,m_pOverlay->height()); painter.end(); - setPixmap(slowQt4Copy); + setPixmap(slowTQt4Copy); #else - QPainter painter(pixmap()); - QSize size = pixmap()->size(); + TQPainter painter(pixmap()); + TQSize size = pixmap()->size(); painter.drawPixmap(0,size.height() - m_pOverlay->height(),*m_pOverlay,0,0,(m_pOverlay->width() * progress) / 100,m_pOverlay->height()); painter.end(); #endif //raise(); - repaint(); + tqrepaint(); g_pApp->processEvents(); //damn... } @@ -172,7 +172,7 @@ void KviSplashScreen::die() m_bIncreasing = false; m_pFadeTimer->start(6); #else - QTime now = QTime::currentTime(); + TQTime now = TQTime::currentTime(); int mSecs = m_creationTime.msecsTo(now); int mRemaining = KVI_SPLASH_SCREEN_MINIMUM_TIMEOUT_IN_MSECS - mSecs; if(mRemaining < 0)mRemaining = 0; diff --git a/src/kvirc/ui/kvi_splash.h b/src/kvirc/ui/kvi_splash.h index 83cfb734..a89e8e9e 100644 --- a/src/kvirc/ui/kvi_splash.h +++ b/src/kvirc/ui/kvi_splash.h @@ -27,37 +27,38 @@ #include "kvi_settings.h" -#include <qframe.h> +#include <tqframe.h> -#include <qprogressbar.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qsplashscreen.h> -#include <qpixmap.h> +#include <tqprogressbar.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqsplashscreen.h> +#include <tqpixmap.h> -class KVIRC_API KviSplashScreen : public QSplashScreen +class KVIRC_API KviSplashScreen : public TQSplashScreen { Q_OBJECT + TQ_OBJECT public: KviSplashScreen(); virtual ~KviSplashScreen(); private: - QTimer * m_pTimer; - QTime m_creationTime; - QPixmap * m_pOverlay; + TQTimer * m_pTimer; + TQTime m_creationTime; + TQPixmap * m_pOverlay; #ifdef COMPILE_USE_QT4 bool m_bIncreasing; qreal m_rTransparency; - QTimer * m_pFadeTimer; + TQTimer * m_pFadeTimer; #endif protected: - virtual void showEvent(QShowEvent * e); - virtual void hideEvent(QHideEvent * e); + virtual void showEvent(TQShowEvent * e); + virtual void hideEvent(TQHideEvent * e); public: void setProgress(int progress); void die(); - //void message(QString); + //void message(TQString); protected slots: void suicide(); void fadeTimerShot(); diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index df20a225..6aad95bb 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -27,7 +27,7 @@ #include "kvi_statusbar.h" #include "kvi_frame.h" -#include <qlabel.h> +#include <tqlabel.h> #include "kvi_iconmanager.h" #include "kvi_window.h" @@ -41,16 +41,16 @@ #include "kvi_statusbarapplet.h" #include "kvi_dynamictooltip.h" -#include <qpainter.h> -#include <qstyle.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qpixmap.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif // This class COULD be derived also from KStatusBar but in fact @@ -61,7 +61,7 @@ #include "kvi_time.h" #include "kvi_qstring.h" -#include <qfont.h> +#include <tqfont.h> /* IDEAS: @@ -73,7 +73,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) -: QStatusBar(pFrame) +: TQStatusBar(pFrame) { setProperty("name","statusbar"); @@ -86,7 +86,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pClickedApplet = 0; - m_pAppletDescriptors = new KviPointerHashTable<QString,KviStatusBarAppletDescriptor>; + m_pAppletDescriptors = new KviPointerHashTable<TQString,KviStatusBarAppletDescriptor>; m_pAppletDescriptors->setAutoDelete(true); KviStatusBarClock::selfRegister(this); @@ -103,28 +103,28 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pMessageTimer = 0; - m_pMessageLabel = new QLabel("<b>[x]</b> x",this,"msgstatuslabel"); + m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel"); m_pMessageLabel->setMargin(1); #ifdef COMPILE_USE_QT4 - m_pMessageLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); + m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); #else - m_pMessageLabel->setAlignment(SingleLine | Qt::AlignVCenter | Qt::AlignLeft); + m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); #endif m_pMessageLabel->setMinimumWidth(350); m_iLastMinimumHeight = 0; m_bStopLayoutOnAddRemove = true; - connect(m_pFrame,SIGNAL(activeContextChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeContextStateChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(setPermanentMessage())); setPermanentMessage(); m_bStopLayoutOnAddRemove = false; m_pToolTip = new KviDynamicToolTip(this); - connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); updateLayout(); } @@ -154,11 +154,11 @@ void KviStatusBar::load() { KviStr prefix(KviStr::Format,"Applet%d",i); KviStr tmp(KviStr::Format,"%s_InternalName",prefix.ptr()); - QString szInternalName = cfg.readEntry(tmp.ptr(),""); + TQString szInternalName = cfg.readEntry(tmp.ptr(),""); if(!szInternalName.isEmpty()) { tmp.sprintf("%s_PreloadModule",prefix.ptr()); - QString szPreloadModule = cfg.readEntry(tmp.ptr(),""); + TQString szPreloadModule = cfg.readEntry(tmp.ptr(),""); if(!szPreloadModule.isEmpty()) g_pModuleManager->getModule(szPreloadModule.utf8().data()); @@ -204,13 +204,13 @@ void KviStatusBar::save() #define SPACING 3 #define RICHTEXTLABELTRICK 2 -void KviStatusBar::layoutChildren() +void KviStatusBar::tqlayoutChildren() { int x = width() - HMARGIN; int h = height() - (VMARGIN * 2); for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - int w = a->sizeHint().width(); + int w = a->tqsizeHint().width(); x -= w; a->setGeometry(x,VMARGIN,w,h); x -= SPACING; @@ -219,29 +219,29 @@ void KviStatusBar::layoutChildren() m_pMessageLabel->setGeometry(HMARGIN,VMARGIN,x - HMARGIN,h - RICHTEXTLABELTRICK); } -void KviStatusBar::resizeEvent(QResizeEvent * e) +void KviStatusBar::resizeEvent(TQResizeEvent * e) { - layoutChildren(); + tqlayoutChildren(); } -bool KviStatusBar::event(QEvent * e) +bool KviStatusBar::event(TQEvent * e) { - if(e->type() == QEvent::LayoutHint) + if(e->type() == TQEvent::LayoutHint) { updateLayout(); - return false; // send to parents too! + return false; // send to tqparents too! } - return QStatusBar::event(e); + return TQStatusBar::event(e); } void KviStatusBar::recalcMinimumHeight() { int s = 18; - int h = m_pMessageLabel->sizeHint().height(); + int h = m_pMessageLabel->tqsizeHint().height(); if(h > s)s = h; for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - h = a->sizeHint().height(); + h = a->tqsizeHint().height(); if(h > s)s = h; } s += (VMARGIN * 2) + RICHTEXTLABELTRICK; @@ -249,22 +249,22 @@ void KviStatusBar::recalcMinimumHeight() { m_iLastMinimumHeight = s; setMinimumHeight(s); - QLayout * l = layout(); + TQLayout * l = tqlayout(); if(l) - if(l->inherits("QBoxLayout")) - ((QBoxLayout *)l)->addStrut(s); - // FIXME: do QMainWindow need setUpLayout() here ? + if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING)) + ((TQBoxLayout *)l)->addStrut(s); + // FIXME: do TQMainWindow need setUpLayout() here ? } } bool KviStatusBar::appletExists(KviStatusBarApplet * pApplet) { - return (m_pAppletList->findRef(pApplet) != -1); + return (m_pAppletList->tqfindRef(pApplet) != -1); } -KviStatusBarApplet * KviStatusBar::appletAt(const QPoint &pnt,bool bBestMatch) +KviStatusBarApplet * KviStatusBar::appletAt(const TQPoint &pnt,bool bBestMatch) { - QPoint local = mapFromGlobal(pnt); + TQPoint local = mapFromGlobal(pnt); if(bBestMatch) { for(KviStatusBarApplet * a = m_pAppletList->first();a;a = m_pAppletList->next()) @@ -287,16 +287,16 @@ KviStatusBarApplet * KviStatusBar::appletAt(const QPoint &pnt,bool bBestMatch) return 0; } -void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt) +void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const TQPoint &pnt) { KviStatusBarApplet * a = appletAt(mapToGlobal(pnt)); - QString szTip; - QRect r; + TQString szTip; + TQRect r; if(a) { szTip = "<table width=\"100%\"><tr><td bgcolor=\"#303030\" align=\"center\"><font color=\"#ffffff\"><b>" + a->descriptor()->visibleName() + "</b></font></td></tr>"; - QString szTipx = a->tipText(a->mapFromGlobal(mapToGlobal(pnt))); + TQString szTipx = a->tipText(a->mapFromGlobal(mapToGlobal(pnt))); if(!szTipx.isEmpty()) { szTip += "<tr><td>"; @@ -307,12 +307,12 @@ void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt) szTip += "<tr><td align=\"center\"><font color=\"#808080\" size=\"-1\">"; szTip += __tr2qs("<b>Shift+Drag</b> or <b>Ctrl+Drag</b> to move the applet around<br><b>Right click</b> to see the other options"); szTip += "</font></td></tr></table>"; - r = QRect(a->x(),a->y(),a->width(),a->height()); + r = TQRect(a->x(),a->y(),a->width(),a->height()); } else { szTip = "<center>"; szTip += __tr2qs("<b>Right click</b> to add/remove applets"); szTip += "</center>"; - r = QRect(m_pMessageLabel->x(),m_pMessageLabel->y(),m_pMessageLabel->width(),m_pMessageLabel->height()); + r = TQRect(m_pMessageLabel->x(),m_pMessageLabel->y(),m_pMessageLabel->width(),m_pMessageLabel->height()); } pTip->tip(r,szTip); } @@ -322,9 +322,9 @@ KviTalPopupMenu * KviStatusBar::contextPopup() if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); } - m_pClickedApplet = appletAt(QCursor::pos()); + m_pClickedApplet = appletAt(TQCursor::pos()); return m_pContextPopup; } @@ -336,30 +336,30 @@ void KviStatusBar::contextPopupAboutToShow() if(appletExists(m_pClickedApplet)) { - QString app = m_pClickedApplet->descriptor()->visibleName(); + TQString app = m_pClickedApplet->descriptor()->visibleName(); - QString tmp; - KviQString::sprintf(tmp,"<center><b>%Q</b></center>",&app); + TQString tmp; + KviTQString::sprintf(tmp,"<center><b>%Q</b></center>",&app); #ifndef COMPILE_USE_QT4 - // FIXME: This is not supported under Qt4.. :( - QLabel * l = new QLabel(tmp,m_pContextPopup); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + // FIXME: This is not supported under TQt4.. :( + TQLabel * l = new TQLabel(tmp,m_pContextPopup); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); m_pContextPopup->insertItem(l); #endif m_pClickedApplet->fillContextPopup(m_pContextPopup); - KviQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); + KviTQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem(tmp,this,SLOT(removeClickedApplet())); + m_pContextPopup->insertItem(tmp,this,TQT_SLOT(removeClickedApplet())); } if(!m_pAppletsPopup) { m_pAppletsPopup = new KviTalPopupMenu(this); - connect(m_pAppletsPopup,SIGNAL(aboutToShow()),this,SLOT(appletsPopupAboutToShow())); - connect(m_pAppletsPopup,SIGNAL(activated(int)),this,SLOT(appletsPopupActivated(int))); + connect(m_pAppletsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(appletsPopupAboutToShow())); + connect(m_pAppletsPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(appletsPopupActivated(int))); } m_pContextPopup->insertItem(__tr2qs("Add Applet"),m_pAppletsPopup); @@ -380,11 +380,11 @@ void KviStatusBar::appletsPopupAboutToShow() // FIXME: could we cache the module results in some way ? g_pModuleManager->loadModulesByCaps("statusbarapplet"); - KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); + KviPointerHashTableIterator<TQString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); while(KviStatusBarAppletDescriptor * d = it.current()) { int id; - QPixmap * pix = d->icon(); + TQPixmap * pix = d->icon(); if(pix)id = m_pAppletsPopup->insertItem(*pix,d->visibleName()); else id = m_pAppletsPopup->insertItem(d->visibleName()); m_pAppletsPopup->setItemParameter(id,d->id()); @@ -392,9 +392,9 @@ void KviStatusBar::appletsPopupAboutToShow() } } -KviStatusBarApplet * KviStatusBar::createApplet(const QString &szInternalName) +KviStatusBarApplet * KviStatusBar::createApplet(const TQString &szInternalName) { - KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->find(szInternalName); + KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->tqfind(szInternalName); if(!d)return 0; return d->create(this); } @@ -412,14 +412,14 @@ void KviStatusBar::appletsPopupActivated(int id) if(!m_pAppletsPopup)return; int par = m_pAppletsPopup->itemParameter(id); - KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); + KviPointerHashTableIterator<TQString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); while(KviStatusBarAppletDescriptor * d = it.current()) { if(par == d->id()) { if(m_pClickedApplet) { - int idx = m_pAppletList->findRef(m_pClickedApplet); + int idx = m_pAppletList->tqfindRef(m_pClickedApplet); if(idx != -1) { // try to put the new applet just after the clicked one @@ -444,7 +444,7 @@ void KviStatusBar::appletsPopupActivated(int id) void KviStatusBar::registerAppletDescriptor(KviStatusBarAppletDescriptor * d) { - m_pAppletDescriptors->replace(d->internalName(),d); + m_pAppletDescriptors->tqreplace(d->internalName(),d); } void KviStatusBar::registerApplet(KviStatusBarApplet * a) @@ -463,42 +463,42 @@ void KviStatusBar::unregisterApplet(KviStatusBarApplet * a) } -void KviStatusBar::paintEvent(QPaintEvent * e) +void KviStatusBar::paintEvent(TQPaintEvent * e) { - // avoid the ugly rectangle around the widgets painted by QStatusBar -// QPainter p(this); -// style().drawPrimitive(QStyle::PE_Panel,&p,rect(),colorGroup(),QStyle::Style_Raised,QStyleOption(1,1)); - //QStatusBar::paintEvent(e); - //qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0); + // avoid the ugly rectangle around the widgets painted by TQStatusBar +// TQPainter p(this); +// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); + //TQStatusBar::paintEvent(e); + //qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0); } -void KviStatusBar::mousePressEvent(QMouseEvent * e) +void KviStatusBar::mousePressEvent(TQMouseEvent * e) { m_pClickedApplet = 0; if(e->button() & Qt::RightButton) { - contextPopup()->popup(QCursor::pos()); + contextPopup()->popup(TQCursor::pos()); return; } - if((e->button() & Qt::LeftButton) && (e->state() & (Qt::ShiftButton | Qt::ControlButton))) + if((e->button() & Qt::LeftButton) && (e->state() & (TQt::ShiftButton | TQt::ControlButton))) { // move! m_pClickedApplet = appletAt(mapToGlobal(e->pos())); if(!m_pClickedApplet)return; m_pClickedApplet->select(); #ifdef COMPILE_USE_QT4 - g_pApp->setOverrideCursor(Qt::SizeAllCursor); + g_pApp->setOverrideCursor(TQt::SizeAllCursor); #else g_pApp->setOverrideCursor(sizeAllCursor); #endif } } -void KviStatusBar::mouseMoveEvent(QMouseEvent * e) +void KviStatusBar::mouseMoveEvent(TQMouseEvent * e) { if(!m_pClickedApplet)return; if(!appletExists(m_pClickedApplet))return; - QPoint g = mapToGlobal(e->pos()); + TQPoint g = mapToGlobal(e->pos()); KviStatusBarApplet * a = appletAt(g,true); if(a == m_pClickedApplet)return; // move! @@ -518,17 +518,17 @@ void KviStatusBar::mouseMoveEvent(QMouseEvent * e) } m_pAppletList->removeRef(m_pClickedApplet); - int idx = m_pAppletList->findRef(a); + int idx = m_pAppletList->tqfindRef(a); if(idx == -1)m_pAppletList->append(m_pClickedApplet); // uhg ? else { - QPoint p = a->mapFromGlobal(g); + TQPoint p = a->mapFromGlobal(g); if(p.x() > (a->width() / 2))idx++; // just after m_pAppletList->insert(idx,m_pClickedApplet); } - layoutChildren(); + tqlayoutChildren(); } -void KviStatusBar::mouseReleaseEvent(QMouseEvent * e) +void KviStatusBar::mouseReleaseEvent(TQMouseEvent * e) { if(e->button() & Qt::LeftButton) { @@ -585,8 +585,8 @@ void KviStatusBar::showFirstMessageInQueue() if(!m_pMessageTimer) { - m_pMessageTimer = new QTimer(this); - QObject::connect(m_pMessageTimer,SIGNAL(timeout()),this,SLOT(messageTimerFired())); + m_pMessageTimer = new TQTimer(this); + TQObject::connect(m_pMessageTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(messageTimerFired())); } else { m_pMessageTimer->stop(); } @@ -602,7 +602,7 @@ void KviStatusBar::setPermanentMessage() KviIrcContext * c = m_pFrame->activeContext(); - QString txt = "<nobr>"; + TQString txt = "<nobr>"; if(c) { diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h index 119c93d8..0030ea5c 100644 --- a/src/kvirc/ui/kvi_statusbar.h +++ b/src/kvirc/ui/kvi_statusbar.h @@ -28,29 +28,29 @@ #include "kvi_pointerlist.h" #include "kvi_heapobject.h" -#include <qstring.h> +#include <tqstring.h> #include "kvi_pointerhashtable.h" -#include <qstatusbar.h> +#include <tqstatusbar.h> class KviFrame; -class QTimer; -class QLabel; +class TQTimer; +class TQLabel; class KviTalPopupMenu; class KVIRC_API KviStatusBarMessage : public KviHeapObject { friend class KviStatusBar; protected: - QString m_szText; + TQString m_szText; unsigned int m_uTimeout; unsigned int m_uPriority; public: - KviStatusBarMessage(const QString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0) + KviStatusBarMessage(const TQString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0) : KviHeapObject(), m_szText(szText), m_uTimeout(uTimeout), m_uPriority(uPriority) {}; ~KviStatusBarMessage(){}; public: - const QString & text(){ return m_szText; }; + const TQString & text(){ return m_szText; }; unsigned int timeout(){ return m_uTimeout; }; unsigned int priority(){ return m_uPriority; }; }; @@ -61,21 +61,22 @@ class KviStatusBarAppletDescriptor; class KviIrcContext; class KviDynamicToolTip; -class KVIRC_API KviStatusBar : public QStatusBar +class KVIRC_API KviStatusBar : public TQStatusBar { friend class KviStatusBarApplet; friend class KviFrame; Q_OBJECT + TQ_OBJECT public: KviStatusBar(KviFrame * pFrame); ~KviStatusBar(); protected: KviFrame * m_pFrame; KviPointerList<KviStatusBarMessage> * m_pMessageQueue; - QTimer * m_pMessageTimer; - QLabel * m_pMessageLabel; + TQTimer * m_pMessageTimer; + TQLabel * m_pMessageLabel; KviPointerList<KviStatusBarApplet> * m_pAppletList; - KviPointerHashTable<QString,KviStatusBarAppletDescriptor> * m_pAppletDescriptors; + KviPointerHashTable<TQString,KviStatusBarAppletDescriptor> * m_pAppletDescriptors; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pAppletsPopup; KviStatusBarApplet * m_pClickedApplet; @@ -88,25 +89,25 @@ protected slots: void messageTimerFired(); protected: void showFirstMessageInQueue(); - virtual void paintEvent(QPaintEvent * e); - virtual void mousePressEvent(QMouseEvent * e); - virtual void mouseMoveEvent(QMouseEvent * e); - virtual void mouseReleaseEvent(QMouseEvent * e); - virtual void resizeEvent(QResizeEvent * e); - virtual bool event(QEvent * e); + virtual void paintEvent(TQPaintEvent * e); + virtual void mousePressEvent(TQMouseEvent * e); + virtual void mouseMoveEvent(TQMouseEvent * e); + virtual void mouseReleaseEvent(TQMouseEvent * e); + virtual void resizeEvent(TQResizeEvent * e); + virtual bool event(TQEvent * e); void registerApplet(KviStatusBarApplet * a); void unregisterApplet(KviStatusBarApplet * a); void recalcMinimumHeight(); - void layoutChildren(); - void updateLayout(){ recalcMinimumHeight(); layoutChildren(); }; + void tqlayoutChildren(); + void updateLayout(){ recalcMinimumHeight(); tqlayoutChildren(); }; void save(); void load(); - KviStatusBarApplet * createApplet(const QString &szInternalName); + KviStatusBarApplet * createApplet(const TQString &szInternalName); void showLayoutHelp(); public: bool appletExists(KviStatusBarApplet * pApplet); // pnt is global! - KviStatusBarApplet * appletAt(const QPoint &pnt,bool bBestMatch = false); + KviStatusBarApplet * appletAt(const TQPoint &pnt,bool bBestMatch = false); KviTalPopupMenu * contextPopup(); // takes the ownership of pMsg @@ -124,7 +125,7 @@ protected slots: void appletsPopupActivated(int id); void removeClickedApplet(); void setPermanentMessage(); - void tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *pTip,const TQPoint &pnt); }; #endif //!_KVI_STATUSBAR_H_ diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 8e4ec89a..bc8fa023 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -40,15 +40,15 @@ #include "kvi_options.h" #include "kvi_kvs_script.h" -#include <qpainter.h> -#include <qstyle.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qpixmap.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif // This class COULD be derived also from KStatusBar but in fact @@ -61,7 +61,7 @@ #include "kvi_time.h" #include "kvi_qstring.h" -#include <qfont.h> +#include <tqfont.h> /* IDEAS: @@ -69,7 +69,7 @@ - Countdown timer */ -KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString &szVisibleName,const QString &szInternalName,CreateAppletCallback pProc,const QString &szPreloadModule,const QPixmap &pixIcon) +KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const TQString &szVisibleName,const TQString &szInternalName,CreateAppletCallback pProc,const TQString &szPreloadModule,const TQPixmap &pixIcon) : KviHeapObject() { static int s_iAppletDescriptorUniqueId = 0; @@ -81,7 +81,7 @@ KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString &szVisi m_pProc = pProc; m_pAppletList = new KviPointerList<KviStatusBarApplet>; m_pAppletList->setAutoDelete(false); - if(!pixIcon.isNull())m_pIcon = new QPixmap(pixIcon); + if(!pixIcon.isNull())m_pIcon = new TQPixmap(pixIcon); else m_pIcon = 0; } @@ -113,7 +113,7 @@ void KviStatusBarAppletDescriptor::unregisterApplet(KviStatusBarApplet * a) KviStatusBarApplet::KviStatusBarApplet(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) -: QLabel(pParent), m_pStatusBar(pParent), m_pDescriptor(pDescriptor) +: TQLabel(pParent), m_pStatusBar(pParent), m_pDescriptor(pDescriptor) { m_pDescriptor->registerApplet(this); m_pStatusBar->registerApplet(this); @@ -126,26 +126,26 @@ KviStatusBarApplet::~KviStatusBarApplet() m_pStatusBar->unregisterApplet(this); } -QString KviStatusBarApplet::tipText(const QPoint &) +TQString KviStatusBarApplet::tipText(const TQPoint &) { - return QString::null; + return TQString(); } -void KviStatusBarApplet::paintEvent(QPaintEvent * e) +void KviStatusBarApplet::paintEvent(TQPaintEvent * e) { - QLabel::paintEvent(e); + TQLabel::paintEvent(e); setFont(KVI_OPTION_FONT(KviOption_fontIrcToolBarApplet)); if(m_bSelected) { - QPainter p(this); + TQPainter p(this); #ifdef COMPILE_USE_QT4 - p.setCompositionMode(QPainter::CompositionMode_SourceOut); - p.fillRect(rect(),Qt::black); - p.setCompositionMode(QPainter::CompositionMode_SourceOver); + p.setCompositionMode(TQPainter::CompositionMode_SourceOut); + p.fillRect(rect(),TQt::black); + p.setCompositionMode(TQPainter::CompositionMode_SourceOver); #else - p.setRasterOp(Qt::NotROP); - p.fillRect(rect(),Qt::black); - p.setRasterOp(Qt::CopyROP); + p.setRasterOp(TQt::NotROP); + p.fillRect(rect(),TQt::black); + p.setRasterOp(TQt::CopyROP); #endif } } @@ -164,9 +164,9 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent,KviS : KviStatusBarApplet(pParent,pDescriptor) { m_bAwayOnAllContexts = false; - connect(pParent->frame(),SIGNAL(activeContextChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeContextStateChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(updateDisplay())); updateDisplay(); @@ -200,7 +200,7 @@ void KviStatusBarAwayIndicator::toggleContext() void KviStatusBarAwayIndicator::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,SLOT(toggleContext())); + int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,TQT_SLOT(toggleContext())); p->setItemChecked(id,m_bAwayOnAllContexts); } @@ -229,13 +229,13 @@ void KviStatusBarAwayIndicator::selfRegister(KviStatusBar * pBar) } // FIXME: Away on all context should know where user is not away/back before toggling status -void KviStatusBarAwayIndicator::mouseDoubleClickEvent(QMouseEvent * e) +void KviStatusBarAwayIndicator::mouseDoubleClickEvent(TQMouseEvent * e) { if(!(e->button() & Qt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; if(c->state() != KviIrcConnection::Connected)return; - QString command; + TQString command; if(m_bAwayOnAllContexts) command = "if($away)back -a; else away -a"; else @@ -243,15 +243,15 @@ void KviStatusBarAwayIndicator::mouseDoubleClickEvent(QMouseEvent * e) KviKvsScript::run(command,c->console()); } -QString KviStatusBarAwayIndicator::tipText(const QPoint &) +TQString KviStatusBarAwayIndicator::tipText(const TQPoint &) { KviIrcConnection * c = statusBar()->frame()->activeConnection(); - QString ret = "<center><b>"; + TQString ret = "<center><b>"; if(!c)goto not_connected; if(c->state() != KviIrcConnection::Connected)goto not_connected; if(c->userInfo()->isAway()) { - QString tmp = KviTimeUtils::formatTimeInterval(kvi_unixTime() - c->userInfo()->awayTime(),KviTimeUtils::NoLeadingEmptyIntervals); + TQString tmp = KviTimeUtils::formatTimeInterval(kvi_unixTime() - c->userInfo()->awayTime(),KviTimeUtils::NoLeadingEmptyIntervals); ret += __tr2qs("Away since"); ret += ' '; ret += tmp; @@ -275,13 +275,13 @@ not_connected: KviStatusBarLagIndicator::KviStatusBarLagIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) : KviStatusBarApplet(pParent,pDescriptor) { - connect(pParent->frame(),SIGNAL(activeContextChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeContextStateChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeConnectionLagChanged()),this,SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(updateDisplay())); updateDisplay(); - QFont f = font(); + TQFont f = font(); f.setFixedPitch(true); f.setFamily("fixed"); setFont(f); @@ -293,7 +293,7 @@ KviStatusBarLagIndicator::~KviStatusBarLagIndicator() { } -void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent *e) +void KviStatusBarLagIndicator::mouseDoubleClickEvent(TQMouseEvent *e) { if(!(e->button() & Qt::LeftButton))return; @@ -308,10 +308,10 @@ void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent *e) } -QString KviStatusBarLagIndicator::tipText(const QPoint &) +TQString KviStatusBarLagIndicator::tipText(const TQPoint &) { KviIrcConnection * c = statusBar()->frame()->activeConnection(); - QString ret = "<center><b>"; + TQString ret = "<center><b>"; if(!c)goto not_connected; if(c->state() != KviIrcConnection::Connected)goto not_connected; if(c->lagMeter()) @@ -322,12 +322,12 @@ QString KviStatusBarLagIndicator::tipText(const QPoint &) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(ret,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(ret,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); ret += "</b><br>"; int vss = c->lagMeter()->secondsSinceLastCompleted(); int vmm = vss / 60; vss = vss % 60; - KviQString::appendFormatted(ret,__tr2qs("Last checked %d mins %d secs ago"),vmm,vss); + KviTQString::appendFormatted(ret,__tr2qs("Last checked %d mins %d secs ago"),vmm,vss); } else { ret += __tr2qs("Lag measure not available yet"); ret += "</b>"; @@ -361,8 +361,8 @@ void KviStatusBarLagIndicator::updateDisplay() int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); if(lll > 60000) { // one minute lag! @@ -401,7 +401,7 @@ KviStatusBarClock::KviStatusBarClock(KviStatusBar * pParent,KviStatusBarAppletDe startTimer(1000); - QFont f = font(); + TQFont f = font(); f.setFixedPitch(true); f.setFamily("fixed"); setFont(f); @@ -411,12 +411,12 @@ KviStatusBarClock::~KviStatusBarClock() { } -void KviStatusBarClock::timerEvent(QTimerEvent *) +void KviStatusBarClock::timerEvent(TQTimerEvent *) { kvi_time_t tt = kvi_unixTime(); struct tm * t = m_bUtc ? gmtime(&tt) : localtime(&tt); - QString tmp; - KviQString::sprintf(tmp,"%d%d:%d%d:%d%d", + TQString tmp; + KviTQString::sprintf(tmp,"%d%d:%d%d:%d%d", t->tm_hour / 10, t->tm_hour % 10, t->tm_min / 10, @@ -428,7 +428,7 @@ void KviStatusBarClock::timerEvent(QTimerEvent *) void KviStatusBarClock::fillContextPopup(KviTalPopupMenu * p) { - int id = p->insertItem("UTC",this,SLOT(toggleUtc())); + int id = p->insertItem("UTC",this,TQT_SLOT(toggleUtc())); p->setItemChecked(id,m_bUtc); } @@ -474,7 +474,7 @@ KviStatusBarConnectionTimer::~KviStatusBarConnectionTimer() { } //g_pApp->topmostConnectedConsole() -void KviStatusBarConnectionTimer::timerEvent(QTimerEvent * e) +void KviStatusBarConnectionTimer::timerEvent(TQTimerEvent * e) { if(m_bTotal) { @@ -509,7 +509,7 @@ void KviStatusBarConnectionTimer::toggleTotal() void KviStatusBarConnectionTimer::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Show total connection time"),this,SLOT(toggleTotal())); + int id = p->insertItem(__tr2qs("Show total connection time"),this,TQT_SLOT(toggleTotal())); p->setItemChecked(id,m_bTotal); } @@ -542,7 +542,7 @@ void KviStatusBarConnectionTimer::selfRegister(KviStatusBar * pBar) KviStatusBarSeparator::KviStatusBarSeparator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) : KviStatusBarApplet(pParent,pDescriptor) { - setFrameStyle(QFrame::VLine | QFrame::Sunken); + setFrameStyle(TQFrame::VLine | TQFrame::Sunken); } KviStatusBarSeparator::~KviStatusBarSeparator() diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index 6302be59..f324657e 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -29,14 +29,14 @@ #include "kvi_heapobject.h" #include "kvi_statusbar.h" -#include <qstring.h> +#include <tqstring.h> #include "kvi_pointerhashtable.h" -#include <qstatusbar.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqstatusbar.h> +#include <tqlabel.h> +#include <tqpixmap.h> -class QTimer; -class QLabel; +class TQTimer; +class TQLabel; class KviTalPopupMenu; class KviConfig; @@ -53,26 +53,26 @@ class KVIRC_API KviStatusBarAppletDescriptor : public KviHeapObject friend class KviStatusBar; friend class KviStatusBarApplet; protected: - QString m_szVisibleName; // visible name of the applet - QString m_szInternalName; // UNIQUE name of the applet - QString m_szPreloadModule; // name of the module that must be preloaded for this applet + TQString m_szVisibleName; // visible name of the applet + TQString m_szInternalName; // UNITQUE name of the applet + TQString m_szPreloadModule; // name of the module that must be preloaded for this applet CreateAppletCallback m_pProc; // creation callback - QPixmap * m_pIcon; + TQPixmap * m_pIcon; int m_iId; KviPointerList<KviStatusBarApplet> * m_pAppletList; public: - KviStatusBarAppletDescriptor(const QString &szVisibleName, - const QString &szInternalName, + KviStatusBarAppletDescriptor(const TQString &szVisibleName, + const TQString &szInternalName, CreateAppletCallback pProc, - const QString &szPreloadModule = QString::null, - const QPixmap &pixIcon = QPixmap()); + const TQString &szPreloadModule = TQString(), + const TQPixmap &pixIcon = TQPixmap()); virtual ~KviStatusBarAppletDescriptor(); public: - const QString &visibleName(){ return m_szVisibleName; }; - const QString &internalName(){ return m_szInternalName; }; - const QString &preloadModule(){ return m_szPreloadModule; }; + const TQString &visibleName(){ return m_szVisibleName; }; + const TQString &internalName(){ return m_szInternalName; }; + const TQString &preloadModule(){ return m_szPreloadModule; }; int id(){ return m_iId; }; - QPixmap * icon(){ return m_pIcon; }; + TQPixmap * icon(){ return m_pIcon; }; protected: KviStatusBarApplet * create(KviStatusBar * pBar); void registerApplet(KviStatusBarApplet * a); @@ -80,10 +80,11 @@ protected: }; -class KVIRC_API KviStatusBarApplet : public QLabel +class KVIRC_API KviStatusBarApplet : public TQLabel { friend class KviStatusBar; Q_OBJECT + TQ_OBJECT protected: KviStatusBar * m_pStatusBar; KviStatusBarAppletDescriptor * m_pDescriptor; @@ -98,11 +99,11 @@ public: void select(bool bSelect = true); bool isSelected(){ return m_bSelected; }; protected: - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); virtual void fillContextPopup(KviTalPopupMenu *p){}; virtual void loadState(const char * prefix,KviConfig *cfg){}; virtual void saveState(const char * prefix,KviConfig *cfg){}; - virtual QString tipText(const QPoint &); + virtual TQString tipText(const TQPoint &); }; @@ -110,6 +111,7 @@ protected: class KviStatusBarClock : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarClock(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarClock(); @@ -119,7 +121,7 @@ public: static void selfRegister(KviStatusBar * pBar); protected: virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void timerEvent(QTimerEvent * e); + virtual void timerEvent(TQTimerEvent * e); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); protected slots: @@ -129,13 +131,14 @@ protected slots: class KviStatusBarConnectionTimer : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarConnectionTimer(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarConnectionTimer(); protected: bool m_bTotal; protected: - virtual void timerEvent(QTimerEvent * e); + virtual void timerEvent(TQTimerEvent * e); virtual void fillContextPopup(KviTalPopupMenu *p); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); @@ -148,6 +151,7 @@ protected slots: class KviStatusBarSeparator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarSeparator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarSeparator(); @@ -158,6 +162,7 @@ public: class KviStatusBarAwayIndicator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarAwayIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarAwayIndicator(); @@ -166,8 +171,8 @@ public: protected: bool m_bAwayOnAllContexts; protected: - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual QString tipText(const QPoint &); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual TQString tipText(const TQPoint &); virtual void fillContextPopup(KviTalPopupMenu *p); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); @@ -179,14 +184,15 @@ protected slots: class KviStatusBarLagIndicator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarLagIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarLagIndicator(); public: static void selfRegister(KviStatusBar * pBar); protected: - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual QString tipText(const QPoint &); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual TQString tipText(const TQPoint &); protected slots: void updateDisplay(); }; diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 8656b69b..e81376ea 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -35,15 +35,15 @@ #include "kvi_doublebuffer.h" #include "kvi_tal_toolbar.h" -#include <qcheckbox.h> -#include <qpainter.h> -#include <qimage.h> -#include <qevent.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqevent.h> +#include <tqtimer.h> KviStyledControlInternal::KviStyledControlInternal( KviStyledControl* control) -:QObject(0,0) +:TQObject(0,0) { m_pControl=control; } @@ -53,12 +53,12 @@ KviStyledControlInternal::~KviStyledControlInternal() } -bool KviStyledControlInternal::eventFilter( QObject *obj, QEvent *ev ) +bool KviStyledControlInternal::eventFilter( TQObject *obj, TQEvent *ev ) { - if(ev->type()==QEvent::Enter) + if(ev->type()==TQEvent::Enter) { m_pControl->enterEvent(ev); - } else if(ev->type()==QEvent::Leave) { + } else if(ev->type()==TQEvent::Leave) { m_pControl->leaveEvent(ev); } return FALSE; @@ -84,16 +84,16 @@ void KviStyledControlInternal::paintTimerShot () m_pControl->m_pTimer->stop(); } } - m_pControl->m_pWidget->repaint( false ); + m_pControl->m_pWidget->tqrepaint( false ); } -KviStyledControl::KviStyledControl(QWidget* w) +KviStyledControl::KviStyledControl(TQWidget* w) { m_pWidget=w; m_iStepNumber=0; m_bMouseEnter=0; m_pInternal=new KviStyledControlInternal(this); - m_pTimer = new QTimer(m_pInternal); + m_pTimer = new TQTimer(m_pInternal); m_pWidget->installEventFilter(m_pInternal); } @@ -103,7 +103,7 @@ KviStyledControl::~KviStyledControl() delete m_pInternal; } -void KviStyledControl::enterEvent ( QEvent * ) +void KviStyledControl::enterEvent ( TQEvent * ) { // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) @@ -112,17 +112,17 @@ void KviStyledControl::enterEvent ( QEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, SIGNAL(timeout()), m_pInternal, SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } m_bMouseEnter=1; m_iStepNumber++; - m_pWidget->repaint( false ); + m_pWidget->tqrepaint( false ); } } -void KviStyledControl::leaveEvent ( QEvent * ) +void KviStyledControl::leaveEvent ( TQEvent * ) { // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) @@ -131,26 +131,26 @@ void KviStyledControl::leaveEvent ( QEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, SIGNAL(timeout()), m_pInternal, SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } m_bMouseEnter=0; m_iStepNumber--; - m_pWidget->repaint( false ); + m_pWidget->tqrepaint( false ); } } -KviStyledCheckBox::KviStyledCheckBox ( QWidget * parent, const char * name ) -: QCheckBox(parent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name ) +: TQCheckBox(tqparent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } -KviStyledCheckBox::KviStyledCheckBox ( const QString & text, QWidget * parent, const char * name ) -: QCheckBox(text,parent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name ) +: TQCheckBox(text,tqparent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } @@ -161,21 +161,21 @@ KviStyledCheckBox::~KviStyledCheckBox() } -void KviStyledCheckBox::paintEvent ( QPaintEvent * event) +void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) { //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) { KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QRect rect=event->rect(); + TQRect rect=event->rect(); pDoubleBufferPixmap->fill(this, rect.topLeft()); - QPainter p(pDoubleBufferPixmap, this); + TQPainter p(pDoubleBufferPixmap, this); p.translate(-rect.x(), -rect.y()); - QPixmap* pStoredPix = 0; + TQPixmap* pStoredPix = 0; if(isChecked()) pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_selected.png"); @@ -185,35 +185,35 @@ void KviStyledCheckBox::paintEvent ( QPaintEvent * event) if(pStoredPix) { //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); - QPixmap pix=*pStoredPix; + TQPixmap pix=*pStoredPix; if(m_iStepNumber && isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, - qBlue(rgb), - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, + tqBlue(rgb), + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } p.drawImage(0,0,image); } else if( !isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { //- From Black to Gray conversion for disabled mode. - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } @@ -222,27 +222,27 @@ void KviStyledCheckBox::paintEvent ( QPaintEvent * event) p.drawPixmap(0,0,pix); } //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); - QString szText=text(); + TQString szText=text(); szText=szText.remove("&"); p.drawText(pix.width()+3,0,width(),height(),0,szText); bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); } else { - QCheckBox::paintEvent(event); + TQCheckBox::paintEvent(event); } } else - QCheckBox::paintEvent(event); + TQCheckBox::paintEvent(event); } -KviStyledToolButton::KviStyledToolButton( QWidget * parent, const char * name ) -: QToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name ) +: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); } -KviStyledToolButton::KviStyledToolButton ( const QIconSet & iconSet, const QString & textLabel, const QString & grouptext, QObject * receiver, const char * slot, KviTalToolBar * parent, const char * name ) -: QToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name ) +: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); @@ -259,11 +259,11 @@ void KviStyledToolButton::setShowSubmenuIndicator(bool bShow) resizeEvent(0); } -void KviStyledToolButton::paintEvent ( QPaintEvent * event) +void KviStyledToolButton::paintEvent ( TQPaintEvent * event) { if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) { - QPixmap* pArrowPix = 0; + TQPixmap* pArrowPix = 0; int iWidth=width(); int iPixWidth=0; if(bShowSubmenuIndicator) @@ -273,62 +273,62 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) } bool bActive= isOn() || m_bMouseEnter; KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QRect rect=event->rect(); + TQRect rect=event->rect(); pDoubleBufferPixmap->fill( - bActive ? QColor(206,215,223) : - colorGroup().background() + bActive ? TQColor(206,215,223) : + tqcolorGroup().background() ); - QPainter p(pDoubleBufferPixmap, this); + TQPainter p(pDoubleBufferPixmap, this); p.translate(-rect.x(), -rect.y()); if(bActive) { - p.setPen(QColor(185,190,195)); + p.setPen(TQColor(185,190,195)); p.drawRect(0,0,iWidth,height()); } - QPixmap pix=iconSet().pixmap( - usesBigPixmap() ? QIconSet::Large : QIconSet::Small, - isEnabled() ? QIconSet::Normal : - QIconSet::Disabled, - isOn() ? QIconSet::On : - QIconSet::Off); - QPoint pos((iWidth-iPixWidth-pix.width())/2,(height()-pix.height())/2); + TQPixmap pix=iconSet().pixmap( + usesBigPixmap() ? TQIconSet::Large : TQIconSet::Small, + isEnabled() ? TQIconSet::Normal : + TQIconSet::Disabled, + isOn() ? TQIconSet::On : + TQIconSet::Off); + TQPoint pos((iWidth-iPixWidth-pix.width())/2,(height()-pix.height())/2); if(!pix.isNull()) { if(m_iStepNumber && isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, - qBlue(rgb), - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, + tqBlue(rgb), + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } p.drawImage(pos,image); } else if( !isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { //- From Black to Gray conversion for disabled mode. - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } @@ -348,21 +348,21 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); } else { - QToolButton::paintEvent(event); + TQToolButton::paintEvent(event); } } -void KviStyledToolButton::resizeEvent ( QResizeEvent * e) +void KviStyledToolButton::resizeEvent ( TQResizeEvent * e) { - QPixmap* pStoredPix = 0; + TQPixmap* pStoredPix = 0; if(pStoredPix=g_pIconManager->getBigIcon("kvi_toolbutton_menuindicator.png")) { - QPixmap pix=iconSet().pixmap( - usesBigPixmap() ? QIconSet::Large : QIconSet::Small, - isEnabled() ? QIconSet::Normal : - QIconSet::Disabled, - isOn() ? QIconSet::On : - QIconSet::Off); + TQPixmap pix=iconSet().pixmap( + usesBigPixmap() ? TQIconSet::Large : TQIconSet::Small, + isEnabled() ? TQIconSet::Normal : + TQIconSet::Disabled, + isOn() ? TQIconSet::On : + TQIconSet::Off); setMinimumWidth(bShowSubmenuIndicator ? pix.width()+8+pStoredPix->width() : pix.width()); } diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h index 8d096fa8..f7e66416 100644 --- a/src/kvirc/ui/kvi_styled_controls.h +++ b/src/kvirc/ui/kvi_styled_controls.h @@ -28,18 +28,18 @@ #include "kvi_settings.h" #ifdef COMPILE_USE_QT4 - // we use internal Qt4 styles for now - #include <qcheckbox.h> - #include <qtoolbutton.h> + // we use internal TQt4 styles for now + #include <tqcheckbox.h> + #include <tqtoolbutton.h> - #define KviStyledCheckBox QCheckBox - #define KviStyledToolButton QToolButton + #define KviStyledCheckBox TQCheckBox + #define KviStyledToolButton TQToolButton #else -#include <qcheckbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> +#include <tqevent.h> +#include <tqtimer.h> #include "kvi_heapobject.h" class KviTalToolBar; @@ -50,16 +50,17 @@ class KviTalToolBar; class KviStyledControl; -class KVIRC_API KviStyledControlInternal : public QObject +class KVIRC_API KviStyledControlInternal : public TQObject { Q_OBJECT + TQ_OBJECT public: KviStyledControlInternal( KviStyledControl* control ); ~KviStyledControlInternal(); public slots: virtual void paintTimerShot(); protected: - bool eventFilter( QObject *obj, QEvent *ev ); + bool eventFilter( TQObject *obj, TQEvent *ev ); protected: KviStyledControl* m_pControl; }; @@ -68,44 +69,46 @@ class KVIRC_API KviStyledControl { friend class KviStyledControlInternal; public: - KviStyledControl(QWidget*); + KviStyledControl(TQWidget*); ~KviStyledControl(); protected: - virtual void enterEvent ( QEvent * ); - virtual void leaveEvent ( QEvent * ); + virtual void enterEvent ( TQEvent * ); + virtual void leaveEvent ( TQEvent * ); int m_bMouseEnter; int m_iStepNumber; - QTimer* m_pTimer; + TQTimer* m_pTimer; KviStyledControlInternal* m_pInternal; - QWidget *m_pWidget; + TQWidget *m_pWidget; }; -class KVIRC_API KviStyledCheckBox : public QCheckBox, public KviStyledControl +class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl { Q_OBJECT + TQ_OBJECT public: - KviStyledCheckBox ( QWidget * parent, const char * name = 0 ); - KviStyledCheckBox ( const QString & text, QWidget * parent, const char * name = 0 ); + KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 ); + KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 ); ~KviStyledCheckBox(); protected: - virtual void paintEvent ( QPaintEvent * ); + virtual void paintEvent ( TQPaintEvent * ); }; -class KVIRC_API KviStyledToolButton : public QToolButton, public KviStyledControl +class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledControl { Q_OBJECT + TQ_OBJECT private: bool bShowSubmenuIndicator; public: - KviStyledToolButton ( QWidget * parent, const char * name = 0 ); - KviStyledToolButton ( const QIconSet & iconSet, const QString & textLabel, const QString & grouptext, QObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 ); + KviStyledToolButton ( TQWidget * tqparent, const char * name = 0 ); + KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name = 0 ); ~KviStyledToolButton(); void setShowSubmenuIndicator(bool bShow); protected: - virtual void paintEvent ( QPaintEvent * ); - virtual void resizeEvent ( QResizeEvent * ) ; + virtual void paintEvent ( TQPaintEvent * ); + virtual void resizeEvent ( TQResizeEvent * ) ; }; #endif diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 8e75bfde..9a0c0b9c 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -47,31 +47,31 @@ #include "kvi_doublebuffer.h" // FIXME: #warning "The tree taskbar min width should be configurable" -#include <qtimer.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqimage.h> #include "kvi_tal_popupmenu.h" -#include <qcursor.h> +#include <tqcursor.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> + #include <tq3header.h> #else - #include <qheader.h> + #include <tqheader.h> #endif -#include <qevent.h> +#include <tqevent.h> #ifdef COMPILE_USE_QT4 - #include <QPaintEvent> + #include <TQPaintEvent> #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -extern QPixmap * g_pActivityMeterPixmap; +extern TQPixmap * g_pActivityMeterPixmap; // FIXME: This should be renamed to "Window List" @@ -81,18 +81,18 @@ extern QPixmap * g_pActivityMeterPixmap; KviTaskBarBase::KviTaskBarBase() #ifdef COMPILE_USE_QT4 -: QDockWidget(__tr2qs("Taskbar"),g_pFrame) +: TQDockWidget(__tr2qs("Taskbar"),g_pFrame) #else -: KviToolBar(__tr2qs("Taskbar"),QT_DOCK_BOTTOM,false,"taskbar") +: KviToolBar(__tr2qs("Taskbar"),TQT_DOCK_BOTTOM,false,"taskbar") #endif { // FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter) #ifdef COMPILE_USE_QT4 setObjectName(__tr2qs("taskbar")); - setFeatures(QDockWidget::DockWidgetMovable); + setFeatures(TQDockWidget::DockWidgetMovable); #endif //COMPILE_USE_QT4 - m_pActivityMeterTimer = new QTimer(); - connect(m_pActivityMeterTimer,SIGNAL(timeout()),this,SLOT(updateActivityMeter())); + m_pActivityMeterTimer = new TQTimer(); + connect(m_pActivityMeterTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateActivityMeter())); m_pActivityMeterTimer->start(5000); } @@ -105,7 +105,7 @@ void KviTaskBarBase::updateActivityMeter() { } -void KviTaskBarBase::getTextForConsole(QString &szText,KviConsole * pConsole) +void KviTaskBarBase::getTextForConsole(TQString &szText,KviConsole * pConsole) { if(pConsole->isConnected()) { @@ -194,13 +194,13 @@ KviTaskBarItem::~KviTaskBarItem() // -KviTaskBarButton::KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * name) -: QPushButton(par,name) , KviTaskBarItem(wnd) +KviTaskBarButton::KviTaskBarButton(TQWidget * par,KviWindow * wnd,const char * name) +: TQPushButton(par,name) , KviTaskBarItem(wnd) { m_bActive = false; m_pTip = new KviDynamicToolTip(this); - connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); -// setBackgroundMode(QWidget::NoBackground); + connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); +// setBackgroundMode(TQWidget::NoBackground); setToggleButton (true); setFlat ( KVI_OPTION_BOOL(KviOption_boolUseFlatClassicTaskbarButtons) ); } @@ -210,21 +210,21 @@ KviTaskBarButton::~KviTaskBarButton() delete m_pTip; //not necessary ? } -void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { if(KVI_OPTION_BOOL(KviOption_boolShowTaskBarToolTips)) { - QString szText; + TQString szText; m_pWindow->getTaskBarTipText(szText); m_pTip->tip(rect(),szText); } } -void KviTaskBarButton::mousePressEvent(QMouseEvent *e) +void KviTaskBarButton::mousePressEvent(TQMouseEvent *e) { if(e->button() & Qt::LeftButton) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { m_pWindow->delayedClose(); } else { @@ -234,13 +234,11 @@ void KviTaskBarButton::mousePressEvent(QMouseEvent *e) } else m_pWindow->contextPopup(); } -#if QT_VERSION >= 300 -void KviTaskBarButton::contextMenuEvent(QContextMenuEvent *e) +void KviTaskBarButton::contextMenuEvent(TQContextMenuEvent *e) { m_pWindow->contextPopup(); e->accept(); } -#endif void KviTaskBarButton::setActive(bool bActive) { @@ -261,46 +259,46 @@ void KviTaskBarButton::setActive(bool bActive) } #ifdef COMPILE_USE_QT4 -void KviTaskBarButton::paintEvent(QPaintEvent * e) +void KviTaskBarButton::paintEvent(TQPaintEvent * e) { - QPainter p(this); - QStyleOption opt; + TQPainter p(this); + TQStyleOption opt; opt.initFrom(this); if(isOn()) - opt.state = QStyle::State_On | QStyle::State_Active; - style()->drawPrimitive(QStyle::PE_PanelButtonTool,&opt,&p,this); + opt.state = TQStyle::State_On | TQStyle::State_Active; + style()->drawPrimitive(TQStyle::PE_PanelButtonTool,&opt,&p,this); drawButtonLabel(&p); } #endif -void KviTaskBarButton::drawButtonLabel(QPainter * painter) +void KviTaskBarButton::drawButtonLabel(TQPainter * painter) { - QRect distRect = painter->window(); + TQRect distRect = painter->window(); int iHeight = distRect.height(); int iWidth = distRect.width(); - QPainter * pPainter; + TQPainter * pPainter; #ifdef COMPILE_USE_QT4 pPainter = painter; #else //!COMPILE_USE_QT4 KviDoubleBuffer db(iWidth,iHeight); - QPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPixmap * pMemBuffer = db.pixmap(); + TQPainter p(pMemBuffer); bitBlt(pMemBuffer,0,0,painter->device(),distRect.x(),distRect.y(),iWidth,iHeight); pPainter = &p; #endif //!COMPILE_USE_QT4 if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT; - QColor base = colorGroup().background(); + TQColor base = tqcolorGroup().background(); if(m_pWindow->console()) { - QColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base); } else { - pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(QColorGroup::Background)); + pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background)); } } @@ -323,7 +321,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) } } - QRect cRect(daX,3,iWidth - (20 + daX),iHeight - 6); + TQRect cRect(daX,3,iWidth - (20 + daX),iHeight - 6); if(m_iProgress >= 0) { @@ -334,8 +332,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) pPainter->fillRect(daX,3,wdth,cRect.height(),KVI_OPTION_COLOR(KviOption_colorTaskBarProgressBar)); } - QRect bRect; - QString szText; + TQRect bRect; + TQString szText; bool bMinimized = m_pWindow->isMinimized(); @@ -363,7 +361,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) { case KVI_WINDOW_TYPE_CONSOLE: { - QFont f = QFont(KVI_OPTION_FONT(KviOption_fontTaskbar)); + TQFont f = TQFont(KVI_OPTION_FONT(KviOption_fontTaskbar)); f.setBold(true); pPainter->setFont(f); KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow); @@ -373,8 +371,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) case KVI_WINDOW_TYPE_DEADCHANNEL: szText = ((KviChannel *)m_pWindow)->nameWithUserFlag(); break; - case KVI_WINDOW_TYPE_QUERY: - case KVI_WINDOW_TYPE_DEADQUERY: + case KVI_WINDOW_TYPE_TQUERY: + case KVI_WINDOW_TYPE_DEADTQUERY: szText = m_pWindow->windowName(); break; default: @@ -384,28 +382,28 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) if(bMinimized) { - QString tmp = QChar('('); + TQString tmp = TQChar('('); tmp += szText; - tmp += QChar(')'); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,tmp,-1,&bRect); + tmp += TQChar(')'); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,tmp,-1,&bRect); } else { - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1,&bRect); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1,&bRect); } if(bRect.width() > cRect.width()) { pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height()); - QColor base = pPainter->pen().color(); - QColor bg = colorGroup().color(QColorGroup::Background); + TQColor base = pPainter->pen().color(); + TQColor bg = tqcolorGroup().color(TQColorGroup::Background); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1); pPainter->setClipRect(cRect.right(),cRect.y(),5,cRect.height()); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1); } #ifndef COMPILE_USE_QT4 pPainter->setClipping(FALSE); @@ -423,7 +421,7 @@ void KviTaskBarButton::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - update(); // repaint(false) ? + update(); // tqrepaint(false) ? } void KviTaskBarButton::unhighlight() @@ -441,7 +439,7 @@ void KviTaskBarButton::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(m_bActive)return; - update(); // repaint(false) ? + update(); // tqrepaint(false) ? } @@ -460,7 +458,7 @@ KviTaskBarToolTip::~KviTaskBarToolTip() { } -void KviTaskBarToolTip::maybeTip(const QPoint &pnt) +void KviTaskBarToolTip::maybeTip(const TQPoint &pnt) { tip(m_pTaskBarButton->rect(),m_pTaskBarButton->m_pWindow->plainTextCaption()); } @@ -479,7 +477,7 @@ KviClassicTaskBar::KviClassicTaskBar() calcButtonHeight(); - m_pBase = new QWidget(this); + m_pBase = new TQWidget(this); // m_pBase->setBackgroundMode(NoBackground); #ifdef COMPILE_USE_QT4 setWidget(m_pBase); @@ -500,7 +498,7 @@ KviClassicTaskBar::KviClassicTaskBar() #ifndef COMPILE_USE_QT4 setResizeEnabled( true ); - connect(this,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChangedSlot(Orientation))); + connect(this,TQT_SIGNAL(orientationChanged(Qt::Orientation)),this,TQT_SLOT(orientationChangedSlot(Qt::Orientation))); #endif } @@ -519,11 +517,11 @@ void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o) } /* -void KviClassicTaskBar::fontChange(const QFont &old) +void KviClassicTaskBar::fontChange(const TQFont &old) { calcButtonHeight(); doLayout(); - QToolBar::fontChange(old); + TQToolBar::fontChange(old); } */ @@ -538,7 +536,7 @@ void KviClassicTaskBar::updateActivityMeter() void KviClassicTaskBar::calcButtonHeight() { - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontTaskbar)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontTaskbar)); m_iButtonHeight = fm.lineSpacing() + 6; if(m_iButtonHeight < 22)m_iButtonHeight = 22; if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) @@ -569,7 +567,7 @@ void KviClassicTaskBar::insertButton(KviTaskBarButton * b) { // same type! // sort by name - if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviQString::cmpCI(btn->kviWindow()->windowName(),b->kviWindow()->windowName()) > 0)) + if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviTQString::cmpCI(btn->kviWindow()->windowName(),b->kviWindow()->windowName()) > 0)) { // got a "higher one" m_pButtonList->insert(idx,b); @@ -658,19 +656,19 @@ void KviClassicTaskBar::doLayout() } #ifdef COMPILE_USE_QT4 - if(isFloating() || ((g_pFrame->dockWidgetArea(this) != Qt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != Qt::TopDockWidgetArea))) + if(isFloating() || ((g_pFrame->dockWidgetArea(this) != TQt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != TQt::TopDockWidgetArea))) { - QDockWidget::DockWidgetFeatures f = features(); - if(f & QDockWidget::DockWidgetVerticalTitleBar) + TQDockWidget::DockWidgetFeatures f = features(); + if(f & TQDockWidget::DockWidgetVerticalTitleBar) { - f &= ~QDockWidget::DockWidgetVerticalTitleBar; + f &= ~TQDockWidget::DockWidgetVerticalTitleBar; setFeatures(f); } } else { - QDockWidget::DockWidgetFeatures f = features(); - if(!(f & QDockWidget::DockWidgetVerticalTitleBar)) + TQDockWidget::DockWidgetFeatures f = features(); + if(!(f & TQDockWidget::DockWidgetVerticalTitleBar)) { - f |= QDockWidget::DockWidgetVerticalTitleBar; + f |= TQDockWidget::DockWidgetVerticalTitleBar; setFeatures(f); } } @@ -740,7 +738,7 @@ void KviClassicTaskBar::applyOptions() doLayout(); } -void KviClassicTaskBar::resizeEvent(QResizeEvent *e) +void KviClassicTaskBar::resizeEvent(TQResizeEvent *e) { /* #ifdef COMPILE_USE_QT4 @@ -779,7 +777,7 @@ inline KviTaskBarItem * KviClassicTaskBar::prevItem(void) inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) { - return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1); + return (m_pButtonList->tqfindRef((const KviTaskBarButton *)it) != -1); } @@ -794,8 +792,8 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTalListView * par,KviWindow * wnd) m_iStepNumber=0; m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); - m_pAnimTimer=new QTimer(); - QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot())); + m_pAnimTimer=new TQTimer(); + TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); applyOptions(); } @@ -805,8 +803,8 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTreeTaskBarItem * par,KviWindow * wnd) m_iStepNumber=0; m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); - m_pAnimTimer=new QTimer(); - QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot())); + m_pAnimTimer=new TQTimer(); + TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); applyOptions(); } @@ -835,7 +833,7 @@ void KviTreeTaskBarItem::applyOptions() void KviTreeTaskBarItem::captionChanged() { // FIXME: can we do better ? - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::unhighlight() @@ -843,7 +841,7 @@ void KviTreeTaskBarItem::unhighlight() if(m_iHighlightLevel < 1)return; m_iHighlightLevel = 0; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::highlight(int iLevel) @@ -853,14 +851,14 @@ void KviTreeTaskBarItem::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(isSelected())return; - repaint(); // repaint(false) ? + tqrepaint(); // tqrepaint(false) ? } void KviTreeTaskBarItem::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - repaint(); // repaint(false) ? + tqrepaint(); // tqrepaint(false) ? } void KviTreeTaskBarItem::setActive(bool bActive) @@ -870,7 +868,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was not selected: the listView will repaint it + // was not selected: the listView will tqrepaint it } else { if(isSelected()) { @@ -878,26 +876,26 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was selected: the list view will repaint it + // was selected: the list view will tqrepaint it } } } #ifdef COMPILE_USE_QT4 -void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h) +void KviTreeTaskBarItem::paintBranches(TQPainter *p,const TQColorGroup &,int w,int y,int h) #else -void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h,GUIStyle s) +void KviTreeTaskBarItem::paintBranches(TQPainter *p,const TQColorGroup &,int w,int y,int h,GUIStyle s) #endif { SET_ANTI_ALIASING(*p); - ((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,QRect(0,y,w,totalHeight() - height())); + ((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,TQRect(0,y,w,totalHeight() - height())); } -void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int column,int width,int) +void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int column,int width,int) { KviDoubleBuffer db(width,height()); - QPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPixmap * pMemBuffer = db.pixmap(); + TQPainter p(pMemBuffer); SET_ANTI_ALIASING(p); if(isSelected()) @@ -909,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = listView()->viewport()->mapToGlobal(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -917,19 +915,19 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); + TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - QPoint pnt = listView()->viewportToContents(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); // debug("%i %i",pnt.x(),pnt.y()); p.translate(-pnt.x(),-pnt.y()); - KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),QRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); + KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),TQRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); p.translate(pnt.x(),pnt.y()); } } else { p.fillRect(0,0,width,height(), - QColor(KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).red()+m_iRedDiff*m_iStepNumber, + TQColor(KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).red()+m_iRedDiff*m_iStepNumber, KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).green()+m_iGreenDiff*m_iStepNumber, KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).blue()+m_iBlueDiff*m_iStepNumber ) @@ -942,9 +940,9 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c int im = listView()->itemMargin(); int yPixmap = (h - 16) >> 1; - QString szText; + TQString szText; - QRect cRect(im + 3,0,width - (im << 1),height()); + TQRect cRect(im + 3,0,width - (im << 1),height()); switch(m_pWindow->type()) { @@ -952,8 +950,8 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c { if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { - QColor base = cg.background(); - QColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor base = cg.background(); + TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); p.fillRect(im + 2,yPixmap + 1,14,15,base); @@ -972,7 +970,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c cRect.setLeft(cRect.left() + 17); } } - QFont f = QFont(); + TQFont f = TQFont(); f.setBold(true); p.setFont(f); KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow); @@ -987,8 +985,8 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c cRect.setLeft(cRect.left() + 17); } break; - case KVI_WINDOW_TYPE_QUERY: - case KVI_WINDOW_TYPE_DEADQUERY: + case KVI_WINDOW_TYPE_TQUERY: + case KVI_WINDOW_TYPE_DEADTQUERY: szText = m_pWindow->windowName(); if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIcons)) { @@ -1039,7 +1037,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c default: iLevel = KviOption_colorTreeTaskBarHighlight5Foreground; break; } p.setPen( - QColor( + TQColor( calculateColor(KVI_OPTION_COLOR(iLevel).red(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).red()), calculateColor(KVI_OPTION_COLOR(iLevel).green(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).green()), calculateColor(KVI_OPTION_COLOR(iLevel).blue(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).blue()) @@ -1049,21 +1047,21 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c if(m_pWindow->isMinimized()) { - QString tmp = QChar('('); + TQString tmp = TQChar('('); tmp += szText; - tmp += QChar(')'); - p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,tmp,-1,0); + tmp += TQChar(')'); + p.drawText(cRect,TQt::AlignLeft | TQt::AlignVCenter,tmp,-1,0); } else { - p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText,-1,0); + p.drawText(cRect,TQt::AlignLeft | TQt::AlignVCenter,szText,-1,0); } painter->drawPixmap(0,0,*pMemBuffer,0,0,width,height()); - //bitBlt(painter->pixmap(),0,0,pMemBuffer,0,0,width,height(),Qt::CopyROP,false); + //bitBlt(painter->pixmap(),0,0,pMemBuffer,0,0,width,height(),TQt::CopyROP,false); } -QString KviTreeTaskBarItem::key(int,bool) const +TQString KviTreeTaskBarItem::key(int,bool) const { - QString ret = m_pWindow->typeString(); + TQString ret = m_pWindow->typeString(); ret.append(m_pWindow->windowName()); return ret; } @@ -1083,7 +1081,7 @@ void KviTreeTaskBarItem::timerShot() m_pAnimTimer->stop(); m_iStepNumber=0; //make shure, that we cannot get out of range } - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::mouseEnter() @@ -1110,7 +1108,7 @@ void KviTreeTaskBarItem::mouseLeave() // -KviTreeTaskBarListView::KviTreeTaskBarListView(QWidget * par) +KviTreeTaskBarListView::KviTreeTaskBarListView(TQWidget * par) : KviTalListView(par) { //setSorting(0); @@ -1126,7 +1124,7 @@ KviTreeTaskBarListView::~KviTreeTaskBarListView() { } -void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e ) +void KviTreeTaskBarListView::contentsMouseMoveEvent ( TQMouseEvent * e ) { if(!e) return; KviTreeTaskBarItem* pCur=(KviTreeTaskBarItem*)(itemAt(contentsToViewport(e->pos()))); @@ -1134,21 +1132,21 @@ void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e ) { if(m_pPrevItem)m_pPrevItem->mouseLeave(); if(pCur) pCur->mouseEnter(); - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); m_pPrevItem=pCur; } else if(!pCur) { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } } -void KviTreeTaskBarListView::leaveEvent(QEvent *) +void KviTreeTaskBarListView::leaveEvent(TQEvent *) { if(m_pPrevItem) m_pPrevItem->mouseLeave(); m_pPrevItem=0; - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } -void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e) +void KviTreeTaskBarListView::contentsMousePressEvent(TQMouseEvent *e) { KviTalListViewItem * it = (KviTalListViewItem *)itemAt(contentsToViewport(e->pos())); if(it) @@ -1159,9 +1157,9 @@ void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e) if(e->button() & Qt::RightButton) { KviTalPopupMenu* pPopup=new KviTalPopupMenu(); - pPopup->insertItem(__tr2qs("Sort"),this,SLOT(sort())); - pPopup->insertItem(__tr2qs("Reverse Sort"),this,SLOT(reverseSort())); - pPopup->popup(QCursor::pos()); + pPopup->insertItem(__tr2qs("Sort"),this,TQT_SLOT(sort())); + pPopup->insertItem(__tr2qs("Reverse Sort"),this,TQT_SLOT(reverseSort())); + pPopup->popup(TQCursor::pos()); } } } @@ -1176,25 +1174,25 @@ void KviTreeTaskBarListView::reverseSort() setSorting(0,FALSE); } -void KviTreeTaskBarListView::resizeEvent(QResizeEvent *e) +void KviTreeTaskBarListView::resizeEvent(TQResizeEvent *e) { KviTalListView::resizeEvent(e); setColumnWidth(0,viewport()->width()); resizeContents(viewport()->width(),contentsHeight()); } -//void KviTreeTaskBarListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect) +//void KviTreeTaskBarListView::paintEmptyAreaInternal(TQPainter * p,const TQRect &viewportRect,const TQRect &painterRect) //{ // //} -void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct) +void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) { SET_ANTI_ALIASING(*p); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = viewport()->mapToGlobal(QPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); + TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -1203,10 +1201,10 @@ void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct) } #endif - QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); + TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - QPoint pnt = viewportToContents(QPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); + TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); //p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y()); KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); } @@ -1237,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar() // FIXME: this code is useless ? if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48) KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48; - int iMin = m_pListView->minimumSize().width() + 4; + int iMin = m_pListView->tqminimumSize().width() + 4; if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)) iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth); setMinimumWidth(iMin); @@ -1249,15 +1247,15 @@ KviTreeTaskBar::KviTreeTaskBar() //m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)); //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); #ifdef COMPILE_USE_QT4 - m_pListView->setFocusPolicy(Qt::NoFocus); + m_pListView->setFocusPolicy(TTQ_NoFocus); #else - m_pListView->setFocusPolicy(QWidget::NoFocus); + m_pListView->setFocusPolicy(TQ_NoFocus); #endif m_pListView->setStaticBackground(true); #ifdef COMPILE_USE_QT4 m_pListView->viewport()->setAutoFillBackground(false); #else - m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground); + m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground); #endif if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader)) { @@ -1272,14 +1270,12 @@ KviTreeTaskBar::KviTreeTaskBar() m_pListView->viewport()->installEventFilter(this); -#if QT_VERSION >= 300 #ifndef COMPILE_USE_QT4 setResizeEnabled(true); #endif -#endif m_pToolTip = new KviDynamicToolTip(m_pListView->viewport(),"tree_taskbar_tooltip"); - connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } KviTreeTaskBar::~KviTreeTaskBar() @@ -1293,34 +1289,34 @@ void KviTreeTaskBar::updatePseudoTransparency() #endif } -void KviTreeTaskBar::moveEvent(QMoveEvent *) +void KviTreeTaskBar::moveEvent(TQMoveEvent *) { #ifdef COMPILE_PSEUDO_TRANSPARENCY updatePseudoTransparency(); #endif } -void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { if(KVI_OPTION_BOOL(KviOption_boolShowTaskBarToolTips)) { KviTalListViewItem * it = (KviTalListViewItem *)m_pListView->itemAt(pnt); if(it) { - QString szText; + TQString szText; ((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText); - m_pToolTip->tip(m_pListView->itemRect(it),szText); + m_pToolTip->tip(m_pListView->tqitemRect(it),szText); } } } -bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e) +bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e) { - if(o == m_pListView->viewport()) + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pListView->viewport())) { - if(e->type() == QEvent::MouseButtonPress) + if(e->type() == TQEvent::MouseButtonPress) { - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; KviTreeTaskBarItem * it = (KviTreeTaskBarItem *)m_pListView->itemAt(ev->pos()); if(!it)return false; KviWindow * wnd = it->kviWindow(); @@ -1328,7 +1324,7 @@ bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e) { if(ev->button() & Qt::LeftButton) { - if(ev->state() & Qt::ShiftButton) + if(ev->state() & TQt::ShiftButton) { wnd->delayedClose(); } else { @@ -1377,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it) { cur->setActive(false); } - if(((KviTreeTaskBarItem *)it)->parent()) + if(((KviTreeTaskBarItem *)it)->tqparent()) { - if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true); + if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true); } ((KviTreeTaskBarItem *)it)->setActive(true); m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive() @@ -1409,15 +1405,15 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->firstChild(); } else { - // this item has no children: try the next sibling + // this item has no tqchildren: try the next sibling if(m_pCurrentItem->nextSibling()) { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); } else { - if(m_pCurrentItem->parent()) + if(m_pCurrentItem->tqparent()) { - // child with not siblings : try the sibling of the parent - m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling(); + // child with not siblings : try the sibling of the tqparent + m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling(); } else { m_pCurrentItem = 0; // toplevel with no siblings } @@ -1432,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() if(!m_pCurrentItem)return 0; - if(m_pCurrentItem->parent()) + if(m_pCurrentItem->tqparent()) { // a child item - it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild(); while(it) { @@ -1444,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() } if(!it) { - it = (KviTreeTaskBarItem *)m_pCurrentItem->parent(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent(); } } else { diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index 300e0f68..9e9ebe29 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -27,16 +27,16 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_tal_tooltip.h" #include "kvi_tal_listview.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> class KviWindow; class KviFrame; -class QPixmap; +class TQPixmap; class KviDynamicToolTip; class KviConsole; @@ -74,28 +74,29 @@ public: // This is the basic interface that all the external classes should see // -// Please note that Qt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks -// while the Qt4 moc skips the Q_MOC_RUN ifdef block.. so... +// Please note that TQt3 tqmoc skips the *_SKIP_BEGIN -> *_SKIP_END blocks +// while the TQt4 tqmoc skips the TQ_TQMOC_RUN ifdef block.. so... -// Qt4 version +// TQt4 version // If you get failures (undefined references) in some non-autotools based -// build system that uses Qt4 then you must add the -DCOMPILE_USE_QT4 -// commandline parameter to moc (at leat) when parsing this file. +// build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4 +// commandline parameter to tqmoc (at leat) when parsing this file. -// MOC_SKIP_BEGIN +// TQMOC_SKIP_BEGIN #ifdef COMPILE_USE_QT4 -#include <QDockWidget> +#include <TQDockWidget> -class KVIRC_API KviTaskBarBase : public QDockWidget +class KVIRC_API KviTaskBarBase : public TQDockWidget { Q_OBJECT + TQ_OBJECT #endif //COMPILE_USE_QT4 -// MOC_SKIP_END +// TQMOC_SKIP_END -// Qt3 version -#ifndef Q_MOC_RUN +// TQt3 version +#ifndef TQ_TQMOC_RUN #ifndef COMPILE_USE_QT4 #include "kvi_toolbar.h" @@ -103,6 +104,7 @@ class KVIRC_API KviTaskBarBase : public QDockWidget class KVIRC_API KviTaskBarBase : public KviToolBar { Q_OBJECT + TQ_OBJECT #endif #endif @@ -111,7 +113,7 @@ public: virtual ~KviTaskBarBase(); protected: KviFrame * m_pFrm; - QTimer * m_pActivityMeterTimer; + TQTimer * m_pActivityMeterTimer; public: virtual KviTaskBarItem * addItem(KviWindow *){ return 0; }; virtual bool removeItem(KviTaskBarItem *){ return false; }; @@ -125,7 +127,7 @@ public: virtual void switchWindow(bool bNext,bool bInContextOnly); virtual void updatePseudoTransparency(){}; virtual void applyOptions(){}; - static void getTextForConsole(QString &szText,KviConsole * pConsole); + static void getTextForConsole(TQString &szText,KviConsole * pConsole); protected slots: virtual void updateActivityMeter(); }; @@ -138,24 +140,23 @@ protected slots: class KviClassicTaskBar; -class KVIRC_API KviTaskBarButton : public QPushButton , KviTaskBarItem +class KVIRC_API KviTaskBarButton : public TQPushButton , KviTaskBarItem { friend class KviClassicTaskBar; Q_OBJECT + TQ_OBJECT public: - KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * name); + KviTaskBarButton(TQWidget * par,KviWindow * wnd,const char * name); ~KviTaskBarButton(); protected: bool m_bActive; KviDynamicToolTip * m_pTip; protected: - virtual void mousePressEvent(QMouseEvent *e); -#if QT_VERSION >= 300 - virtual void contextMenuEvent(QContextMenuEvent *e); -#endif - virtual void drawButtonLabel(QPainter *p); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void contextMenuEvent(TQContextMenuEvent *e); + virtual void drawButtonLabel(TQPainter *p); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent * e); + virtual void paintEvent(TQPaintEvent * e); #endif public: virtual bool active(){ return m_bActive; }; @@ -166,27 +167,28 @@ public: protected: void setActive(bool bActive); protected slots: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; class KVIRC_API KviClassicTaskBar : public KviTaskBarBase { Q_OBJECT + TQ_OBJECT public: KviClassicTaskBar(); ~KviClassicTaskBar(); protected: KviPointerList<KviTaskBarButton> * m_pButtonList; int m_iButtonHeight; - QWidget * m_pBase; + TQWidget * m_pBase; protected: void calcButtonHeight(); void doLayout(); // called by KviFrame to adjust a bug on WIndows void insertButton(KviTaskBarButton * b); public: -// virtual void fontChange(const QFont & old); - virtual void resizeEvent(QResizeEvent *e); +// virtual void fontChange(const TQFont & old); + virtual void resizeEvent(TQResizeEvent *e); public: virtual KviTaskBarItem * addItem(KviWindow *); virtual bool removeItem(KviTaskBarItem *); @@ -217,18 +219,18 @@ public: protected: int m_iStepNumber; bool m_bIncreasing; - QTimer* m_pAnimTimer; + TQTimer* m_pAnimTimer; KviTreeTaskBarItemInternal *m_pInternal; int m_iRedDiff; int m_iGreenDiff; int m_iBlueDiff; public: - virtual QString key(int column,bool) const; - virtual void paintCell(QPainter *p,const QColorGroup &cg,int column,int width,int alignment); + virtual TQString key(int column,bool) const; + virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int tqalignment); #ifdef COMPILE_USE_QT4 - virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h); + virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h); #else - virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h,GUIStyle s); + virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h,GUIStyle s); #endif virtual void captionChanged(); virtual void highlight(int iLevel = 1); @@ -244,9 +246,10 @@ protected: int calculateColor(int col1,int col2); }; -class KviTreeTaskBarItemInternal : public QObject +class KviTreeTaskBarItemInternal : public TQObject { Q_OBJECT + TQ_OBJECT public: KviTreeTaskBarItemInternal(KviTreeTaskBarItem* pItem):m_pItem(pItem) {}; ~KviTreeTaskBarItemInternal() {}; @@ -260,16 +263,17 @@ class KVIRC_API KviTreeTaskBarListView : public KviTalListView { friend class KviTreeTaskBarItem; Q_OBJECT + TQ_OBJECT KviTreeTaskBarItem* m_pPrevItem; public: - KviTreeTaskBarListView(QWidget * par); + KviTreeTaskBarListView(TQWidget * par); ~KviTreeTaskBarListView(); protected: - virtual void contentsMousePressEvent(QMouseEvent *e); - virtual void paintEmptyArea(QPainter * p,const QRect &rct); - virtual void resizeEvent(QResizeEvent *e); - virtual void contentsMouseMoveEvent ( QMouseEvent * e ); - virtual void leaveEvent(QEvent *); + virtual void contentsMousePressEvent(TQMouseEvent *e); + virtual void paintEmptyArea(TQPainter * p,const TQRect &rct); + virtual void resizeEvent(TQResizeEvent *e); + virtual void contentsMouseMoveEvent ( TQMouseEvent * e ); + virtual void leaveEvent(TQEvent *); signals: void leftMousePress(KviTalListViewItem * it); void rightMousePress(KviTalListViewItem * it); @@ -282,6 +286,7 @@ public slots: class KVIRC_API KviTreeTaskBar : public KviTaskBarBase { Q_OBJECT + TQ_OBJECT public: KviTreeTaskBar(); ~KviTreeTaskBar(); @@ -299,13 +304,13 @@ public: virtual KviTaskBarItem * prevItem(void); virtual bool setIterationPointer(KviTaskBarItem * it); virtual void updatePseudoTransparency(); - virtual bool eventFilter(QObject * o,QEvent *e); + virtual bool eventFilter(TQObject * o,TQEvent *e); virtual void updateActivityMeter(); virtual void applyOptions(); protected: - virtual void moveEvent(QMoveEvent *); + virtual void moveEvent(TQMoveEvent *); protected slots: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index bd480785..fed0535c 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -33,18 +33,18 @@ #include "kvi_mirccntrl.h" #include "kvi_iconmanager.h" -#include <qnamespace.h> -#include <qlineedit.h> +#include <tqnamespace.h> +#include <tqlineedit.h> #include <ctype.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif KviTextIconWindow::KviTextIconWindow() #ifdef COMPILE_USE_QT4 -: KviTalIconView(0,Qt::Popup) +: KviTalIconView(0,TQt::Popup) #else -: KviTalIconView(0,Qt::WType_Popup) +: KviTalIconView(0,TQt::WType_Popup) #endif { m_iTimerId = -1; @@ -52,9 +52,9 @@ KviTextIconWindow::KviTextIconWindow() setFixedSize(KVI_TEXTICON_WIN_WIDTH,KVI_TEXTICON_WIN_HEIGHT); m_pOwner = 0; fill(); - connect(g_pTextIconManager,SIGNAL(changed()),this,SLOT(fill())); - connect(this,SIGNAL(doubleClicked( KviTalIconViewItem * )),this,SLOT(itemSelected(KviTalIconViewItem *))); - connect(this,SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,SLOT(itemSelected(KviTalIconViewItem *))); + connect(g_pTextIconManager,TQT_SIGNAL(changed()),this,TQT_SLOT(fill())); + connect(this,TQT_SIGNAL(doubleClicked( KviTalIconViewItem * )),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); + connect(this,TQT_SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); m_bAltMode = false; setWordWrapIconText(true); } @@ -73,11 +73,11 @@ KviTextIconWindow::~KviTextIconWindow() void KviTextIconWindow::fill() { clear(); - KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); - KviPointerHashTableIterator<QString,KviTextIcon> it(*d); + KviPointerHashTable<TQString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); + KviPointerHashTableIterator<TQString,KviTextIcon> it(*d); while(KviTextIcon * i = it.current()) { - QPixmap *pix = i->pixmap(); + TQPixmap *pix = i->pixmap(); if(pix)insertItem(new KviTalIconViewItem(this,it.currentKey(),*pix)); ++it; } @@ -85,13 +85,13 @@ void KviTextIconWindow::fill() setCurrentItem(0); } -void KviTextIconWindow::popup(QWidget *owner,bool bAltMode) +void KviTextIconWindow::popup(TQWidget *owner,bool bAltMode) { - if(m_pOwner)disconnect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); m_pOwner = owner; m_szTypedSeq = ""; m_bAltMode = bAltMode; - connect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); show(); } @@ -104,7 +104,7 @@ bool KviTextIconWindow::findTypedSeq() KviTalIconViewItem *item; for ( item = (KviTalIconViewItem *)firstItem(); item; item = (KviTalIconViewItem *)item->nextItem() ) { - QString szIt = item->text(); + TQString szIt = item->text(); int j; for(j=0;j<((int)(szIt.length()));j++) { @@ -128,25 +128,25 @@ got_mit: return bFullMax; } -void KviTextIconWindow::keyPressEvent(QKeyEvent *e) +void KviTextIconWindow::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_PageUp: - case Qt::Key_PageDown: - case Qt::Key_Return: + case TQt::Key_Up: + case TQt::Key_Down: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_PageUp: + case TQt::Key_PageDown: + case TQt::Key_Return: KviTalIconView::keyPressEvent(e); return; break; - case Qt::Key_Escape: + case TQt::Key_Escape: doHide(); return; break; - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(!m_szTypedSeq.isEmpty()) { m_szTypedSeq.remove(m_szTypedSeq.length() - 1,1); @@ -157,11 +157,11 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) } return; break; - case Qt::Key_Space: + case TQt::Key_Space: doHide(); if(findTypedSeq()) { - QString szItem = m_szTypedSeq; + TQString szItem = m_szTypedSeq; szItem.append(' '); if(m_pOwner) { @@ -169,12 +169,12 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } } } else { @@ -182,22 +182,22 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) } return; break; - case Qt::Key_Tab: + case TQt::Key_Tab: doHide(); findTypedSeq(); - QString szItem = m_szCurFullSeq; + TQString szItem = m_szCurFullSeq; szItem.append(' '); if(m_bAltMode)szItem.prepend(KVI_TEXT_ICON); if(m_pOwner->inherits("KviInputEditor")) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } return; break; @@ -223,10 +223,10 @@ void KviTextIconWindow::ownerDead() void KviTextIconWindow::show() { m_iTimerId = startTimer(50000); //50 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviTextIconWindow::timerEvent(QTimerEvent *) +void KviTextIconWindow::timerEvent(TQTimerEvent *) { doHide(); } @@ -246,26 +246,26 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item) { if(item) { -// debug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits("QLineEdit"),m_pOwner->className()); +// debug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING),m_pOwner->className()); doHide(); - QString szItem = item->text(); + TQString szItem = item->text(); szItem.append(' '); if(m_bAltMode)szItem.prepend(KVI_TEXT_ICON); if(m_pOwner->inherits("KviInputEditor")) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } } } -void KviTextIconWindow::mousePressEvent(QMouseEvent *e) +void KviTextIconWindow::mousePressEvent(TQMouseEvent *e) { if(e->pos().x() < 0)goto hideme; if(e->pos().x() > width())goto hideme; diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h index 76a4a60e..83c9c3d6 100644 --- a/src/kvirc/ui/kvi_texticonwin.h +++ b/src/kvirc/ui/kvi_texticonwin.h @@ -36,25 +36,26 @@ class KVIRC_API KviTextIconWindow : public KviTalIconView { Q_OBJECT + TQ_OBJECT public: KviTextIconWindow(); ~KviTextIconWindow(); private: - QWidget * m_pOwner; - QString m_szTypedSeq; - QString m_szCurFullSeq; - bool m_bAltMode; // in alt mode the itemSelected() string contains + TQWidget * m_pOwner; + TQString m_szTypedSeq; + TQString m_szCurFullSeq; + bool m_bAltMode; // in alt mode the itemSelected() string tqcontains // also the CTRL+I escape code int m_iTimerId; public: - void popup(QWidget *owner,bool bAltMode = false); + void popup(TQWidget *owner,bool bAltMode = false); private: void doHide(); virtual void show(); bool findTypedSeq(); // returns true if it is a complete word - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *); - virtual void timerEvent(QTimerEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *); + virtual void timerEvent(TQTimerEvent *); public slots: void fill(); void ownerDead(); diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index f9cf8e33..4d4243cc 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -26,16 +26,16 @@ #include "kvi_settings.h" #include "kvi_app.h" #include "kvi_window.h" -#include <qpainter.h> +#include <tqpainter.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -KviThemedLabel::KviThemedLabel(QWidget * par,const char * name) -: QFrame(par,name) +KviThemedLabel::KviThemedLabel(TQWidget * par,const char * name) +: TQFrame(par,name) { - setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); applyOptions(); m_bAutoHeight=0; } @@ -44,34 +44,34 @@ KviThemedLabel::~KviThemedLabel() { } -/*QSize KviThemedLabel::sizeHint() +/*TQSize KviThemedLabel::tqsizeHint() { - QSize size=QFrame::sizeHint(); - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + TQSize size=TQFrame::tqsizeHint(); + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; size.setHeight(iHeight); return size; }*/ void KviThemedLabel::setText(const char * text) { - m_szText = QString(text); + m_szText = TQString(text); if(m_bAutoHeight) { - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(parent(),new QEvent(QEvent::Resize)); + //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); } update(); } -void KviThemedLabel::setText(const QString& text) +void KviThemedLabel::setText(const TQString& text) { m_szText = text; if(m_bAutoHeight) { - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(parent(),new QEvent(QEvent::Resize)); + //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); } update(); } @@ -83,15 +83,15 @@ void KviThemedLabel::applyOptions() } #ifdef COMPILE_USE_QT4 -void KviThemedLabel::paintEvent ( QPaintEvent * event ) +void KviThemedLabel::paintEvent ( TQPaintEvent * event ) { - QFrame::paintEvent(event); - QPainter p(this); + TQFrame::paintEvent(event); + TQPainter p(this); SET_ANTI_ALIASING(p); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p.drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -107,20 +107,20 @@ void KviThemedLabel::paintEvent ( QPaintEvent * event ) } #endif - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setLeft(r.left() + 2); // some margin p.setPen(KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - p.drawText(r,Qt::AlignLeft | Qt::AlignVCenter,m_szText); + p.drawText(r,TQt::AlignLeft | TQt::AlignVCenter,m_szText); } #else -void KviThemedLabel::drawContents(QPainter *p) +void KviThemedLabel::drawContents(TQPainter *p) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -136,16 +136,16 @@ void KviThemedLabel::drawContents(QPainter *p) } #endif - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setLeft(r.left() + 2); // some margin p->setPen(KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - p->drawText(r,Qt::AlignLeft | Qt::AlignVCenter,m_szText); + p->drawText(r,TQt::AlignLeft | TQt::AlignVCenter,m_szText); } #endif -void KviThemedLabel::mouseDoubleClickEvent(QMouseEvent *) +void KviThemedLabel::mouseDoubleClickEvent(TQMouseEvent *) { emit doubleClicked(); } diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h index b63e2386..a307149c 100644 --- a/src/kvirc/ui/kvi_themedlabel.h +++ b/src/kvirc/ui/kvi_themedlabel.h @@ -25,36 +25,37 @@ #include "kvi_settings.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_string.h" -class KVIRC_API KviThemedLabel : public QFrame +class KVIRC_API KviThemedLabel : public TQFrame { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) public: - KviThemedLabel(QWidget * par,const char * name); + KviThemedLabel(TQWidget * par,const char * name); ~KviThemedLabel(); private: - QString m_szText; + TQString m_szText; bool m_bAutoHeight; protected: #ifdef COMPILE_USE_QT4 - virtual void paintEvent ( QPaintEvent * event ); + virtual void paintEvent ( TQPaintEvent * event ); #else - virtual void drawContents(QPainter *p); + virtual void drawContents(TQPainter *p); #endif - virtual void mouseDoubleClickEvent(QMouseEvent *e); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); public: int dummyRead() const { return 0; }; void setText(const char * text); - void setText(const QString& text); - QString text() { return m_szText; }; + void setText(const TQString& text); + TQString text() { return m_szText; }; void setAutoHeight(bool value) { m_bAutoHeight=value; }; void applyOptions(); -// QSize sizeHint(); +// TQSize tqsizeHint(); signals: void doubleClicked(); }; diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 792f9fc0..7e62bf68 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -29,11 +29,11 @@ #include "kvi_locale.h" #include "kvi_app.h" -#include <qcursor.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif static KviTalPopupMenu * g_pToolBarContextPopup = 0; @@ -42,7 +42,7 @@ static KviTalPopupMenu * g_pToolBarIconSizesPopup = 0; static KviTalPopupMenu * g_pToolBarPositionsPopup = 0; -KviToolBar::KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) +KviToolBar::KviToolBar(const TQString &label,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KviTalToolBar(label,g_pFrame,dock,bNewLine,nam) { } @@ -60,7 +60,7 @@ KviToolBar::~KviToolBar() g_pToolBarWindowsPopup = 0; } -void KviToolBar::mousePressEvent(QMouseEvent *e) +void KviToolBar::mousePressEvent(TQMouseEvent *e) { if(!(e->button() & Qt::RightButton)) { @@ -81,67 +81,63 @@ void KviToolBar::mousePressEvent(QMouseEvent *e) g_pFrame->fillToolBarsPopup(g_pToolBarWindowsPopup); g_pToolBarContextPopup->insertItem(__tr2qs("Toolbars"),g_pToolBarWindowsPopup); - g_pToolBarContextPopup->insertItem(__tr2qs("Orientation"),g_pToolBarPositionsPopup); + g_pToolBarContextPopup->insertItem(__tr2qs("Qt::Orientation"),g_pToolBarPositionsPopup); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,SLOT(moveToTop())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,SLOT(moveToLeft())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,SLOT(moveToRight())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,SLOT(moveToBottom())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,TQT_SLOT(moveToTop())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,TQT_SLOT(moveToLeft())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,TQT_SLOT(moveToRight())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,TQT_SLOT(moveToBottom())); g_pToolBarPositionsPopup->insertSeparator(); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,SLOT(moveToTornOff())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,SLOT(moveToMinimized())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,TQT_SLOT(moveToTornOff())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,TQT_SLOT(moveToMinimized())); g_pToolBarContextPopup->insertItem(__tr2qs("Icon Size"),g_pToolBarIconSizesPopup); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,SLOT(setSmallIcons())); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,SLOT(setBigIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,TQT_SLOT(setSmallIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,TQT_SLOT(setBigIcons())); - g_pToolBarContextPopup->popup(QCursor::pos()); + g_pToolBarContextPopup->popup(TQCursor::pos()); } -void KviToolBar::moveTo(QT_TOOLBARDOCK_TYPE dock) +void KviToolBar::moveTo(TQT_TOOLBARDOCK_TYPE dock) { // FIXME: this should be hidden in Tal #ifdef COMPILE_USE_QT4 g_pFrame->removeToolBar(this); g_pFrame->addToolBar(dock,this); #else //!COMPILE_USE_QT4 -#if QT_VERSION >= 300 g_pFrame->moveDockWindow(this,dock); -#else - g_pFrame->moveToolBar(this,dock); -#endif #endif //!COMPILE_USE_QT4 } void KviToolBar::moveToTop() { - moveTo(QT_DOCK_TOP); + moveTo(TQT_DOCK_TOP); } void KviToolBar::moveToLeft() { - moveTo(QT_DOCK_LEFT); + moveTo(TQT_DOCK_LEFT); } void KviToolBar::moveToRight() { - moveTo(QT_DOCK_RIGHT); + moveTo(TQT_DOCK_RIGHT); } void KviToolBar::moveToBottom() { - moveTo(QT_DOCK_BOTTOM); + moveTo(TQT_DOCK_BOTTOM); } void KviToolBar::moveToMinimized() { - moveTo(QT_DOCK_MINIMIZED); + moveTo(TQT_DOCK_MINIMIZED); } void KviToolBar::moveToTornOff() { - moveTo(QT_DOCK_TORNOFF); + moveTo(TQT_DOCK_TORNOFF); } void KviToolBar::setBigIcons() diff --git a/src/kvirc/ui/kvi_toolbar.h b/src/kvirc/ui/kvi_toolbar.h index a0e05119..bc5a7815 100644 --- a/src/kvirc/ui/kvi_toolbar.h +++ b/src/kvirc/ui/kvi_toolbar.h @@ -31,12 +31,13 @@ class KviFrame; class KVIRC_API KviToolBar : public KviTalToolBar { Q_OBJECT + TQ_OBJECT public: - KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock = QT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); + KviToolBar(const TQString &label,TQT_TOOLBARDOCK_TYPE dock = TQT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); ~KviToolBar(); protected: - virtual void mousePressEvent(QMouseEvent *e); - void moveTo(QT_TOOLBARDOCK_TYPE dock); + virtual void mousePressEvent(TQMouseEvent *e); + void moveTo(TQT_TOOLBARDOCK_TYPE dock); public slots: void moveToTop(); void moveToLeft(); diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 270a7063..bd424fee 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -1,22 +1,22 @@ #define __KVIRC__ -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qobjectcleanuphandler.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqobjectcleanuphandler.h> +#include <tqpushbutton.h> #include "kvi_tal_vbox.h" -#include <qpainter.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqapplication.h> #include "kvi_toolwindows_container.h" #include "kvi_iconmanager.h" -KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) -:QWidget(parent/*,name,f*/) +KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) +:TQWidget(tqparent/*,name,f*/) { -// m_pContainer=parent; +// m_pContainer=tqparent; m_pButton=button; m_bAutoDelete=1; m_bHidden=0; @@ -64,7 +64,7 @@ void KviWindowToolWidget::unregisterSelf() unregisterSelf(); m_bHidden=1; } - QWidget::hide(); + TQWidget::hide(); }*/ /*void KviWindowToolWidget::show() @@ -73,28 +73,28 @@ void KviWindowToolWidget::unregisterSelf() { registerSelf(); } - QWidget::show(); + TQWidget::show(); m_bHidden=0; }*/ -KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn, const char * name ) -:TOOL_PAGE_PARENT(parent) +KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name ) +:TOOL_PAGE_PARENT(tqparent) { #ifdef COMPILE_USE_QT4 setFlat(true); setObjectName("kvi_window_tool_button"); - setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon)))); + setIcon(TQIcon(*(g_pIconManager->getSmallIcon(pixon)))); #else - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); setIconSet(is1); setUsesBigPixmap(false); #endif setToggleButton(true); setOn(bOn); -// setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Ignored)); +// tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); } KviWindowToolPageButton::~KviWindowToolPageButton() @@ -102,34 +102,34 @@ KviWindowToolPageButton::~KviWindowToolPageButton() } -/*void KviWindowToolPageButton::drawButton ( QPainter * p) +/*void KviWindowToolPageButton::drawButton ( TQPainter * p) { - QPixmap pixmap( height(), width() ); + TQPixmap pixmap( height(), width() ); if(isOn()) - pixmap.fill(colorGroup().mid()); + pixmap.fill(tqcolorGroup().mid()); else - pixmap.fill(colorGroup().button()); - QPainter painter( &pixmap ); + pixmap.fill(tqcolorGroup().button()); + TQPainter painter( &pixmap ); - QPixmap icon; + TQPixmap icon; if(isOn()) - icon=iconSet()->pixmap(QIconSet::Small,QIconSet::Normal,QIconSet::On); + icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); else - icon=iconSet()->pixmap(QIconSet::Small,QIconSet::Normal,QIconSet::Off); + icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); // Draw the frame - //painter.setPen( colorGroup().mid() ); + //painter.setPen( tqcolorGroup().mid() ); //if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); //painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); // Draw the text - QFont font; - QString str = text(); + TQFont font; + TQString str = text(); str.remove("&"); - const int textX = pixmap.width() / 2 - QFontMetrics( font ).width( str ) / 2; - painter.setPen( colorGroup().buttonText() ); - const QRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); - painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, str ); + const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2; + painter.setPen( tqcolorGroup().buttonText() ); + const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); + painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str ); // Draw the icon painter.drawPixmap( textX - icon.width() / 2 - 2, pixmap.height() / 2 - icon.height() / 2, icon ); diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h index ec131d9b..7b43af33 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.h +++ b/src/kvirc/ui/kvi_toolwindows_container.h @@ -4,9 +4,9 @@ #include "kvi_tal_widgetstack.h" #include "kvi_tal_vbox.h" -#include <qtoolbutton.h> -#include <qobjectcleanuphandler.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqobjectcleanuphandler.h> +#include <tqpushbutton.h> #include "kvi_heapobject.h" #include "kvi_styled_controls.h" @@ -21,11 +21,12 @@ class KviWindowToolPageButton; -class KVIRC_API KviWindowToolWidget : public QWidget +class KVIRC_API KviWindowToolWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KviWindowToolWidget( QWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); + KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); ~KviWindowToolWidget(); void setAutoDelete(bool b) { m_bAutoDelete=b; }; @@ -41,12 +42,12 @@ protected: KviWindowToolPageButton *m_pButton; bool m_bAutoDelete; bool m_bHidden; -// QObjectCleanupHandler m_ObjectHandler; +// TQObjectCleanupHandler m_ObjectHandler; }; #ifdef COMPILE_USE_QT4 - #define TOOL_PAGE_PARENT QPushButton + #define TOOL_PAGE_PARENT TQPushButton #else #define TOOL_PAGE_PARENT KviStyledToolButton #endif @@ -55,11 +56,12 @@ protected: class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT { Q_OBJECT + TQ_OBJECT public: - KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn=0,const char * name = 0 ); + KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 ); ~KviWindowToolPageButton(); /*protected: - virtual void drawButton ( QPainter * painter);*/ + virtual void drawButton ( TQPainter * painter);*/ }; #endif //_KVI_TOOLWINDOWS_CONTAINER_H_ diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index bbcf0c5c..8ae19621 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -46,42 +46,42 @@ extern KviTextIconWindow * g_pTextIconWindow; extern KviColorWindow * g_pColorWindow; static int g_iInputFontCharWidth[256]; -#include <qpainter.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> #include "kvi_tal_tooltip.h" -#include <qlineedit.h> +#include <tqlineedit.h> #include "kvi_tal_listbox.h" -#include <qregexp.h> -#include <qclipboard.h> +#include <tqregexp.h> +#include <tqclipboard.h> #include "kvi_tal_popupmenu.h" -#include <qevent.h> +#include <tqevent.h> // FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)" #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -extern QStringList * g_pRecentTopicList; +extern TQStringList * g_pRecentTopicList; int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const { - QFontMetrics fm(lb->font()); + TQFontMetrics fm(lb->font()); return fm.width(KviMircCntrl::stripControlBytes(text())); } -void KviListBoxTopicItem::paint ( QPainter * p ) +void KviListBoxTopicItem::paint ( TQPainter * p ) { - KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox())); + KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox())); } -KviTopicWidget::KviTopicWidget(QWidget * par,const char * name) -: QFrame(par,name) +KviTopicWidget::KviTopicWidget(TQWidget * par,const char * name) +: TQFrame(par,name) { - setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); setFont(KVI_OPTION_FONT(KviOption_fontLabel)); m_pHistory = 0; m_pAccept = 0; @@ -92,21 +92,21 @@ KviTopicWidget::KviTopicWidget(QWidget * par,const char * name) #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif reset(); #ifdef COMPILE_USE_QT4 - m_pCompletionBox=new KviTalListBox(this,Qt::Popup); + m_pCompletionBox=new KviTalListBox(this,TQt::Popup); #else - m_pCompletionBox=new KviTalListBox(this,Qt::WType_Popup); + m_pCompletionBox=new KviTalListBox(this,TQt::WType_Popup); #endif m_pCompletionBox->setFont( font() ); m_pCompletionBox->setPalette( palette() ); // m_pCompletionBox->setVScrollBarMode( KviTalListBox::AlwaysOff ); // m_pCompletionBox->setHScrollBarMode( KviTalListBox::AlwaysOff ); - m_pCompletionBox->setFrameStyle( QFrame::Box | QFrame::Plain ); + m_pCompletionBox->setFrameStyle( TQFrame::Box | TQFrame::Plain ); m_pCompletionBox->setLineWidth( 1 ); - connect(m_pCompletionBox,SIGNAL(selected(int)),this,SLOT(complete(int))); + connect(m_pCompletionBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(complete(int))); m_pCompletionBox->hide(); } @@ -141,9 +141,9 @@ void KviTopicWidget::applyOptions() #define KVI_LABEL_DEF_BACK 100 #define KVI_LABEL_DEF_FORE 101 -QString convertToHtml(const QString &text) +TQString convertToHtml(const TQString &text) { - QString result; + TQString result; bool curBold = false; bool curUnderline = false; unsigned char curFore = KVI_LABEL_DEF_FORE; //default fore @@ -153,7 +153,7 @@ QString convertToHtml(const QString &text) while(idx < text.length()) { - unsigned short c = text[(int)idx].unicode(); + unsigned short c = text[(int)idx].tqunicode(); unsigned int start = idx; @@ -168,7 +168,7 @@ QString convertToHtml(const QString &text) { idx++; if(idx >= text.length())break; - else c = text[(int)idx].unicode(); + else c = text[(int)idx].tqunicode(); } int len = idx - start; @@ -176,7 +176,7 @@ QString convertToHtml(const QString &text) if(len > 0) { bool bOpened = FALSE; - QString szText = text.mid(start,len); + TQString szText = text.mid(start,len); if(curBold) result.append("<b>"); if(curUnderline) result.append("<u>"); @@ -251,7 +251,7 @@ QString convertToHtml(const QString &text) ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -259,7 +259,7 @@ QString convertToHtml(const QString &text) if(icon) { //TODO: icons -/* QPixmap * pigzmap = icon->pixmap(); +/* TQPixmap * pigzmap = icon->pixmap(); p->drawPixmap(curX,(baseline + 2) - pigzmap->height(),*(pigzmap)); curX += pigzmap->width();*/ } else { @@ -272,9 +272,9 @@ QString convertToHtml(const QString &text) return result; } -void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGroup& cg,int height, int width) +void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg,int height, int width) { - QFontMetrics fm(p->font()); + TQFontMetrics fm(p->font()); if(height<0) height=p->window().height(); if(width<0) width=p->window().width(); @@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou while((idx < text.length()) && (curX < width)) { - unsigned short c = text[(int)idx].unicode(); + unsigned short c = text[(int)idx].tqunicode(); unsigned int start = idx; @@ -305,7 +305,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou ) { idx++; - c = text[(int)idx].unicode(); + c = text[(int)idx].tqunicode(); } int len = idx - start; @@ -313,7 +313,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou if(len > 0) { - QString szText = text.mid(start,len); + TQString szText = text.mid(start,len); wdth = fm.width(szText); @@ -392,14 +392,14 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(lookupString.ptr()); if(icon) { - QPixmap * pigzmap = icon->pixmap(); + TQPixmap * pigzmap = icon->pixmap(); p->drawPixmap(curX,(baseline + 2) - pigzmap->height(),*(pigzmap)); curX += pigzmap->width(); } else { @@ -412,20 +412,20 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou } #ifdef COMPILE_USE_QT4 -void KviTopicWidget::paintEvent(QPaintEvent * e) +void KviTopicWidget::paintEvent(TQPaintEvent * e) { - QPainter pa(this); + TQPainter pa(this); drawFrame(&pa); drawContents(&pa); } #endif -void KviTopicWidget::drawContents(QPainter *p) +void KviTopicWidget::drawContents(TQPainter *p) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -438,18 +438,18 @@ void KviTopicWidget::drawContents(QPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - QColorGroup colorGroup; - //colorGroup() - colorGroup.setColor(QColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - colorGroup.setColor(QColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); - paintColoredText(p,m_szTopic,colorGroup); + TQColorGroup tqcolorGroup; + //tqcolorGroup() + tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); + tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); + paintColoredText(p,m_szTopic,tqcolorGroup); } -void KviTopicWidget::setTopic(const QString & topic) +void KviTopicWidget::setTopic(const TQString & topic) { m_szTopic = topic; bool bFound = false; - for(QStringList::Iterator it=g_pRecentTopicList->begin();it != g_pRecentTopicList->end(); ++it) + for(TQStringList::Iterator it=g_pRecentTopicList->begin();it != g_pRecentTopicList->end(); ++it) { if(*it == m_szTopic) { @@ -469,13 +469,13 @@ void KviTopicWidget::setTopic(const QString & topic) update(); } -void KviTopicWidget::setTopicSetBy(const QString & setBy) +void KviTopicWidget::setTopicSetBy(const TQString & setBy) { m_szSetBy = setBy; updateToolTip(); } -void KviTopicWidget::setTopicSetAt(const QString & setAt) +void KviTopicWidget::setTopicSetAt(const TQString & setAt) { m_szSetAt = setAt; updateToolTip(); @@ -485,7 +485,7 @@ void KviTopicWidget::updateToolTip() { KviTalToolTip::remove(this); - QString txt = "<html>" \ + TQString txt = "<html>" \ "<body>" \ "<table width=\"100%\">"; @@ -497,11 +497,11 @@ void KviTopicWidget::updateToolTip() txt += "<tr><td><center>"; - QString tmp = m_szTopic; + TQString tmp = m_szTopic; - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); tmp = convertToHtml(tmp); txt += tmp; @@ -541,20 +541,20 @@ void KviTopicWidget::updateToolTip() KviTalToolTip::add(this,txt); } -QSize KviTopicWidget::sizeHint() const +TQSize KviTopicWidget::tqsizeHint() const { - QFontMetrics fm(font()); + TQFontMetrics fm(font()); int hght = fm.lineSpacing() + (frameWidth() << 1) + 4; int baseline = ((hght + fm.ascent() - fm.descent() + 1) >> 1); if(baseline < 16)hght += (16 - baseline); - return QSize(width(),hght); + return TQSize(width(),hght); } -void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) +void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) { int maxlen=-1; - QObject * w = parent(); - QString szModes; + TQObject * w = tqparent(); + TQString szModes; bool bCanEdit = TRUE; while(w) { @@ -563,12 +563,12 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) KviChannel *chan = ((KviChannel *)w); maxlen=chan->connection()->serverInfo()->maxTopicLen(); chan->getChannelModeString(szModes); - if(szModes.contains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { + if(szModes.tqcontains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { bCanEdit=false; } break; } - w = w->parent(); + w = w->tqparent(); } if(m_pInput == 0) { @@ -577,45 +577,45 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) m_pInput->setMaxBufferSize(maxlen); m_pInput->setGeometry(0,0,width() - (height() << 2)+height(),height()); m_pInput->setText(m_szTopic); - connect(m_pInput,SIGNAL(enterPressed()),this,SLOT(acceptClicked())); - connect(m_pInput,SIGNAL(escapePressed()),this,SLOT(discardClicked())); + connect(m_pInput,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(acceptClicked())); + connect(m_pInput,TQT_SIGNAL(escapePressed()),this,TQT_SLOT(discardClicked())); m_pInput->installEventFilter(this); - m_pHistory = new QPushButton(this); + m_pHistory = new TQPushButton(this); m_pHistory->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height()); KviTalToolTip::add(m_pHistory,__tr2qs("History")); m_pHistory->show(); - connect(m_pHistory,SIGNAL(clicked()),this,SLOT(historyClicked())); + connect(m_pHistory,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyClicked())); - m_pAccept = new QPushButton(this); + m_pAccept = new TQPushButton(this); m_pAccept->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); m_pAccept->setGeometry(width() - (height() << 1),0,height(),height()); m_pAccept->setEnabled(bCanEdit); m_pAccept->show(); KviTalToolTip::add(m_pAccept,__tr2qs("Commit Changes")); - connect(m_pAccept,SIGNAL(clicked()),this,SLOT(acceptClicked())); + connect(m_pAccept,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked())); - m_pDiscard = new QPushButton(this); + m_pDiscard = new TQPushButton(this); m_pDiscard->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); m_pDiscard->setGeometry(width() - height(),0,height(),height()); KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes")); m_pDiscard->show(); - connect(m_pDiscard,SIGNAL(clicked()),this,SLOT(discardClicked())); + connect(m_pDiscard,TQT_SIGNAL(clicked()),this,TQT_SLOT(discardClicked())); m_pInput->show(); m_pInput->setFocus(); } } -void KviTopicWidget::mousePressEvent(QMouseEvent * e) +void KviTopicWidget::mousePressEvent(TQMouseEvent * e) { if(!(e->button() & Qt::RightButton))return; if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); } m_pContextPopup->popup(mapToGlobal(e->pos())); } @@ -624,50 +624,50 @@ void KviTopicWidget::contextPopupAboutToShow() { if(!m_pContextPopup)return; // hm ? m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,SLOT(copy())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,TQT_SLOT(copy())); } void KviTopicWidget::copy() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - if(c->supportsSelection())c->setText(m_szTopic,QClipboard::Selection); - c->setText(m_szTopic,QClipboard::Clipboard); + if(c->supportsSelection())c->setText(m_szTopic,TQClipboard::Selection); + c->setText(m_szTopic,TQClipboard::Clipboard); } -bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) +bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) { if ( !e ) return TRUE; - if(object==m_pCompletionBox) + if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(m_pCompletionBox)) { switch( e->type() ) { - case QEvent::MouseButtonPress: - if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) { - complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((QMouseEvent*)e)->pos()))); + case TQEvent::MouseButtonPress: + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((TQMouseEvent*)e)->pos()))); return TRUE; } break; - case QEvent::MouseButtonRelease: - if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) { - QMouseEvent tmp( QEvent::MouseButtonDblClick, - ((QMouseEvent*)e)->pos(), ((QMouseEvent*)e)->button(), ((QMouseEvent*)e)->state() ) ; + case TQEvent::MouseButtonRelease: + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + TQMouseEvent tmp( TQEvent::MouseButtonDblClick, + ((TQMouseEvent*)e)->pos(), ((TQMouseEvent*)e)->button(), ((TQMouseEvent*)e)->state() ) ; // will hide popup - QApplication::sendEvent( object, &tmp ); + TQApplication::sendEvent( object, &tmp ); return TRUE; } else { if ( m_pCompletionBox->isVisible() ) popDownListBox(); } break; - case QEvent::KeyPress: - switch( ((QKeyEvent *)e)->key() ) { - case Qt::Key_Up: - case Qt::Key_Down: - if ( !(((QKeyEvent *)e)->state() & Qt::AltButton) ) + case TQEvent::KeyPress: + switch( ((TQKeyEvent *)e)->key() ) { + case TQt::Key_Up: + case TQt::Key_Down: + if ( !(((TQKeyEvent *)e)->state() & TQt::AltButton) ) break; - case Qt::Key_F4: - case Qt::Key_Escape: + case TQt::Key_F4: + case TQt::Key_Escape: if ( m_pCompletionBox->isVisible() ) { popDownListBox(); return TRUE; @@ -677,22 +677,22 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) break; } break; - case QEvent::Hide: + case TQEvent::Hide: popDownListBox(); break; default: break; } } - return QFrame::eventFilter(object,e); + return TQFrame::eventFilter(object,e); } -bool KviTopicWidget::handleKeyPressEvent(QKeyEvent * e) +bool KviTopicWidget::handleKeyPressEvent(TQKeyEvent * e) { return 1; } -void KviTopicWidget::keyPressEvent(QKeyEvent * e) +void KviTopicWidget::keyPressEvent(TQKeyEvent * e) { if(handleKeyPressEvent(e)) { @@ -701,9 +701,9 @@ void KviTopicWidget::keyPressEvent(QKeyEvent * e) } } -void KviTopicWidget::resizeEvent(QResizeEvent *e) +void KviTopicWidget::resizeEvent(TQResizeEvent *e) { - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); if(m_pInput) { m_pInput->setGeometry(0,0,width() - (height() << 2)+height(),height()); @@ -728,9 +728,9 @@ void KviTopicWidget::deactivate() m_pDiscard = 0; } - // try to find a KviWindow parent and give it the focus + // try to find a KviWindow tqparent and give it the focus - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviWindow")) @@ -738,15 +738,15 @@ void KviTopicWidget::deactivate() ((KviWindow *)w)->setFocus(); return; } - w = w->parent(); + w = w->tqparent(); } // no KviWindow on the path - w = parent(); + w = tqparent(); if(w) { - if(w->inherits("QWidget")) - ((QWidget *)w)->setFocus(); + if(w->inherits(TQWIDGET_OBJECT_NAME_STRING)) + ((TQWidget *)w)->setFocus(); } } @@ -761,12 +761,12 @@ void KviTopicWidget::historyClicked() { m_pCompletionBox->installEventFilter( this ); m_pCompletionBox->clear(); - for ( QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) { + for ( TQStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) { KviListBoxTopicItem* item=new KviListBoxTopicItem(m_pCompletionBox,*it); } m_pCompletionBox->resize(m_pInput->width(),6*m_pCompletionBox->fontMetrics().height()+20); - QPoint point=m_pInput->mapToGlobal(QPoint(0,0)); - point+=QPoint(0,m_pInput->height()); + TQPoint point=m_pInput->mapToGlobal(TQPoint(0,0)); + point+=TQPoint(0,m_pInput->height()); m_pCompletionBox->move(point); m_pCompletionBox->show(); } @@ -776,18 +776,18 @@ void KviTopicWidget::acceptClicked() { if(!m_pInput->readOnly()) { - QString tmp = m_pInput->text(); + TQString tmp = m_pInput->text(); if(tmp != m_szTopic)emit topicSelected(tmp); } deactivate(); } -void KviTopicWidget::insertChar(QChar c) +void KviTopicWidget::insertChar(TQChar c) { - insertText(QString(c)); + insertText(TQString(c)); } -void KviTopicWidget::insertText(const QString &c) +void KviTopicWidget::insertText(const TQString &c) { if(m_pInput) m_pInput->insertText(c); @@ -803,30 +803,30 @@ void KviTopicWidget::complete(int pos) popDownListBox(); } -QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) +TQChar KviTopicWidget::getSubstituteChar(unsigned short control_code) { switch(control_code) { case KVI_TEXT_COLOR: - return QChar('K'); + return TQChar('K'); break; case KVI_TEXT_BOLD: - return QChar('B'); + return TQChar('B'); break; case KVI_TEXT_RESET: - return QChar('O'); + return TQChar('O'); break; case KVI_TEXT_REVERSE: - return QChar('R'); + return TQChar('R'); break; case KVI_TEXT_UNDERLINE: - return QChar('U'); + return TQChar('U'); break; case KVI_TEXT_ICON: - return QChar('I'); + return TQChar('I'); break; default: - return QChar(control_code); + return TQChar(control_code); break; } } diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index b13088d7..5a59ced1 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -27,15 +27,15 @@ #include "kvi_settings.h" -#include <qframe.h> -#include <qpushbutton.h> +#include <tqframe.h> +#include <tqpushbutton.h> #include "kvi_tal_listbox.h" #include "kvi_string.h" #include "kvi_app.h" #include "kvi_input.h" -class QComboBox; +class TQComboBox; class KviChannel; class KviTalPopupMenu; class KviIrcConnection; @@ -44,67 +44,68 @@ class KviTalListBox; class KVIRC_API KviListBoxTopicItem : public KviTalListBoxText { public: - KviListBoxTopicItem( KviTalListBox * listbox = 0 , const QString & text = QString::null):KviTalListBoxText(listbox,text) { ; }; + KviListBoxTopicItem( KviTalListBox * listbox = 0 , const TQString & text = TQString()):KviTalListBoxText(listbox,text) { ; }; virtual int width ( const KviTalListBox * lb ) const; protected: - virtual void paint ( QPainter * p ); + virtual void paint ( TQPainter * p ); }; -class KVIRC_API KviTopicWidget : public QFrame +class KVIRC_API KviTopicWidget : public TQFrame { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) friend class KviChannel; public: - KviTopicWidget(QWidget * par,const char * name); + KviTopicWidget(TQWidget * par,const char * name); ~KviTopicWidget(); private: - QString m_szTopic; - QString m_szSetBy; - QString m_szSetAt; - QPushButton * m_pAccept; - QPushButton * m_pDiscard; - QPushButton * m_pHistory; + TQString m_szTopic; + TQString m_szSetBy; + TQString m_szSetAt; + TQPushButton * m_pAccept; + TQPushButton * m_pDiscard; + TQPushButton * m_pHistory; KviTalPopupMenu * m_pContextPopup; - QChar getSubstituteChar(unsigned short control_code); + TQChar getSubstituteChar(unsigned short control_code); int xCursorPostionCalculation(int xInd); KviInputEditor* m_pInput; KviTalListBox* m_pCompletionBox; protected: int m_iCursorPosition; - virtual void drawContents(QPainter *p); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void keyPressEvent(QKeyEvent *e); - virtual void resizeEvent(QResizeEvent *e); + virtual void drawContents(TQPainter *p); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void resizeEvent(TQResizeEvent *e); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent * e); + virtual void paintEvent(TQPaintEvent * e); #endif void updateToolTip(); void deactivate(); void iconButtonClicked(); - virtual bool eventFilter(QObject *o,QEvent *e); - bool handleKeyPressEvent(QKeyEvent * e); + virtual bool eventFilter(TQObject *o,TQEvent *e); + bool handleKeyPressEvent(TQKeyEvent * e); public: - void insertChar(QChar c); - void insertText(const QString &s); + void insertChar(TQChar c); + void insertText(const TQString &s); int dummyRead() const { return 0; }; void reset(); - void setTopic(const QString & szTopic); - void setTopicSetBy(const QString & setBy); - void setTopicSetAt(const QString & setAt); + void setTopic(const TQString & szTopic); + void setTopicSetBy(const TQString & setBy); + void setTopicSetAt(const TQString & setAt); - const QString & topic(){ return m_szTopic; }; - const QString & topicSetBy(){ return m_szSetBy; }; - const QString & topicSetAt(){ return m_szSetAt; }; - virtual QSize sizeHint() const; + const TQString & topic(){ return m_szTopic; }; + const TQString & topicSetBy(){ return m_szSetBy; }; + const TQString & topicSetAt(){ return m_szSetAt; }; + virtual TQSize tqsizeHint() const; void applyOptions(); - static void paintColoredText(QPainter *p, QString text,const QColorGroup& cg, int h=-1, int w=-1); + static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1); protected slots: void acceptClicked(); void discardClicked(); @@ -114,7 +115,7 @@ protected slots: void complete(int); void popDownListBox(); signals: - void topicSelected(const QString &szTopic); + void topicSelected(const TQString &szTopic); }; #endif //_KVI_TOPICW_H_ diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 20f75f06..d96aa532 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -48,23 +48,23 @@ #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" -#include <qlabel.h> -#include <qscrollbar.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qfontmetrics.h> -#include <qdatetime.h> -#include <qmime.h> +#include <tqlabel.h> +#include <tqscrollbar.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqfontmetrics.h> +#include <tqdatetime.h> +#include <tqmime.h> #include "kvi_styled_controls.h" -#include <qevent.h> +#include <tqevent.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif // kvi_app.cpp (loaded and destroyed by KviIconManager) -extern QPixmap * g_pUserChanStatePixmap; +extern TQPixmap * g_pUserChanStatePixmap; // Yet another really complex widget :) @@ -83,7 +83,7 @@ KviUserListToolTip::~KviUserListToolTip() { } -void KviUserListToolTip::maybeTip(const QPoint &pnt) +void KviUserListToolTip::maybeTip(const TQPoint &pnt) { m_pListView->maybeTip(this,pnt); } @@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const QPoint &pnt) -KviUserListEntry::KviUserListEntry(KviUserListView * parent,const QString &nick, +KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick, KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown) { - m_pListView = parent; + m_pListView = tqparent; m_szNick = nick; m_pGlobalData = e; m_iFlags = iFlags; @@ -111,7 +111,7 @@ KviUserListEntry::~KviUserListEntry() { } -bool KviUserListEntry::color(QColor& color) +bool KviUserListEntry::color(TQColor& color) { // // FIXME: Unused ? @@ -167,7 +167,7 @@ void KviUserListEntry::recalcSize() ) ) { - QPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); + TQPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); m_iHeight += pix->height(); } @@ -184,15 +184,15 @@ void KviUserListEntry::recalcSize() -KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const QString & label_text,const char * name) -: KviWindowToolWidget(parent,button) +KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) +: KviWindowToolWidget(tqparent,button) { setAutoDelete(0); m_pKviWindow = pWnd; - m_pEntryDict = new KviPointerHashTable<QString,KviUserListEntry>(dictSize,false); + m_pEntryDict = new KviPointerHashTable<TQString,KviUserListEntry>(dictSize,false); m_pEntryDict->setAutoDelete(true); - m_pUsersLabel = new QLabel(this,"userslabel"); + m_pUsersLabel = new TQLabel(this,"userslabel"); KviTalToolTip::add(m_pUsersLabel,label_text); m_pViewArea = new KviUserListViewArea(this); @@ -212,7 +212,7 @@ KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* butto m_ieEntries = 0; m_iIEntries = 0; m_iSelectedCount = 0; -// setBackgroundMode(QWidget::NoBackground); +// setBackgroundMode(TQWidget::NoBackground); applyOptions(); registerSelf(); } @@ -230,7 +230,7 @@ void KviUserListView::emitRightClick() switch(m_pKviWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickPopupRequest; break; - case KVI_WINDOW_TYPE_QUERY: ev = KviEvent_OnQueryNickPopupRequest; break; + case KVI_WINDOW_TYPE_TQUERY: ev = KviEvent_OnQueryNickPopupRequest; break; case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListPopupRequest; break; default: ev = KviEvent_OnNickLinkPopupRequest; break; // this should actually never happen } @@ -238,7 +238,7 @@ void KviUserListView::emitRightClick() { if(KviKvsEventManager::instance()->hasAppHandlers(ev)) { - QString nicks; + TQString nicks; appendSelectedNicknames(nicks); KviKvsVariantList vList; vList.append(nicks); @@ -255,7 +255,7 @@ void KviUserListView::emitDoubleClick() switch(m_pKviWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickDefaultActionRequest; break; - case KVI_WINDOW_TYPE_QUERY: ev = KviEvent_OnQueryNickDefaultActionRequest; break; + case KVI_WINDOW_TYPE_TQUERY: ev = KviEvent_OnQueryNickDefaultActionRequest; break; case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListDefaultActionRequest; break; default: ev = KviEvent_OnNickLinkDefaultActionRequest; break; // this should actually never happen } @@ -263,7 +263,7 @@ void KviUserListView::emitDoubleClick() { if(KviKvsEventManager::instance()->hasAppHandlers(ev)) { - QString nicks; + TQString nicks; appendSelectedNicknames(nicks); KviKvsVariantList vList; vList.append(nicks); @@ -291,7 +291,7 @@ void KviUserListView::applyOptions() updateUsersLabel(); }*/ setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontUserListView)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontUserListView)); m_iFontHeight = fm.lineSpacing(); KviUserListEntry * e = m_pHeadItem; m_iTotalHeight = 0; @@ -305,7 +305,7 @@ void KviUserListView::applyOptions() m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); setMinimumWidth(100); resizeEvent(0); // this will call update() too - repaint(); + tqrepaint(); } void KviUserListView::updateArea() { @@ -338,27 +338,27 @@ void KviUserListView::setMaskEntries(char type, int num) updateUsersLabel(); } -void KviUserListView::completeNickBashLike(const QString &begin,KviPointerList<QString> *l,bool bAppendMask) +void KviUserListView::completeNickBashLike(const TQString &begin,KviPointerList<TQString> *l,bool bAppendMask) { KviUserListEntry * entry = m_pHeadItem; while(entry) { - if(KviQString::equalCIN(begin,entry->m_szNick,begin.length())) + if(KviTQString::equalCIN(begin,entry->m_szNick,begin.length())) { if(bAppendMask) { - QString * s = new QString(); - KviQString::sprintf(*s,"%Q!%Q@%Q",&(entry->m_szNick),&(entry->m_pGlobalData->user()),&(entry->m_pGlobalData->host())); + TQString * s = new TQString(); + KviTQString::sprintf(*s,"%Q!%Q@%Q",&(entry->m_szNick),&(entry->m_pGlobalData->user()),&(entry->m_pGlobalData->host())); l->append(s); } else - l->append(new QString(entry->m_szNick)); + l->append(new TQString(entry->m_szNick)); } entry = entry->m_pNext; } } -bool KviUserListView::completeNickStandard(const QString &begin,const QString &skipAfter,QString &buffer,bool bAppendMask) +bool KviUserListView::completeNickStandard(const TQString &begin,const TQString &skipAfter,TQString &buffer,bool bAppendMask) { KviUserListEntry * entry = m_pHeadItem; @@ -366,7 +366,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s { while(entry) { - if(KviQString::equalCI(skipAfter,entry->m_szNick)) + if(KviTQString::equalCI(skipAfter,entry->m_szNick)) { entry = entry->m_pNext; break; @@ -387,7 +387,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s { if(entry->m_szNick.length() >= begin.length()) { - int result = KviQString::cmpCIN(begin,entry->m_szNick,begin.length()); + int result = KviTQString::cmpCIN(begin,entry->m_szNick,begin.length()); if(result == 0) { // This is ok. @@ -421,7 +421,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s } -void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) +void KviUserListView::insertUserEntry(const TQString &nick,KviUserListEntry * e) { // Complex insertion task :) @@ -538,7 +538,7 @@ void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) } // else it is chan owner, so nothing to skip: the chan owners are first in the list // now strcmp within the current user-flag group... - while(entry && (KviQString::cmpCI(entry->m_szNick,e->m_szNick) < 0) && + while(entry && (KviTQString::cmpCI(entry->m_szNick,e->m_szNick) < 0) && ((entry->m_iFlags & flag) || (flag == 0))) { if(entry == m_pTopItem)bGotTopItem = true; @@ -601,17 +601,17 @@ void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) } } -KviUserListEntry * KviUserListView::join(const QString &nick,const QString &user, - const QString &host,int iFlags) +KviUserListEntry * KviUserListView::join(const TQString &nick,const TQString &user, + const TQString &host,int iFlags) { // Ok..an user joins the channel - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it == 0) { // add an entry to the global dict KviIrcUserEntry * pGlobalData = m_pIrcUserDataBase->insertUser(nick,user,host); // calculate the flags and update the counters - it = new KviUserListEntry(this,nick,pGlobalData,iFlags,(user == QString::null)); + it = new KviUserListEntry(this,nick,pGlobalData,iFlags,(user == TQString())); insertUserEntry(nick,it); } else { // if(!host.isEmpty()) - it can be UHNAMES with host or NAMEX(X) w/o it @@ -646,9 +646,9 @@ void KviUserListView::triggerUpdate() } } -bool KviUserListView::avatarChanged(const QString &nick) +bool KviUserListView::avatarChanged(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { int oldH = it->m_iHeight; @@ -694,7 +694,7 @@ bool KviUserListView::avatarChanged(const QString &nick) } -bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &user,const QString &host,int actionTemperature,QString &oldUser,QString &oldHost) +bool KviUserListView::userActionVerifyMask(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature,TQString &oldUser,TQString &oldHost) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel @@ -704,16 +704,16 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us // change (unless they were not known at all) // This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(nick)); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); bool bChanged = false; - if(!(host.isEmpty() || (KviQString::equalCS(host,"*")))) + if(!(host.isEmpty() || (KviTQString::equalCS(host,"*")))) { - if(!KviQString::equalCI(it->m_pGlobalData->host(),host)) + if(!KviTQString::equalCI(it->m_pGlobalData->host(),host)) { - if(!(it->m_pGlobalData->host().isEmpty() || KviQString::equalCS(it->m_pGlobalData->host(),"*"))) + if(!(it->m_pGlobalData->host().isEmpty() || KviTQString::equalCS(it->m_pGlobalData->host(),"*"))) { oldHost = it->m_pGlobalData->host(); bChanged = true; @@ -721,11 +721,11 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us it->m_pGlobalData->setHost(host); } } - if(!(user.isEmpty() || (KviQString::equalCS(user,"*")))) + if(!(user.isEmpty() || (KviTQString::equalCS(user,"*")))) { - if(!KviQString::equalCI(it->m_pGlobalData->user(),user)) + if(!KviTQString::equalCI(it->m_pGlobalData->user(),user)) { - if(!(it->m_pGlobalData->user().isEmpty() || KviQString::equalCS(it->m_pGlobalData->user(),"*"))) + if(!(it->m_pGlobalData->user().isEmpty() || KviTQString::equalCS(it->m_pGlobalData->user(),"*"))) { oldUser = it->m_pGlobalData->user(); bChanged = true; @@ -744,19 +744,19 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us } -void KviUserListView::userAction(const QString &nick,const QString &user,const QString &host,int actionTemperature) +void KviUserListView::userAction(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(nick)); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); - if(!(host.isEmpty() || (KviQString::equalCS(host,"*")))) + if(!(host.isEmpty() || (KviTQString::equalCS(host,"*")))) it->m_pGlobalData->setHost(host); - if(!(user.isEmpty() || (KviQString::equalCS(user,"*")))) + if(!(user.isEmpty() || (KviTQString::equalCS(user,"*")))) it->m_pGlobalData->setUser(user); it->m_iTemperature += actionTemperature; // Don't allow it to grow too much @@ -773,7 +773,7 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature) // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(user->nick())); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(user->nick())); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -787,13 +787,13 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature) } } -void KviUserListView::userAction(const QString &nick,int actionTemperature) +void KviUserListView::userAction(const TQString &nick,int actionTemperature) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -804,24 +804,24 @@ void KviUserListView::userAction(const QString &nick,int actionTemperature) } } -kvi_time_t KviUserListView::getUserJoinTime(const QString &szNick) +kvi_time_t KviUserListView::getUserJoinTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return (kvi_time_t)0; return e->m_joinTime; } -kvi_time_t KviUserListView::getUserLastActionTime(const QString &szNick) +kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return (kvi_time_t)0; return e->m_lastActionTime; } -int KviUserListView::getUserModeLevel(const QString &szNick) +int KviUserListView::getUserModeLevel(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return 0; if(e->m_iFlags & KVI_USERFLAG_MODEMASK) { @@ -838,25 +838,25 @@ int KviUserListView::getUserModeLevel(const QString &szNick) char KviUserListView::getUserFlag(KviUserListEntry * e) { if(!e)return 0; - return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode(); + return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).tqunicode(); } -void KviUserListView::prependUserFlag(const QString &nick,QString &buffer) +void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer) { char uFlag = getUserFlag(nick); if(uFlag)buffer.prepend(uFlag); } -int KviUserListView::flags(const QString &nick) +int KviUserListView::flags(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); return it ? it->m_iFlags : 0; } #define SET_FLAG_FUNC(__funcname,__flag) \ - bool KviUserListView::__funcname(const QString &nick,bool bYes) \ + bool KviUserListView::__funcname(const TQString &nick,bool bYes) \ { \ - KviUserListEntry * it = m_pEntryDict->find(nick); \ + KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ if(!it)return false; \ m_pEntryDict->setAutoDelete(false); \ partInternal(nick,false); \ @@ -881,9 +881,9 @@ SET_FLAG_FUNC(userop,KVI_USERFLAG_USEROP) SET_FLAG_FUNC(voice,KVI_USERFLAG_VOICE) #define GET_FLAG_FUNC(__funcname,__flag) \ - bool KviUserListView::__funcname(const QString &nick,bool bAtLeast) \ + bool KviUserListView::__funcname(const TQString &nick,bool bAtLeast) \ { \ - KviUserListEntry * it = m_pEntryDict->find(nick); \ + KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ return it ? (bAtLeast ? (it->m_iFlags >= __flag) : (it->m_iFlags & __flag)) : false; \ } @@ -895,14 +895,14 @@ GET_FLAG_FUNC(isHalfOp,KVI_USERFLAG_HALFOP) GET_FLAG_FUNC(isUserOp,KVI_USERFLAG_USEROP) -QString * KviUserListView::firstSelectedNickname() +TQString * KviUserListView::firstSelectedNickname() { m_pIterator = m_pHeadItem; while(m_pIterator) { if(m_pIterator->m_bSelected) { - QString * s = &(m_pIterator->m_szNick); + TQString * s = &(m_pIterator->m_szNick); m_pIterator = m_pIterator->m_pNext; return s; } @@ -911,13 +911,13 @@ QString * KviUserListView::firstSelectedNickname() return 0; } -QString * KviUserListView::nextSelectedNickname() +TQString * KviUserListView::nextSelectedNickname() { while(m_pIterator) { if(m_pIterator->m_bSelected) { - QString * s = &(m_pIterator->m_szNick); + TQString * s = &(m_pIterator->m_szNick); m_pIterator = m_pIterator->m_pNext; return s; } @@ -926,7 +926,7 @@ QString * KviUserListView::nextSelectedNickname() return 0; } -void KviUserListView::appendSelectedNicknames(QString &buffer) +void KviUserListView::appendSelectedNicknames(TQString &buffer) { KviUserListEntry * aux = m_pHeadItem; bool bFirst = true; @@ -942,15 +942,15 @@ void KviUserListView::appendSelectedNicknames(QString &buffer) } } -void KviUserListView::select(const QString& nick){ - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); +void KviUserListView::select(const TQString& nick){ + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { ((KviUserListEntry *)it.current())->m_bSelected = false; ++it; } - KviUserListEntry * entry = m_pEntryDict->find(nick); + KviUserListEntry * entry = m_pEntryDict->tqfind(nick); if(entry) { entry->m_bSelected = true; @@ -962,9 +962,9 @@ void KviUserListView::select(const QString& nick){ m_pViewArea->update(); } -bool KviUserListView::partInternal(const QString &nick,bool bRemove) +bool KviUserListView::partInternal(const TQString &nick,bool bRemove) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { // so, first of all..check if this item is over, or below the top item @@ -1028,13 +1028,13 @@ bool KviUserListView::partInternal(const QString &nick,bool bRemove) return false; } -bool KviUserListView::nickChange(const QString &oldNick,const QString &newNick) +bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick) { - KviUserListEntry * it = m_pEntryDict->find(oldNick); + KviUserListEntry * it = m_pEntryDict->tqfind(oldNick); if(it) { - QString user = it->m_pGlobalData->user(); - QString host = it->m_pGlobalData->host(); + TQString user = it->m_pGlobalData->user(); + TQString host = it->m_pGlobalData->host(); int iFlags = it->m_iFlags; kvi_time_t joint = it->m_joinTime; bool bSelect = it->m_bSelected; @@ -1042,7 +1042,7 @@ bool KviUserListView::nickChange(const QString &oldNick,const QString &newNick) KviIrcUserEntry::Gender gender = it->m_pGlobalData->gender(); bool bBot = it->m_pGlobalData->isBot(); part(oldNick); - __range_invalid(m_pEntryDict->find(oldNick)); + __range_invalid(m_pEntryDict->tqfind(oldNick)); it = join(newNick,user,host,iFlags); it->m_pGlobalData->setGender(gender); it->m_pGlobalData->setBot(bBot); @@ -1082,17 +1082,17 @@ void KviUserListView::updateUsersLabel() } // FIXME: this could be done really better -void KviUserListView::partAllButOne(const QString &whoNot) +void KviUserListView::partAllButOne(const TQString &whoNot) { - QStringList ll; - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); + TQStringList ll; + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { - if(!KviQString::equalCI(whoNot,it.currentKey())) + if(!KviTQString::equalCI(whoNot,it.currentKey())) ll.append(it.currentKey()); ++it; } - for(QStringList::Iterator it2 = ll.begin();it2 != ll.end();it2++) + for(TQStringList::Iterator it2 = ll.begin();it2 != ll.end();it2++) { part(*it2); } @@ -1100,7 +1100,7 @@ void KviUserListView::partAllButOne(const QString &whoNot) void KviUserListView::removeAllEntries() { - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { m_pIrcUserDataBase->removeUser(it.currentKey(), @@ -1136,12 +1136,12 @@ void KviUserListView::partAll() triggerUpdate(); } -void KviUserListView::resizeEvent(QResizeEvent *) +void KviUserListView::resizeEvent(TQResizeEvent *) { int hght; if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005 { - hght = m_pUsersLabel->sizeHint().height(); + hght = m_pUsersLabel->tqsizeHint().height(); if(hght < 16)hght = 16; // at least m_pUsersLabel->setGeometry(0,0,width(),hght); } @@ -1169,7 +1169,7 @@ bool KviUserListView::itemVisible(KviUserListEntry * e) return false; } -KviUserListEntry * KviUserListView::itemAt(const QPoint &pnt,QRect * rct) +KviUserListEntry * KviUserListView::itemAt(const TQPoint &pnt,TQRect * rct) { if(!m_pTopItem)return 0; if(pnt.y() < 0)return 0; @@ -1262,26 +1262,26 @@ void KviUserListView::userStats(KviUserListViewUserStats * s) } -void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) +void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) { if(!KVI_OPTION_BOOL(KviOption_boolShowUserListViewToolTips))return; - QRect itRect; + TQRect itRect; KviUserListEntry * it = (KviUserListEntry *)itemAt(pnt,&itRect); if(it) { if(m_pKviWindow->console()) { - QString buffer; + TQString buffer; m_pKviWindow->console()->getUserTipText(it->m_szNick,it->m_pGlobalData,buffer); buffer += "<table width=\"100%\">"; if(it->m_joinTime != 0) { - QDateTime dt; + TQDateTime dt; dt.setTime_t(it->m_joinTime); buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString()); + buffer += __tr2qs("Joined on <b>%1</b>").tqarg(dt.toString()); buffer += "</nobr></td></tr>"; } @@ -1293,7 +1293,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) int hors = mins / 60; mins = mins % 60; buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(hors).arg(mins).arg(secs); + buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").tqarg(hors).tqarg(mins).tqarg(secs); buffer += "</nobr></td></tr>"; } buffer += "</table>"; @@ -1306,22 +1306,22 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) /////////////////////////////////////////////////////////////// KviUserListViewArea::KviUserListViewArea(KviUserListView * par) -: QWidget(par) +: TQWidget(par) { m_pListView = par; #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif #ifdef COMPILE_USE_QT4 - m_pScrollBar = new QScrollBar(Qt::Vertical,this,"scrollbar"); + m_pScrollBar = new TQScrollBar(Qt::Vertical,this,"scrollbar"); #else - m_pScrollBar = new QScrollBar(QScrollBar::Vertical,this,"scrollbar"); + m_pScrollBar = new TQScrollBar(Qt::Vertical,this,"scrollbar"); #endif m_pScrollBar->setRange(0,0); m_pScrollBar->setValue(0); - connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarMoved(int))); + connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarMoved(int))); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight); m_iLastScrollBarVal = 0; @@ -1390,7 +1390,7 @@ void KviUserListViewArea::scrollBarMoved(int newVal) } -void KviUserListViewArea::paintEvent(QPaintEvent *ev) +void KviUserListViewArea::paintEvent(TQPaintEvent *ev) { // update the scroll bar @@ -1409,30 +1409,30 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) int wdth = width() - m_pScrollBar->width(); - QRect r = ev->rect(); + TQRect r = ev->rect(); if(r.right() > wdth)r.setRight(wdth); //debug("PAINT EVENT %d,%d,%d,%d",r.left(),r.top(),r.width(),r.height()); KviDoubleBuffer db(width(),height()); - QPixmap * pMemBuffer = db.pixmap(); + TQPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPainter p(pMemBuffer); SET_ANTI_ALIASING(p); p.setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); #ifdef COMPILE_USE_QT4 - QFontMetrics fm(p.fontMetrics()); + TQFontMetrics fm(p.fontMetrics()); #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(r.left(),r.top())); + TQPoint pnt = mapToGlobal(TQPoint(r.left(),r.top())); p.drawTiledPixmap(r.left(),r.top(),r.width(),r.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap *pix = KVI_OPTION_PIXMAP(KviOption_pixmapUserListViewBackground).pixmap(); + TQPixmap *pix = KVI_OPTION_PIXMAP(KviOption_pixmapUserListViewBackground).pixmap(); p.fillRect(r.left(),r.top(),r.width(),r.height(),KVI_OPTION_COLOR(KviOption_colorUserListViewBackground)); if(pix) KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign),r,width(),height()); @@ -1460,7 +1460,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) if(bottom >= r.top()) { - QColor * pClrFore = 0; + TQColor * pClrFore = 0; bool bColorAllocated=0; // FIXME: bool is true or false if(e->m_bSelected) { @@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) // FIXME: // // this is slow... VERY slow when one has a lot of registered users. - // (this is NOT a simple lookup in the user db... it is a mask match) + // (this is NOT a simple lookup in the user db... it is a tqmask match) // if we REALLY need to use custom colors for regged users then // they should be updated ONCE and stored (cached) in the KviUserListEntry structure // @@ -1515,11 +1515,11 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) { case KVI_USERLISTVIEW_GRIDTYPE_PLAINGRID: case KVI_USERLISTVIEW_GRIDTYPE_DOTGRID: - p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0, + p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0, #ifdef COMPILE_USE_QT4 - (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? Qt::DotLine : Qt::SolidLine)); + (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? TQt::DotLine : TQt::SolidLine)); #else - (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? QPen::DotLine : QPen::SolidLine)); + (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? TQPen::DotLine : TQPen::SolidLine)); #endif p.drawLine(0,bottom - 1,wdth,bottom - 1); if(bShowState || bShowIcons) @@ -1528,12 +1528,12 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) default: // KVI_USERLISTVIEW_GRIDTYPE_3DGRID and KVI_USERLISTVIEW_GRIDTYPE_3DBUTTONS if(!e->m_bSelected) { - p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,QPen::DotLine*/)); + p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/)); if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID)) p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY); - p.setPen(colorGroup().shadow()); + p.setPen(tqcolorGroup().shadow()); p.drawLine(0,bottom - 1,wdth,bottom - 1); - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(0,theY,wdth,theY); theY--; } @@ -1547,9 +1547,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) if(e->globalData()->isAway()) { - QRgb rgb2 = pClrFore->rgb(); - QRgb rgb1 = KVI_OPTION_COLOR(KviOption_colorUserListViewAwayForeground).rgb(); - p.setPen(QColor(((qRed(rgb1)*2) + qRed(rgb2)) / 3,((qGreen(rgb1)*2) + qGreen(rgb2)) / 3,((qBlue(rgb1)*2) + qBlue(rgb2)) / 3)); + TQRgb rgb2 = pClrFore->rgb(); + TQRgb rgb1 = KVI_OPTION_COLOR(KviOption_colorUserListViewAwayForeground).rgb(); + p.setPen(TQColor(((tqRed(rgb1)*2) + tqRed(rgb2)) / 3,((tqGreen(rgb1)*2) + tqGreen(rgb2)) / 3,((tqBlue(rgb1)*2) + tqBlue(rgb2)) / 3)); } else { p.setPen(*pClrFore); } @@ -1560,7 +1560,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) KviAvatar * av = e->m_pGlobalData->avatar(); if(av && KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth) && KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) { - QPixmap * pix; + TQPixmap * pix; if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || @@ -1580,12 +1580,12 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) { if(e->globalData()->gender()!=KviIrcUserEntry::Unknown) { - QPixmap * ico = g_pIconManager->getBigIcon((e->globalData()->gender()==KviIrcUserEntry::Male) ? "kvi_icon_male.png" : "kvi_icon_female.png"); + TQPixmap * ico = g_pIconManager->getBigIcon((e->globalData()->gender()==KviIrcUserEntry::Male) ? "kvi_icon_male.png" : "kvi_icon_female.png"); p.drawPixmap(theX,theY+(m_pListView->m_iFontHeight-11)/2,*ico); } if(e->globalData()->isBot()) { - QPixmap * ico = g_pIconManager->getBigIcon("kvi_icon_bot.png"); + TQPixmap * ico = g_pIconManager->getBigIcon("kvi_icon_bot.png"); p.drawPixmap(theX,theY+(m_pListView->m_iFontHeight-11)/2,*ico); } theX +=11; @@ -1663,7 +1663,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) //p.drawRect(theX,theY + 2,18,e->m_iHeight - 4); if(e->m_iFlags != 0) { - QPixmap * ico = g_pIconManager->getSmallIcon( \ + TQPixmap * ico = g_pIconManager->getSmallIcon( \ e->globalData()->isAway() ? \ ( \ (e->m_iFlags & KVI_USERFLAG_CHANOWNER) ? \ @@ -1691,27 +1691,27 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) } theX +=18; #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #endif } else { char flag = m_pListView->getUserFlag(e); if(flag) { - QString ttt = QChar(flag); + TQString ttt = TQChar(flag); ttt += e->m_szNick; #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,ttt); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,ttt); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,ttt); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,ttt); #endif } else { #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #endif } } @@ -1725,30 +1725,30 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) //we really do not need any self-draw borders. //if we will need it, we will draw a better one with system style - //p.setPen(colorGroup().dark()); + //p.setPen(tqcolorGroup().dark()); //p.drawLine(0,0,wdth,0); //p.drawLine(0,0,0,height()); - //p.setPen(colorGroup().light()); + //p.setPen(tqcolorGroup().light()); //p.drawLine(1,height()-1,wdth,height()-1); //p.drawLine(wdth - 1,1,wdth - 1,height()); #ifdef COMPILE_USE_QT4 - QPainter qt4SuxBecauseOfThisAdditionalPainter(this); + TQPainter qt4SuxBecauseOfThisAdditionalPainter(this); qt4SuxBecauseOfThisAdditionalPainter.drawPixmap(r.left(),r.top(),r.width(),r.height(),*pMemBuffer,r.left(),r.top(),r.width(),r.height()); #else - bitBlt(this,r.left(),r.top(),pMemBuffer,r.left(),r.top(),r.width(),r.height(),Qt::CopyROP,false); + bitBlt(TQT_TQPAINTDEVICE(this),r.left(),r.top(),TQT_TQPAINTDEVICE(pMemBuffer),r.left(),r.top(),r.width(),r.height(),TQt::CopyROP,false); #endif } -void KviUserListViewArea::resizeEvent(QResizeEvent *) +void KviUserListViewArea::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->sizeHint().width(); + int iScr = m_pScrollBar->tqsizeHint().width(); m_pScrollBar->setGeometry(width() - iScr,0,iScr,height()); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1); } -void KviUserListViewArea::mousePressEvent(QMouseEvent *e) +void KviUserListViewArea::mousePressEvent(TQMouseEvent *e) { setFocus(); if(e->button() & Qt::LeftButton) @@ -1756,14 +1756,14 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { // Multiselect mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; entry->m_bSelected = true; if(m_pListView->m_iSelectedCount == 1)g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); - } else if(e->state() & Qt::ControlButton) + } else if(e->state() & TQt::ControlButton) { // Invert mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; @@ -1800,7 +1800,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) if(!entry->m_bSelected){ entry->m_bSelected = true; m_pListView->m_iSelectedCount=1; - KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pListView->m_pEntryDict)); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*(m_pListView->m_pEntryDict)); while(it.current()) { if(it.current()!=entry) @@ -1815,22 +1815,22 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) m_pListView->emitRightClick(); } } -void KviUserListViewArea::keyPressEvent( QKeyEvent * e ) +void KviUserListViewArea::keyPressEvent( TQKeyEvent * e ) { - if(e->key()==Qt::Key_Escape) + if(e->key()==TQt::Key_Escape) { if(m_pListView->m_pKviWindow->input()) - ((QWidget*)(m_pListView->m_pKviWindow->input()))->setFocus(); + ((TQWidget*)(m_pListView->m_pKviWindow->input()))->setFocus(); } else { - QString szKey=e->text(); + TQString szKey=e->text(); if(!szKey.isEmpty()) { KviUserListEntry * nick=0; KviUserListEntry * aux = m_pListView->m_pHeadItem; while(aux) { - //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); - if(aux->nick().find(szKey,0,0)==0) + //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().tqfind(szKey,0,0)); + if(aux->nick().tqfind(szKey,0,0)==0) { nick=aux; break; @@ -1859,19 +1859,19 @@ void KviUserListViewArea::keyPressEvent( QKeyEvent * e ) } } -void KviUserListViewArea::mouseDoubleClickEvent(QMouseEvent *e) +void KviUserListViewArea::mouseDoubleClickEvent(TQMouseEvent *e) { m_pListView->emitDoubleClick(); } -void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) +void KviUserListViewArea::mouseMoveEvent(TQMouseEvent *e) { if(e->state() & Qt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry && (entry != m_pLastEntryUnderMouse)) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(entry->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1896,7 +1896,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() - top->m_iHeight); if(m_pListView->m_pTopItem != top) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(m_pListView->m_pTopItem->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1929,7 +1929,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() + bottom->m_iHeight); if(bottom != m_pLastEntryUnderMouse) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(bottom->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1951,15 +1951,15 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) } } -void KviUserListViewArea::mouseReleaseEvent(QMouseEvent *) +void KviUserListViewArea::mouseReleaseEvent(TQMouseEvent *) { m_pLastEntryUnderMouse = 0; } -void KviUserListViewArea::wheelEvent(QWheelEvent *e) +void KviUserListViewArea::wheelEvent(TQWheelEvent *e) { #ifdef COMPILE_USE_QT4 - static bool bHere = false; // Qt4(<= 4.2.2) has a nasty bug that makes the re-sent wheelEvent to cause infinite recursion + static bool bHere = false; // TQt4(<= 4.2.2) has a nasty bug that makes the re-sent wheelEvent to cause infinite recursion if(bHere)return; bHere = true; #endif diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index f5405937..2098a942 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -34,13 +34,13 @@ #include <time.h> #include "kvi_tal_tooltip.h" -#include <qwidget.h> +#include <tqwidget.h> #include "kvi_pointerlist.h" #include "kvi_pointerhashtable.h" #include "kvi_toolwindows_container.h" -class QLabel; -class QScrollBar; +class TQLabel; +class TQScrollBar; class KviUserListView; class KviUserListViewArea; @@ -63,8 +63,8 @@ public: private: KviUserListView * m_pListView; public: - virtual void maybeTip(const QPoint &pnt); - void doTip(const QRect &rct,const QString &str){ tip(rct,str); }; + virtual void maybeTip(const TQPoint &pnt); + void doTip(const TQRect &rct,const TQString &str){ tip(rct,str); }; }; @@ -74,11 +74,11 @@ class KVIRC_API KviUserListEntry friend class KviUserListView; friend class KviUserListViewArea; public: - KviUserListEntry(KviUserListView * parent,const QString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); + KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); ~KviUserListEntry(); protected: KviUserListView * m_pListView; - QString m_szNick; + TQString m_szNick; KviIrcUserEntry * m_pGlobalData; short int m_iFlags; short int m_iTemperature; // user temperature : 0 = neutral @@ -92,9 +92,9 @@ protected: public: short int flags() const { return m_iFlags; }; KviIrcUserEntry * globalData(){ return m_pGlobalData; }; - const QString &nick() const { return m_szNick; }; + const TQString &nick() const { return m_szNick; }; KviUserListEntry * next(){ return m_pNext; }; - bool color(QColor& color); + bool color(TQColor& color); protected: void recalcSize(); }; @@ -126,16 +126,17 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget friend class KviChannel; friend class KviQuery; Q_OBJECT + TQ_OBJECT public: - KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const QString &label_text = QString::null,const char * name = 0); + KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); ~KviUserListView(); protected: - KviPointerHashTable<QString,KviUserListEntry> * m_pEntryDict; + KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict; KviUserListEntry * m_pTopItem; KviUserListEntry * m_pHeadItem; KviUserListEntry * m_pTailItem; KviUserListEntry * m_pIterator; - QLabel * m_pUsersLabel; + TQLabel * m_pUsersLabel; KviUserListViewArea * m_pViewArea; KviIrcUserDataBase * m_pIrcUserDataBase; int m_iSelectedCount; @@ -153,22 +154,22 @@ protected: int m_iIEntries; KviWindow * m_pKviWindow; protected: - void maybeTip(KviUserListToolTip * tip,const QPoint &pnt); + void maybeTip(KviUserListToolTip * tip,const TQPoint &pnt); void triggerUpdate(); void updateUsersLabel(); - void insertUserEntry(const QString &nick,KviUserListEntry * e); + void insertUserEntry(const TQString &nick,KviUserListEntry * e); void removeAllEntries(); - virtual void resizeEvent(QResizeEvent *); - bool partInternal(const QString &nick,bool bRemove = true); + virtual void resizeEvent(TQResizeEvent *); + bool partInternal(const TQString &nick,bool bRemove = true); void setUserDataBase(KviIrcUserDataBase * db){ m_pIrcUserDataBase = db; }; void updateScrollBarRange(); public: void updateArea(); - void select(const QString&); + void select(const TQString&); void applyOptions(); - KviPointerHashTable<QString,KviUserListEntry> * entryDict(){ return m_pEntryDict; }; + KviPointerHashTable<TQString,KviUserListEntry> * entryDict(){ return m_pEntryDict; }; KviUserListEntry * firstItem(){ return m_pHeadItem; }; - KviUserListEntry * itemAt(const QPoint &pnt,QRect * rct = 0); + KviUserListEntry * itemAt(const TQPoint &pnt,TQRect * rct = 0); bool itemVisible(KviUserListEntry * e); KviWindow * window(){ return m_pKviWindow; }; @@ -181,55 +182,56 @@ public: int halfOpCount(){ return m_iHalfOpCount; }; int userOpCount(){ return m_iUserOpCount; }; - KviUserListEntry * findEntry(const QString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->find(nick); }; - void appendSelectedNicknames(QString &buffer); - QString * firstSelectedNickname(); - QString * nextSelectedNickname(); + KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->tqfind(nick); }; + void appendSelectedNicknames(TQString &buffer); + TQString * firstSelectedNickname(); + TQString * nextSelectedNickname(); void partAll(); - void partAllButOne(const QString &whoNot); + void partAllButOne(const TQString &whoNot); void userStats(KviUserListViewUserStats * s); - int getUserModeLevel(const QString &nick); - kvi_time_t getUserJoinTime(const QString &nick); - kvi_time_t getUserLastActionTime(const QString &nick); + int getUserModeLevel(const TQString &nick); + kvi_time_t getUserJoinTime(const TQString &nick); + kvi_time_t getUserLastActionTime(const TQString &nick); char getUserFlag(KviUserListEntry * e); - char getUserFlag(const QString &nick){ return getUserFlag(m_pEntryDict->find(nick)); }; - bool part(const QString &nick){ return partInternal(nick,true); }; - bool op(const QString &nick,bool bOp); - void prependUserFlag(const QString &nick,QString &buffer); - int flags(const QString &nick); - bool isOp(const QString &nick,bool bAtLeast = false); - bool isVoice(const QString &nick,bool bAtLeast = false); - bool isHalfOp(const QString &nick,bool bAtLeast = false); - bool isChanAdmin(const QString &nick,bool bAtLeast = false); - bool isChanOwner(const QString &nick,bool bAtLeast = false); - bool isUserOp(const QString &nick,bool bAtLeast = false); - bool voice(const QString &nick,bool bVoice); - bool setChanAdmin(const QString &nick,bool bChanAdmin); - bool setChanOwner(const QString &nick,bool bChanOwner); - bool halfop(const QString &nick,bool bHalfOp); - bool userop(const QString &nick,bool bUserOp); + char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->tqfind(nick)); }; + bool part(const TQString &nick){ return partInternal(nick,true); }; + bool op(const TQString &nick,bool bOp); + void prependUserFlag(const TQString &nick,TQString &buffer); + int flags(const TQString &nick); + bool isOp(const TQString &nick,bool bAtLeast = false); + bool isVoice(const TQString &nick,bool bAtLeast = false); + bool isHalfOp(const TQString &nick,bool bAtLeast = false); + bool isChanAdmin(const TQString &nick,bool bAtLeast = false); + bool isChanOwner(const TQString &nick,bool bAtLeast = false); + bool isUserOp(const TQString &nick,bool bAtLeast = false); + bool voice(const TQString &nick,bool bVoice); + bool setChanAdmin(const TQString &nick,bool bChanAdmin); + bool setChanOwner(const TQString &nick,bool bChanOwner); + bool halfop(const TQString &nick,bool bHalfOp); + bool userop(const TQString &nick,bool bUserOp); void userAction(KviIrcMask *user,int actionTemperature); - bool userActionVerifyMask(const QString &nick,const QString &user,const QString &host,int actionTemperature,QString &oldUser,QString &oldHost); - void userAction(const QString &nick,const QString &user,const QString &host,int actionTemperature); - void userAction(const QString &nick,int actionTemperature); - bool nickChange(const QString &oldNick,const QString &newNick); + bool userActionVerifyMask(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature,TQString &oldUser,TQString &oldHost); + void userAction(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature); + void userAction(const TQString &nick,int actionTemperature); + bool nickChange(const TQString &oldNick,const TQString &newNick); //KviUserListEntry * join(const char *nick,const char * user,const char * host,bool bOp,bool bVoice,bool bHalfOp); - KviUserListEntry * join(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,int iFlags = 0); - bool avatarChanged(const QString &nick); + KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0); + bool avatarChanged(const TQString &nick); void enableUpdates(bool bEnable); void setMaskEntries(char type, int num); void emitRightClick(); void emitDoubleClick(); - bool completeNickStandard(const QString &begin,const QString &skipAfter,QString &buffer,bool bAppendMask); - void completeNickBashLike(const QString &begin,KviPointerList<QString> * l,bool bAppendMask); + bool completeNickStandard(const TQString &begin,const TQString &skipAfter,TQString &buffer,bool bAppendMask); + void completeNickBashLike(const TQString &begin,KviPointerList<TQString> * l,bool bAppendMask); }; -class KVIRC_API KviUserListViewArea : public QWidget +class KVIRC_API KviUserListViewArea : public TQWidget { friend class KviUserListView; Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) public: KviUserListViewArea(KviUserListView * par); ~KviUserListViewArea(); @@ -238,19 +240,19 @@ public: protected: KviUserListView * m_pListView; KviUserListEntry * m_pLastEntryUnderMouse; - QScrollBar * m_pScrollBar; + TQScrollBar * m_pScrollBar; int m_iLastScrollBarVal; int m_iTopItemOffset; bool m_bIgnoreScrollBar; protected: - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void keyPressEvent( QKeyEvent * e ); + virtual void paintEvent(TQPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void keyPressEvent( TQKeyEvent * e ); protected slots: void scrollBarMoved(int newVal); }; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 2cf64085..763df175 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -53,29 +53,29 @@ #include "kvi_styled_controls.h" #include "kvi_kvs_script.h" -#include <qpixmap.h> +#include <tqpixmap.h> #include "kvi_tal_popupmenu.h" -#include <qcursor.h> -#include <qtimer.h> -#include <qsplitter.h> -#include <qmetaobject.h> -#include <qdatetime.h> -#include <qtextcodec.h> -#include <qevent.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqsplitter.h> +#include <tqmetaobject.h> +#include <tqdatetime.h> +#include <tqtextcodec.h> +#include <tqevent.h> // it looks they can't decide :D #ifdef COMPILE_USE_QT4 - #include <QPushButton> - #include <qdesktopwidget.h> + #include <TQPushButton> + #include <tqdesktopwidget.h> #else - #include <qobjectlist.h> + #include <tqobjectlist.h> #endif -#include <qvariant.h> -#include <qtoolbutton.h> +#include <tqvariant.h> +#include <tqtoolbutton.h> #include "kvi_tal_tooltip.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> #ifdef COMPILE_CRYPT_SUPPORT #include "kvi_crypt.h" @@ -102,8 +102,8 @@ static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = 0; unsigned long int g_uUniqueWindowId = 1; // FIXME: #warning "Mouse wheel support" -KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * lpConsole) - : QWidget(0) +KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * lpConsole) + : TQWidget(0) { m_uId = g_uUniqueWindowId; g_uUniqueWindowId++; @@ -146,13 +146,13 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); #ifdef COMPILE_USE_QT4 //setAutoFillBackground(false); - setFocusPolicy(Qt::StrongFocus); + setFocusPolicy(TTQ_StrongFocus); #else setBackgroundMode(NoBackground); - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); #endif - connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } KviWindow::~KviWindow() @@ -180,7 +180,7 @@ KviWindow::~KviWindow() #endif } -void KviWindow::setWindowName(const QString &szName) +void KviWindow::setWindowName(const TQString &szName) { m_szName = szName; emit windowNameChanged(); @@ -188,7 +188,7 @@ void KviWindow::setWindowName(const QString &szName) void KviWindow::toggleButtonContainer() { - QFrame *pContainer=buttonContainer(); + TQFrame *pContainer=buttonContainer(); if(pContainer) { pContainer->setHidden(!pContainer->isHidden()); @@ -198,7 +198,7 @@ void KviWindow::toggleButtonContainer() void KviWindow::setName(const char * name) { m_szName = name; - QWidget::setName(name); + TQWidget::setName(name); } KviIrcConnection * KviWindow::connection() @@ -213,22 +213,22 @@ void KviWindow::reloadImages() bool KviWindow::hasAttention() { - if(((QApplication *)g_pApp)->activeWindow() == 0)return false; // no application window has the focus atm + if(((TQApplication *)g_pApp)->activeWindow() == 0)return false; // no application window has the focus atm if(mdiParent()) { if(frame()->isActiveWindow())return true; // This frame is not the active window but the // active window still belongs to KVIrc. - // When the active window is derived from QDialog + // When the active window is derived from TQDialog // then it is probably a KVIrc's option dialog // or something similar. // In this case we assume that the user has the // KVIrc window just below and can see it. // Handle the special case of the dialogs then - QWidget * w = ((QApplication *)g_pApp)->activeWindow(); - if(w->inherits("QDialog")) + TQWidget * w = TQT_TQWIDGET(((TQApplication *)g_pApp)->activeWindow()); + if(w->inherits(TQDIALOG_OBJECT_NAME_STRING)) { // but make sure that the frame is visible at all! if(!frame()->isVisible())return false; @@ -285,43 +285,43 @@ void KviWindow::demandAttention() bool KviWindow::focusNextPrevChild(bool next) { - QWidget * w = focusWidget(); + TQWidget * w = tqfocusWidget(); if(w) { #ifdef COMPILE_USE_QT4 - if(w->focusPolicy() == Qt::StrongFocus)return false; + if(w->focusPolicy() == TTQ_StrongFocus)return false; #else - if(w->focusPolicy() == QWidget::StrongFocus)return false; + if(w->focusPolicy() == TQ_StrongFocus)return false; #endif - //QVariant v = w->property("KviProperty_FocusOwner"); + //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->parent()) + if(w->tqparent()) { #ifdef COMPILE_USE_QT4 - if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->tqparent()->tqmetaObject()->tqfindProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } } - return QWidget::focusNextPrevChild(next); + return TQWidget::focusNextPrevChild(next); } -void KviWindow::forceTextCodec(QTextCodec * c) +void KviWindow::forceTextCodec(TQTextCodec * c) { if(!c)return; m_pTextCodec = c; - QTextCodec * dc = defaultTextCodec(); + TQTextCodec * dc = defaultTextCodec(); if(dc != c) m_szTextEncoding = c->name(); else m_szTextEncoding = ""; // this is the default anyway } -bool KviWindow::setTextEncoding(const QString &szTextEncoding) +bool KviWindow::setTextEncoding(const TQString &szTextEncoding) { if(!szTextEncoding.isEmpty()) { @@ -340,24 +340,24 @@ bool KviWindow::setTextEncoding(const QString &szTextEncoding) return false; } -QTextCodec * KviWindow::defaultTextCodec() +TQTextCodec * KviWindow::defaultTextCodec() { // if we have a connection try to inherit from there... if(connection()) { - QTextCodec * c = connection()->textCodec(); + TQTextCodec * c = connection()->textCodec(); if(c)return c; } return KviApp::defaultTextCodec(); } -KviQCString KviWindow::encodeText(const QString &szText) +KviTQCString KviWindow::encodeText(const TQString &szText) { if(!m_pTextCodec)return defaultTextCodec()->fromUnicode(szText); return m_pTextCodec->fromUnicode(szText); } -QString KviWindow::decodeText(const char * szText) +TQString KviWindow::decodeText(const char * szText) { if(!m_pTextCodec)return defaultTextCodec()->toUnicode(szText); return m_pTextCodec->toUnicode(szText); @@ -427,20 +427,20 @@ void KviWindow::destroyTaskBarItem() // m_pTaskBarItem = 0; // actually the taskBarItem destructor sets it } -BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn) +BUTTON_CLASS * KviWindow::createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn) { #ifdef COMPILE_USE_QT4 BUTTON_CLASS * b = new BUTTON_CLASS(par); b->setObjectName(nam); b->setFlat(true); - b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon)))); + b->setIcon(TQIcon(*(g_pIconManager->getSmallIcon(pixon)))); #else BUTTON_CLASS * b = new BUTTON_CLASS(par,nam); b->setToggleButton(true); b->setUsesBigPixmap(false); - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); b->setIconSet(is1); #endif @@ -452,43 +452,43 @@ BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pi } // This is always defined... -void KviWindow::createCryptControllerButton(QWidget * par) +void KviWindow::createCryptControllerButton(TQWidget * par) { #ifdef COMPILE_CRYPT_SUPPORT m_pCryptControllerButton = new KviWindowToolPageButton(KVI_SMALLICON_UNLOCKEDOFF,KVI_SMALLICON_UNLOCKED,__tr2qs("Crypting"),buttonContainer(),false,"crypt_controller_button"); - connect(m_pCryptControllerButton,SIGNAL(clicked()),this,SLOT(toggleCryptController())); + connect(m_pCryptControllerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleCryptController())); #endif // COMPILE_CRYPT_SUPPORT } -void KviWindow::createTextEncodingButton(QWidget * par) +void KviWindow::createTextEncodingButton(TQWidget * par) { if(m_pTextEncodingButton)delete m_pTextEncodingButton; m_pTextEncodingButton = createToolButton(par,"text_encoding_button",KVI_SMALLICON_TEXTENCODING,KVI_SMALLICON_TEXTENCODING,__tr2qs("Private Text Encoding"),false); - connect(m_pTextEncodingButton,SIGNAL(clicked()),this,SLOT(textEncodingButtonClicked())); + connect(m_pTextEncodingButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(textEncodingButtonClicked())); } void KviWindow::textEncodingButtonClicked() { createSystemTextEncodingPopup(); - g_pMdiWindowSystemTextEncodingPopup->popup(m_pTextEncodingButton->mapToGlobal(QPoint(0,m_pTextEncodingButton->height()))); + g_pMdiWindowSystemTextEncodingPopup->popup(m_pTextEncodingButton->mapToGlobal(TQPoint(0,m_pTextEncodingButton->height()))); m_pTextEncodingButton->setOn(false); } -const QString & KviWindow::lastLineOfText() +const TQString & KviWindow::lastLineOfText() { if(m_pIrcView) return m_pIrcView->lastLineOfText(); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviWindow::lastMessageText() +const TQString & KviWindow::lastMessageText() { if(m_pIrcView) return m_pIrcView->lastMessageText(); - return KviQString::empty; + return KviTQString::empty; } -// The following three have to be here even if the crypt support is disabled...moc does not support conditional compilations +// The following three have to be here even if the crypt support is disabled...tqmoc does not support conditional compilations void KviWindow::toggleCryptController() { #ifdef COMPILE_CRYPT_SUPPORT @@ -507,8 +507,8 @@ void KviWindow::toggleCryptController() if(m_pSplitter && m_pInput) { m_pCryptController = new KviCryptController(m_pSplitter,m_pCryptControllerButton,"crypt_controller",this,m_pCryptSessionInfo); - connect(m_pCryptController,SIGNAL(done()),this,SLOT(cryptControllerFinished())); - //setFocusHandlerNoClass(m_pInput,m_pCryptController,"QLineEdit"); //link it! + connect(m_pCryptController,TQT_SIGNAL(done()),this,TQT_SLOT(cryptControllerFinished())); + //setFocusHandlerNoClass(m_pInput,m_pCryptController,TQLINEEDIT_OBJECT_NAME_STRING); //link it! m_pCryptController->show(); if(!m_pCryptControllerButton) return; @@ -527,22 +527,14 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf) m_pCryptSessionInfo = inf; if(m_pCryptSessionInfo) { - connect(m_pCryptSessionInfo->pEngine,SIGNAL(destroyed()),this,SLOT(cryptSessionInfoDestroyed())); + connect(m_pCryptSessionInfo->pEngine,TQT_SIGNAL(destroyed()),this,TQT_SLOT(cryptSessionInfoDestroyed())); } if(m_pCryptControllerButton) { -#if QT_VERSION >= 300 - QIconSet is; - is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); - is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIconSet::Small,QIconSet::Normal,QIconSet::On); + TQIconSet is; + is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); + is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); m_pCryptControllerButton->setIconSet(is); -#else - - m_pCryptControllerButton->setOnIconSet( - *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF))); - m_pCryptControllerButton->setOffIconSet( - *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED))); -#endif if(m_pCryptControllerButton->isOn()) m_pCryptControllerButton->setOn(false); @@ -584,28 +576,28 @@ void KviWindow::listWindowTypes() outputNoFmt(KVI_OUT_SYSTEMMESSAGE,m_typeTable[i]); } -void KviWindow::getConfigGroupName(QString &buf) +void KviWindow::getConfigGroupName(TQString &buf) { buf = typeString(); } -void KviWindow::getDefaultLogFileName(QString &buffer) +void KviWindow::getDefaultLogFileName(TQString &buffer) { // FIXME: #warning "Make it configurable ?" - QString date; - QDate dt(QDate::currentDate()); + TQString date; + TQDate dt(TQDate::tqcurrentDate()); date=dt.toString("yyyy.MM.dd"); - QString base; + TQString base; getBaseLogFileName(base); kvi_encodeFileName(base); - base.replace("%%2e","%2e"); + base.tqreplace("%%2e","%2e"); base=base.lower(); - QString tmp; + TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolGzipLogs)) - KviQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.utf8().data(),date.utf8().data()); + KviTQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.utf8().data(),date.utf8().data()); else - KviQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.utf8().data(),date.utf8().data()); + KviTQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.utf8().data(),date.utf8().data()); g_pApp->getLocalKvircDirectory(buffer,KviApp::Log,tmp); } @@ -614,7 +606,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer) buffer = m_szName; }*/ -void KviWindow::getBaseLogFileName(QString &buffer) +void KviWindow::getBaseLogFileName(TQString &buffer) { buffer = m_szName; } @@ -623,17 +615,17 @@ void KviWindow::getBaseLogFileName(QString &buffer) void KviWindow::saveProperties(KviConfig *cfg) { // store only the non-default text encoding. - QString szCodec = m_szTextEncoding; - QTextCodec * c = defaultTextCodec(); + TQString szCodec = m_szTextEncoding; + TQTextCodec * c = defaultTextCodec(); if(c && m_pTextCodec) { #ifdef COMPILE_USE_QT4 - if(KviQString::equalCI(szCodec,c->name().data()))szCodec = KviQString::empty; // store "default" + if(KviTQString::equalCI(szCodec,c->name().data()))szCodec = KviTQString::empty; // store "default" #else - if(KviQString::equalCI(szCodec,c->name()))szCodec = KviQString::empty; // store "default" + if(KviTQString::equalCI(szCodec,c->name()))szCodec = KviTQString::empty; // store "default" #endif } - QString szKey = "TextEncoding_"; + TQString szKey = "TextEncoding_"; szKey += m_szName; cfg->writeEntry(szKey,szCodec); if(m_pInput) { @@ -650,9 +642,9 @@ void KviWindow::saveProperties(KviConfig *cfg) void KviWindow::loadProperties(KviConfig *cfg) { - QString szKey = "TextEncoding_"; + TQString szKey = "TextEncoding_"; szKey += m_szName; - setTextEncoding(cfg->readQStringEntry(szKey,KviQString::empty).utf8().data()); + setTextEncoding(cfg->readTQStringEntry(szKey,KviTQString::empty).utf8().data()); if(m_pInput) { m_pInput->setButtonsHidden(cfg->readBoolEntry("inputToolButtonsHidden",KVI_OPTION_BOOL(KviOption_boolHideInputToolButtons))); m_pInput->setUserFriendly(cfg->readBoolEntry("commandLineIsUserFriendly",KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))); @@ -662,42 +654,42 @@ void KviWindow::loadProperties(KviConfig *cfg) bool bEnableLogs=cfg->readBoolEntry("LoggingEnabled",0); if(!m_pIrcView->isLogging() && bEnableLogs) { - QString szTmp; + TQString szTmp; getBaseLogFileName(szTmp); m_pIrcView->startLogging(); } }*/ } -QPixmap * KviWindow::myIconPtr() +TQPixmap * KviWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON); } -void KviWindow::getTaskBarTipText(QString &buffer) +void KviWindow::getTaskBarTipText(TQString &buffer) { buffer = m_szPlainTextCaption; } -void KviWindow::setFixedCaption(const QString &szCaption) +void KviWindow::setFixedCaption(const TQString &szCaption) { m_szPlainTextCaption = szCaption; } void KviWindow::fillCaptionBuffers() { - QString szCaption = m_szPlainTextCaption; + TQString szCaption = m_szPlainTextCaption; if(szCaption.isEmpty()) szCaption = m_szName; fillSingleColorCaptionBuffers(szCaption); } -void KviWindow::fillSingleColorCaptionBuffers(const QString &szName) +void KviWindow::fillSingleColorCaptionBuffers(const TQString &szName) { - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); + static TQString p1("<nobr><font color=\""); + static TQString p2("\"><b>"); + static TQString p3("</b></font></nobr>"); m_szPlainTextCaption = szName; @@ -740,7 +732,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupStandard->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmart) @@ -748,7 +740,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmart->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8) @@ -756,11 +748,11 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmartUtf8->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),0,0); } - QTextCodec * c = defaultTextCodec(); - QString tmp = __tr2qs("Use Default Encoding"); + TQTextCodec * c = defaultTextCodec(); + TQString tmp = __tr2qs("Use Default Encoding"); if(c) { tmp += " ("; @@ -768,7 +760,7 @@ void KviWindow::createSystemTextEncodingPopup() tmp += ")"; } - int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,SLOT(systemTextEncodingPopupDefault())); + int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,TQT_SLOT(systemTextEncodingPopupDefault())); if(m_szTextEncoding.isEmpty())g_pMdiWindowSystemTextEncodingPopup->setItemChecked(id,true); g_pMdiWindowSystemTextEncodingPopup->insertSeparator(); @@ -780,22 +772,22 @@ void KviWindow::createSystemTextEncodingPopup() KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i); while(d->szName) { - KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription); + KviTQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription); KviTalPopupMenu * ppp = d->bSmart ? (d->bSendUtf8 ? g_pMdiWindowSystemTextEncodingPopupSmartUtf8 : g_pMdiWindowSystemTextEncodingPopupSmart) : g_pMdiWindowSystemTextEncodingPopupStandard; id = ppp->insertItem(tmp); - if(KviQString::equalCI(m_szTextEncoding,d->szName)) + if(KviTQString::equalCI(m_szTextEncoding,d->szName)) ppp->setItemChecked(id,true); i = i + 1; d = KviLocale::encodingDescription(i); } - connect(g_pMdiWindowSystemTextEncodingPopupSmart,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupSmartActivated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupStandard,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupStandardActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupStandardActivated(int))); } -void KviWindow::systemPopupRequest(const QPoint &pnt) +void KviWindow::systemPopupRequest(const TQPoint &pnt) { if(!g_pMdiWindowSystemMainPopup) g_pMdiWindowSystemMainPopup = new KviTalPopupMenu(); @@ -807,27 +799,27 @@ void KviWindow::systemPopupRequest(const QPoint &pnt) if(mdiParent()) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_UNDOCK)), - __tr2qs("&Undock"),this,SLOT(undock())); + __tr2qs("&Undock"),this,TQT_SLOT(undock())); else g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCK)), - __tr2qs("&Dock"),this,SLOT(dock())); + __tr2qs("&Dock"),this,TQT_SLOT(dock())); g_pMdiWindowSystemMainPopup->insertSeparator(); int id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)), - __tr2qs("Mi&nimize"),this,SLOT(minimize())); + __tr2qs("Mi&nimize"),this,TQT_SLOT(minimize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMinimized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)), - __tr2qs("Ma&ximize"),this,SLOT(maximize())); + __tr2qs("Ma&ximize"),this,TQT_SLOT(maximize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMaximized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)), - __tr2qs("&Restore"),this,SLOT(restore())); + __tr2qs("&Restore"),this,TQT_SLOT(restore())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,isMinimized()||isMaximized()); g_pMdiWindowSystemMainPopup->insertSeparator(); g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)), - __tr2qs("Close"),this,SLOT(close())); + __tr2qs("Close"),this,TQT_SLOT(close())); g_pMdiWindowSystemMainPopup->insertSeparator(); @@ -839,7 +831,7 @@ void KviWindow::systemPopupRequest(const QPoint &pnt) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_XY)), - __tr2qs("Sa&ve Window Properties"),this,SLOT(savePropertiesAsDefault())); + __tr2qs("Sa&ve Window Properties"),this,TQT_SLOT(savePropertiesAsDefault())); fillContextPopup(g_pMdiWindowSystemMainPopup); @@ -856,8 +848,8 @@ void KviWindow::systemTextEncodingPopupSmartActivated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupSmart) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupSmart->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupSmart->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } @@ -865,8 +857,8 @@ void KviWindow::systemTextEncodingPopupSmartUtf8Activated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupSmartUtf8->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupSmartUtf8->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } @@ -874,14 +866,14 @@ void KviWindow::systemTextEncodingPopupStandardActivated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupStandard) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupStandard->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupStandard->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } void KviWindow::savePropertiesAsDefault() { - QString group; + TQString group; getConfigGroupName(group); if(!kvi_strEqualCI(group,typeString())) @@ -895,7 +887,7 @@ void KviWindow::savePropertiesAsDefault() void KviWindow::contextPopup() { - systemPopupRequest(QCursor::pos()); + systemPopupRequest(TQCursor::pos()); } void KviWindow::fillContextPopup(KviTalPopupMenu *) @@ -915,7 +907,7 @@ void KviWindow::dock() void KviWindow::delayedAutoRaise() { - QTimer::singleShot(0,this,SLOT(autoRaise())); + TQTimer::singleShot(0,this,TQT_SLOT(autoRaise())); } void KviWindow::autoRaise() @@ -933,10 +925,10 @@ void KviWindow::autoRaise() void KviWindow::delayedClose() { - QTimer::singleShot(0,this,SLOT(close())); + TQTimer::singleShot(0,this,TQT_SLOT(close())); } -void KviWindow::closeEvent(QCloseEvent *e) +void KviWindow::closeEvent(TQCloseEvent *e) { e->ignore(); g_pFrame->childWindowCloseRequest(this); @@ -944,9 +936,9 @@ void KviWindow::closeEvent(QCloseEvent *e) void KviWindow::updateIcon() { - if(parent()) + if(tqparent()) { - ((KviMdiChild *)parent())->setIcon(*myIconPtr()); + ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); } else { setIcon(*myIconPtr()); } @@ -959,9 +951,9 @@ void KviWindow::youAreDocked() delete m_pAccel; m_pAccel = 0; } - ((KviMdiChild *)parent())->setIcon(*myIconPtr()); + ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); updateCaption(); - connect(((KviMdiChild *)parent()),SIGNAL(systemPopupRequest(const QPoint &)),this,SLOT(systemPopupRequest(const QPoint &))); + connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); } void KviWindow::youAreUndocked() @@ -988,13 +980,13 @@ void KviWindow::activateSelf() void KviWindow::setFocus() { - // don't trigger the whole Qt focus mechanism.. + // don't trigger the whole TQt focus mechanism.. // just trigger directly our focusInEvent // so we'll redirect the focus to the m_pFocusHandler focusInEvent(0); } -void KviWindow::focusInEvent(QFocusEvent *) +void KviWindow::focusInEvent(TQFocusEvent *) { if(m_pLastFocusedChild) { @@ -1014,25 +1006,25 @@ void KviWindow::focusInEvent(QFocusEvent *) if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { #ifdef COMPILE_USE_QT4 - QList<QObject *> list = children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - m_pFocusHandler = (QWidget *)c; + m_pFocusHandler = (TQWidget *)c; break; } } #else - QObjectList *list = (QObjectList *)(children()); - if(list) + TQObjectList list = childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) { - m_pFocusHandler = (QWidget *)c; + m_pFocusHandler = (TQWidget *)c; break; } } @@ -1050,7 +1042,7 @@ void KviWindow::focusInEvent(QFocusEvent *) } // Setting the focus to the focus handler usually - // triggers our filter for the children's focusInEvent. + // triggers our filter for the tqchildren's focusInEvent. // This should call activateSelf() and thus // we should be already the active window at this point. // If we're not, then run activateSelf() to fix this. @@ -1059,26 +1051,26 @@ void KviWindow::focusInEvent(QFocusEvent *) updateCaption(); } -bool KviWindow::eventFilter(QObject *o,QEvent *e) +bool KviWindow::eventFilter(TQObject *o,TQEvent *e) { switch(e->type()) { - case QEvent::FocusIn: - m_pLastFocusedChild = (QWidget *)o; + case TQEvent::FocusIn: + m_pLastFocusedChild = (TQWidget *)o; if(g_pActiveWindow != this)activateSelf(); break; - case QEvent::Enter: + case TQEvent::Enter: // this is a handler moved here from KviMdiChild::eventFilter - if(QApplication::overrideCursor()) - QApplication::restoreOverrideCursor(); + if(TQApplication::overrideCursor()) + TQApplication::restoreOverrideCursor(); break; - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: #ifdef COMPILE_USE_QT4 - if( (((QWidget *)o)->focusPolicy() == Qt::NoFocus) || - (((QWidget *)o)->focusPolicy() == Qt::TabFocus)) + if( (((TQWidget *)o)->focusPolicy() == TTQ_NoFocus) || + (((TQWidget *)o)->focusPolicy() == TTQ_TabFocus)) #else - if( (((QWidget *)o)->focusPolicy() == QWidget::NoFocus) || - (((QWidget *)o)->focusPolicy() == QWidget::TabFocus)) + if( (((TQWidget *)o)->focusPolicy() == TQ_NoFocus) || + (((TQWidget *)o)->focusPolicy() == TQ_TabFocus)) #endif { // this will not focus our window @@ -1097,13 +1089,13 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e) } } break; - case QEvent::ChildInserted: - if(((QChildEvent *)e)->child()->isWidgetType()) - childInserted((QWidget *)((QChildEvent *)e)->child()); + case TQEvent::ChildInserted: + if(((TQChildEvent *)e)->child()->isWidgetType()) + childInserted((TQWidget *)((TQChildEvent *)e)->child()); break; - case QEvent::ChildRemoved: - if(((QChildEvent *)e)->child()->isWidgetType()) - childRemoved((QWidget *)((QChildEvent *)e)->child()); + case TQEvent::ChildRemoved: + if(((TQChildEvent *)e)->child()->isWidgetType()) + childRemoved((TQWidget *)((TQChildEvent *)e)->child()); break; default: /* make gcc happy */ break; } @@ -1111,20 +1103,20 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e) } -void KviWindow::childInserted(QWidget * o) +void KviWindow::childInserted(TQWidget * o) { o->removeEventFilter(this); // ensure that we don't filter twice o->installEventFilter(this); // we filter its events - connect(o,SIGNAL(destroyed()),this,SLOT(childDestroyed())); + connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(childDestroyed())); if(o->inherits("KviInput")) m_pFocusHandler = o; else { #ifdef COMPILE_USE_QT4 - if(!m_pFocusHandler && (o->focusPolicy() == Qt::StrongFocus)) + if(!m_pFocusHandler && (o->focusPolicy() == TTQ_StrongFocus)) #else - if(!m_pFocusHandler && (o->focusPolicy() == QWidget::StrongFocus)) + if(!m_pFocusHandler && (o->focusPolicy() == TQ_StrongFocus)) #endif { m_pFocusHandler = o; @@ -1132,23 +1124,23 @@ void KviWindow::childInserted(QWidget * o) } #ifdef COMPILE_USE_QT4 - QList<QObject *> list = o->children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = o->tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - childInserted((QWidget *)c); + childInserted((TQWidget *)c); } } #else - QObjectList *list = (QObjectList *)(o->children()); - if(list) + TQObjectList list = o->childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) - childInserted((QWidget *)c); + childInserted((TQWidget *)c); } } #endif @@ -1156,11 +1148,11 @@ void KviWindow::childInserted(QWidget * o) void KviWindow::childDestroyed() { - QWidget * s = (QWidget *)sender(); + TQWidget * s = (TQWidget *)sender(); childRemoved(s); } -void KviWindow::childRemoved(QWidget * o) +void KviWindow::childRemoved(TQWidget * o) { //debug("CHILD REMOVED %d",o); o->removeEventFilter(this); @@ -1170,92 +1162,85 @@ void KviWindow::childRemoved(QWidget * o) m_pLastFocusedChild = 0; #ifdef COMPILE_USE_QT4 - QList<QObject *> list = o->children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = o->tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - childRemoved((QWidget *)c); + childRemoved((TQWidget *)c); } } #else - QObjectList *list = (QObjectList *)(o->children()); - if(list) + TQObjectList list = o->childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) - childRemoved((QWidget *)c); + childRemoved((TQWidget *)c); } - } //else debug("The removed object has no children"); + } //else debug("The removed object has no tqchildren"); #endif } -void KviWindow::childEvent(QChildEvent *e) +void KviWindow::childEvent(TQChildEvent *e) { if(e->child()->isWidgetType()) { if(e->removed()) - childRemoved((QWidget *)(e->child())); + childRemoved((TQWidget *)(e->child())); else - childInserted((QWidget *)(e->child())); + childInserted((TQWidget *)(e->child())); } - QWidget::childEvent(e); + TQWidget::childEvent(e); } -void KviWindow::wheelEvent(QWheelEvent *e) +void KviWindow::wheelEvent(TQWheelEvent *e) { /* NOTHING HERE FOR NOW (FIXME) */ } -void KviWindow::childrenTreeChanged(QWidget * widgetAdded) +void KviWindow::tqchildrenTreeChanged(TQWidget * widgetAdded) { // if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded); // FIXME: This might be useless - QResizeEvent * e = new QResizeEvent(size(),size()); + TQResizeEvent * e = new TQResizeEvent(size(),size()); resizeEvent(e); delete e; } -void KviWindow::updateBackgrounds(QObject * obj) +void KviWindow::updateBackgrounds(TQObject * obj) { if(!obj) - obj = this; + obj = TQT_TQOBJECT(this); #ifdef COMPILE_USE_QT4 - QList<QObject *> list = obj->children(); + TQList<TQObject *> list = obj->tqchildren(); if (list.count()) { - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * child = *it; - if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){ + TQObject * child = *it; + if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){ // if (child->isWidgetType()) - ((QWidget *)child)->update(); + ((TQWidget *)child)->update(); } updateBackgrounds(child); } } #else - QObjectList * list = (QObjectList *)(obj->children()); - if(list) + TQObjectList list = obj->childrenListObject(); + if(!list.isEmpty()) { - for(unsigned int i=0;i<list->count();i++) + for(unsigned int i=0;i<list.count();i++) { - QObject * child = list->at(i); -#if QT_VERSION >= 300 + TQObject * child = list.at(i); // FIXME: check if this code can work with qt < 3.0.0 too - if(child->metaObject()->findProperty("TransparencyCapable",true) != -1) - ((QWidget *)child)->update(); -#else - - QVariant v = list->at(i)->property("TransparencyCapable"); - if(v.isValid()) - ((QWidget *)child)->update(); -#endif + if(child->tqmetaObject()->tqfindProperty("TransparencyCapable",true) != -1) + ((TQWidget *)child)->update(); updateBackgrounds(child); } @@ -1263,13 +1248,13 @@ void KviWindow::updateBackgrounds(QObject * obj) #endif } -void KviWindow::moveEvent(QMoveEvent *e) +void KviWindow::moveEvent(TQMoveEvent *e) { #ifdef COMPILE_PSEUDO_TRANSPARENCY updateBackgrounds(); #endif - QWidget::moveEvent(e); + TQWidget::moveEvent(e); } void KviWindow::minimize() @@ -1300,7 +1285,7 @@ bool KviWindow::isMinimized() if(mdiParent()) return (mdiParent()->state() == KviMdiChild::Minimized); else - return QWidget::isMinimized(); + return TQWidget::isMinimized(); } bool KviWindow::isMaximized() @@ -1327,12 +1312,12 @@ void KviWindow::restore() autoRaise(); } -QRect KviWindow::externalGeometry() +TQRect KviWindow::externalGeometry() { #ifndef Q_OS_MACX return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry(); #else - return mdiParent() ? mdiParent()->restoredGeometry() : geometry(); + return mdiParent() ? mdiParent()->restoredGeometry() : tqgeometry(); #endif } @@ -1342,7 +1327,7 @@ void KviWindow::applyOptions() if(m_pIrcView)m_pIrcView->applyOptions(); if(m_pInput)m_pInput->applyOptions(); - // trick: relayout + // trick: retqlayout resize(width() - 1,height() - 1); resize(width() + 1,height() + 1); } @@ -1392,8 +1377,8 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t ( KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsgQueryToo) && ( - (msg_type == KVI_OUT_QUERYPRIVMSG) || (msg_type == KVI_OUT_QUERYTRACE) || - (msg_type == KVI_OUT_QUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_QUERYNOTICE) || (msg_type == KVI_OUT_QUERYNOTICECRYPTED) + (msg_type == KVI_OUT_TQUERYPRIVMSG) || (msg_type == KVI_OUT_TQUERYTRACE) || + (msg_type == KVI_OUT_TQUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_TQUERYNOTICE) || (msg_type == KVI_OUT_TQUERYNOTICECRYPTED) ) ) || @@ -1417,59 +1402,59 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t void KviWindow::output(int msg_type,const char *format,...) { - QString szFmt(format); + TQString szFmt(format); kvi_va_list l; kvi_va_start(l,format); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } -void KviWindow::output(int msg_type,const QString &szFmt,...) +void KviWindow::output(int msg_type,const TQString &szFmt,...) { kvi_va_list l; kvi_va_start_by_reference(l,szFmt); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } void KviWindow::output(int msg_type,const kvi_wchar_t *format,...) { - QString szFmt=QString::fromUtf8(KviStr(format).ptr()); + TQString szFmt=TQString::fromUtf8(KviStr(format).ptr()); kvi_va_list l; kvi_va_start(l,format); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } void KviWindow::outputNoFmt(int msg_type,const char * text,int iFlags) { - QString szText(text); + TQString szText(text); preprocessMessage(szText); - const QChar * pC = KviQString::nullTerminatedArray(szText); + const TQChar * pC = KviTQString::nullTerminatedArray(szText); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC,iFlags); } -void KviWindow::outputNoFmt(int msg_type,const QString &szText,int iFlags) +void KviWindow::outputNoFmt(int msg_type,const TQString &szText,int iFlags) { - QString szBuf(szText); + TQString szBuf(szText); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC,iFlags); } @@ -1488,27 +1473,27 @@ void KviWindow::unhighlight() Fixed */ -void KviWindow::preprocessMessage(QString & szMessage) +void KviWindow::preprocessMessage(TQString & szMessage) { // slow #ifdef COMPILE_USE_QT4 - QStringList strings = szMessage.split(" "); + TQStringList strings = szMessage.split(" "); #else - QStringList strings = QStringList::split(" ",szMessage, TRUE); + TQStringList strings = TQStringList::split(" ",szMessage, TRUE); #endif - for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { - QString tmp(*it); - if(tmp.contains('\r')) continue; + for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { + TQString tmp(*it); + if(tmp.tqcontains('\r')) continue; tmp = KviMircCntrl::stripControlBytes(tmp); tmp.stripWhiteSpace(); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) if((*it)==tmp) - *it=QString("\r!c\r%1\r").arg(*it); + *it=TQString("\r!c\r%1\r").tqarg(*it); else { - *it=QString("\r!c%1\r%2\r").arg(tmp).arg(*it); + *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); } } szMessage=strings.join(" "); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index 419096fc..f86b6c2d 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -30,13 +30,13 @@ #include "kvi_settings.h" #ifdef COMPILE_ON_WINDOWS - // The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition + // The brain-damaged MSVC compiler can't instantiate TQList templates without a destructor definition #include "kvi_mdichild.h" #else class KviMdiChild; #endif -#include <qframe.h> +#include <tqframe.h> class KviFrame; class KviTaskBarItem; @@ -49,11 +49,11 @@ class KviIrcConnection; class KviWindowToolPageButton; class KviTalPopupMenu; -class QPixmap; -class QSplitter; +class TQPixmap; +class TQSplitter; class KviTalHBox; -class QToolButton; -class QTextCodec; +class TQToolButton; +class TQTextCodec; class KviTalWidgetStack; #include "kvi_tal_hbox.h" @@ -65,7 +65,7 @@ class KviTalWidgetStack; class KviCryptSessionInfo; #endif -#include <qwidget.h> +#include <tqwidget.h> // // Window types @@ -77,7 +77,7 @@ class KviTalWidgetStack; #define KVI_WINDOW_TYPE_CONSOLE 0 #define KVI_WINDOW_TYPE_CHANNEL 1 -#define KVI_WINDOW_TYPE_QUERY 2 +#define KVI_WINDOW_TYPE_TQUERY 2 #define KVI_WINDOW_TYPE_HELP 3 #define KVI_WINDOW_TYPE_TERM 4 #define KVI_WINDOW_TYPE_EDITOR 5 @@ -94,7 +94,7 @@ class KviTalWidgetStack; #define KVI_WINDOW_TYPE_OFFER 16 #define KVI_WINDOW_TYPE_LOGVIEW 17 #define KVI_WINDOW_TYPE_DEADCHANNEL 18 -#define KVI_WINDOW_TYPE_DEADQUERY 19 +#define KVI_WINDOW_TYPE_DEADTQUERY 19 #define KVI_WINDOW_TYPE_SCRIPTEDITOR 20 #define KVI_WINDOW_TYPE_SCRIPTOBJECT 21 #define KVI_WINDOW_TYPE_USERWINDOW 22 @@ -125,14 +125,14 @@ class KviTalWidgetStack; #define KVI_ACTIVITY_FIRE 6 #ifdef COMPILE_USE_QT4 - class QPushButton; - #define BUTTON_CLASS QPushButton + class TQPushButton; + #define BUTTON_CLASS TQPushButton #else - #define BUTTON_CLASS QToolButton + #define BUTTON_CLASS TQToolButton #endif -class KVIRC_API KviWindow : public QWidget +class KVIRC_API KviWindow : public TQWidget { friend class KviInput; friend class KviFrame; @@ -140,13 +140,14 @@ class KVIRC_API KviWindow : public QWidget friend class KviTaskBarButton; friend class KviTreeTaskBarItem; friend class KviTreeTaskBar; - Q_PROPERTY(int KviProperty_ChildFocusOwner READ type) + TQ_PROPERTY(int KviProperty_ChildFocusOwner READ type) Q_OBJECT + TQ_OBJECT public: - KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * pConsole = 0); + KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * pConsole = 0); virtual ~KviWindow(); protected: // almost private: don't touch :D - QString m_szName; // the current window name (usually also the target) + TQString m_szName; // the current window name (usually also the target) KviFrame * m_pFrm; KviConsole * m_pConsole; KviIrcContext * m_pContext; @@ -154,38 +155,38 @@ protected: // almost private: don't touch :D int m_iType; KviTaskBarItem * m_pTaskBarItem; - QWidget * m_pFocusHandler; - QString m_szPlainTextCaption; - QString m_szHtmlActiveCaption; - QString m_szHtmlInactiveCaption; + TQWidget * m_pFocusHandler; + TQString m_szPlainTextCaption; + TQString m_szHtmlActiveCaption; + TQString m_szHtmlInactiveCaption; KviIrcView * m_pIrcView; KviInput * m_pInput; - QSplitter * m_pSplitter; + TQSplitter * m_pSplitter; KviTalHBox * m_pButtonBox; unsigned long int m_uId; - QString m_szTextEncoding; + TQString m_szTextEncoding; #ifdef COMPILE_CRYPT_SUPPORT KviWindowToolPageButton * m_pCryptControllerButton; KviCryptController * m_pCryptController; KviCryptSessionInfo * m_pCryptSessionInfo; #endif BUTTON_CLASS * m_pTextEncodingButton; - QToolButton * m_pHideToolsButton; - QWidget * m_pLastFocusedChild; + TQToolButton * m_pHideToolsButton; + TQWidget * m_pLastFocusedChild; KviAccel * m_pAccel; static const char * m_typeTable[KVI_WINDOW_NUM_TYPES + 1]; // text encoding and decoding //unsigned int m_uTextEncoding; - QTextCodec * m_pTextCodec; + TQTextCodec * m_pTextCodec; // KviToolWindowsContainer * m_pEditorsContainer; public: // The global ID of this window: unique in the application - QString id(){ return QString("%1").arg(m_uId); }; + TQString id(){ return TQString("%1").tqarg(m_uId); }; unsigned long int numericId(){ return m_uId; }; public: // THIS is the function that should be used - const QString & windowName(){ return m_szName; }; - void setWindowName(const QString &szName); + const TQString & windowName(){ return m_szName; }; + void setWindowName(const TQString &szName); // force QT to set our UNICODE name too... FIXME: this should be removed later... virtual void setName(const char * szName); @@ -196,8 +197,8 @@ public: // by THIS implementation is "unknown" virtual const char * typeString(); - QTextCodec * textCodec(){ return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); }; - void forceTextCodec(QTextCodec * c); + TQTextCodec * textCodec(){ return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); }; + void forceTextCodec(TQTextCodec * c); // The frame that this window belongs to // It is always non-null and never changes @@ -205,7 +206,7 @@ public: // The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output) KviIrcView * view() const { return m_pIrcView; }; // The mdiParent widget: may be nulll if the window is undocked - KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); }; + KviMdiChild * mdiParent(){ return (KviMdiChild *)tqparent(); }; // The console that this window belongs to: may be null for windows that aren't bound to irc contexts KviConsole * console(){ return m_pConsole; }; // same as above @@ -213,11 +214,11 @@ public: // the current IRC connection (if any) KviIrcConnection * connection(); // The splitter of this window: it *shouldn't* be null... but ... well.. who knows ? :D ...better check it - QSplitter * splitter(){ return m_pSplitter; }; + TQSplitter * splitter(){ return m_pSplitter; }; // The window has ALWAYS a taskbar item KviTaskBarItem * taskBarItem(){ return m_pTaskBarItem; }; // The window *might* have a button container - virtual QFrame * buttonContainer(){ return (QFrame*)m_pButtonBox; }; + virtual TQFrame * buttonContainer(){ return (TQFrame*)m_pButtonBox; }; virtual void toggleButtonContainer(); // The window *might* have an output proxy: if it has no view() for example virtual KviWindow * outputProxy(); @@ -225,9 +226,9 @@ public: KviInput * input(){ return m_pInput; }; // The target of this window: empty when it makes no sense :D - virtual const QString & target(){ return KviQString::empty; }; + virtual const TQString & target(){ return KviTQString::empty; }; // The local nickname bound to this window: might be empty when a local nickname makes no sense - virtual const QString & localNick(){ return KviQString::empty; }; + virtual const TQString & localNick(){ return KviTQString::empty; }; #ifdef COMPILE_CRYPT_SUPPORT KviCryptSessionInfo * cryptSessionInfo(){ return m_pCryptSessionInfo; }; @@ -238,20 +239,20 @@ public: void unhighlight(); - virtual void getTaskBarTipText(QString &buffer); + virtual void getTaskBarTipText(TQString &buffer); // This is meaningful only if view() is non NULL - const QString & lastLineOfText(); - const QString & lastMessageText(); + const TQString & lastLineOfText(); + const TQString & lastMessageText(); - const QString &textEncoding(){ return m_szTextEncoding; }; + const TQString &textEncoding(){ return m_szTextEncoding; }; // returns true if the encoding could be succesfully set - bool setTextEncoding(const QString &szTextEncoding); + bool setTextEncoding(const TQString &szTextEncoding); // this must return a default text codec suitable for this window - virtual QTextCodec * defaultTextCodec(); + virtual TQTextCodec * defaultTextCodec(); // encode the text from szSource by using m_uTextEncoding - KviQCString encodeText(const QString &szText); - QString decodeText(const char * szText); + KviTQCString encodeText(const TQString &szText); + TQString decodeText(const char * szText); void contextPopup(); // Raises the window (after a light delay to prevent focus pingpongs) @@ -260,25 +261,25 @@ public: bool isMinimized(); bool isMaximized(); // Retrieves the default log file name: this is pre-build - void getDefaultLogFileName(QString &buffer); - // Well...the external geometry :) - QRect externalGeometry(); + void getDefaultLogFileName(TQString &buffer); + // Well...the external tqgeometry :) + TQRect externalGeometry(); void delayedClose(); // close that jumps out of the current event loop // Interesting overridables: virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void getConfigGroupName(QString &buf); + virtual void getConfigGroupName(TQString &buf); // virtual void getBaseLogFileName(KviStr &buffer); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void updateCaption(); virtual void applyOptions(); virtual void updateIcon(); - virtual void ownMessage(const QString &text){}; - virtual void ownAction(const QString &text){}; - virtual const QString & plainTextCaption(){ return m_szPlainTextCaption; }; - virtual const QString & htmlActiveCaption(){ return m_szHtmlActiveCaption; }; - virtual const QString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; }; + virtual void ownMessage(const TQString &text){}; + virtual void ownAction(const TQString &text){}; + virtual const TQString & plainTextCaption(){ return m_szPlainTextCaption; }; + virtual const TQString & htmlActiveCaption(){ return m_szHtmlActiveCaption; }; + virtual const TQString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; }; virtual void setFocus(); void internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t * text,int iFlags=0); @@ -287,10 +288,10 @@ public: virtual void outputNoFmt(int msg_type,const char * text,int iFlags=0); virtual void output(int msg_type,const kvi_wchar_t * format,...); virtual void outputNoFmt(int msg_type,const kvi_wchar_t * text,int iFlags=0){ internalOutput(m_pIrcView,msg_type,text,iFlags); }; - virtual void output(int msg_type,const QString &szFmt,...); - virtual void outputNoFmt(int msg_type,const QString &szText,int iFlags=0); // <-- these are KviIrcView::AppendTextFlags + virtual void output(int msg_type,const TQString &szFmt,...); + virtual void outputNoFmt(int msg_type,const TQString &szText,int iFlags=0); // <-- these are KviIrcView::AppendTextFlags // Just helpers.. FIXME: might be redesigned in some other way - void updateBackgrounds(QObject * obj = 0); + void updateBackgrounds(TQObject * obj = 0); void demandAttention(); bool hasAttention(); @@ -308,11 +309,11 @@ public slots: void reloadImages(); protected slots: void savePropertiesAsDefault(); - void toggleCryptController(); // This has to be here even if the crypt support is enabled...moc does not support conditionals + void toggleCryptController(); // This has to be here even if the crypt support is enabled...tqmoc does not support conditionals void cryptControllerFinished(); // same as above void cryptSessionInfoDestroyed(); // same as above void textEncodingButtonClicked(); - void systemPopupRequest(const QPoint &pnt); + void systemPopupRequest(const TQPoint &pnt); void systemTextEncodingPopupSmartActivated(int id); void systemTextEncodingPopupSmartUtf8Activated(int id); void systemTextEncodingPopupStandardActivated(int id); @@ -339,45 +340,45 @@ protected: // call this in the constructor if your caption is fixed: // it will set m_szPlainTextCaption to szCaption and it will // automatically use it without the need of overriding fillCaptionBuffers - void setFixedCaption(const QString &szCaption); + void setFixedCaption(const TQString &szCaption); // this by default calls fillSingleColorCaptionBuffer(plainTextCaption()); virtual void fillCaptionBuffers(); // protected helper - void fillSingleColorCaptionBuffers(const QString &szName); + void fillSingleColorCaptionBuffers(const TQString &szName); // Virtual events that signal dock state change virtual void youAreDocked(); virtual void youAreUndocked(); // Reimplement to show a special icon in the taskbar items and captions - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); // Sets the type of this window: be careful with this void setType(int iType); - bool eventFilter(QObject *o,QEvent *e); + bool eventFilter(TQObject *o,TQEvent *e); - // Virtuals overridden to manage the internal layouts... - virtual void moveEvent(QMoveEvent *e); - virtual void closeEvent(QCloseEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void childEvent(QChildEvent *e); - virtual void focusInEvent(QFocusEvent *e); + // Virtuals overridden to manage the internal tqlayouts... + virtual void moveEvent(TQMoveEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void childEvent(TQChildEvent *e); + virtual void focusInEvent(TQFocusEvent *e); - void childInserted(QWidget * o); - void childRemoved(QWidget * o); + void childInserted(TQWidget * o); + void childRemoved(TQWidget * o); void activateSelf(); // Internal helpers - void createCryptControllerButton(QWidget * par); - void createTextEncodingButton(QWidget * par); + void createCryptControllerButton(TQWidget * par); + void createTextEncodingButton(TQWidget * par); void createSystemTextEncodingPopup(); - BUTTON_CLASS * createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn); + BUTTON_CLASS * createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn); // This is called by KviInput: actually it links the widgetAdded - virtual void childrenTreeChanged(QWidget * widgetAdded); + virtual void tqchildrenTreeChanged(TQWidget * widgetAdded); virtual bool focusNextPrevChild(bool bNext); - virtual void preprocessMessage(QString & szMessage); + virtual void preprocessMessage(TQString & szMessage); }; #ifndef _KVI_WINDOW_CPP_ diff --git a/src/kvirc/ui/moc_kvi_actiondrawer.cpp b/src/kvirc/ui/moc_kvi_actiondrawer.cpp index 833bc391..7b3bad70 100644 --- a/src/kvirc/ui/moc_kvi_actiondrawer.cpp +++ b/src/kvirc/ui/moc_kvi_actiondrawer.cpp @@ -2,21 +2,21 @@ ** KviActionDrawerPageListView meta object code from reading C++ file 'kvi_actiondrawer.h' ** ** Created: Mon Feb 25 00:12:20 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_actiondrawer.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviActionDrawerPageListView::className() const @@ -24,72 +24,72 @@ const char *KviActionDrawerPageListView::className() const return "KviActionDrawerPageListView"; } -QMetaObject *KviActionDrawerPageListView::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawerPageListView( "KviActionDrawerPageListView", &KviActionDrawerPageListView::staticMetaObject ); +TQMetaObject *KviActionDrawerPageListView::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawerPageListView( "KviActionDrawerPageListView", &KviActionDrawerPageListView::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawerPageListView::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawerPageListView::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPageListView", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPageListView", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawerPageListView::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawerPageListView::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPageListView", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPageListView", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawerPageListView::staticMetaObject() +TQMetaObject* KviActionDrawerPageListView::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviListView::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawerPageListView", parentObject, + TQMetaObject* tqparentObject = KviListView::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawerPageListView", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawerPageListView.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawerPageListView::qt_cast( const char* clname ) +void* KviActionDrawerPageListView::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawerPageListView" ) ) return this; - return KviListView::qt_cast( clname ); + return KviListView::tqqt_cast( clname ); } -bool KviActionDrawerPageListView::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawerPageListView::qt_invoke( int _id, TQUObject* _o ) { return KviListView::qt_invoke(_id,_o); } -bool KviActionDrawerPageListView::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawerPageListView::qt_emit( int _id, TQUObject* _o ) { return KviListView::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawerPageListView::qt_property( int id, int f, QVariant* v) +bool KviActionDrawerPageListView::qt_property( int id, int f, TQVariant* v) { return KviListView::qt_property( id, f, v); } -bool KviActionDrawerPageListView::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawerPageListView::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviActionDrawerPage::className() const @@ -97,72 +97,72 @@ const char *KviActionDrawerPage::className() const return "KviActionDrawerPage"; } -QMetaObject *KviActionDrawerPage::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawerPage( "KviActionDrawerPage", &KviActionDrawerPage::staticMetaObject ); +TQMetaObject *KviActionDrawerPage::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawerPage( "KviActionDrawerPage", &KviActionDrawerPage::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawerPage::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawerPage::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPage", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPage", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawerPage::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawerPage::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPage", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPage", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawerPage::staticMetaObject() +TQMetaObject* KviActionDrawerPage::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawerPage", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawerPage", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawerPage.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawerPage::qt_cast( const char* clname ) +void* KviActionDrawerPage::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawerPage" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviActionDrawerPage::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawerPage::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviActionDrawerPage::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawerPage::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawerPage::qt_property( int id, int f, QVariant* v) +bool KviActionDrawerPage::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviActionDrawerPage::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawerPage::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviActionDrawer::className() const @@ -170,69 +170,69 @@ const char *KviActionDrawer::className() const return "KviActionDrawer"; } -QMetaObject *KviActionDrawer::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawer( "KviActionDrawer", &KviActionDrawer::staticMetaObject ); +TQMetaObject *KviActionDrawer::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawer( "KviActionDrawer", &KviActionDrawer::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawer::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawer::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawer", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawer", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawer::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawer::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawer", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawer", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawer::staticMetaObject() +TQMetaObject* KviActionDrawer::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QTabWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawer", parentObject, + TQMetaObject* tqparentObject = TQTabWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawer", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawer.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawer::qt_cast( const char* clname ) +void* KviActionDrawer::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawer" ) ) return this; - return QTabWidget::qt_cast( clname ); + return TQTabWidget::tqqt_cast( clname ); } -bool KviActionDrawer::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawer::qt_invoke( int _id, TQUObject* _o ) { - return QTabWidget::qt_invoke(_id,_o); + return TQTabWidget::qt_invoke(_id,_o); } -bool KviActionDrawer::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawer::qt_emit( int _id, TQUObject* _o ) { - return QTabWidget::qt_emit(_id,_o); + return TQTabWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawer::qt_property( int id, int f, QVariant* v) +bool KviActionDrawer::qt_property( int id, int f, TQVariant* v) { - return QTabWidget::qt_property( id, f, v); + return TQTabWidget::qt_property( id, f, v); } -bool KviActionDrawer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawer::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_customtoolbar.cpp b/src/kvirc/ui/moc_kvi_customtoolbar.cpp index 4a89b121..46989ea6 100644 --- a/src/kvirc/ui/moc_kvi_customtoolbar.cpp +++ b/src/kvirc/ui/moc_kvi_customtoolbar.cpp @@ -2,21 +2,21 @@ ** KviCustomToolBarSeparator meta object code from reading C++ file 'kvi_customtoolbar.h' ** ** Created: Mon Feb 25 00:12:23 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_customtoolbar.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviCustomToolBarSeparator::className() const @@ -24,72 +24,72 @@ const char *KviCustomToolBarSeparator::className() const return "KviCustomToolBarSeparator"; } -QMetaObject *KviCustomToolBarSeparator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviCustomToolBarSeparator( "KviCustomToolBarSeparator", &KviCustomToolBarSeparator::staticMetaObject ); +TQMetaObject *KviCustomToolBarSeparator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviCustomToolBarSeparator( "KviCustomToolBarSeparator", &KviCustomToolBarSeparator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviCustomToolBarSeparator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviCustomToolBarSeparator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBarSeparator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBarSeparator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviCustomToolBarSeparator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviCustomToolBarSeparator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBarSeparator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBarSeparator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviCustomToolBarSeparator::staticMetaObject() +TQMetaObject* KviCustomToolBarSeparator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviCustomToolBarSeparator", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviCustomToolBarSeparator", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviCustomToolBarSeparator.setMetaObject( metaObj ); return metaObj; } -void* KviCustomToolBarSeparator::qt_cast( const char* clname ) +void* KviCustomToolBarSeparator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviCustomToolBarSeparator" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviCustomToolBarSeparator::qt_invoke( int _id, QUObject* _o ) +bool KviCustomToolBarSeparator::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviCustomToolBarSeparator::qt_emit( int _id, QUObject* _o ) +bool KviCustomToolBarSeparator::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviCustomToolBarSeparator::qt_property( int id, int f, QVariant* v) +bool KviCustomToolBarSeparator::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviCustomToolBarSeparator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviCustomToolBarSeparator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviCustomToolBar::className() const @@ -97,63 +97,63 @@ const char *KviCustomToolBar::className() const return "KviCustomToolBar"; } -QMetaObject *KviCustomToolBar::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviCustomToolBar( "KviCustomToolBar", &KviCustomToolBar::staticMetaObject ); +TQMetaObject *KviCustomToolBar::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviCustomToolBar( "KviCustomToolBar", &KviCustomToolBar::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviCustomToolBar::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviCustomToolBar::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBar", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBar", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviCustomToolBar::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviCustomToolBar::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBar", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBar", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviCustomToolBar::staticMetaObject() +TQMetaObject* KviCustomToolBar::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviToolBar::staticMetaObject(); - static const QUMethod slot_0 = {"beginCustomize", 0, 0 }; - static const QUMethod slot_1 = {"endCustomize", 0, 0 }; - static const QUMethod slot_2 = {"filteredChildDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "beginCustomize()", &slot_0, QMetaData::Protected }, - { "endCustomize()", &slot_1, QMetaData::Protected }, - { "filteredChildDestroyed()", &slot_2, QMetaData::Protected } + TQMetaObject* tqparentObject = KviToolBar::staticMetaObject(); + static const TQUMethod slot_0 = {"beginCustomize", 0, 0 }; + static const TQUMethod slot_1 = {"endCustomize", 0, 0 }; + static const TQUMethod slot_2 = {"filteredChildDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "beginCustomize()", &slot_0, TQMetaData::Protected }, + { "endCustomize()", &slot_1, TQMetaData::Protected }, + { "filteredChildDestroyed()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviCustomToolBar", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviCustomToolBar", tqparentObject, slot_tbl, 3, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviCustomToolBar.setMetaObject( metaObj ); return metaObj; } -void* KviCustomToolBar::qt_cast( const char* clname ) +void* KviCustomToolBar::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviCustomToolBar" ) ) return this; - return KviToolBar::qt_cast( clname ); + return KviToolBar::tqqt_cast( clname ); } -bool KviCustomToolBar::qt_invoke( int _id, QUObject* _o ) +bool KviCustomToolBar::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: beginCustomize(); break; @@ -165,16 +165,16 @@ bool KviCustomToolBar::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviCustomToolBar::qt_emit( int _id, QUObject* _o ) +bool KviCustomToolBar::qt_emit( int _id, TQUObject* _o ) { return KviToolBar::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviCustomToolBar::qt_property( int id, int f, QVariant* v) +bool KviCustomToolBar::qt_property( int id, int f, TQVariant* v) { return KviToolBar::qt_property( id, f, v); } -bool KviCustomToolBar::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviCustomToolBar::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_debugwindow.cpp b/src/kvirc/ui/moc_kvi_debugwindow.cpp index 5e3da82c..5e096e25 100644 --- a/src/kvirc/ui/moc_kvi_debugwindow.cpp +++ b/src/kvirc/ui/moc_kvi_debugwindow.cpp @@ -2,21 +2,21 @@ ** KviDebugWindow meta object code from reading C++ file 'kvi_debugwindow.h' ** ** Created: Mon Feb 25 00:12:25 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_debugwindow.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviDebugWindow::className() const @@ -24,69 +24,69 @@ const char *KviDebugWindow::className() const return "KviDebugWindow"; } -QMetaObject *KviDebugWindow::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviDebugWindow( "KviDebugWindow", &KviDebugWindow::staticMetaObject ); +TQMetaObject *KviDebugWindow::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviDebugWindow( "KviDebugWindow", &KviDebugWindow::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviDebugWindow::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviDebugWindow::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDebugWindow", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviDebugWindow", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviDebugWindow::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviDebugWindow::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDebugWindow", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviDebugWindow", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviDebugWindow::staticMetaObject() +TQMetaObject* KviDebugWindow::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviWindow::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviDebugWindow", parentObject, + TQMetaObject* tqparentObject = KviWindow::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviDebugWindow", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviDebugWindow.setMetaObject( metaObj ); return metaObj; } -void* KviDebugWindow::qt_cast( const char* clname ) +void* KviDebugWindow::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviDebugWindow" ) ) return this; - return KviWindow::qt_cast( clname ); + return KviWindow::tqqt_cast( clname ); } -bool KviDebugWindow::qt_invoke( int _id, QUObject* _o ) +bool KviDebugWindow::qt_invoke( int _id, TQUObject* _o ) { return KviWindow::qt_invoke(_id,_o); } -bool KviDebugWindow::qt_emit( int _id, QUObject* _o ) +bool KviDebugWindow::qt_emit( int _id, TQUObject* _o ) { return KviWindow::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviDebugWindow::qt_property( int id, int f, QVariant* v) +bool KviDebugWindow::qt_property( int id, int f, TQVariant* v) { return KviWindow::qt_property( id, f, v); } -bool KviDebugWindow::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviDebugWindow::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_htmldialog.cpp b/src/kvirc/ui/moc_kvi_htmldialog.cpp index 62d76814..d98ff98a 100644 --- a/src/kvirc/ui/moc_kvi_htmldialog.cpp +++ b/src/kvirc/ui/moc_kvi_htmldialog.cpp @@ -2,21 +2,21 @@ ** KviHtmlDialog meta object code from reading C++ file 'kvi_htmldialog.h' ** ** Created: Mon Feb 25 00:12:27 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_htmldialog.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviHtmlDialog::className() const @@ -24,84 +24,84 @@ const char *KviHtmlDialog::className() const return "KviHtmlDialog"; } -QMetaObject *KviHtmlDialog::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviHtmlDialog( "KviHtmlDialog", &KviHtmlDialog::staticMetaObject ); +TQMetaObject *KviHtmlDialog::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviHtmlDialog( "KviHtmlDialog", &KviHtmlDialog::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviHtmlDialog::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviHtmlDialog::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHtmlDialog", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviHtmlDialog", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviHtmlDialog::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviHtmlDialog::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHtmlDialog", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviHtmlDialog", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviHtmlDialog::staticMetaObject() +TQMetaObject* KviHtmlDialog::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QDialog::staticMetaObject(); - static const QUMethod slot_0 = {"button1Pressed", 0, 0 }; - static const QUMethod slot_1 = {"button2Pressed", 0, 0 }; - static const QUMethod slot_2 = {"button3Pressed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "button1Pressed()", &slot_0, QMetaData::Protected }, - { "button2Pressed()", &slot_1, QMetaData::Protected }, - { "button3Pressed()", &slot_2, QMetaData::Protected } + TQMetaObject* tqparentObject = TQDialog::staticMetaObject(); + static const TQUMethod slot_0 = {"button1Pressed", 0, 0 }; + static const TQUMethod slot_1 = {"button2Pressed", 0, 0 }; + static const TQUMethod slot_2 = {"button3Pressed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "button1Pressed()", &slot_0, TQMetaData::Protected }, + { "button2Pressed()", &slot_1, TQMetaData::Protected }, + { "button3Pressed()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviHtmlDialog", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviHtmlDialog", tqparentObject, slot_tbl, 3, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviHtmlDialog.setMetaObject( metaObj ); return metaObj; } -void* KviHtmlDialog::qt_cast( const char* clname ) +void* KviHtmlDialog::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviHtmlDialog" ) ) return this; - return QDialog::qt_cast( clname ); + return TQDialog::tqqt_cast( clname ); } -bool KviHtmlDialog::qt_invoke( int _id, QUObject* _o ) +bool KviHtmlDialog::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: button1Pressed(); break; case 1: button2Pressed(); break; case 2: button3Pressed(); break; default: - return QDialog::qt_invoke( _id, _o ); + return TQDialog::qt_invoke( _id, _o ); } return TRUE; } -bool KviHtmlDialog::qt_emit( int _id, QUObject* _o ) +bool KviHtmlDialog::qt_emit( int _id, TQUObject* _o ) { - return QDialog::qt_emit(_id,_o); + return TQDialog::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviHtmlDialog::qt_property( int id, int f, QVariant* v) +bool KviHtmlDialog::qt_property( int id, int f, TQVariant* v) { - return QDialog::qt_property( id, f, v); + return TQDialog::qt_property( id, f, v); } -bool KviHtmlDialog::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviHtmlDialog::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_imagedialog.cpp b/src/kvirc/ui/moc_kvi_imagedialog.cpp index be88643c..22a1e621 100644 --- a/src/kvirc/ui/moc_kvi_imagedialog.cpp +++ b/src/kvirc/ui/moc_kvi_imagedialog.cpp @@ -2,21 +2,21 @@ ** KviImageDialog meta object code from reading C++ file 'kvi_imagedialog.h' ** ** Created: Mon Feb 25 00:12:28 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_imagedialog.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviImageDialog::className() const @@ -24,103 +24,103 @@ const char *KviImageDialog::className() const return "KviImageDialog"; } -QMetaObject *KviImageDialog::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviImageDialog( "KviImageDialog", &KviImageDialog::staticMetaObject ); +TQMetaObject *KviImageDialog::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviImageDialog( "KviImageDialog", &KviImageDialog::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviImageDialog::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviImageDialog::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviImageDialog", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviImageDialog", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviImageDialog::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviImageDialog::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviImageDialog", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviImageDialog", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviImageDialog::staticMetaObject() +TQMetaObject* KviImageDialog::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QDialog::staticMetaObject(); - static const QUMethod slot_0 = {"okClicked", 0, 0 }; - static const QUMethod slot_1 = {"cancelClicked", 0, 0 }; - static const QUMethod slot_2 = {"heartbeat", 0, 0 }; - static const QUParameter param_slot_3[] = { - { "index", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQDialog::staticMetaObject(); + static const TQUMethod slot_0 = {"okClicked", 0, 0 }; + static const TQUMethod slot_1 = {"cancelClicked", 0, 0 }; + static const TQUMethod slot_2 = {"heartbeat", 0, 0 }; + static const TQUParameter param_slot_3[] = { + { "index", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_3 = {"jobTypeSelected", 1, param_slot_3 }; - static const QUParameter param_slot_4[] = { - { "it", &static_QUType_ptr, "KviTalListBoxItem", QUParameter::In } + static const TQUMethod slot_3 = {"jobTypeSelected", 1, param_slot_3 }; + static const TQUParameter param_slot_4[] = { + { "it", &static_TQUType_ptr, "KviTalListBoxItem", TQUParameter::In } }; - static const QUMethod slot_4 = {"itemDoubleClicked", 1, param_slot_4 }; - static const QUParameter param_slot_5[] = { - { 0, &static_QUType_ptr, "KviDynamicToolTip", QUParameter::In }, - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUMethod slot_4 = {"itemDoubleClicked", 1, param_slot_4 }; + static const TQUParameter param_slot_5[] = { + { 0, &static_TQUType_ptr, "KviDynamicToolTip", TQUParameter::In }, + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod slot_5 = {"tipRequest", 2, param_slot_5 }; - static const QMetaData slot_tbl[] = { - { "okClicked()", &slot_0, QMetaData::Protected }, - { "cancelClicked()", &slot_1, QMetaData::Protected }, - { "heartbeat()", &slot_2, QMetaData::Protected }, - { "jobTypeSelected(int)", &slot_3, QMetaData::Protected }, - { "itemDoubleClicked(KviTalListBoxItem*)", &slot_4, QMetaData::Protected }, - { "tipRequest(KviDynamicToolTip*,const QPoint&)", &slot_5, QMetaData::Protected } + static const TQUMethod slot_5 = {"tipRequest", 2, param_slot_5 }; + static const TQMetaData slot_tbl[] = { + { "okClicked()", &slot_0, TQMetaData::Protected }, + { "cancelClicked()", &slot_1, TQMetaData::Protected }, + { "heartbeat()", &slot_2, TQMetaData::Protected }, + { "jobTypeSelected(int)", &slot_3, TQMetaData::Protected }, + { "itemDoubleClicked(KviTalListBoxItem*)", &slot_4, TQMetaData::Protected }, + { "tipRequest(KviDynamicToolTip*,const TQPoint&)", &slot_5, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviImageDialog", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviImageDialog", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviImageDialog.setMetaObject( metaObj ); return metaObj; } -void* KviImageDialog::qt_cast( const char* clname ) +void* KviImageDialog::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviImageDialog" ) ) return this; - return QDialog::qt_cast( clname ); + return TQDialog::tqqt_cast( clname ); } -bool KviImageDialog::qt_invoke( int _id, QUObject* _o ) +bool KviImageDialog::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: okClicked(); break; case 1: cancelClicked(); break; case 2: heartbeat(); break; - case 3: jobTypeSelected((int)static_QUType_int.get(_o+1)); break; - case 4: itemDoubleClicked((KviTalListBoxItem*)static_QUType_ptr.get(_o+1)); break; - case 5: tipRequest((KviDynamicToolTip*)static_QUType_ptr.get(_o+1),(const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+2))); break; + case 3: jobTypeSelected((int)static_TQUType_int.get(_o+1)); break; + case 4: itemDoubleClicked((KviTalListBoxItem*)static_TQUType_ptr.get(_o+1)); break; + case 5: tipRequest((KviDynamicToolTip*)static_TQUType_ptr.get(_o+1),(const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+2))); break; default: - return QDialog::qt_invoke( _id, _o ); + return TQDialog::qt_invoke( _id, _o ); } return TRUE; } -bool KviImageDialog::qt_emit( int _id, QUObject* _o ) +bool KviImageDialog::qt_emit( int _id, TQUObject* _o ) { - return QDialog::qt_emit(_id,_o); + return TQDialog::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviImageDialog::qt_property( int id, int f, QVariant* v) +bool KviImageDialog::qt_property( int id, int f, TQVariant* v) { - return QDialog::qt_property( id, f, v); + return TQDialog::qt_property( id, f, v); } -bool KviImageDialog::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviImageDialog::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_ircviewtools.cpp b/src/kvirc/ui/moc_kvi_ircviewtools.cpp index e44adb66..37f7c77a 100644 --- a/src/kvirc/ui/moc_kvi_ircviewtools.cpp +++ b/src/kvirc/ui/moc_kvi_ircviewtools.cpp @@ -2,21 +2,21 @@ ** KviIrcViewToolWidget meta object code from reading C++ file 'kvi_ircviewtools.h' ** ** Created: Mon Feb 25 00:12:30 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_ircviewtools.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcViewToolWidget::className() const @@ -24,69 +24,69 @@ const char *KviIrcViewToolWidget::className() const return "KviIrcViewToolWidget"; } -QMetaObject *KviIrcViewToolWidget::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcViewToolWidget( "KviIrcViewToolWidget", &KviIrcViewToolWidget::staticMetaObject ); +TQMetaObject *KviIrcViewToolWidget::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcViewToolWidget( "KviIrcViewToolWidget", &KviIrcViewToolWidget::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcViewToolWidget::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcViewToolWidget::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcViewToolWidget", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcViewToolWidget", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcViewToolWidget::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcViewToolWidget::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcViewToolWidget", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcViewToolWidget", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcViewToolWidget::staticMetaObject() +TQMetaObject* KviIrcViewToolWidget::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QFrame::staticMetaObject(); - static const QUMethod slot_0 = {"findPrev", 0, 0 }; - static const QUMethod slot_1 = {"findNext", 0, 0 }; - static const QUMethod slot_2 = {"filterEnableAll", 0, 0 }; - static const QUMethod slot_3 = {"filterEnableNone", 0, 0 }; - static const QUMethod slot_4 = {"filterSave", 0, 0 }; - static const QUMethod slot_5 = {"filterLoad", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "findPrev()", &slot_0, QMetaData::Protected }, - { "findNext()", &slot_1, QMetaData::Protected }, - { "filterEnableAll()", &slot_2, QMetaData::Protected }, - { "filterEnableNone()", &slot_3, QMetaData::Protected }, - { "filterSave()", &slot_4, QMetaData::Protected }, - { "filterLoad()", &slot_5, QMetaData::Protected } + TQMetaObject* tqparentObject = TQFrame::staticMetaObject(); + static const TQUMethod slot_0 = {"findPrev", 0, 0 }; + static const TQUMethod slot_1 = {"findNext", 0, 0 }; + static const TQUMethod slot_2 = {"filterEnableAll", 0, 0 }; + static const TQUMethod slot_3 = {"filterEnableNone", 0, 0 }; + static const TQUMethod slot_4 = {"filterSave", 0, 0 }; + static const TQUMethod slot_5 = {"filterLoad", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "findPrev()", &slot_0, TQMetaData::Protected }, + { "findNext()", &slot_1, TQMetaData::Protected }, + { "filterEnableAll()", &slot_2, TQMetaData::Protected }, + { "filterEnableNone()", &slot_3, TQMetaData::Protected }, + { "filterSave()", &slot_4, TQMetaData::Protected }, + { "filterLoad()", &slot_5, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcViewToolWidget", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcViewToolWidget", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcViewToolWidget.setMetaObject( metaObj ); return metaObj; } -void* KviIrcViewToolWidget::qt_cast( const char* clname ) +void* KviIrcViewToolWidget::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcViewToolWidget" ) ) return this; - return QFrame::qt_cast( clname ); + return TQFrame::tqqt_cast( clname ); } -bool KviIrcViewToolWidget::qt_invoke( int _id, QUObject* _o ) +bool KviIrcViewToolWidget::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: findPrev(); break; @@ -96,21 +96,21 @@ bool KviIrcViewToolWidget::qt_invoke( int _id, QUObject* _o ) case 4: filterSave(); break; case 5: filterLoad(); break; default: - return QFrame::qt_invoke( _id, _o ); + return TQFrame::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcViewToolWidget::qt_emit( int _id, QUObject* _o ) +bool KviIrcViewToolWidget::qt_emit( int _id, TQUObject* _o ) { - return QFrame::qt_emit(_id,_o); + return TQFrame::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcViewToolWidget::qt_property( int id, int f, QVariant* v) +bool KviIrcViewToolWidget::qt_property( int id, int f, TQVariant* v) { - return QFrame::qt_property( id, f, v); + return TQFrame::qt_property( id, f, v); } -bool KviIrcViewToolWidget::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcViewToolWidget::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_listview.cpp b/src/kvirc/ui/moc_kvi_listview.cpp index f9f61186..30ebd519 100644 --- a/src/kvirc/ui/moc_kvi_listview.cpp +++ b/src/kvirc/ui/moc_kvi_listview.cpp @@ -2,21 +2,21 @@ ** KviListView meta object code from reading C++ file 'kvi_listview.h' ** ** Created: Mon Feb 25 00:12:44 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_listview.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviListView::className() const @@ -24,69 +24,69 @@ const char *KviListView::className() const return "KviListView"; } -QMetaObject *KviListView::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviListView( "KviListView", &KviListView::staticMetaObject ); +TQMetaObject *KviListView::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviListView( "KviListView", &KviListView::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviListView::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviListView::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviListView", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviListView", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviListView::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviListView::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviListView", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviListView", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviListView::staticMetaObject() +TQMetaObject* KviListView::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalListView::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviListView", parentObject, + TQMetaObject* tqparentObject = KviTalListView::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviListView", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviListView.setMetaObject( metaObj ); return metaObj; } -void* KviListView::qt_cast( const char* clname ) +void* KviListView::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviListView" ) ) return this; - return KviTalListView::qt_cast( clname ); + return KviTalListView::tqqt_cast( clname ); } -bool KviListView::qt_invoke( int _id, QUObject* _o ) +bool KviListView::qt_invoke( int _id, TQUObject* _o ) { return KviTalListView::qt_invoke(_id,_o); } -bool KviListView::qt_emit( int _id, QUObject* _o ) +bool KviListView::qt_emit( int _id, TQUObject* _o ) { return KviTalListView::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviListView::qt_property( int id, int f, QVariant* v) +bool KviListView::qt_property( int id, int f, TQVariant* v) { return KviTalListView::qt_property( id, f, v); } -bool KviListView::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviListView::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdicaption.cpp b/src/kvirc/ui/moc_kvi_mdicaption.cpp index 3e027b92..3966c6e8 100644 --- a/src/kvirc/ui/moc_kvi_mdicaption.cpp +++ b/src/kvirc/ui/moc_kvi_mdicaption.cpp @@ -2,21 +2,21 @@ ** KviMdiCaptionButton meta object code from reading C++ file 'kvi_mdicaption.h' ** ** Created: Mon Feb 25 00:12:32 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdicaption.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiCaptionButton::className() const @@ -24,72 +24,72 @@ const char *KviMdiCaptionButton::className() const return "KviMdiCaptionButton"; } -QMetaObject *KviMdiCaptionButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiCaptionButton( "KviMdiCaptionButton", &KviMdiCaptionButton::staticMetaObject ); +TQMetaObject *KviMdiCaptionButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiCaptionButton( "KviMdiCaptionButton", &KviMdiCaptionButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiCaptionButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiCaptionButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaptionButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaptionButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiCaptionButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiCaptionButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaptionButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaptionButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiCaptionButton::staticMetaObject() +TQMetaObject* KviMdiCaptionButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QToolButton::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMdiCaptionButton", parentObject, + TQMetaObject* tqparentObject = TQToolButton::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMdiCaptionButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiCaptionButton.setMetaObject( metaObj ); return metaObj; } -void* KviMdiCaptionButton::qt_cast( const char* clname ) +void* KviMdiCaptionButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiCaptionButton" ) ) return this; - return QToolButton::qt_cast( clname ); + return TQToolButton::tqqt_cast( clname ); } -bool KviMdiCaptionButton::qt_invoke( int _id, QUObject* _o ) +bool KviMdiCaptionButton::qt_invoke( int _id, TQUObject* _o ) { - return QToolButton::qt_invoke(_id,_o); + return TQToolButton::qt_invoke(_id,_o); } -bool KviMdiCaptionButton::qt_emit( int _id, QUObject* _o ) +bool KviMdiCaptionButton::qt_emit( int _id, TQUObject* _o ) { - return QToolButton::qt_emit(_id,_o); + return TQToolButton::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiCaptionButton::qt_property( int id, int f, QVariant* v) +bool KviMdiCaptionButton::qt_property( int id, int f, TQVariant* v) { - return QToolButton::qt_property( id, f, v); + return TQToolButton::qt_property( id, f, v); } -bool KviMdiCaptionButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiCaptionButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviMenuBarToolButton::className() const @@ -97,72 +97,72 @@ const char *KviMenuBarToolButton::className() const return "KviMenuBarToolButton"; } -QMetaObject *KviMenuBarToolButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMenuBarToolButton( "KviMenuBarToolButton", &KviMenuBarToolButton::staticMetaObject ); +TQMetaObject *KviMenuBarToolButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMenuBarToolButton( "KviMenuBarToolButton", &KviMenuBarToolButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMenuBarToolButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMenuBarToolButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMenuBarToolButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMenuBarToolButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMenuBarToolButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMenuBarToolButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMenuBarToolButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMenuBarToolButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMenuBarToolButton::staticMetaObject() +TQMetaObject* KviMenuBarToolButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStyledToolButton::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMenuBarToolButton", parentObject, + TQMetaObject* tqparentObject = KviStyledToolButton::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMenuBarToolButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMenuBarToolButton.setMetaObject( metaObj ); return metaObj; } -void* KviMenuBarToolButton::qt_cast( const char* clname ) +void* KviMenuBarToolButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMenuBarToolButton" ) ) return this; - return KviStyledToolButton::qt_cast( clname ); + return KviStyledToolButton::tqqt_cast( clname ); } -bool KviMenuBarToolButton::qt_invoke( int _id, QUObject* _o ) +bool KviMenuBarToolButton::qt_invoke( int _id, TQUObject* _o ) { return KviStyledToolButton::qt_invoke(_id,_o); } -bool KviMenuBarToolButton::qt_emit( int _id, QUObject* _o ) +bool KviMenuBarToolButton::qt_emit( int _id, TQUObject* _o ) { return KviStyledToolButton::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMenuBarToolButton::qt_property( int id, int f, QVariant* v) +bool KviMenuBarToolButton::qt_property( int id, int f, TQVariant* v) { return KviStyledToolButton::qt_property( id, f, v); } -bool KviMenuBarToolButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMenuBarToolButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviMdiCaption::className() const @@ -170,69 +170,69 @@ const char *KviMdiCaption::className() const return "KviMdiCaption"; } -QMetaObject *KviMdiCaption::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiCaption( "KviMdiCaption", &KviMdiCaption::staticMetaObject ); +TQMetaObject *KviMdiCaption::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiCaption( "KviMdiCaption", &KviMdiCaption::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiCaption::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiCaption::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaption", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaption", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiCaption::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiCaption::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaption", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaption", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiCaption::staticMetaObject() +TQMetaObject* KviMdiCaption::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMdiCaption", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMdiCaption", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiCaption.setMetaObject( metaObj ); return metaObj; } -void* KviMdiCaption::qt_cast( const char* clname ) +void* KviMdiCaption::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiCaption" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviMdiCaption::qt_invoke( int _id, QUObject* _o ) +bool KviMdiCaption::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviMdiCaption::qt_emit( int _id, QUObject* _o ) +bool KviMdiCaption::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiCaption::qt_property( int id, int f, QVariant* v) +bool KviMdiCaption::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviMdiCaption::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiCaption::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdichild.cpp b/src/kvirc/ui/moc_kvi_mdichild.cpp index 3fcefcda..ae461eba 100644 --- a/src/kvirc/ui/moc_kvi_mdichild.cpp +++ b/src/kvirc/ui/moc_kvi_mdichild.cpp @@ -2,21 +2,21 @@ ** KviMdiChild meta object code from reading C++ file 'kvi_mdichild.h' ** ** Created: Mon Feb 25 00:12:34 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdichild.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiChild::className() const @@ -24,90 +24,90 @@ const char *KviMdiChild::className() const return "KviMdiChild"; } -QMetaObject *KviMdiChild::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiChild( "KviMdiChild", &KviMdiChild::staticMetaObject ); +TQMetaObject *KviMdiChild::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiChild( "KviMdiChild", &KviMdiChild::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiChild::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiChild::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiChild", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiChild", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiChild::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiChild::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiChild", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiChild", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiChild::staticMetaObject() +TQMetaObject* KviMdiChild::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QFrame::staticMetaObject(); - static const QUMethod slot_0 = {"maximize", 0, 0 }; - static const QUMethod slot_1 = {"minimize", 0, 0 }; - static const QUMethod slot_2 = {"restore", 0, 0 }; - static const QUMethod slot_3 = {"systemPopupSlot", 0, 0 }; - static const QUMethod slot_4 = {"closeRequest", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "maximize()", &slot_0, QMetaData::Public }, - { "minimize()", &slot_1, QMetaData::Public }, - { "restore()", &slot_2, QMetaData::Public }, - { "systemPopupSlot()", &slot_3, QMetaData::Public }, - { "closeRequest()", &slot_4, QMetaData::Public } + TQMetaObject* tqparentObject = TQFrame::staticMetaObject(); + static const TQUMethod slot_0 = {"maximize", 0, 0 }; + static const TQUMethod slot_1 = {"minimize", 0, 0 }; + static const TQUMethod slot_2 = {"restore", 0, 0 }; + static const TQUMethod slot_3 = {"systemPopupSlot", 0, 0 }; + static const TQUMethod slot_4 = {"closeRequest", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "maximize()", &slot_0, TQMetaData::Public }, + { "minimize()", &slot_1, TQMetaData::Public }, + { "restore()", &slot_2, TQMetaData::Public }, + { "systemPopupSlot()", &slot_3, TQMetaData::Public }, + { "closeRequest()", &slot_4, TQMetaData::Public } }; - static const QUParameter param_signal_0[] = { - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod signal_0 = {"systemPopupRequest", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "systemPopupRequest(const QPoint&)", &signal_0, QMetaData::Public } + static const TQUMethod signal_0 = {"systemPopupRequest", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "systemPopupRequest(const TQPoint&)", &signal_0, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviMdiChild", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviMdiChild", tqparentObject, slot_tbl, 5, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiChild.setMetaObject( metaObj ); return metaObj; } -void* KviMdiChild::qt_cast( const char* clname ) +void* KviMdiChild::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiChild" ) ) return this; - return QFrame::qt_cast( clname ); + return TQFrame::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL systemPopupRequest -void KviMdiChild::systemPopupRequest( const QPoint& t0 ) +// TQT_SIGNAL systemPopupRequest +void KviMdiChild::systemPopupRequest( const TQPoint& t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_varptr.set(o+1,&t0); + TQUObject o[2]; + static_TQUType_varptr.set(o+1,&t0); activate_signal( clist, o ); } -bool KviMdiChild::qt_invoke( int _id, QUObject* _o ) +bool KviMdiChild::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: maximize(); break; @@ -116,26 +116,26 @@ bool KviMdiChild::qt_invoke( int _id, QUObject* _o ) case 3: systemPopupSlot(); break; case 4: closeRequest(); break; default: - return QFrame::qt_invoke( _id, _o ); + return TQFrame::qt_invoke( _id, _o ); } return TRUE; } -bool KviMdiChild::qt_emit( int _id, QUObject* _o ) +bool KviMdiChild::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: systemPopupRequest((const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+1))); break; + case 0: systemPopupRequest((const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+1))); break; default: - return QFrame::qt_emit(_id,_o); + return TQFrame::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiChild::qt_property( int id, int f, QVariant* v) +bool KviMdiChild::qt_property( int id, int f, TQVariant* v) { - return QFrame::qt_property( id, f, v); + return TQFrame::qt_property( id, f, v); } -bool KviMdiChild::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiChild::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdimanager.cpp b/src/kvirc/ui/moc_kvi_mdimanager.cpp index fed719be..0ddbf668 100644 --- a/src/kvirc/ui/moc_kvi_mdimanager.cpp +++ b/src/kvirc/ui/moc_kvi_mdimanager.cpp @@ -2,21 +2,21 @@ ** KviMdiManager meta object code from reading C++ file 'kvi_mdimanager.h' ** ** Created: Mon Feb 25 00:12:36 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdimanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiManager::className() const @@ -24,126 +24,126 @@ const char *KviMdiManager::className() const return "KviMdiManager"; } -QMetaObject *KviMdiManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiManager( "KviMdiManager", &KviMdiManager::staticMetaObject ); +TQMetaObject *KviMdiManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiManager( "KviMdiManager", &KviMdiManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiManager::staticMetaObject() +TQMetaObject* KviMdiManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalScrollView::staticMetaObject(); - static const QUMethod slot_0 = {"relayoutMenuButtons", 0, 0 }; - static const QUMethod slot_1 = {"cascadeWindows", 0, 0 }; - static const QUMethod slot_2 = {"cascadeMaximized", 0, 0 }; - static const QUMethod slot_3 = {"expandVertical", 0, 0 }; - static const QUMethod slot_4 = {"expandHorizontal", 0, 0 }; - static const QUMethod slot_5 = {"minimizeAll", 0, 0 }; - static const QUMethod slot_6 = {"tile", 0, 0 }; - static const QUMethod slot_7 = {"toggleAutoTile", 0, 0 }; - static const QUMethod slot_8 = {"tileAnodine", 0, 0 }; - static const QUMethod slot_9 = {"reloadImages", 0, 0 }; - static const QUMethod slot_10 = {"minimizeActiveChild", 0, 0 }; - static const QUMethod slot_11 = {"restoreActiveChild", 0, 0 }; - static const QUMethod slot_12 = {"closeActiveChild", 0, 0 }; - static const QUMethod slot_13 = {"activeChildSystemPopup", 0, 0 }; - static const QUParameter param_slot_14[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviTalScrollView::staticMetaObject(); + static const TQUMethod slot_0 = {"retqlayoutMenuButtons", 0, 0 }; + static const TQUMethod slot_1 = {"cascadeWindows", 0, 0 }; + static const TQUMethod slot_2 = {"cascadeMaximized", 0, 0 }; + static const TQUMethod slot_3 = {"expandVertical", 0, 0 }; + static const TQUMethod slot_4 = {"expandHorizontal", 0, 0 }; + static const TQUMethod slot_5 = {"minimizeAll", 0, 0 }; + static const TQUMethod slot_6 = {"tile", 0, 0 }; + static const TQUMethod slot_7 = {"toggleAutoTile", 0, 0 }; + static const TQUMethod slot_8 = {"tileAnodine", 0, 0 }; + static const TQUMethod slot_9 = {"reloadImages", 0, 0 }; + static const TQUMethod slot_10 = {"minimizeActiveChild", 0, 0 }; + static const TQUMethod slot_11 = {"restoreActiveChild", 0, 0 }; + static const TQUMethod slot_12 = {"closeActiveChild", 0, 0 }; + static const TQUMethod slot_13 = {"activeChildSystemPopup", 0, 0 }; + static const TQUParameter param_slot_14[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_14 = {"menuActivated", 1, param_slot_14 }; - static const QUParameter param_slot_15[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_14 = {"menuActivated", 1, param_slot_14 }; + static const TQUParameter param_slot_15[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_15 = {"tileMethodMenuActivated", 1, param_slot_15 }; - static const QUMethod slot_16 = {"fillWindowPopup", 0, 0 }; - static const QUMethod slot_17 = {"sdiMinimizeButtonDestroyed", 0, 0 }; - static const QUMethod slot_18 = {"sdiRestoreButtonDestroyed", 0, 0 }; - static const QUMethod slot_19 = {"sdiCloseButtonDestroyed", 0, 0 }; - static const QUMethod slot_20 = {"sdiIconButtonDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "relayoutMenuButtons()", &slot_0, QMetaData::Public }, - { "cascadeWindows()", &slot_1, QMetaData::Public }, - { "cascadeMaximized()", &slot_2, QMetaData::Public }, - { "expandVertical()", &slot_3, QMetaData::Public }, - { "expandHorizontal()", &slot_4, QMetaData::Public }, - { "minimizeAll()", &slot_5, QMetaData::Public }, - { "tile()", &slot_6, QMetaData::Public }, - { "toggleAutoTile()", &slot_7, QMetaData::Public }, - { "tileAnodine()", &slot_8, QMetaData::Public }, - { "reloadImages()", &slot_9, QMetaData::Public }, - { "minimizeActiveChild()", &slot_10, QMetaData::Protected }, - { "restoreActiveChild()", &slot_11, QMetaData::Protected }, - { "closeActiveChild()", &slot_12, QMetaData::Protected }, - { "activeChildSystemPopup()", &slot_13, QMetaData::Protected }, - { "menuActivated(int)", &slot_14, QMetaData::Protected }, - { "tileMethodMenuActivated(int)", &slot_15, QMetaData::Protected }, - { "fillWindowPopup()", &slot_16, QMetaData::Protected }, - { "sdiMinimizeButtonDestroyed()", &slot_17, QMetaData::Protected }, - { "sdiRestoreButtonDestroyed()", &slot_18, QMetaData::Protected }, - { "sdiCloseButtonDestroyed()", &slot_19, QMetaData::Protected }, - { "sdiIconButtonDestroyed()", &slot_20, QMetaData::Protected } + static const TQUMethod slot_15 = {"tileMethodMenuActivated", 1, param_slot_15 }; + static const TQUMethod slot_16 = {"fillWindowPopup", 0, 0 }; + static const TQUMethod slot_17 = {"sdiMinimizeButtonDestroyed", 0, 0 }; + static const TQUMethod slot_18 = {"sdiRestoreButtonDestroyed", 0, 0 }; + static const TQUMethod slot_19 = {"sdiCloseButtonDestroyed", 0, 0 }; + static const TQUMethod slot_20 = {"sdiIconButtonDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "retqlayoutMenuButtons()", &slot_0, TQMetaData::Public }, + { "cascadeWindows()", &slot_1, TQMetaData::Public }, + { "cascadeMaximized()", &slot_2, TQMetaData::Public }, + { "expandVertical()", &slot_3, TQMetaData::Public }, + { "expandHorizontal()", &slot_4, TQMetaData::Public }, + { "minimizeAll()", &slot_5, TQMetaData::Public }, + { "tile()", &slot_6, TQMetaData::Public }, + { "toggleAutoTile()", &slot_7, TQMetaData::Public }, + { "tileAnodine()", &slot_8, TQMetaData::Public }, + { "reloadImages()", &slot_9, TQMetaData::Public }, + { "minimizeActiveChild()", &slot_10, TQMetaData::Protected }, + { "restoreActiveChild()", &slot_11, TQMetaData::Protected }, + { "closeActiveChild()", &slot_12, TQMetaData::Protected }, + { "activeChildSystemPopup()", &slot_13, TQMetaData::Protected }, + { "menuActivated(int)", &slot_14, TQMetaData::Protected }, + { "tileMethodMenuActivated(int)", &slot_15, TQMetaData::Protected }, + { "fillWindowPopup()", &slot_16, TQMetaData::Protected }, + { "sdiMinimizeButtonDestroyed()", &slot_17, TQMetaData::Protected }, + { "sdiRestoreButtonDestroyed()", &slot_18, TQMetaData::Protected }, + { "sdiCloseButtonDestroyed()", &slot_19, TQMetaData::Protected }, + { "sdiIconButtonDestroyed()", &slot_20, TQMetaData::Protected } }; - static const QUMethod signal_0 = {"enteredSdiMode", 0, 0 }; - static const QUMethod signal_1 = {"leftSdiMode", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "enteredSdiMode()", &signal_0, QMetaData::Private }, - { "leftSdiMode()", &signal_1, QMetaData::Private } + static const TQUMethod signal_0 = {"enteredSdiMode", 0, 0 }; + static const TQUMethod signal_1 = {"leftSdiMode", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "enteredSdiMode()", &signal_0, TQMetaData::Private }, + { "leftSdiMode()", &signal_1, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviMdiManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviMdiManager", tqparentObject, slot_tbl, 21, signal_tbl, 2, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiManager.setMetaObject( metaObj ); return metaObj; } -void* KviMdiManager::qt_cast( const char* clname ) +void* KviMdiManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiManager" ) ) return this; - return KviTalScrollView::qt_cast( clname ); + return KviTalScrollView::tqqt_cast( clname ); } -// SIGNAL enteredSdiMode +// TQT_SIGNAL enteredSdiMode void KviMdiManager::enteredSdiMode() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -// SIGNAL leftSdiMode +// TQT_SIGNAL leftSdiMode void KviMdiManager::leftSdiMode() { activate_signal( staticMetaObject()->signalOffset() + 1 ); } -bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) +bool KviMdiManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: relayoutMenuButtons(); break; + case 0: retqlayoutMenuButtons(); break; case 1: cascadeWindows(); break; case 2: cascadeMaximized(); break; case 3: expandVertical(); break; @@ -157,8 +157,8 @@ bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) case 11: restoreActiveChild(); break; case 12: closeActiveChild(); break; case 13: activeChildSystemPopup(); break; - case 14: menuActivated((int)static_QUType_int.get(_o+1)); break; - case 15: tileMethodMenuActivated((int)static_QUType_int.get(_o+1)); break; + case 14: menuActivated((int)static_TQUType_int.get(_o+1)); break; + case 15: tileMethodMenuActivated((int)static_TQUType_int.get(_o+1)); break; case 16: fillWindowPopup(); break; case 17: sdiMinimizeButtonDestroyed(); break; case 18: sdiRestoreButtonDestroyed(); break; @@ -170,7 +170,7 @@ bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviMdiManager::qt_emit( int _id, QUObject* _o ) +bool KviMdiManager::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: enteredSdiMode(); break; @@ -180,12 +180,12 @@ bool KviMdiManager::qt_emit( int _id, QUObject* _o ) } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiManager::qt_property( int id, int f, QVariant* v) +bool KviMdiManager::qt_property( int id, int f, TQVariant* v) { return KviTalScrollView::qt_property( id, f, v); } -bool KviMdiManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_statusbar.cpp b/src/kvirc/ui/moc_kvi_statusbar.cpp index d3cbf9c4..2c0fbfa9 100644 --- a/src/kvirc/ui/moc_kvi_statusbar.cpp +++ b/src/kvirc/ui/moc_kvi_statusbar.cpp @@ -2,21 +2,21 @@ ** KviStatusBar meta object code from reading C++ file 'kvi_statusbar.h' ** ** Created: Mon Feb 25 00:12:38 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_statusbar.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviStatusBar::className() const @@ -24,103 +24,103 @@ const char *KviStatusBar::className() const return "KviStatusBar"; } -QMetaObject *KviStatusBar::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBar( "KviStatusBar", &KviStatusBar::staticMetaObject ); +TQMetaObject *KviStatusBar::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBar( "KviStatusBar", &KviStatusBar::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBar::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBar::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBar", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBar", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBar::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBar::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBar", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBar", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBar::staticMetaObject() +TQMetaObject* KviStatusBar::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QStatusBar::staticMetaObject(); - static const QUMethod slot_0 = {"messageTimerFired", 0, 0 }; - static const QUMethod slot_1 = {"contextPopupAboutToShow", 0, 0 }; - static const QUMethod slot_2 = {"appletsPopupAboutToShow", 0, 0 }; - static const QUParameter param_slot_3[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQStatusBar::staticMetaObject(); + static const TQUMethod slot_0 = {"messageTimerFired", 0, 0 }; + static const TQUMethod slot_1 = {"contextPopupAboutToShow", 0, 0 }; + static const TQUMethod slot_2 = {"appletsPopupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_3[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_3 = {"appletsPopupActivated", 1, param_slot_3 }; - static const QUMethod slot_4 = {"removeClickedApplet", 0, 0 }; - static const QUMethod slot_5 = {"setPermanentMessage", 0, 0 }; - static const QUParameter param_slot_6[] = { - { "pTip", &static_QUType_ptr, "KviDynamicToolTip", QUParameter::In }, - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUMethod slot_3 = {"appletsPopupActivated", 1, param_slot_3 }; + static const TQUMethod slot_4 = {"removeClickedApplet", 0, 0 }; + static const TQUMethod slot_5 = {"setPermanentMessage", 0, 0 }; + static const TQUParameter param_slot_6[] = { + { "pTip", &static_TQUType_ptr, "KviDynamicToolTip", TQUParameter::In }, + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod slot_6 = {"tipRequest", 2, param_slot_6 }; - static const QMetaData slot_tbl[] = { - { "messageTimerFired()", &slot_0, QMetaData::Protected }, - { "contextPopupAboutToShow()", &slot_1, QMetaData::Protected }, - { "appletsPopupAboutToShow()", &slot_2, QMetaData::Protected }, - { "appletsPopupActivated(int)", &slot_3, QMetaData::Protected }, - { "removeClickedApplet()", &slot_4, QMetaData::Protected }, - { "setPermanentMessage()", &slot_5, QMetaData::Protected }, - { "tipRequest(KviDynamicToolTip*,const QPoint&)", &slot_6, QMetaData::Protected } + static const TQUMethod slot_6 = {"tipRequest", 2, param_slot_6 }; + static const TQMetaData slot_tbl[] = { + { "messageTimerFired()", &slot_0, TQMetaData::Protected }, + { "contextPopupAboutToShow()", &slot_1, TQMetaData::Protected }, + { "appletsPopupAboutToShow()", &slot_2, TQMetaData::Protected }, + { "appletsPopupActivated(int)", &slot_3, TQMetaData::Protected }, + { "removeClickedApplet()", &slot_4, TQMetaData::Protected }, + { "setPermanentMessage()", &slot_5, TQMetaData::Protected }, + { "tipRequest(KviDynamicToolTip*,const TQPoint&)", &slot_6, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBar", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBar", tqparentObject, slot_tbl, 7, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBar.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBar::qt_cast( const char* clname ) +void* KviStatusBar::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBar" ) ) return this; - return QStatusBar::qt_cast( clname ); + return TQStatusBar::tqqt_cast( clname ); } -bool KviStatusBar::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBar::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: messageTimerFired(); break; case 1: contextPopupAboutToShow(); break; case 2: appletsPopupAboutToShow(); break; - case 3: appletsPopupActivated((int)static_QUType_int.get(_o+1)); break; + case 3: appletsPopupActivated((int)static_TQUType_int.get(_o+1)); break; case 4: removeClickedApplet(); break; case 5: setPermanentMessage(); break; - case 6: tipRequest((KviDynamicToolTip*)static_QUType_ptr.get(_o+1),(const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+2))); break; + case 6: tipRequest((KviDynamicToolTip*)static_TQUType_ptr.get(_o+1),(const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+2))); break; default: - return QStatusBar::qt_invoke( _id, _o ); + return TQStatusBar::qt_invoke( _id, _o ); } return TRUE; } -bool KviStatusBar::qt_emit( int _id, QUObject* _o ) +bool KviStatusBar::qt_emit( int _id, TQUObject* _o ) { - return QStatusBar::qt_emit(_id,_o); + return TQStatusBar::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBar::qt_property( int id, int f, QVariant* v) +bool KviStatusBar::qt_property( int id, int f, TQVariant* v) { - return QStatusBar::qt_property( id, f, v); + return TQStatusBar::qt_property( id, f, v); } -bool KviStatusBar::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBar::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_statusbarapplet.cpp b/src/kvirc/ui/moc_kvi_statusbarapplet.cpp index 85eb55e8..d244ce07 100644 --- a/src/kvirc/ui/moc_kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/moc_kvi_statusbarapplet.cpp @@ -2,21 +2,21 @@ ** KviStatusBarApplet meta object code from reading C++ file 'kvi_statusbarapplet.h' ** ** Created: Mon Feb 25 00:12:39 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_statusbarapplet.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviStatusBarApplet::className() const @@ -24,72 +24,72 @@ const char *KviStatusBarApplet::className() const return "KviStatusBarApplet"; } -QMetaObject *KviStatusBarApplet::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarApplet( "KviStatusBarApplet", &KviStatusBarApplet::staticMetaObject ); +TQMetaObject *KviStatusBarApplet::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarApplet( "KviStatusBarApplet", &KviStatusBarApplet::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarApplet::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarApplet::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarApplet", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarApplet", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarApplet::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarApplet::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarApplet", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarApplet", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarApplet::staticMetaObject() +TQMetaObject* KviStatusBarApplet::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QLabel::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviStatusBarApplet", parentObject, + TQMetaObject* tqparentObject = TQLabel::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarApplet", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarApplet.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarApplet::qt_cast( const char* clname ) +void* KviStatusBarApplet::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarApplet" ) ) return this; - return QLabel::qt_cast( clname ); + return TQLabel::tqqt_cast( clname ); } -bool KviStatusBarApplet::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarApplet::qt_invoke( int _id, TQUObject* _o ) { - return QLabel::qt_invoke(_id,_o); + return TQLabel::qt_invoke(_id,_o); } -bool KviStatusBarApplet::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarApplet::qt_emit( int _id, TQUObject* _o ) { - return QLabel::qt_emit(_id,_o); + return TQLabel::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarApplet::qt_property( int id, int f, QVariant* v) +bool KviStatusBarApplet::qt_property( int id, int f, TQVariant* v) { - return QLabel::qt_property( id, f, v); + return TQLabel::qt_property( id, f, v); } -bool KviStatusBarApplet::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarApplet::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarClock::className() const @@ -97,59 +97,59 @@ const char *KviStatusBarClock::className() const return "KviStatusBarClock"; } -QMetaObject *KviStatusBarClock::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarClock( "KviStatusBarClock", &KviStatusBarClock::staticMetaObject ); +TQMetaObject *KviStatusBarClock::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarClock( "KviStatusBarClock", &KviStatusBarClock::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarClock::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarClock::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarClock", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarClock", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarClock::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarClock::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarClock", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarClock", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarClock::staticMetaObject() +TQMetaObject* KviStatusBarClock::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"toggleUtc", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "toggleUtc()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"toggleUtc", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "toggleUtc()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarClock", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarClock", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarClock.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarClock::qt_cast( const char* clname ) +void* KviStatusBarClock::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarClock" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarClock::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarClock::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: toggleUtc(); break; @@ -159,19 +159,19 @@ bool KviStatusBarClock::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarClock::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarClock::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarClock::qt_property( int id, int f, QVariant* v) +bool KviStatusBarClock::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarClock::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarClock::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarConnectionTimer::className() const @@ -179,59 +179,59 @@ const char *KviStatusBarConnectionTimer::className() const return "KviStatusBarConnectionTimer"; } -QMetaObject *KviStatusBarConnectionTimer::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarConnectionTimer( "KviStatusBarConnectionTimer", &KviStatusBarConnectionTimer::staticMetaObject ); +TQMetaObject *KviStatusBarConnectionTimer::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarConnectionTimer( "KviStatusBarConnectionTimer", &KviStatusBarConnectionTimer::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarConnectionTimer::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarConnectionTimer::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarConnectionTimer", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarConnectionTimer", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarConnectionTimer::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarConnectionTimer::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarConnectionTimer", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarConnectionTimer", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarConnectionTimer::staticMetaObject() +TQMetaObject* KviStatusBarConnectionTimer::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"toggleTotal", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "toggleTotal()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"toggleTotal", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "toggleTotal()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarConnectionTimer", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarConnectionTimer", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarConnectionTimer.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarConnectionTimer::qt_cast( const char* clname ) +void* KviStatusBarConnectionTimer::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarConnectionTimer" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarConnectionTimer::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarConnectionTimer::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: toggleTotal(); break; @@ -241,19 +241,19 @@ bool KviStatusBarConnectionTimer::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarConnectionTimer::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarConnectionTimer::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarConnectionTimer::qt_property( int id, int f, QVariant* v) +bool KviStatusBarConnectionTimer::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarConnectionTimer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarConnectionTimer::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarSeparator::className() const @@ -261,72 +261,72 @@ const char *KviStatusBarSeparator::className() const return "KviStatusBarSeparator"; } -QMetaObject *KviStatusBarSeparator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarSeparator( "KviStatusBarSeparator", &KviStatusBarSeparator::staticMetaObject ); +TQMetaObject *KviStatusBarSeparator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarSeparator( "KviStatusBarSeparator", &KviStatusBarSeparator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarSeparator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarSeparator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarSeparator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarSeparator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarSeparator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarSeparator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarSeparator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarSeparator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarSeparator::staticMetaObject() +TQMetaObject* KviStatusBarSeparator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviStatusBarSeparator", parentObject, + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarSeparator", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarSeparator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarSeparator::qt_cast( const char* clname ) +void* KviStatusBarSeparator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarSeparator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarSeparator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarSeparator::qt_invoke( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_invoke(_id,_o); } -bool KviStatusBarSeparator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarSeparator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarSeparator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarSeparator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarSeparator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarSeparator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarAwayIndicator::className() const @@ -334,61 +334,61 @@ const char *KviStatusBarAwayIndicator::className() const return "KviStatusBarAwayIndicator"; } -QMetaObject *KviStatusBarAwayIndicator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarAwayIndicator( "KviStatusBarAwayIndicator", &KviStatusBarAwayIndicator::staticMetaObject ); +TQMetaObject *KviStatusBarAwayIndicator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarAwayIndicator( "KviStatusBarAwayIndicator", &KviStatusBarAwayIndicator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarAwayIndicator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarAwayIndicator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarAwayIndicator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarAwayIndicator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarAwayIndicator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarAwayIndicator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarAwayIndicator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarAwayIndicator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarAwayIndicator::staticMetaObject() +TQMetaObject* KviStatusBarAwayIndicator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"updateDisplay", 0, 0 }; - static const QUMethod slot_1 = {"toggleContext", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "updateDisplay()", &slot_0, QMetaData::Protected }, - { "toggleContext()", &slot_1, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"updateDisplay", 0, 0 }; + static const TQUMethod slot_1 = {"toggleContext", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "updateDisplay()", &slot_0, TQMetaData::Protected }, + { "toggleContext()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarAwayIndicator", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarAwayIndicator", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarAwayIndicator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarAwayIndicator::qt_cast( const char* clname ) +void* KviStatusBarAwayIndicator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarAwayIndicator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarAwayIndicator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarAwayIndicator::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: updateDisplay(); break; @@ -399,19 +399,19 @@ bool KviStatusBarAwayIndicator::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarAwayIndicator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarAwayIndicator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarAwayIndicator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarAwayIndicator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarAwayIndicator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarAwayIndicator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarLagIndicator::className() const @@ -419,59 +419,59 @@ const char *KviStatusBarLagIndicator::className() const return "KviStatusBarLagIndicator"; } -QMetaObject *KviStatusBarLagIndicator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarLagIndicator( "KviStatusBarLagIndicator", &KviStatusBarLagIndicator::staticMetaObject ); +TQMetaObject *KviStatusBarLagIndicator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarLagIndicator( "KviStatusBarLagIndicator", &KviStatusBarLagIndicator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarLagIndicator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarLagIndicator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarLagIndicator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarLagIndicator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarLagIndicator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarLagIndicator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarLagIndicator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarLagIndicator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarLagIndicator::staticMetaObject() +TQMetaObject* KviStatusBarLagIndicator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"updateDisplay", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "updateDisplay()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"updateDisplay", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "updateDisplay()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarLagIndicator", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarLagIndicator", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarLagIndicator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarLagIndicator::qt_cast( const char* clname ) +void* KviStatusBarLagIndicator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarLagIndicator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarLagIndicator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarLagIndicator::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: updateDisplay(); break; @@ -481,16 +481,16 @@ bool KviStatusBarLagIndicator::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarLagIndicator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarLagIndicator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarLagIndicator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarLagIndicator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarLagIndicator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarLagIndicator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_toolwindows_container.cpp b/src/kvirc/ui/moc_kvi_toolwindows_container.cpp index dc5a24f9..977626a7 100644 --- a/src/kvirc/ui/moc_kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/moc_kvi_toolwindows_container.cpp @@ -2,21 +2,21 @@ ** KviWindowToolWidget meta object code from reading C++ file 'kvi_toolwindows_container.h' ** ** Created: Mon Feb 25 00:12:41 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_toolwindows_container.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviWindowToolWidget::className() const @@ -24,72 +24,72 @@ const char *KviWindowToolWidget::className() const return "KviWindowToolWidget"; } -QMetaObject *KviWindowToolWidget::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviWindowToolWidget( "KviWindowToolWidget", &KviWindowToolWidget::staticMetaObject ); +TQMetaObject *KviWindowToolWidget::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviWindowToolWidget( "KviWindowToolWidget", &KviWindowToolWidget::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviWindowToolWidget::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviWindowToolWidget::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolWidget", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolWidget", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviWindowToolWidget::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviWindowToolWidget::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolWidget", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolWidget", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviWindowToolWidget::staticMetaObject() +TQMetaObject* KviWindowToolWidget::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviWindowToolWidget", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviWindowToolWidget", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviWindowToolWidget.setMetaObject( metaObj ); return metaObj; } -void* KviWindowToolWidget::qt_cast( const char* clname ) +void* KviWindowToolWidget::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviWindowToolWidget" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviWindowToolWidget::qt_invoke( int _id, QUObject* _o ) +bool KviWindowToolWidget::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviWindowToolWidget::qt_emit( int _id, QUObject* _o ) +bool KviWindowToolWidget::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviWindowToolWidget::qt_property( int id, int f, QVariant* v) +bool KviWindowToolWidget::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviWindowToolWidget::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviWindowToolWidget::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviWindowToolPageButton::className() const @@ -97,69 +97,69 @@ const char *KviWindowToolPageButton::className() const return "KviWindowToolPageButton"; } -QMetaObject *KviWindowToolPageButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviWindowToolPageButton( "KviWindowToolPageButton", &KviWindowToolPageButton::staticMetaObject ); +TQMetaObject *KviWindowToolPageButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviWindowToolPageButton( "KviWindowToolPageButton", &KviWindowToolPageButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviWindowToolPageButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviWindowToolPageButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolPageButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolPageButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviWindowToolPageButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviWindowToolPageButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolPageButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolPageButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviWindowToolPageButton::staticMetaObject() +TQMetaObject* KviWindowToolPageButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = TOOL_PAGE_PARENT::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviWindowToolPageButton", parentObject, + TQMetaObject* tqparentObject = TOOL_PAGE_PARENT::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviWindowToolPageButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviWindowToolPageButton.setMetaObject( metaObj ); return metaObj; } -void* KviWindowToolPageButton::qt_cast( const char* clname ) +void* KviWindowToolPageButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviWindowToolPageButton" ) ) return this; - return TOOL_PAGE_PARENT::qt_cast( clname ); + return TOOL_PAGE_PARENT::tqqt_cast( clname ); } -bool KviWindowToolPageButton::qt_invoke( int _id, QUObject* _o ) +bool KviWindowToolPageButton::qt_invoke( int _id, TQUObject* _o ) { return TOOL_PAGE_PARENT::qt_invoke(_id,_o); } -bool KviWindowToolPageButton::qt_emit( int _id, QUObject* _o ) +bool KviWindowToolPageButton::qt_emit( int _id, TQUObject* _o ) { return TOOL_PAGE_PARENT::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviWindowToolPageButton::qt_property( int id, int f, QVariant* v) +bool KviWindowToolPageButton::qt_property( int id, int f, TQVariant* v) { return TOOL_PAGE_PARENT::qt_property( id, f, v); } -bool KviWindowToolPageButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviWindowToolPageButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES |