diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
commit | 47c8a359c5276062c4bc17f0e82410f29081b502 (patch) | |
tree | 2d54a5f60a5b74067632f9ef6df58c2bc38155e6 /kopete/protocols/irc/ui | |
parent | 6f82532777a35e0e60bbd2b290b2e93e646f349b (diff) | |
download | tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.tar.gz tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/irc/ui')
-rw-r--r-- | kopete/protocols/irc/ui/channellist.cpp | 166 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/channellist.h | 38 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/channellistdialog.cpp | 16 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/channellistdialog.h | 4 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/irceditaccountwidget.cpp | 116 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/irceditaccountwidget.h | 12 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/networkconfig.ui.h | 4 |
7 files changed, 178 insertions, 178 deletions
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 5c66ede0..ea085db8 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -22,34 +22,34 @@ #include <klocale.h> #include <kmessagebox.h> -#include <qvariant.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qapplication.h> -#include <qsimplerichtext.h> -#include <qstyle.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qheader.h> +#include <tqvariant.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqapplication.h> +#include <tqsimplerichtext.h> +#include <tqstyle.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqheader.h> #include <klistview.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qtimer.h> -#include <qspinbox.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqtimer.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> class ChannelListItem : public KListViewItem { public: - ChannelListItem( KListView *parent, QString arg1, QString arg2, QString arg3 ); - virtual int compare( QListViewItem *i, int col, bool ascending ) const; - virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ); + ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ); + virtual int compare( TQListViewItem *i, int col, bool ascending ) const; + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: KListView *parentList; }; -ChannelListItem::ChannelListItem( KListView *parent, QString arg1, QString arg2, QString arg3 ) : +ChannelListItem::ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : KListViewItem( parent, parent->lastItem() ), parentList( parent ) { setText(0, arg1); @@ -57,7 +57,7 @@ ChannelListItem::ChannelListItem( KListView *parent, QString arg1, QString arg2, setText(2, arg3); } -int ChannelListItem::compare( QListViewItem *i, int col, bool ascending ) const +int ChannelListItem::compare( TQListViewItem *i, int col, bool ascending ) const { if( col == 1 ) { @@ -69,58 +69,58 @@ int ChannelListItem::compare( QListViewItem *i, int col, bool ascending ) const return 1; } else - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } -void ChannelListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ) +void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ) { - QPixmap back( width, height() ); - QPainter paint( &back ); + TQPixmap back( width, height() ); + TQPainter paint( &back ); //KListViewItem::paintCell( &paint, cg, column, width, align ); // PASTED FROM KLISTVIEWITEM: // set the alternate cell background colour if necessary - QColorGroup _cg = cg; + TQColorGroup _cg = cg; if (isAlternate()) if (listView()->viewport()->backgroundMode()==Qt::FixedColor) - _cg.setColor(QColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); else - _cg.setColor(QColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); // PASTED FROM QLISTVIEWITEM { - QPainter *p = &paint; + TQPainter *p = &paint; - QListView *lv = listView(); + TQListView *lv = listView(); if ( !lv ) return; - QFontMetrics fm( p->fontMetrics() ); + TQFontMetrics fm( p->fontMetrics() ); // any text we render is done by the Components, not by this class, so make sure we've nothing to write - QString t; + TQString t; // removed text truncating code from Qt - we do that differently, further on int marg = lv->itemMargin(); int r = marg; - // const QPixmap * icon = pixmap( column ); + // const TQPixmap * icon = pixmap( column ); const BackgroundMode bgmode = lv->viewport()->backgroundMode(); - const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode ); + const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { - // all copied from QListView::paintEmptyArea + // all copied from TQListView::paintEmptyArea - //lv->paintEmptyArea( p, QRect( 0, 0, width, height() ) ); - QStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in QListView and QHeader - QStyle::SFlags how = QStyle::Style_Default; + //lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); + TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and QHeader + TQStyle::SFlags how = TQStyle::Style_Default; if ( lv->isEnabled() ) - how |= QStyle::Style_Enabled; + how |= TQStyle::Style_Enabled; - lv->style().drawComplexControl( QStyle::CC_ListView, - p, lv, QRect( 0, 0, width, height() ), lv->colorGroup(), - how, QStyle::SC_ListView, QStyle::SC_None, + lv->style().drawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), + how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -129,7 +129,7 @@ void ChannelListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, if ( isSelected() && (column == 0 || lv->allColumnsShowFocus()) ) { p->fillRect( r - marg, 0, width - r + marg, height(), - _cg.brush( QColorGroup::Highlight ) ); + _cg.brush( TQColorGroup::Highlight ) ); // removed text pen setting code from Qt } @@ -138,16 +138,16 @@ void ChannelListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, // draw the tree gubbins if ( multiLinesEnabled() && column == 0 && isOpen() && childCount() ) { int textheight = fm.size( align, t ).height() + 2 * lv->itemMargin(); - textheight = QMAX( textheight, QApplication::globalStrut().height() ); + textheight = QMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->style().drawComplexControl( QStyle::CC_ListView, p, lv, - QRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, - lv->isEnabled() ? QStyle::Style_Enabled : QStyle::Style_Default, - QStyle::SC_ListViewExpand, - (uint)QStyle::SC_All, QStyleOption( this ) ); + lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, + TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, + lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, + TQStyle::SC_ListViewExpand, + (uint)TQStyle::SC_All, TQStyleOption( this ) ); } } } @@ -156,33 +156,33 @@ void ChannelListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, //do you see a better way to tell the TextComponent we are selected ? - Olivier 2004-09-02 if ( isSelected() ) - _cg.setColor(QColorGroup::Text , _cg.highlightedText() ); + _cg.setColor(TQColorGroup::Text , _cg.highlightedText() ); - QSimpleRichText myrichtext( text(column), paint.font() ); + TQSimpleRichText myrichtext( text(column), paint.font() ); myrichtext.draw( &paint, 0, 0, paint.window(), _cg ); paint.end(); p->drawPixmap( 0, 0, back ); } -ChannelList::ChannelList( QWidget* parent, KIRC::Engine *engine ) - : QWidget( parent ), m_engine( engine ) +ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) + : TQWidget( parent ), m_engine( engine ) { - ChannelListLayout = new QVBoxLayout( this, 11, 6, "ChannelListLayout"); + ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout"); - layout72_2 = new QHBoxLayout( 0, 0, 6, "layout72_2"); + layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2"); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); layout72_2->addWidget( textLabel1_2 ); - channelSearch = new QLineEdit( this, "channelSearch" ); + channelSearch = new TQLineEdit( this, "channelSearch" ); layout72_2->addWidget( channelSearch ); - numUsers = new QSpinBox( 0, 32767, 1, this, "num_users" ); + numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" ); numUsers->setSuffix( i18n(" members") ); layout72_2->addWidget( numUsers ); - mSearchButton = new QPushButton( this, "mSearchButton" ); + mSearchButton = new TQPushButton( this, "mSearchButton" ); layout72_2->addWidget( mSearchButton ); ChannelListLayout->addLayout( layout72_2 ); @@ -198,46 +198,46 @@ ChannelList::ChannelList( QWidget* parent, KIRC::Engine *engine ) clearWState( WState_Polished ); textLabel1_2->setText( i18n( "Search for:" ) ); - QToolTip::add( textLabel1_2, i18n( "You may search for channels on the IRC server for a text string entered here." ) ); - QToolTip::add( numUsers, i18n( "Channels returned must have at least this many members." ) ); - QWhatsThis::add( numUsers, i18n( "Channels returned must have at least this many members." ) ); - QWhatsThis::add( textLabel1_2, i18n( "You may search for channels on the IRC server for a text string entered here. For instance, you may type 'linux' to find channels that have something to do with linux." ) ); - QToolTip::add( channelSearch, i18n( "You may search for channels on the IRC server for a text string entered here." ) ); - QWhatsThis::add( channelSearch, i18n( "You may search for channels on the IRC server for a text string entered here. For instance, you may type 'linux' to find channels that have something to do with linux." ) ); + TQToolTip::add( textLabel1_2, i18n( "You may search for channels on the IRC server for a text string entered here." ) ); + TQToolTip::add( numUsers, i18n( "Channels returned must have at least this many members." ) ); + TQWhatsThis::add( numUsers, i18n( "Channels returned must have at least this many members." ) ); + TQWhatsThis::add( textLabel1_2, i18n( "You may search for channels on the IRC server for a text string entered here. For instance, you may type 'linux' to find channels that have something to do with linux." ) ); + TQToolTip::add( channelSearch, i18n( "You may search for channels on the IRC server for a text string entered here." ) ); + TQWhatsThis::add( channelSearch, i18n( "You may search for channels on the IRC server for a text string entered here. For instance, you may type 'linux' to find channels that have something to do with linux." ) ); mSearchButton->setText( i18n( "S&earch" ) ); - QToolTip::add( mSearchButton, i18n( "Perform a channel search." ) ); - QWhatsThis::add( mSearchButton, i18n( "Perform a channel search. Please be patient, as this can be slow depending on the number of channels on the server." ) ); - QToolTip::add( mChannelList, i18n( "Double click on a channel to select it." ) ); + TQToolTip::add( mSearchButton, i18n( "Perform a channel search." ) ); + TQWhatsThis::add( mSearchButton, i18n( "Perform a channel search. Please be patient, as this can be slow depending on the number of channels on the server." ) ); + TQToolTip::add( mChannelList, i18n( "Double click on a channel to select it." ) ); mChannelList->header()->setLabel( 0, i18n( "Channel" ) ); mChannelList->header()->setLabel( 1, i18n( "Users" ) ); mChannelList->header()->setLabel( 2, i18n( "Topic" ) ); // signals and slots connections - connect( mChannelList, SIGNAL( doubleClicked(QListViewItem*) ), - this, SLOT( slotItemDoubleClicked(QListViewItem*) ) ); + connect( mChannelList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQT_SLOT( slotItemDoubleClicked(TQListViewItem*) ) ); - connect( mSearchButton, SIGNAL( clicked() ), this, SLOT( search() ) ); + connect( mSearchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( search() ) ); - connect( mChannelList, SIGNAL( selectionChanged( QListViewItem*) ), this, - SLOT( slotItemSelected( QListViewItem *) ) ); + connect( mChannelList, TQT_SIGNAL( selectionChanged( TQListViewItem*) ), this, + TQT_SLOT( slotItemSelected( TQListViewItem *) ) ); - connect( m_engine, SIGNAL( incomingListedChan( const QString &, uint, const QString & ) ), - this, SLOT( slotChannelListed( const QString &, uint, const QString & ) ) ); + connect( m_engine, TQT_SIGNAL( incomingListedChan( const TQString &, uint, const TQString & ) ), + this, TQT_SLOT( slotChannelListed( const TQString &, uint, const TQString & ) ) ); - connect( m_engine, SIGNAL( incomingEndOfList() ), this, SLOT( slotListEnd() ) ); + connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) ); - connect( m_engine, SIGNAL( statusChanged(KIRC::Engine::Status) ), - this, SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); + connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ), + this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); show(); } -void ChannelList::slotItemDoubleClicked( QListViewItem *i ) +void ChannelList::slotItemDoubleClicked( TQListViewItem *i ) { emit channelDoubleClicked( i->text(0) ); } -void ChannelList::slotItemSelected( QListViewItem *i ) +void ChannelList::slotItemSelected( TQListViewItem *i ) { emit channelSelected( i->text(0) ); } @@ -306,19 +306,19 @@ void ChannelList::search() } } -void ChannelList::slotChannelListed( const QString &channel, uint users, const QString &topic ) +void ChannelList::slotChannelListed( const TQString &channel, uint users, const TQString &topic ) { checkSearchResult( channel, users, topic ); - channelCache.insert( channel, QPair< uint, QString >( users, topic ) ); + channelCache.insert( channel, QPair< uint, TQString >( users, topic ) ); } -void ChannelList::checkSearchResult( const QString &channel, uint users, const QString &topic ) +void ChannelList::checkSearchResult( const TQString &channel, uint users, const TQString &topic ) { if( ( mUsers == 0 || mUsers <= users ) && ( mSearch.isEmpty() || channel.contains( mSearch, false ) || topic.contains( mSearch, false ) ) ) { - new ChannelListItem( mChannelList, channel, QString::number(users), topic ); + new ChannelListItem( mChannelList, channel, TQString::number(users), topic ); } } @@ -328,7 +328,7 @@ void ChannelList::slotSearchCache() { checkSearchResult( cacheIterator.key(), cacheIterator.data().first, cacheIterator.data().second ); ++cacheIterator; - QTimer::singleShot( 0, this, SLOT( slotSearchCache() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotSearchCache() ) ); } else { diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index c6f435a0..59b03a25 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -18,9 +18,9 @@ #ifndef CHANNELLIST_H #define CHANNELLIST_H -#include <qwidget.h> -#include <qmap.h> -#include <qpair.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqpair.h> #include "kircengine.h" @@ -40,7 +40,7 @@ class ChannelList Q_OBJECT public: - ChannelList( QWidget *parent, KIRC::Engine *engine ); + ChannelList( TQWidget *parent, KIRC::Engine *engine ); public slots: void search(); @@ -48,33 +48,33 @@ class ChannelList void clear(); signals: - void channelDoubleClicked( const QString &channel ); - void channelSelected( const QString &channel ); + void channelDoubleClicked( const TQString &channel ); + void channelSelected( const TQString &channel ); private slots: - void slotItemDoubleClicked( QListViewItem * i ); - void slotItemSelected( QListViewItem * i ); - void slotChannelListed( const QString & channel, uint users, const QString & topic ); + void slotItemDoubleClicked( TQListViewItem * i ); + void slotItemSelected( TQListViewItem * i ); + void slotChannelListed( const TQString & channel, uint users, const TQString & topic ); void slotListEnd(); void slotSearchCache(); void slotStatusChanged( KIRC::Engine::Status ); private: - void checkSearchResult( const QString & channel, uint users, const QString & topic ); + void checkSearchResult( const TQString & channel, uint users, const TQString & topic ); - QLabel* textLabel1_2; - QLineEdit* channelSearch; - QSpinBox* numUsers; - QPushButton* mSearchButton; + TQLabel* textLabel1_2; + TQLineEdit* channelSearch; + TQSpinBox* numUsers; + TQPushButton* mSearchButton; KListView* mChannelList; - QVBoxLayout* ChannelListLayout; - QHBoxLayout* layout72_2; + TQVBoxLayout* ChannelListLayout; + TQHBoxLayout* layout72_2; KIRC::Engine *m_engine; bool mSearching; - QString mSearch; + TQString mSearch; uint mUsers; - QMap< QString, QPair< uint, QString > > channelCache; - QMap< QString, QPair< uint, QString > >::const_iterator cacheIterator; + TQMap< TQString, QPair< uint, TQString > > channelCache; + TQMap< TQString, QPair< uint, TQString > >::const_iterator cacheIterator; }; #endif diff --git a/kopete/protocols/irc/ui/channellistdialog.cpp b/kopete/protocols/irc/ui/channellistdialog.cpp index 46128730..e344d227 100644 --- a/kopete/protocols/irc/ui/channellistdialog.cpp +++ b/kopete/protocols/irc/ui/channellistdialog.cpp @@ -22,23 +22,23 @@ #include "kopeteuiglobal.h" -#include "qlayout.h" +#include "tqlayout.h" -ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const QString &caption, QObject *target, const char* slotJoinChan) +ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan) : KDialogBase(Kopete::UI::Global::mainWidget(), "channel_list_widget", false, caption, Close) { m_engine = engine; m_list = new ChannelList( this, engine ); - connect( m_list, SIGNAL( channelDoubleClicked( const QString & ) ), + connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), target, slotJoinChan ); - connect( m_list, SIGNAL( channelDoubleClicked( const QString & ) ), - this, SLOT( slotChannelDoubleClicked( const QString & ) ) ); + connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), + this, TQT_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); - new QHBoxLayout( m_list, 0, spacingHint() ); + new TQHBoxLayout( m_list, 0, spacingHint() ); - setInitialSize( QSize( 500, 400 ) ); + setInitialSize( TQSize( 500, 400 ) ); setMainWidget( m_list ); show(); } @@ -53,7 +53,7 @@ void ChannelListDialog::search() m_list->search(); } -void ChannelListDialog::slotChannelDoubleClicked( const QString & ) +void ChannelListDialog::slotChannelDoubleClicked( const TQString & ) { close(); } diff --git a/kopete/protocols/irc/ui/channellistdialog.h b/kopete/protocols/irc/ui/channellistdialog.h index 2bb85f5b..9dcb0cbb 100644 --- a/kopete/protocols/irc/ui/channellistdialog.h +++ b/kopete/protocols/irc/ui/channellistdialog.h @@ -28,14 +28,14 @@ class ChannelListDialog Q_OBJECT public: - ChannelListDialog(KIRC::Engine *engine, const QString &caption, QObject *target, const char* slotJoinChan); + ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan); void clear(); void search(); private slots: - void slotChannelDoubleClicked( const QString & ); + void slotChannelDoubleClicked( const TQString & ); private: KIRC::Engine *m_engine; diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 4a1e6ed3..06e2f166 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -36,17 +36,17 @@ #include <kglobal.h> #include <kcharsets.h> -#include <qlabel.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qconnection.h> -#include <qvalidator.h> -#include <qcombobox.h> -#include <qlistbox.h> -#include <qlineedit.h> - -IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, QWidget *parent, const char * ) +#include <tqlabel.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqconnection.h> +#include <tqvalidator.h> +#include <tqcombobox.h> +#include <tqlistbox.h> +#include <tqlineedit.h> + +IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, TQWidget *parent, const char * ) : IRCEditAccountBase(parent), KopeteEditAccountWidget(ident) { mProtocol = proto; @@ -56,8 +56,8 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident if( account() ) { - QString nickName = account()->mySelf()->nickName(); - QString serverInfo = account()->accountId(); + TQString nickName = account()->mySelf()->nickName(); + TQString serverInfo = account()->accountId(); mNickName->setText( nickName ); mAltNickname->setText( account()->altNick() ); @@ -82,23 +82,23 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident informationReplies->setCurrentItem( config->readNumEntry( "InformationReplies", IRCAccount::ActiveWindow ) - 1 ); errorMessages->setCurrentItem( config->readNumEntry( "ErrorMessages", IRCAccount::ActiveWindow ) - 1 ); - QStringList cmds = account()->connectCommands(); - for( QStringList::Iterator i = cmds.begin(); i != cmds.end(); ++i ) - new QListViewItem( commandList, *i ); + TQStringList cmds = account()->connectCommands(); + for( TQStringList::Iterator i = cmds.begin(); i != cmds.end(); ++i ) + new TQListViewItem( commandList, *i ); - const QMap< QString, QString > replies = account()->customCtcpReplies(); - for( QMap< QString, QString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) - new QListViewItem( ctcpList, it.key(), it.data() ); + const TQMap< TQString, TQString > replies = account()->customCtcpReplies(); + for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) + new TQListViewItem( ctcpList, it.key(), it.data() ); } - mUserName->setValidator( new QRegExpValidator( QString::fromLatin1("^[^\\s]*$"), mUserName ) ); - mNickName->setValidator( new QRegExpValidator( QString::fromLatin1("^[^#+&][^\\s]*$"), mNickName ) ); - mAltNickname->setValidator( new QRegExpValidator( QString::fromLatin1("^[^#+&][^\\s]*$"), mAltNickname ) ); + mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), mUserName ) ); + mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mNickName ) ); + mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mAltNickname ) ); charset->insertStringList( KCodecAction::supportedEncodings() ); for (int i = 0; i < charset->count(); ++i) { - QString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); + TQString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { charset->setCurrentItem( i ); @@ -106,23 +106,23 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident } } - connect( commandList, SIGNAL( contextMenu( KListView *, QListViewItem *, const QPoint & ) ), - this, SLOT( slotCommandContextMenu( KListView *, QListViewItem *, const QPoint & ) ) ); + connect( commandList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), + this, TQT_SLOT( slotCommandContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( ctcpList, SIGNAL( contextMenu( KListView *, QListViewItem *, const QPoint & ) ), - this, SLOT( slotCtcpContextMenu( KListView *, QListViewItem *, const QPoint & ) ) ); + connect( ctcpList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), + this, TQT_SLOT( slotCtcpContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( addButton, SIGNAL( clicked() ), this, SLOT( slotAddCommand() ) ); - connect( editButton, SIGNAL( clicked() ), this, SLOT(slotEditNetworks() ) ); - connect( addReply, SIGNAL( clicked() ), this, SLOT( slotAddCtcp() ) ); + connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) ); + connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) ); + connect( addReply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCtcp() ) ); - connect( network, SIGNAL( activated( const QString & ) ), - this, SLOT( slotUpdateNetworkDescription( const QString &) ) ); + connect( network, TQT_SIGNAL( activated( const TQString & ) ), + this, TQT_SLOT( slotUpdateNetworkDescription( const TQString &) ) ); - connect( IRCProtocol::protocol(), SIGNAL( networkConfigUpdated( const QString & ) ), - this, SLOT( slotUpdateNetworks( const QString & ) ) ); + connect( IRCProtocol::protocol(), TQT_SIGNAL( networkConfigUpdated( const TQString & ) ), + this, TQT_SLOT( slotUpdateNetworks( const TQString & ) ) ); - slotUpdateNetworks( QString::null ); + slotUpdateNetworks( TQString::null ); } IRCEditAccountWidget::~IRCEditAccountWidget() @@ -134,19 +134,19 @@ IRCAccount *IRCEditAccountWidget::account () return dynamic_cast<IRCAccount *>(KopeteEditAccountWidget::account () ); } -void IRCEditAccountWidget::slotUpdateNetworks( const QString & selectedNetwork ) +void IRCEditAccountWidget::slotUpdateNetworks( const TQString & selectedNetwork ) { network->clear(); uint i = 0; - QStringList keys; - for( QDictIterator<IRCNetwork> it( IRCProtocol::protocol()->networks() ); it.current(); ++it ) + TQStringList keys; + for( TQDictIterator<IRCNetwork> it( IRCProtocol::protocol()->networks() ); it.current(); ++it ) keys.append( it.currentKey() ); keys.sort(); - QStringList::Iterator end = keys.end(); - for( QStringList::Iterator it = keys.begin(); it != end; ++it ) + TQStringList::Iterator end = keys.end(); + for( TQStringList::Iterator it = keys.begin(); it != end; ++it ) { IRCNetwork * current = IRCProtocol::protocol()->networks()[*it]; network->insertItem( current->name ); @@ -164,24 +164,24 @@ void IRCEditAccountWidget::slotEditNetworks() IRCProtocol::protocol()->editNetworks( network->currentText() ); } -void IRCEditAccountWidget::slotUpdateNetworkDescription( const QString &network ) +void IRCEditAccountWidget::slotUpdateNetworkDescription( const TQString &network ) { description->setText( IRCProtocol::protocol()->networks()[ network ]->description ); } -void IRCEditAccountWidget::slotCommandContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void IRCEditAccountWidget::slotCommandContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { - QPopupMenu popup; + TQPopupMenu popup; popup.insertItem( i18n("Remove Command"), 1 ); if( popup.exec( p ) == 1 ) delete item; } -void IRCEditAccountWidget::slotCtcpContextMenu( KListView *, QListViewItem *item, const QPoint &p ) +void IRCEditAccountWidget::slotCtcpContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) { - QPopupMenu popup; + TQPopupMenu popup; popup.insertItem( i18n("Remove CTCP Reply"), 1 ); if( popup.exec( p ) == 1 ) delete item; @@ -191,7 +191,7 @@ void IRCEditAccountWidget::slotAddCommand() { if ( !commandEdit->text().isEmpty() ) { - new QListViewItem( commandList, commandEdit->text() ); + new TQListViewItem( commandList, commandEdit->text() ); commandEdit->clear(); } } @@ -200,21 +200,21 @@ void IRCEditAccountWidget::slotAddCtcp() { if ( !newCTCP->text().isEmpty() && !newReply->text().isEmpty() ) { - new QListViewItem( ctcpList, newCTCP->text(), newReply->text() ); + new TQListViewItem( ctcpList, newCTCP->text(), newReply->text() ); newCTCP->clear(); newReply->clear(); } } -QString IRCEditAccountWidget::generateAccountId( const QString &network ) +TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { KConfig *config = KGlobal::config(); - QString nextId = network; + TQString nextId = network; uint accountNumber = 1; - while( config->hasGroup( QString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) ) + while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) ) { - nextId = QString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber ); + nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber ); } kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl; return nextId; @@ -222,12 +222,12 @@ QString IRCEditAccountWidget::generateAccountId( const QString &network ) Kopete::Account *IRCEditAccountWidget::apply() { - QString nickName = mNickName->text(); - QString networkName = network->currentText(); + TQString nickName = mNickName->text(); + TQString networkName = network->currentText(); if( !account() ) { - setAccount( new IRCAccount( mProtocol, generateAccountId(networkName), QString::null, networkName, nickName ) ); + setAccount( new IRCAccount( mProtocol, generateAccountId(networkName), TQString::null, networkName, nickName ) ); } else @@ -251,12 +251,12 @@ Kopete::Account *IRCEditAccountWidget::apply() account()->configGroup()->writeEntry("PreferSSL", preferSSL->isChecked()); - QStringList cmds; - for( QListViewItem *i = commandList->firstChild(); i; i = i->nextSibling() ) + TQStringList cmds; + for( TQListViewItem *i = commandList->firstChild(); i; i = i->nextSibling() ) cmds.append( i->text(0) ); - QMap< QString, QString > replies; - for( QListViewItem *i = ctcpList->firstChild(); i; i = i->nextSibling() ) + TQMap< TQString, TQString > replies; + for( TQListViewItem *i = ctcpList->firstChild(); i; i = i->nextSibling() ) replies[ i->text(0) ] = i->text(1); account()->setCustomCtcpReplies( replies ); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.h b/kopete/protocols/irc/ui/irceditaccountwidget.h index 365acaf3..348e5cc3 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.h +++ b/kopete/protocols/irc/ui/irceditaccountwidget.h @@ -31,7 +31,7 @@ class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccount Q_OBJECT public: - IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, QWidget *parent=0, const char *name=0); + IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *parent=0, const char *name=0); ~IRCEditAccountWidget(); IRCAccount *account(); @@ -39,17 +39,17 @@ class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccount virtual Kopete::Account *apply(); private slots: - void slotCommandContextMenu( KListView*, QListViewItem*, const QPoint & ); - void slotCtcpContextMenu( KListView*, QListViewItem*, const QPoint & ); + void slotCommandContextMenu( KListView*, TQListViewItem*, const TQPoint & ); + void slotCtcpContextMenu( KListView*, TQListViewItem*, const TQPoint & ); void slotAddCommand(); void slotAddCtcp(); void slotEditNetworks(); - void slotUpdateNetworks( const QString & ); - void slotUpdateNetworkDescription( const QString & ); + void slotUpdateNetworks( const TQString & ); + void slotUpdateNetworkDescription( const TQString & ); private: void readNetworks(); - QString generateAccountId( const QString &network ); + TQString generateAccountId( const TQString &network ); IRCProtocol *mProtocol; }; diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networkconfig.ui.h index 7716e75f..30f9654e 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui.h +++ b/kopete/protocols/irc/ui/networkconfig.ui.h @@ -15,12 +15,12 @@ void NetworkConfig::accept() { emit accepted(); - QDialog::accept(); + TQDialog::accept(); } void NetworkConfig::reject() { emit rejected(); - QDialog::reject(); + TQDialog::reject(); } |