summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/ui
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/irc/ui')
-rw-r--r--kopete/protocols/irc/ui/channellist.cpp30
-rw-r--r--kopete/protocols/irc/ui/channellist.h4
-rw-r--r--kopete/protocols/irc/ui/channellistdialog.cpp2
-rw-r--r--kopete/protocols/irc/ui/ircadd.ui6
-rw-r--r--kopete/protocols/irc/ui/irceditaccount.ui34
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp10
-rw-r--r--kopete/protocols/irc/ui/networkconfig.ui6
7 files changed, 46 insertions, 46 deletions
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 6426224a..ea2c5d19 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -32,7 +32,7 @@
#include <tqpushbutton.h>
#include <tqheader.h>
#include <klistview.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqspinbox.h>
@@ -106,7 +106,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
- if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), _cg.brush( crole ) );
else
{
@@ -118,8 +118,8 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
if ( lv->isEnabled() )
how |= TQStyle::Style_Enabled;
- lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
- p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(),
+ lv->tqstyle().drawComplexControl( TQStyle::CC_ListView,
+ p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(),
how, TQStyle::SC_ListView, TQStyle::SC_None,
opt );
}
@@ -143,7 +143,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
textheight++;
if ( textheight < height() ) {
int w = lv->treeStepSize() / 2;
- lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv,
+ lv->tqstyle().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,
@@ -170,21 +170,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
{
ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout");
- tqlayout72_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout72_2");
+ layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2");
textLabel1_2 = new TQLabel( this, "textLabel1_2" );
- tqlayout72_2->addWidget( textLabel1_2 );
+ layout72_2->addWidget( textLabel1_2 );
channelSearch = new TQLineEdit( this, "channelSearch" );
- tqlayout72_2->addWidget( channelSearch );
+ layout72_2->addWidget( channelSearch );
numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" );
numUsers->setSuffix( i18n(" members") );
- tqlayout72_2->addWidget( numUsers );
+ layout72_2->addWidget( numUsers );
mSearchButton = new TQPushButton( this, "mSearchButton" );
- tqlayout72_2->addWidget( mSearchButton );
- ChannelListLayout->addLayout( tqlayout72_2 );
+ layout72_2->addWidget( mSearchButton );
+ ChannelListLayout->addLayout( layout72_2 );
mChannelList = new KListView( this, "mChannelList" );
mChannelList->addColumn( i18n( "Channel" ) );
@@ -226,8 +226,8 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) );
- connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::tqStatus) ),
- this, TQT_SLOT( slotStatusChanged(KIRC::Engine::tqStatus) ) );
+ connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ),
+ this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) );
show();
}
@@ -242,9 +242,9 @@ void ChannelList::slotItemSelected( TQListViewItem *i )
emit channelSelected( i->text(0) );
}
-void ChannelList::slotStatusChanged(KIRC::Engine::tqStatus newtqStatus)
+void ChannelList::slotStatusChanged(KIRC::Engine::Status newStatus)
{
- switch(newtqStatus) {
+ switch(newStatus) {
case KIRC::Engine::Connected:
this->reset();
break;
diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h
index a5963b6b..1a528bb9 100644
--- a/kopete/protocols/irc/ui/channellist.h
+++ b/kopete/protocols/irc/ui/channellist.h
@@ -58,7 +58,7 @@ class ChannelList
void slotChannelListed( const TQString & channel, uint users, const TQString & topic );
void slotListEnd();
void slotSearchCache();
- void slotStatusChanged( KIRC::Engine::tqStatus );
+ void slotStatusChanged( KIRC::Engine::Status );
private:
void checkSearchResult( const TQString & channel, uint users, const TQString & topic );
@@ -69,7 +69,7 @@ class ChannelList
TQPushButton* mSearchButton;
KListView* mChannelList;
TQVBoxLayout* ChannelListLayout;
- TQHBoxLayout* tqlayout72_2;
+ TQHBoxLayout* layout72_2;
KIRC::Engine *m_engine;
bool mSearching;
TQString mSearch;
diff --git a/kopete/protocols/irc/ui/channellistdialog.cpp b/kopete/protocols/irc/ui/channellistdialog.cpp
index e344d227..f68f3d10 100644
--- a/kopete/protocols/irc/ui/channellistdialog.cpp
+++ b/kopete/protocols/irc/ui/channellistdialog.cpp
@@ -22,7 +22,7 @@
#include "kopeteuiglobal.h"
-#include "tqlayout.h"
+#include "layout.h"
ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan)
: KDialogBase(Kopete::UI::Global::mainWidget(), "channel_list_widget", false, caption, Close)
diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui
index c899eca8..a85681cd 100644
--- a/kopete/protocols/irc/ui/ircadd.ui
+++ b/kopete/protocols/irc/ui/ircadd.ui
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<hbox>
<property name="name">
@@ -88,7 +88,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe_bob or #somechannel)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index e2e33f69..c184b92e 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -82,7 +82,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -91,7 +91,7 @@
<property name="text">
<string>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Most IRC servers do not require a password, and only a nickname is required to connect&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -261,7 +261,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<grid>
<property name="name">
@@ -269,7 +269,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -293,7 +293,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>20</height>
@@ -304,7 +304,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>392</width>
<height>20</height>
@@ -395,7 +395,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -427,7 +427,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -505,7 +505,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -554,7 +554,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<grid>
<property name="name">
@@ -646,7 +646,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@@ -744,7 +744,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>130</height>
@@ -809,7 +809,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout153</cstring>
+ <cstring>layout153</cstring>
</property>
<hbox>
<property name="name">
@@ -871,7 +871,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>130</height>
@@ -886,7 +886,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 8a7cdcfb..c0d5a87a 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
new TQListViewItem( ctcpList, it.key(), it.data() );
}
- mUserName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
- mNickName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
- mAltNickname->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
+ mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
+ mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
+ mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
charset->insertStringList( KCodecAction::supportedEncodings() );
@@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network )
TQString nextId = network;
uint accountNumber = 1;
- while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) )
+ while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) )
{
- nextId = TQString::tqfromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber );
+ nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber );
}
kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl;
return nextId;
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui
index 0f15dee5..09121e54 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networkconfig.ui
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>151</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>20</height>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 05:00:26 +0000