From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/reguser/edituser.cpp | 282 +++++++++++++++++++-------------------- 1 file changed, 141 insertions(+), 141 deletions(-) (limited to 'src/modules/reguser/edituser.cpp') diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index f0d6d6b..6fd82ca 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -41,34 +41,34 @@ #include "kvi_stringconversion.h" #include "kvi_options.h" -#include -#include -#include +#include +#include +#include #ifdef COMPILE_USE_QT4 -#include -#include -#include +#include +#include +#include #else -#include +#include #endif #include "kvi_pointerhashtable.h" -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include "kvi_tal_hbox.h" #include "kvi_tal_vbox.h" -#include +#include #include "wizard.h" #include "dialog.h" #ifdef COMPILE_INFO_TIPS - #include + #include #endif // COMPILE_INFO_TIPS // kvi_app.cpp @@ -78,20 +78,20 @@ KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy! -KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHashTable * dict) -: QDialog(p,"property_editor",true) +KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHashTable * dict) +: TQDialog(p,"property_editor",true) { m_pPropertyDict = dict; setCaption(__tr2qs("Property Editor")); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); - QGridLayout * g = new QGridLayout(this,3,3,4,4); + TQGridLayout * g = new TQGridLayout(this,3,3,4,4); #ifdef COMPILE_USE_QT4 m_pTable = new Q3Table(this); #else - m_pTable = new QTable(this); + m_pTable = new TQTable(this); #endif g->addMultiCellWidget(m_pTable,0,1,0,1); @@ -102,31 +102,31 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value")); m_pTable->setMinimumSize(250,250); - //connect(m_pTable,SIGNAL(valueChanged(int,int)),this,SLOT(propertyValueChanged(int,int))); + //connect(m_pTable,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(propertyValueChanged(int,int))); KviTalVBox * vb = new KviTalVBox(this); vb->setSpacing(4); g->addWidget(vb,0,2); - m_pAddButton = new QPushButton(__tr2qs("&New"),vb); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); + m_pAddButton = new TQPushButton(__tr2qs("&New"),vb); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); - m_pDelButton = new QPushButton(__tr2qs("&Remove"),vb); - connect(m_pDelButton,SIGNAL(clicked()),this,SLOT(delClicked())); + m_pDelButton = new TQPushButton(__tr2qs("&Remove"),vb); + connect(m_pDelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked())); m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); KviTalHBox * b = new KviTalHBox(this); b->setSpacing(4); g->addMultiCellWidget(b,2,2,1,2); - QPushButton * pb = new QPushButton(__tr2qs("&OK"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); + TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); - pb = new QPushButton(__tr2qs("Cancel"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + pb = new TQPushButton(__tr2qs("Cancel"),b); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); g->setRowStretch(1,1); @@ -139,7 +139,7 @@ KviReguserPropertiesDialog::~KviReguserPropertiesDialog() { } -void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e) +void KviReguserPropertiesDialog::closeEvent(TQCloseEvent *e) { e->accept(); //delete this; @@ -148,7 +148,7 @@ void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e) void KviReguserPropertiesDialog::fillData() { m_pTable->setNumRows(m_pPropertyDict->count()); - KviPointerHashTableIterator it(*m_pPropertyDict); + KviPointerHashTableIterator it(*m_pPropertyDict); int row = 0; while(it.current()) { @@ -167,11 +167,11 @@ void KviReguserPropertiesDialog::okClicked() int n = m_pTable->numRows(); for(int i=0;itext(i,0); - QString szValue = m_pTable->text(i,1); + TQString szName = m_pTable->text(i,0); + TQString szValue = m_pTable->text(i,1); if((!szName.isEmpty()) && (!szValue.isEmpty())) { - m_pPropertyDict->replace(szName,new QString(szValue)); + m_pPropertyDict->tqreplace(szName,new TQString(szValue)); } } @@ -207,69 +207,69 @@ void KviReguserPropertiesDialog::delClicked() } -KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m) -: QDialog(p,"reguser_mask_editor",true) +KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m) +: TQDialog(p,"reguser_tqmask_editor",true) { m_pMask = m; setCaption(__tr2qs("Mask Editor")); - QGridLayout * g = new QGridLayout(this,3,2,4,4); + TQGridLayout * g = new TQGridLayout(this,3,2,4,4); - QLabel * l = new QLabel(__tr2qs("Insert a mask for this user.
It can contain the wildcard characters '*' and '?'."),this); - //l->setAlignment(Qt::AlignCenter); + TQLabel * l = new TQLabel(__tr2qs("Insert a tqmask for this user.
It can contain the wildcard characters '*' and '?'."),this); + //l->tqsetAlignment(TQt::AlignCenter); g->addMultiCellWidget(l,0,0,0,1); KviTalHBox * b = new KviTalHBox(this); g->addMultiCellWidget(b,1,1,0,1); - m_pNickEdit = new QLineEdit(b); + m_pNickEdit = new TQLineEdit(b); //m_pNickEdit->setMinimumWidth(120); - m_pNickEdit->setAlignment(Qt::AlignRight); + m_pNickEdit->tqsetAlignment(TQt::AlignRight); #ifdef COMPILE_INFO_TIPS - QToolTip::add(m_pNickEdit,__tr2qs("
This the nickname that will match this user, default value is the registered name.
")); + TQToolTip::add(m_pNickEdit,__tr2qs("
This the nickname that will match this user, default value is the registered name.
")); #endif - l = new QLabel("
!
",b); - l->setAlignment(Qt::AlignCenter); + l = new TQLabel("
!
",b); + l->tqsetAlignment(TQt::AlignCenter); //l->setMinimumWidth(40); - m_pUserEdit = new QLineEdit(b); + m_pUserEdit = new TQLineEdit(b); //m_pUserEdit->setMinimumWidth(120); - m_pUserEdit->setAlignment(Qt::AlignCenter); + m_pUserEdit->tqsetAlignment(TQt::AlignCenter); #ifdef COMPILE_INFO_TIPS - QToolTip::add(m_pUserEdit,__tr2qs("
This the username that will match this user. * will match any username.
")); + TQToolTip::add(m_pUserEdit,__tr2qs("
This the username that will match this user. * will match any username.
")); #endif - l = new QLabel("
@
",b); - l->setAlignment(Qt::AlignCenter); + l = new TQLabel("
@
",b); + l->tqsetAlignment(TQt::AlignCenter); //l->setMinimumWidth(40); - m_pHostEdit = new QLineEdit(b); + m_pHostEdit = new TQLineEdit(b); //m_pHostEdit->setMinimumWidth(120); - m_pHostEdit->setAlignment(Qt::AlignLeft); + m_pHostEdit->tqsetAlignment(TQt::AlignLeft); #ifdef COMPILE_INFO_TIPS - QToolTip::add(m_pHostEdit,__tr2qs("
This the hostname that will match this user. * will match any hostname.
")); + TQToolTip::add(m_pHostEdit,__tr2qs("
This the hostname that will match this user. * will match any hostname.
")); #endif // just a spacer -// l = new QLabel(" ",this); +// l = new TQLabel(" ",this); // g->addMultiCellWidget(l,2,2,0,1); -// QFrame * f = new QFrame(this); -// f->setFrameStyle(QFrame::HLine | QFrame::Sunken); +// TQFrame * f = new TQFrame(this); +// f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); // g->addMultiCellWidget(f,3,3,0,1); b = new KviTalHBox(this); b->setSpacing(4); g->addWidget(b,2,1); - QPushButton * pb = new QPushButton(__tr2qs("&OK"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); + TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); //pb->setMinimumWidth(120); - pb = new QPushButton(__tr2qs("Cancel"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + pb = new TQPushButton(__tr2qs("Cancel"),b); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); //pb->setMinimumWidth(120); @@ -286,7 +286,7 @@ KviReguserMaskDialog::~KviReguserMaskDialog() { } -void KviReguserMaskDialog::closeEvent(QCloseEvent *e) +void KviReguserMaskDialog::closeEvent(TQCloseEvent *e) { e->accept(); //delete this; @@ -312,19 +312,19 @@ void KviReguserMaskDialog::okClicked() -KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal) +KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegisteredUser * r,bool bModal) : KviTalTabDialog(p,"reguser_entry_editor",bModal) { m_pUser = r; - m_pCustomColor = new QColor(); + m_pCustomColor = new TQColor(); if(r) { - QString col=r->getProperty("customColor"); + TQString col=r->getProperty("customColor"); KviStringConversion::fromString(col,(*m_pCustomColor)); } - m_pPropertyDict = new KviPointerHashTable(17,false); + m_pPropertyDict = new KviPointerHashTable(17,false); m_pPropertyDict->setAutoDelete(true); //setMinimumSize(400,450); @@ -332,31 +332,31 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); setCaption(__tr2qs("Registered User Entry")); - QWidget * p1 = new QWidget(this); + TQWidget * p1 = new TQWidget(this); - QGridLayout * g = new QGridLayout(p1,6,2,4,4); + TQGridLayout * g = new TQGridLayout(p1,6,2,4,4); - QLabel * l = new QLabel(__tr2qs("Name:"),p1); + TQLabel * l = new TQLabel(__tr2qs("Name:"),p1); g->addWidget(l,0,0); - m_pNameEdit = new QLineEdit(p1); + m_pNameEdit = new TQLineEdit(p1); g->addWidget(m_pNameEdit,0,1); - l = new QLabel(__tr2qs("Comment:"),p1); + l = new TQLabel(__tr2qs("Comment:"),p1); g->addWidget(l,1,0); - m_pCommentEdit = new QLineEdit(p1); + m_pCommentEdit = new TQLineEdit(p1); g->addWidget(m_pCommentEdit,1,1); - QFrame * f = new QFrame(p1); + TQFrame * f = new TQFrame(p1); g->addMultiCellWidget(f,2,2,0,1); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - l = new QLabel(__tr2qs("Masks:"),p1); + l = new TQLabel(__tr2qs("Masks:"),p1); g->addMultiCellWidget(l,3,3,0,1); m_pMaskListBox = new KviTalListBox(p1); - connect(m_pMaskListBox,SIGNAL(currentChanged(KviTalListBoxItem *)),this,SLOT(maskCurrentChanged(KviTalListBoxItem *))); + connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(tqmaskCurrentChanged(KviTalListBoxItem *))); m_pMaskListBox->setMinimumSize(300,200); g->addMultiCellWidget(m_pMaskListBox,4,4,0,1); @@ -365,18 +365,18 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste g->addMultiCellWidget(b,5,5,0,1); b->setSpacing(4); - m_pAddMaskButton = new QPushButton(__tr2qs("&Add..."),b); - connect(m_pAddMaskButton,SIGNAL(clicked()),this,SLOT(addMaskClicked())); + m_pAddMaskButton = new TQPushButton(__tr2qs("&Add..."),b); + connect(m_pAddMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addMaskClicked())); m_pAddMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); - m_pDelMaskButton = new QPushButton(__tr2qs("Re&move"),b); + m_pDelMaskButton = new TQPushButton(__tr2qs("Re&move"),b); m_pDelMaskButton->setEnabled(false); - connect(m_pDelMaskButton,SIGNAL(clicked()),this,SLOT(delMaskClicked())); + connect(m_pDelMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMaskClicked())); m_pDelMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); - m_pEditMaskButton = new QPushButton(__tr2qs("&Edit"),b); + m_pEditMaskButton = new TQPushButton(__tr2qs("&Edit"),b); m_pEditMaskButton->setEnabled(false); - connect(m_pEditMaskButton,SIGNAL(clicked()),this,SLOT(editMaskClicked())); + connect(m_pEditMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editMaskClicked())); m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM))); g->setRowStretch(4,1); @@ -386,30 +386,30 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste - QWidget * p2 = new QWidget(this); + TQWidget * p2 = new TQWidget(this); - g = new QGridLayout(p2,6,3,5,2); + g = new TQGridLayout(p2,6,3,5,2); m_pNotifyCheck = new KviStyledCheckBox(__tr2qs("Notify when user is online"),p2); g->addMultiCellWidget(m_pNotifyCheck,0,0,0,2); - l = new QLabel(__tr2qs("Notify nicknames:"),p2); + l = new TQLabel(__tr2qs("Notify nicknames:"),p2); l->setEnabled(m_pNotifyCheck->isChecked()); g->addWidget(l,1,0); - connect(m_pNotifyCheck,SIGNAL(toggled(bool)),l,SLOT(setEnabled(bool))); + connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool))); #ifdef COMPILE_INFO_TIPS - QToolTip::add(m_pNotifyCheck,__tr2qs("
You can enter a space separated list of nicknames.
")); + TQToolTip::add(m_pNotifyCheck,__tr2qs("
You can enter a space separated list of nicknames.
")); #endif - m_pNotifyNick = new QLineEdit(p2); + m_pNotifyNick = new TQLineEdit(p2); m_pNotifyNick->setEnabled(false); g->addMultiCellWidget(m_pNotifyNick,1,1,1,2); - connect(m_pNotifyCheck,SIGNAL(toggled(bool)),m_pNotifyNick,SLOT(setEnabled(bool))); + connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),m_pNotifyNick,TQT_SLOT(setEnabled(bool))); - f = new QFrame(p2); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + f = new TQFrame(p2); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(f,2,2,0,2); m_pAvatar = 0; @@ -426,8 +426,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste m_pAvatarSelector = new KviPixmapSelector(p2,__tr2qs("Avatar"),m_pAvatar,true); g->addMultiCellWidget(m_pAvatarSelector,3,3,0,2); - f = new QFrame(p2); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + f = new TQFrame(p2); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(f,4,4,0,2); m_pCustomColorCheck = new KviStyledCheckBox(__tr2qs("Use custom color in userlist"),p2); @@ -435,11 +435,11 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor")); g->addMultiCellWidget(m_pCustomColorCheck,5,5,0,1); - m_pCustomColorSelector = new KviColorSelector(p2,QString::null,m_pCustomColor,1); + m_pCustomColorSelector = new KviColorSelector(p2,TQString(),m_pCustomColor,1); g->addWidget(m_pCustomColorSelector,5,2); - QPushButton * pb = new QPushButton(__tr2qs("All Properties..."),p2); - connect(pb,SIGNAL(clicked()),this,SLOT(editAllPropertiesClicked())); + TQPushButton * pb = new TQPushButton(__tr2qs("All Properties..."),p2); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(editAllPropertiesClicked())); g->addWidget(pb,6,2); g->setColStretch(1,1); @@ -451,60 +451,60 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste #ifdef COMPILE_USE_QT4 Q3VBox * vb = new Q3VBox(this); #else - QVBox * vb = new QVBox(this); + TQVBox * vb = new TQVBox(this); #endif vb->setMargin(10); m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb); - QGroupBox * gb = new QGroupBox(__tr2qs("Ignore features"),vb); - connect(m_pIgnoreEnabled,SIGNAL(toggled(bool)),gb,SLOT(setEnabled(bool))); + TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb); + connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool))); - QVBoxLayout * layout = new QVBoxLayout(gb,20,3); + TQVBoxLayout * tqlayout = new TQVBoxLayout(gb,20,3); m_pIgnoreQuery = new KviStyledCheckBox(__tr2qs("Ignore query-messages"),gb); - layout->addWidget(m_pIgnoreQuery); + tqlayout->addWidget(m_pIgnoreQuery); m_pIgnoreChannel = new KviStyledCheckBox(__tr2qs("Ignore channel-messages"),gb); - layout->addWidget(m_pIgnoreChannel); + tqlayout->addWidget(m_pIgnoreChannel); m_pIgnoreNotice = new KviStyledCheckBox(__tr2qs("Ignore notice-messages"),gb); - layout->addWidget(m_pIgnoreNotice); + tqlayout->addWidget(m_pIgnoreNotice); m_pIgnoreCtcp = new KviStyledCheckBox(__tr2qs("Ignore ctcp-messages"),gb); - layout->addWidget(m_pIgnoreCtcp); + tqlayout->addWidget(m_pIgnoreCtcp); m_pIgnoreInvite = new KviStyledCheckBox(__tr2qs("Ignore invites"),gb); - layout->addWidget(m_pIgnoreInvite); + tqlayout->addWidget(m_pIgnoreInvite); m_pIgnoreDcc = new KviStyledCheckBox(__tr2qs("Ignore DCCs"),gb); - layout->addWidget(m_pIgnoreDcc); + tqlayout->addWidget(m_pIgnoreDcc); - QWidget *w = new QWidget(vb); - w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); + TQWidget *w = new TQWidget(vb); + w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); addTab(vb,__tr2qs("Ignore")); setCancelButton(__tr2qs("Cancel")); setOkButton(__tr2qs("&OK")); - connect(this,SIGNAL(applyButtonPressed()),this,SLOT(okClicked())); - connect(this,SIGNAL(cancelButtonPressed()),this,SLOT(reject())); + connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(okClicked())); + connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(reject())); if(r) { m_pNameEdit->setText(r->name()); m_pCommentEdit->setText(r->getProperty("comment")); - for(KviIrcMask * m = r->maskList()->first();m;m = r->maskList()->next()) + for(KviIrcMask * m = r->tqmaskList()->first();m;m = r->tqmaskList()->next()) { - QString mk = m->nick(); - mk += QChar('!'); + TQString mk = m->nick(); + mk += TQChar('!'); mk += m->user(); - mk += QChar('@'); + mk += TQChar('@'); mk += m->host(); m_pMaskListBox->insertItem(mk); } - QString szNotifyNicks = r->getProperty("notify"); + TQString szNotifyNicks = r->getProperty("notify"); if(!szNotifyNicks.isEmpty()) { m_pNotifyCheck->setChecked(true); @@ -514,10 +514,10 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste if(r->propertyDict()) { - KviPointerHashTableIterator it(*(r->propertyDict())); - while(QString *s = it.current()) + KviPointerHashTableIterator it(*(r->propertyDict())); + while(TQString *s = it.current()) { - m_pPropertyDict->insert(it.currentKey(),new QString(*s)); + m_pPropertyDict->insert(it.currentKey(),new TQString(*s)); ++it; } } @@ -541,7 +541,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste } } -void KviRegisteredUserEntryDialog::closeEvent(QCloseEvent *e) +void KviRegisteredUserEntryDialog::closeEvent(TQCloseEvent *e) { e->accept(); okClicked(); @@ -555,7 +555,7 @@ KviRegisteredUserEntryDialog::~KviRegisteredUserEntryDialog() delete m_pCustomColor; } -void KviRegisteredUserEntryDialog::maskCurrentChanged(KviTalListBoxItem *it) +void KviRegisteredUserEntryDialog::tqmaskCurrentChanged(KviTalListBoxItem *it) { m_pDelMaskButton->setEnabled(it); m_pEditMaskButton->setEnabled(it); @@ -563,20 +563,20 @@ void KviRegisteredUserEntryDialog::maskCurrentChanged(KviTalListBoxItem *it) void KviRegisteredUserEntryDialog::okClicked() { - QString szGroup; + TQString szGroup; if(m_pUser) { szGroup=m_pUser->group(); g_pLocalRegisteredUserDataBase->removeUser(m_pUser->name()); } - QString name = m_pNameEdit->text(); + TQString name = m_pNameEdit->text(); if(name.isEmpty())name = "user"; KviRegisteredUser * u; - QString szNameOk = name; + TQString szNameOk = name; int idx = 1; @@ -584,7 +584,7 @@ void KviRegisteredUserEntryDialog::okClicked() u = g_pLocalRegisteredUserDataBase->findUserByName(szNameOk); if(u) { - KviQString::sprintf(szNameOk,"%Q%d",&name,idx); + KviTQString::sprintf(szNameOk,"%Q%d",&name,idx); idx++; } } while(u); @@ -606,8 +606,8 @@ void KviRegisteredUserEntryDialog::okClicked() idx = 0; while(cnt > 0) { - QString mask = m_pMaskListBox->text(idx); - KviIrcMask * mk = new KviIrcMask(mask); + TQString tqmask = m_pMaskListBox->text(idx); + KviIrcMask * mk = new KviIrcMask(tqmask); g_pLocalRegisteredUserDataBase->removeMask(*mk); g_pLocalRegisteredUserDataBase->addMask(u,mk); cnt--; @@ -619,13 +619,13 @@ void KviRegisteredUserEntryDialog::okClicked() if(!m_pAvatar->isNull()) { - QString szPath = m_pAvatar->path(); + TQString szPath = m_pAvatar->path(); u->setProperty("avatar",szPath); } if(m_pNotifyCheck->isChecked()) { - QString szNicks = m_pNotifyNick->text(); + TQString szNicks = m_pNotifyNick->text(); if(!szNicks.isEmpty()) { @@ -636,8 +636,8 @@ void KviRegisteredUserEntryDialog::okClicked() m_pPropertyDict->remove("notify"); m_pPropertyDict->remove("avatar"); - KviPointerHashTableIterator it(*m_pPropertyDict); - while(QString *s = it.current()) + KviPointerHashTableIterator it(*m_pPropertyDict); + while(TQString *s = it.current()) { u->setProperty(it.currentKey(),*s); ++it; @@ -645,7 +645,7 @@ void KviRegisteredUserEntryDialog::okClicked() u->setProperty("useCustomColor",m_pCustomColorCheck->isChecked()); - QString col; + TQString col; KviStringConversion::toString(m_pCustomColorSelector->getColor(),col); u->setProperty("customColor",col); @@ -675,12 +675,12 @@ void KviRegisteredUserEntryDialog::addMaskClicked() { KviIrcMask mk; KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk); - if(dlg->exec() == QDialog::Accepted) + if(dlg->exec() == TQDialog::Accepted) { - QString m = mk.nick(); - m += QChar('!'); + TQString m = mk.nick(); + m += TQChar('!'); m += mk.user(); - m += QChar('@'); + m += TQChar('@'); m += mk.host(); m_pMaskListBox->insertItem(m); } @@ -703,12 +703,12 @@ void KviRegisteredUserEntryDialog::editMaskClicked() KviIrcMask mk(szM.ptr()); KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk); - if(dlg->exec() == QDialog::Accepted) + if(dlg->exec() == TQDialog::Accepted) { - QString m = mk.nick(); - m += QChar('!'); + TQString m = mk.nick(); + m += TQChar('!'); m += mk.user(); - m += QChar('@'); + m += TQChar('@'); m += mk.host(); m_pMaskListBox->changeItem(m,idx); } @@ -725,16 +725,16 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() } else { KviStr szPath = m_pAvatar->path(); if(szPath.isEmpty())m_pPropertyDict->remove("avatar"); - else m_pPropertyDict->replace("avatar",new QString(szPath)); + else m_pPropertyDict->tqreplace("avatar",new TQString(szPath)); } if(m_pNotifyCheck->isChecked()) { - QString szNicks = m_pNotifyNick->text(); + TQString szNicks = m_pNotifyNick->text(); if(!szNicks.isEmpty()) { - m_pPropertyDict->replace("notify",new QString(szNicks)); + m_pPropertyDict->tqreplace("notify",new TQString(szNicks)); } else { m_pPropertyDict->remove("notify"); } @@ -744,14 +744,14 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() KviReguserPropertiesDialog * dlg = new KviReguserPropertiesDialog(this,m_pPropertyDict); - if(dlg->exec() != QDialog::Accepted) + if(dlg->exec() != TQDialog::Accepted) { delete dlg; return; } delete dlg; - QString * notify = m_pPropertyDict->find("notify"); + TQString * notify = m_pPropertyDict->tqfind("notify"); bool bGotIt = false; if(notify) { @@ -765,7 +765,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() m_pNotifyNick->setEnabled(bGotIt); if(!bGotIt)m_pNotifyNick->setText(""); - QString * avatar = m_pPropertyDict->find("avatar"); + TQString * avatar = m_pPropertyDict->tqfind("avatar"); bGotIt = false; if(avatar) { -- cgit v1.2.3