diff options
Diffstat (limited to 'src/kvirc/ui')
38 files changed, 156 insertions, 156 deletions
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 1c01b23..b9e2f2b 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -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 tqmask editors yet + // no mask editors yet m_pBanEditor = 0; m_pBanExceptionEditor = 0; m_pInviteEditor = 0; @@ -1424,7 +1424,7 @@ int KviChannel::myFlags() } -void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt) +void KviChannel::setMask(char flag, const TQString &mask,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 TQString &tqmask,bool bAdd,const TQStr break; } - internalMask(tqmask,bAdd,setBy,setAt,list,&editor); + internalMask(mask,bAdd,setBy,setAt,list,&editor); m_pUserListView->setMaskEntries(flag,(int)list->count()); } -void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) +void KviChannel::internalMask(const TQString &mask,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(KviTQString::equalCI(e->szMask,tqmask))return; //already there + if(KviTQString::equalCI(e->szMask,mask))return; //already there } e = new KviMaskEntry; - e->szMask = tqmask; + e->szMask = mask; e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)"); e->uSetAt = setAt; l->append(e); @@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &s } else { for(e = l->first();e;e = l->next()) { - if(KviTQString::equalCI(e->szMask,tqmask))break; + if(KviTQString::equalCI(e->szMask,mask))break; } if(e) { diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index f1d1732..45a4801 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -160,7 +160,7 @@ protected: 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 TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); + void internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); void checkChannelSync(); void showDoubleView(bool bShow); void fixActionHistory(); @@ -192,7 +192,7 @@ public: const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; virtual const TQString & target(){ return windowName(); }; // void appendSelectedNicknames(KviStr &buffer); - void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt); + void setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt); kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; }; void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; }; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 0b08447..fdce502 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString if(u) { - TQString tqmask; - u->tqmask()->tqmask(tqmask); + TQString mask; + u->mask()->mask(mask); buffer += "<tr bgcolor=\"#F0F0F0\"><td>"; buffer += __tr2qs("Registered as"); buffer += " <b>"; @@ -385,7 +385,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">"; buffer += __tr2qs("(Matched by"); buffer += " "; - buffer += tqmask; + buffer += mask; buffer += ")</td></tr>"; } diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 17e26a4..0be14a2 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -76,7 +76,7 @@ Q_OBJECT TQ_OBJECT public: - KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); + KviCryptController(TQWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); ~KviCryptController(); protected: KviWindow * m_pWindow; diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index fe67619..2e1dad1 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(TQWidget * tqparent,KviDynamicToolTip * parToolTip) -: KviTalToolTip(tqparent) +KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip) +: KviTalToolTip(parent) { m_pParentToolTip = parToolTip; } @@ -37,10 +37,10 @@ void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt) m_pParentToolTip->maybeTip(pnt); } -KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name) -: TQObject(tqparent,name) +KviDynamicToolTip::KviDynamicToolTip(TQWidget * parent,const char * name) +: TQObject(parent,name) { - m_pHelper = new KviDynamicToolTipHelper(tqparent,this); + m_pHelper = new KviDynamicToolTipHelper(parent,this); } KviDynamicToolTip::~KviDynamicToolTip() diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h index d6a6adf..d57902c 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.h +++ b/src/kvirc/ui/kvi_dynamictooltip.h @@ -33,7 +33,7 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip { friend class KviDynamicToolTip; protected: - KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip); + KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip); virtual ~KviDynamicToolTipHelper(); protected: KviDynamicToolTip * m_pParentToolTip; @@ -47,7 +47,7 @@ class KVIRC_API KviDynamicToolTip : public TQObject Q_OBJECT TQ_OBJECT public: - KviDynamicToolTip(TQWidget * tqparent,const char * name = 0); + KviDynamicToolTip(TQWidget * parent,const char * name = 0); virtual ~KviDynamicToolTip(); protected: KviDynamicToolTipHelper * m_pHelper; diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 2dfba50..2660a52 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -37,8 +37,8 @@ extern KviMediaManager * g_pMediaManager; KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter, - TQWidget *tqparent, const char *name, bool modal) -: KviTalFileDialog(dirName,filter,tqparent,name,modal) + TQWidget *parent, const char *name, bool modal) +: KviTalFileDialog(dirName,filter,parent,name,modal) { setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); @@ -70,17 +70,17 @@ void KviFileDialog::goHome() -bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); return !buffer.isEmpty(); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::ExistingFile); //d->setShowHiddenFiles(showHidden); @@ -96,14 +96,14 @@ bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption, } -bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { while (1) { - buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption); + buffer=TQFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); //return !buffer.isEmpty(); if(buffer.isEmpty()) return false; @@ -112,7 +112,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption if(!KviFileUtils::fileExists(buffer)) return true; 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)) + switch(TQMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { case TQMessageBox::Cancel: return false; break; case TQMessageBox::Yes: return true; break; @@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption #endif - KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::AnyFile); //d->setShowHiddenFiles(showHidden); @@ -167,24 +167,24 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption } -bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption); + buffer = TQFileDialog::getExistingDirectory(initial,parent,"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,tqparent,caption); + buffer = KFileDialog::getExistingDirectory(initial,parent,caption); return !buffer.isEmpty(); #endif #endif KviFileDialog * d = new KviFileDialog(initial, - filter,tqparent,"directory_name_dialog",true); + filter,parent,"directory_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::Directory); //d->setShowHiddenFiles(showHidden); @@ -201,17 +201,17 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio } -bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { - buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption); return (buffer.count()>0); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),parent,"open_file_names_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::ExistingFiles); //d->setShowHiddenFiles(showHidden); diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 0bb03f6..03fea70 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -41,14 +41,14 @@ class KVIRC_API KviFileDialog : public KviTalFileDialog TQ_OBJECT public: KviFileDialog(const TQString &dirName, const TQString &filter=TQString(), - TQWidget *tqparent=0, const char *name=0, bool modal=false); + TQWidget *parent=0, const char *name=0, bool modal=false); ~KviFileDialog(); public: - 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 askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* parent=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* 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); + static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0); + static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0); }; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index dfae586..db5efa8 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1176,9 +1176,9 @@ bool KviFrame::focusNextPrevChild(bool next) //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->tqparent()) + if(w->parent()) { - TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner"); + TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); if(v.isValid())return false; // Do NOT change the focus widget! } } diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 1a255fc..5258577 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -2274,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: Hosttqmask or function/command completion (see below)<br> + Shift+Tab: Hostmask 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) diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 9d1b363..0e12d2d 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -33,8 +33,8 @@ // FIXME: #warning "THIS COULD GO INTO libkvioptions ?" -KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name) -:TQFrame(tqparent,name) +KviIpEditor::KviIpEditor(TQWidget * parent,AddressType addrType,const TQString &ipAddr,const char *name) +:TQFrame(parent,name) { for(int i=0;i<7;i++) diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 3a39841..19e2a3c 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public TQFrame TQ_OBJECT public: enum AddressType { IpV4 , IpV6 }; - KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); + KviIpEditor(TQWidget * parent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); ~KviIpEditor(); private: TQLabel * m_pLabel[7]; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 25be1cc..a500c46 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -281,8 +281,8 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd) -: TQWidget(tqparent,"irc_view") +KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) +: TQWidget(parent,"irc_view") { // Ok...here we go // initialize the initializable @@ -2920,7 +2920,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) //Calculate the position of the image //imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) ); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the tqmask if needed + //Set the mask if needed int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId(); if(iPixId > 0) pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId))); @@ -3263,7 +3263,7 @@ 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 tqmask if needed + //Set the mask 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)); @@ -4429,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect 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 tqmask links and 's' for server links.[br] + 'c' for channel links, 'h' for hostname links, 'm' for mask 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] diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 26912ef..092d5ed 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -62,7 +62,7 @@ public: friend class KviIrcViewToolTip; friend class KviIrcViewToolWidget; public: - KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd); + KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd); ~KviIrcView(); public: int dummyRead() const { return 0; }; diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index d1605e9..c0dd4ba 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -32,8 +32,8 @@ #include "kvi_doublebuffer.h" -KviListView::KviListView( TQWidget * tqparent, const char * name) -:KviTalListView(tqparent) +KviListView::KviListView( TQWidget * parent, const char * name) +:KviTalListView(parent) { m_pBackgroundOverlayPixmap=0; m_iBackgroundOverlayAlignment=TQt::AlignAuto; diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h index 6f86d80..c4f0888 100644 --- a/src/kvirc/ui/kvi_listview.h +++ b/src/kvirc/ui/kvi_listview.h @@ -37,7 +37,7 @@ class KVIRC_API KviListView : public KviTalListView Q_OBJECT TQ_OBJECT public: - KviListView( TQWidget * tqparent = 0, const char * name = 0); + KviListView( TQWidget * parent = 0, const char * name = 0); ~KviListView(); protected: TQPixmap * m_pBackgroundOverlayPixmap; diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index f0040a1..21921b5 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -36,13 +36,13 @@ #include <tqlabel.h> #include <tqvalidator.h> -KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry) -:KviTalListViewItem(tqparent), m_Mask(*entry) +KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry) +:KviTalListViewItem(parent), m_Mask(*entry) { TQDateTime date; - date.setTime_t(tqmask()->uSetAt); - setText(0,tqmask()->szMask); - setText(1,tqmask()->szSetBy); + date.setTime_t(mask()->uSetAt); + setText(0,mask()->szMask); + setText(1,mask()->szSetBy); setText(2,date.toString()); } @@ -57,9 +57,9 @@ int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const { if(col==2) { - 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; + 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; } return KviTalListViewItem::compare(i,col,ascending); } @@ -76,7 +76,7 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this); + TQLabel * tl = new TQLabel(__tr2qs("New mask must match an *!*@* expression"),this); g->addMultiCellWidget(tl,0,0,0,3); m_pEdit=new TQLineEdit(szMask,this); @@ -128,7 +128,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP { bool isEnabled=1; - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -137,7 +137,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->tqparent(); + w = w->parent(); } #ifdef COMPILE_USE_QT4 @@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text) { pMaskItem->setVisible(true); } else { - if(pMaskItem->tqmask()->szMask.contains(text)) + if(pMaskItem->mask()->szMask.contains(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->tqmask()->szMask; - e->szSetBy = it->tqmask()->szSetBy; - e->uSetAt = it->tqmask()->uSetAt; + e->szMask = it->mask()->szMask; + e->szSetBy = it->mask()->szSetBy; + e->uSetAt = it->mask()->uSetAt; l->append(e); } it = (KviMaskItem *)(it->nextSibling()); @@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked() void KviMaskEditor::addClicked() { - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -299,7 +299,7 @@ void KviMaskEditor::addClicked() } break; } - w = w->tqparent(); + w = w->parent(); } } @@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e) KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild()); while(it) { - if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask)) + if(KviTQString::equalCI(it->mask()->szMask,e->szMask)) { delete it; return; @@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) { if(pItem) { - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) } break; } - w = w->tqparent(); + w = w->parent(); } } } diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h index 47a53e8..71baadf 100644 --- a/src/kvirc/ui/kvi_maskeditor.h +++ b/src/kvirc/ui/kvi_maskeditor.h @@ -47,10 +47,10 @@ typedef struct _KviMaskEntry class KviMaskItem: public KviTalListViewItem { public: - KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry); + KviMaskItem(KviTalListView* parent,KviMaskEntry* entry); ~KviMaskItem(); - KviMaskEntry* tqmask() { return &m_Mask; }; + KviMaskEntry* mask() { return &m_Mask; }; #ifdef COMPILE_USE_QT4 virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const; #else diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index 80d0cac..f1d47c9 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -55,8 +55,8 @@ #include <tqdrawutil.h> #include <tqevent.h> -KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name) -: TQToolButton(tqparent,name) +KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name) +: TQToolButton(parent,name) { setPixmap(pix); //setAutoRaise(true); @@ -104,17 +104,17 @@ void KviMdiCaptionButton::drawButton(TQPainter *p) -KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name) -: TQWidget(tqparent,name) +KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name) +: TQWidget(parent,name) { m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button"); - connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize())); + connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(maximize())); m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button"); - connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize())); + connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(minimize())); m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button"); - connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest())); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(closeRequest())); m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button"); - connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot())); + connect(m_pSystemButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(systemPopupSlot())); m_lastMousePos = TQPoint(-1,-1); m_bMouseGrabbed = true; @@ -165,7 +165,7 @@ void KviMdiCaption::fontChange(const TQFont &old) { calcLineSpacing(); TQWidget::fontChange(old); - ((KviMdiChild *)tqparent())->resizeEvent(0); + ((KviMdiChild *)parent())->resizeEvent(0); } void KviMdiCaption::mousePressEvent(TQMouseEvent *e) @@ -177,7 +177,7 @@ void KviMdiCaption::mousePressEvent(TQMouseEvent *e) #else setCursor(TQCursor::sizeAllCursor); #endif - ((KviMdiChild *)tqparent())->activate(true); + ((KviMdiChild *)parent())->activate(true); } void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) @@ -187,7 +187,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) TQPoint p = TQCursor::pos(); int dx = m_lastMousePos.x() - p.x(); int dy = m_lastMousePos.y() - p.y(); - KviMdiChild * c = (KviMdiChild *)tqparent(); + KviMdiChild * c = (KviMdiChild *)parent(); int nx = c->manager()->childX(c) - dx; int ny = c->manager()->childY(c) - dy; @@ -220,7 +220,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e) { - ((KviMdiChild *)tqparent())->maximize(); + ((KviMdiChild *)parent())->maximize(); } void KviMdiCaption::paintEvent(TQPaintEvent * e) @@ -228,7 +228,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e) TQRect r = e->rect(); TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); - TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font()); + TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index d070e19..c46572a 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -39,7 +39,7 @@ class KVIRC_API KviMdiCaptionButton : public TQToolButton Q_OBJECT TQ_OBJECT public: - KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name); + KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name); ~KviMdiCaptionButton(); protected: virtual void drawButton(TQPainter * p); @@ -67,7 +67,7 @@ class KVIRC_API KviMdiCaption : public TQWidget Q_OBJECT TQ_OBJECT public: - KviMdiCaption(KviMdiChild * tqparent,const char * name); + KviMdiCaption(KviMdiChild * parent,const char * name); ~KviMdiCaption(); protected: TQPoint m_lastMousePos; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index b559be8..2bf0130 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -490,8 +490,8 @@ void KviMdiChild::setClient(TQWidget *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); - //Retqparent if needed - if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){ + //Reparent if needed + if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){ //reparent to this widget , no flags , point , show it TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); w->reparent(this,pnt2,true); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 7d4a9b6..9163595 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -57,8 +57,8 @@ -KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name) -: KviTalScrollView(tqparent) +KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name) +: KviTalScrollView(parent) { setFrameShape(NoFrame); m_pZ = new KviPointerList<KviMdiChild>; diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index 9577ef6..e4093d6 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -61,7 +61,7 @@ class KVIRC_API KviMdiManager : public KviTalScrollView Q_OBJECT TQ_OBJECT public: - KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name); + KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name); ~KviMdiManager(); public: KviMdiChild * topChild(){ return m_pZ->last(); }; diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 9407131..18ce661 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons m_szLimit = limit; bool isEnabled=1; - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -63,7 +63,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->tqparent(); + w = w->parent(); } TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 28d986f..8b959a7 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -41,8 +41,8 @@ TQString KviOptionsWidget::m_szBasicTipStart; // empty decl TQString KviOptionsWidget::m_szBasicTipEnd; -KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken) -: TQFrame(tqparent,name), KviSelectorInterface() +KviOptionsWidget::KviOptionsWidget(TQWidget * parent,const char * name,bool bSunken) +: TQFrame(parent,name), KviSelectorInterface() { if(m_szBasicTipStart.isEmpty()) { diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 463cc82..5e397f1 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -41,7 +41,7 @@ class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface Q_OBJECT TQ_OBJECT public: - KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true); + KviOptionsWidget(TQWidget * parent,const char * name = 0,bool bSunken = true); ~KviOptionsWidget(); private: TQGridLayout * m_pLayout; diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 17a9ddf..c3e5473 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -735,9 +735,9 @@ KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,T :KviTalListViewItem(pList,szChan) { m_szPass=szPass; - TQString tqmask; - tqmask.fill('*',szPass.length()); - setText(1,tqmask); + TQString mask; + mask.fill('*',szPass.length()); + setText(1,mask); } KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index e81376e..629fae9 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -142,15 +142,15 @@ void KviStyledControl::leaveEvent ( TQEvent * ) } -KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name ) -: TQCheckBox(tqparent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( TQWidget * parent, const char * name ) +: TQCheckBox(parent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } -KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name ) -: TQCheckBox(text,tqparent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name ) +: TQCheckBox(text,parent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } @@ -234,15 +234,15 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) TQCheckBox::paintEvent(event); } -KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name ) -: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton( TQWidget * parent, const char * name ) +: TQToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); } -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) +KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name ) +: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h index f7e6641..0a7ed59 100644 --- a/src/kvirc/ui/kvi_styled_controls.h +++ b/src/kvirc/ui/kvi_styled_controls.h @@ -87,8 +87,8 @@ class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl Q_OBJECT TQ_OBJECT public: - KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 ); - KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 ); + KviStyledCheckBox ( TQWidget * parent, const char * name = 0 ); + KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name = 0 ); ~KviStyledCheckBox(); protected: virtual void paintEvent ( TQPaintEvent * ); @@ -101,8 +101,8 @@ class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledContr private: bool bShowSubmenuIndicator; public: - 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 ( TQWidget * parent, const char * name = 0 ); + KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 ); ~KviStyledToolButton(); void setShowSubmenuIndicator(bool bShow); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 37bb7a8..ad47661 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -1373,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it) { cur->setActive(false); } - if(((KviTreeTaskBarItem *)it)->tqparent()) + if(((KviTreeTaskBarItem *)it)->parent()) { - if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true); + if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true); } ((KviTreeTaskBarItem *)it)->setActive(true); m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive() @@ -1410,10 +1410,10 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); } else { - if(m_pCurrentItem->tqparent()) + if(m_pCurrentItem->parent()) { - // child with not siblings : try the sibling of the tqparent - m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling(); + // child with not siblings : try the sibling of the parent + m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling(); } else { m_pCurrentItem = 0; // toplevel with no siblings } @@ -1428,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() if(!m_pCurrentItem)return 0; - if(m_pCurrentItem->tqparent()) + if(m_pCurrentItem->parent()) { // a child item - it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild(); while(it) { @@ -1440,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() } if(!it) { - it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->parent(); } } else { diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index 4d4243c..1f57db0 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -59,7 +59,7 @@ void KviThemedLabel::setText(const char * text) { int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); + //g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize)); } update(); } @@ -71,7 +71,7 @@ void KviThemedLabel::setText(const TQString& text) { int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); + //g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize)); } update(); } diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index bd424fe..65c6dec 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -13,10 +13,10 @@ #include "kvi_iconmanager.h" -KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) -:TQWidget(tqparent/*,name,f*/) +KviWindowToolWidget::KviWindowToolWidget(TQWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) +:TQWidget(parent/*,name,f*/) { -// m_pContainer=tqparent; +// m_pContainer=parent; m_pButton=button; m_bAutoDelete=1; m_bHidden=0; @@ -77,8 +77,8 @@ void KviWindowToolWidget::unregisterSelf() m_bHidden=0; }*/ -KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name ) -:TOOL_PAGE_PARENT(tqparent) +KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn, const char * name ) +:TOOL_PAGE_PARENT(parent) { #ifdef COMPILE_USE_QT4 setFlat(true); diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h index 7b43af3..456418e 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.h +++ b/src/kvirc/ui/kvi_toolwindows_container.h @@ -26,7 +26,7 @@ class KVIRC_API KviWindowToolWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); + KviWindowToolWidget( TQWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); ~KviWindowToolWidget(); void setAutoDelete(bool b) { m_bAutoDelete=b; }; @@ -58,7 +58,7 @@ class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT Q_OBJECT TQ_OBJECT public: - KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 ); + KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn=0,const char * name = 0 ); ~KviWindowToolPageButton(); /*protected: virtual void drawButton ( TQPainter * painter);*/ diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index d4a3ecd..fe9011e 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -553,7 +553,7 @@ TQSize KviTopicWidget::tqsizeHint() const void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) { int maxlen=-1; - TQObject * w = tqparent(); + TQObject * w = parent(); TQString szModes; bool bCanEdit = TRUE; while(w) @@ -568,7 +568,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) } break; } - w = w->tqparent(); + w = w->parent(); } if(m_pInput == 0) { @@ -728,9 +728,9 @@ void KviTopicWidget::deactivate() m_pDiscard = 0; } - // try to find a KviWindow tqparent and give it the focus + // try to find a KviWindow parent and give it the focus - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviWindow")) @@ -738,11 +738,11 @@ void KviTopicWidget::deactivate() ((KviWindow *)w)->setFocus(); return; } - w = w->tqparent(); + w = w->parent(); } // no KviWindow on the path - w = tqparent(); + w = parent(); if(w) { if(w->inherits(TQWIDGET_OBJECT_NAME_STRING)) diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 1b55386..d504915 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const TQPoint &pnt) -KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick, +KviUserListEntry::KviUserListEntry(KviUserListView * parent,const TQString &nick, KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown) { - m_pListView = tqparent; + m_pListView = parent; m_szNick = nick; m_pGlobalData = e; m_iFlags = iFlags; @@ -184,8 +184,8 @@ void KviUserListEntry::recalcSize() -KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) -: KviWindowToolWidget(tqparent,button) +KviUserListView::KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) +: KviWindowToolWidget(parent,button) { setAutoDelete(0); m_pKviWindow = pWnd; @@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *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 tqmask match) + // (this is NOT a simple lookup in the user db... it is a mask 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 // diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index a666d33..b275126 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -74,7 +74,7 @@ class KVIRC_API KviUserListEntry friend class KviUserListView; friend class KviUserListViewArea; public: - KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); + KviUserListEntry(KviUserListView * parent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); ~KviUserListEntry(); protected: KviUserListView * m_pListView; @@ -128,7 +128,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget Q_OBJECT TQ_OBJECT public: - KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); + KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); ~KviUserListView(); protected: KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index d7f141a..352c0cf 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -296,12 +296,12 @@ bool KviWindow::focusNextPrevChild(bool next) //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->tqparent()) + if(w->parent()) { #ifdef COMPILE_USE_QT4 - if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } @@ -936,9 +936,9 @@ void KviWindow::closeEvent(TQCloseEvent *e) void KviWindow::updateIcon() { - if(tqparent()) + if(parent()) { - ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); + ((KviMdiChild *)parent())->setIcon(*myIconPtr()); } else { setIcon(*myIconPtr()); } @@ -951,9 +951,9 @@ void KviWindow::youAreDocked() delete m_pAccel; m_pAccel = 0; } - ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); + ((KviMdiChild *)parent())->setIcon(*myIconPtr()); updateCaption(); - connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); + connect(((KviMdiChild *)parent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); } void KviWindow::youAreUndocked() diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index 7cc410b..a044bae 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -206,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 *)tqparent(); }; + KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); }; // 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 |