diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /ksirc | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip | |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksirc')
177 files changed, 1672 insertions, 1603 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index a94c5d6d..df1e9509 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: FilterRuleEditor.cpp Last generated: Mon Dec 15 18:14:27 1997 @@ -23,10 +23,10 @@ FilterRuleEditor::FilterRuleEditor ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) - : KDialogBase( parent, name, true, i18n( "Edit Filter Rules" ), + : KDialogBase( tqparent, name, true, i18n( "Edit Filter Rules" ), Close, Close, true ) { filter = new FilterRuleWidget( this, name ); @@ -64,10 +64,10 @@ FilterRuleEditor::~FilterRuleEditor() void FilterRuleEditor::newRule() { - filter->LineTitle->setText( TQString::null ); - filter->LineSearch->setText( TQString::null ); - filter->LineFrom->setText( TQString::null ); - filter->LineTo->setText( TQString::null ); + filter->LineTitle->setText( TQString() ); + filter->LineSearch->setText( TQString() ); + filter->LineFrom->setText( TQString() ); + filter->LineTo->setText( TQString() ); filter->LineTitle->setFocus(); filter->InsertButton->setEnabled( true ); @@ -132,7 +132,7 @@ void FilterRuleEditor::updateListBox(int citem ) } if(filter->RuleList->count() > 0) filter->RuleList->setCurrentItem(citem); - filter->RuleList->repaint(); + filter->RuleList->tqrepaint(); filter->DeleteButton->setEnabled( filter->RuleList->currentItem() > -1 ); filter->ModifyButton->setEnabled( filter->RuleList->currentItem() > -1 ); @@ -228,13 +228,13 @@ void FilterRuleEditor::lowerRule() TQString FilterRuleEditor::convertSpecial(TQString str) { - str.replace(TQRegExp("\\$"), "$$"); + str.tqreplace(TQRegExp("\\$"), "$$"); return str; } TQString FilterRuleEditor::convertSpecialBack(TQString str) { - str.replace(TQRegExp("\\$\\$"), "$"); + str.tqreplace(TQRegExp("\\$\\$"), "$"); return str; } diff --git a/ksirc/FilterRuleEditor.dlg b/ksirc/FilterRuleEditor.dlg index 5461d839..bbfa72e2 100644 --- a/ksirc/FilterRuleEditor.dlg +++ b/ksirc/FilterRuleEditor.dlg @@ -24,7 +24,7 @@ Label { Margin {-1} Rect {140 10 80 30} Name {Label_1} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -36,7 +36,7 @@ LineEdit { Rect {220 10 280 30} Name {LineEdit_1} Variable {LineTitle} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -46,7 +46,7 @@ Label { Margin {-1} Rect {140 50 70 30} Name {Label_4} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -58,7 +58,7 @@ LineEdit { Rect {220 50 280 30} Name {LineEdit_2} Variable {LineSearch} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ Label { Margin {-1} Rect {140 90 80 30} Name {Label_7} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -78,7 +78,7 @@ Label { Margin {-1} Rect {140 130 70 30} Name {Label_9} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -90,7 +90,7 @@ LineEdit { Rect {220 90 280 30} Name {LineEdit_3} Variable {LineFrom} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -102,7 +102,7 @@ LineEdit { Rect {220 130 280 30} Name {LineEdit_4} Variable {LineTo} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -117,7 +117,7 @@ PushButton { Name {PushButton_1} Variable {ApplyButton} Signal {[Protected] clicked --> OkPressed ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -131,7 +131,7 @@ PushButton { Rect {390 210 110 30} Name {PushButton_2} Signal {[Protected] clicked --> closePressed ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -145,7 +145,7 @@ PushButton { Rect {270 170 110 30} Name {PushButton_7} Signal {[Protected] clicked --> newRule ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -160,7 +160,7 @@ PushButton { Name {PushButton_8} Variable {deleteButton} Signal {[Protected] clicked --> deleteRule ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -174,7 +174,7 @@ PushButton { Rect {10 210 55 30} Name {PushButton_9} Signal {[Protected] clicked --> raiseRule ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -188,7 +188,7 @@ PushButton { Rect {75 210 55 30} Name {PushButton_10} Signal {[Protected] clicked --> lowerRule ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -208,7 +208,7 @@ ListBox { Variable {RuleList} Signal {[Protected] highlighted --> newHighlight (int)} Signal {[Protected] selected --> newHighlight (int)} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/FilterRuleEditor.h b/ksirc/FilterRuleEditor.h index b8bf1a0e..1c3655b6 100644 --- a/ksirc/FilterRuleEditor.h +++ b/ksirc/FilterRuleEditor.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: FilterRuleEditor.h Last generated: Mon Dec 15 18:14:27 1997 @@ -19,12 +19,13 @@ class FilterRuleEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: FilterRuleEditor ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/FilterRuleWidget.ui b/ksirc/FilterRuleWidget.ui index 2ac7f6d4..ab845cdd 100644 --- a/ksirc/FilterRuleWidget.ui +++ b/ksirc/FilterRuleWidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>FilterRuleWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FilterRuleWidget</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>InsertButton</cstring> </property> @@ -44,7 +44,7 @@ <string>&Insert</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>DeleteButton</cstring> </property> @@ -52,7 +52,7 @@ <string>&Delete</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>NewButton</cstring> </property> @@ -60,7 +60,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>ModifyButton</cstring> </property> @@ -70,7 +70,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -84,7 +84,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>DownButton</cstring> </property> @@ -100,7 +100,7 @@ <string></string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>UpButton</cstring> </property> @@ -116,7 +116,7 @@ <string></string> </property> </widget> - <widget class="QListBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>RuleList</cstring> </property> @@ -142,7 +142,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -167,12 +167,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>LineTitle</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -183,7 +183,7 @@ <cstring>LineTitle</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -194,22 +194,22 @@ <cstring>LineTo</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>LineTo</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>LineSearch</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>LineFrom</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -220,7 +220,7 @@ <cstring>LineSearch</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -235,5 +235,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSOpenkSirc/enter_combo.h b/ksirc/KSOpenkSirc/enter_combo.h index 7af88d8f..bca46165 100644 --- a/ksirc/KSOpenkSirc/enter_combo.h +++ b/ksirc/KSOpenkSirc/enter_combo.h @@ -10,13 +10,14 @@ class EnterCombo : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - EnterCombo ( TQWidget * parent=0, const char * name=0 ) - : TQComboBox(TRUE, parent, name) + EnterCombo ( TQWidget * tqparent=0, const char * name=0 ) + : TQComboBox(TRUE, tqparent, name) { } - EnterCombo ( bool rw, TQWidget * parent=0, const char * name=0 ) - : TQComboBox(rw, parent, name) + EnterCombo ( bool rw, TQWidget * tqparent=0, const char * name=0 ) + : TQComboBox(rw, tqparent, name) { TQKeyEvent ke(TQEvent::KeyPress, SHIFT|Key_Home, 0, 0); keyPressEvent(&ke); diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index d3ff7488..f005394b 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: open_ksirc.cpp Last generated: Wed Jul 29 16:41:26 1998 @@ -35,11 +35,11 @@ TQPtrList<Server> Groups; open_ksirc::open_ksirc ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name, true ) + Inherited( tqparent, name, true ) { setCaption( i18n("Connect to Server") ); @@ -137,7 +137,7 @@ void open_ksirc::insertGroupList() Server *serv; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if (tempgroups.find(serv->group()) == -1) + if (tempgroups.tqfind(serv->group()) == -1) tempgroups.inSort( serv->group() ); } @@ -233,7 +233,7 @@ TQString open_ksirc::encryptPassword( const TQString &password ) memcpy(result.data(), kapp->randomString(utf8Length).latin1(), utf8Length); for (unsigned int i = 0; i < utf8Length; ++i) result[i + utf8Length] = utf8[i] ^ result[i]; - return TQString::fromLatin1(KCodecs::base64Encode(result)); + return TQString::tqfromLatin1(KCodecs::base64Encode(result)); } TQString open_ksirc::decryptPassword( const TQString &scrambled ) @@ -307,8 +307,8 @@ void open_ksirc::clickConnect() conf->setGroup("ServerList"); conf->writeEntry("StorePasswords", CheckB_StorePassword->isChecked()); TQStringList recent = conf->readListEntry("RecentServers"); - if(recent.contains(server)){ - TQStringList::Iterator it = recent.find(server); + if(recent.tqcontains(server)){ + TQStringList::Iterator it = recent.tqfind(server); recent.remove(it); } diff --git a/ksirc/KSOpenkSirc/open_ksirc.h b/ksirc/KSOpenkSirc/open_ksirc.h index 29fb4f60..238d6b84 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.h +++ b/ksirc/KSOpenkSirc/open_ksirc.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: open_ksirc.h Last generated: Wed Jul 29 16:41:26 1998 @@ -19,12 +19,13 @@ class KSircServer; class open_ksirc : public open_ksircData { Q_OBJECT + TQ_OBJECT public: open_ksirc ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index ae97f341..df4ae7c6 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>open_ksircData</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Form1</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -33,7 +33,7 @@ <cstring>ComboB_ServerName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -44,7 +44,7 @@ <cstring>ComboB_ServerPort</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ComboB_ServerGroup</cstring> </property> @@ -55,7 +55,7 @@ <string>Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, you can select the closest server for your favorite network.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -88,7 +88,7 @@ <string>If you selected an IRC Network in <i>"Group"</i>, this window shows all of its servers. If you did not choose a group, you can enter your own here or select one of the recently used ones (<i>"Quick Connect"</i>).</string> </property> </widget> - <widget class="QComboBox" row="1" column="4"> + <widget class="TQComboBox" row="1" column="4"> <property name="name"> <cstring>ComboB_ServerPort</cstring> </property> @@ -102,7 +102,7 @@ <string>Using <i>"6667"</i> or <i>"6666"</i> here is safe in most cases. Only use other values if you have been told so.</string> </property> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -122,7 +122,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>Label_ServerDesc</cstring> </property> @@ -134,7 +134,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -144,7 +144,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="3" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -169,7 +169,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -180,7 +180,7 @@ <cstring>LineE_Password</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>LineE_Password</cstring> </property> @@ -196,7 +196,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>CheckB_UseSSL</cstring> </property> @@ -207,7 +207,7 @@ <string>This will use a secure connection to the server. This must be supported by the server.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>CheckB_StorePassword</cstring> </property> @@ -220,7 +220,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="3" column="4"> + <widget class="TQPushButton" row="3" column="4"> <property name="name"> <cstring>PB_Cancel</cstring> </property> @@ -234,7 +234,7 @@ <string>Cancel Connect</string> </property> </widget> - <widget class="QPushButton" row="3" column="3"> + <widget class="TQPushButton" row="3" column="3"> <property name="name"> <cstring>PB_Connect</cstring> </property> @@ -259,7 +259,7 @@ <string>Connect to the server given in <i>"Server / Quick Connect to:"</i> on the port given in <i>"Port:"</i>.</string> </property> </widget> - <widget class="QPushButton" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>PB_Edit</cstring> </property> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -330,8 +330,8 @@ <tabstop>PB_Connect</tabstop> <tabstop>PB_Cancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">passwordChanged(const QString &)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSOpenkSirc/serverDataType.h b/ksirc/KSOpenkSirc/serverDataType.h index 157be09e..417625e8 100644 --- a/ksirc/KSOpenkSirc/serverDataType.h +++ b/ksirc/KSOpenkSirc/serverDataType.h @@ -26,7 +26,7 @@ public: TQPtrList<port> ports, const TQString &serverdesc, const TQString &script, - const TQString &password = TQString::null, + const TQString &password = TQString(), bool dossl = false ) { g=group; s=server; p=ports; sd=serverdesc; sc=script; diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp index 40ccc56f..6deb550c 100644 --- a/ksirc/KSPrefs/ksprefs.cpp +++ b/ksirc/KSPrefs/ksprefs.cpp @@ -26,10 +26,10 @@ #include "page_looknfeel.h" #include "page_shortcuts.h" -KSPrefs::KSPrefs(TQWidget * parent, const char * name): +KSPrefs::KSPrefs(TQWidget * tqparent, const char * name): KDialogBase(KDialogBase::IconList, i18n("Configure KSirc"), KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default, - KDialogBase::Ok, parent, name) + KDialogBase::Ok, tqparent, name) { setWFlags( getWFlags() | WDestructiveClose ); TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) ); diff --git a/ksirc/KSPrefs/ksprefs.h b/ksirc/KSPrefs/ksprefs.h index 1e5beaf0..51ae6562 100644 --- a/ksirc/KSPrefs/ksprefs.h +++ b/ksirc/KSPrefs/ksprefs.h @@ -29,8 +29,9 @@ class KSPrefs : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KSPrefs(TQWidget * parent = 0, const char * name = 0); + KSPrefs(TQWidget * tqparent = 0, const char * name = 0); ~KSPrefs(); public slots: diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index c9ab585d..9a6e61ab 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -26,7 +26,7 @@ #define PASS 2 #define SSL 3 -PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAutoConnectBase( parent, name) +PageAutoConnect::PageAutoConnect( TQWidget *tqparent, const char *name ) : PageAutoConnectBase( tqparent, name) { KLVAutoConnect->setSorting( 0 ); //KLVAutoConnect->header()->hide(); @@ -59,7 +59,7 @@ void PageAutoConnect::saveConfig() if(it->text(SSL).length() > 0) server += " (SSL)"; if(it->text(PASS).length() > 0) - server += TQString(" (pass: %1)").arg(it->text(PASS)); + server += TQString(" (pass: %1)").tqarg(it->text(PASS)); servers << server; @@ -73,7 +73,7 @@ void PageAutoConnect::saveConfig() channel = ch->text(NAME); if(ch->text(PK).length() > 0) - channel += TQString(" (key: %1)").arg(ch->text(PK)); + channel += TQString(" (key: %1)").tqarg(ch->text(PK)); channels << channel; @@ -101,8 +101,8 @@ void PageAutoConnect::readConfig() TQStringList channels = conf->readListEntry(*ser); TQString server = *ser; TQString port = "6667"; - TQString ssl = TQString::null; - TQString pass = TQString::null; + TQString ssl = TQString(); + TQString pass = TQString(); TQRegExp rx("(.+) \\(SSL\\)(.*)"); if(rx.search(server) >= 0){ @@ -127,7 +127,7 @@ void PageAutoConnect::readConfig() TQStringList::ConstIterator chan = channels.begin(); for(; chan != channels.end(); chan++){ TQString channel = *chan; - TQString key = TQString::null; + TQString key = TQString(); TQRegExp crx("(.+) \\(key: (\\S+)\\)"); if(crx.search(channel) >= 0){ channel = crx.cap(1); @@ -157,7 +157,7 @@ void PageAutoConnect::add_pressed() s = KLVAutoConnect->selectedItem(); if(!s){ /* new item */ TQString server = ServerLE->text(); - TQString ssl = TQString::null; + TQString ssl = TQString(); TQString port; port.setNum(PortKI->value()); @@ -170,25 +170,25 @@ void PageAutoConnect::add_pressed() KLVAutoConnect->setCurrentItem(s); } else { /* update the existing one */ - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *child; - if(s->parent()){ - parent = s->parent(); + if(s->tqparent()){ + tqparent = s->tqparent(); child = s; } else { - parent = s; + tqparent = s; child = 0x0; } - parent->setText(NAME, ServerLE->text()); - parent->setText(PK, TQString("%1").arg(PortKI->value())); - parent->setText(PASS, PassLE->text()); + tqparent->setText(NAME, ServerLE->text()); + tqparent->setText(PK, TQString("%1").tqarg(PortKI->value())); + tqparent->setText(PASS, PassLE->text()); if(sslCB->isChecked()) - parent->setText(SSL, i18n("SSL")); + tqparent->setText(SSL, i18n("SSL")); else - parent->setText(SSL, TQString::null); + tqparent->setText(SSL, TQString()); if(child){ child->setText(NAME, ChannelLE->text()); @@ -197,7 +197,7 @@ void PageAutoConnect::add_pressed() else { if(ChannelLE->text().length() > 0){ fnd = 0; - TQListViewItem *c = parent->firstChild(); + TQListViewItem *c = tqparent->firstChild(); for( ; c != 0 && fnd == 0; c = c->nextSibling()){ if(c->text(NAME) == ChannelLE->text()){ c->setText(PK, KeyLE->text()); @@ -205,7 +205,7 @@ void PageAutoConnect::add_pressed() } } if(fnd == 0){ - new TQListViewItem(parent, ChannelLE->text(), KeyLE->text()); + new TQListViewItem(tqparent, ChannelLE->text(), KeyLE->text()); } } } @@ -260,16 +260,16 @@ void PageAutoConnect::delete_pressed() void PageAutoConnect::kvl_clicked(TQListViewItem *it) { if(it != 0){ - if(it->parent() != 0){ + if(it->tqparent() != 0){ ChannelLE->setText(it->text(NAME)); KeyLE->setText(it->text(PK)); AddPB->setText(i18n("&Update")); /* - * Move it to the parent to setup parent/server + * Move it to the tqparent to setup tqparent/server * values. This save writing this code * in two places. */ - it = it->parent(); + it = it->tqparent(); } else { AddPB->setText(i18n("&Update/Add")); @@ -277,7 +277,7 @@ void PageAutoConnect::kvl_clicked(TQListViewItem *it) KeyLE->clear(); } - if(it->parent() == 0){ + if(it->tqparent() == 0){ ServerLE->setText(it->text(NAME)); PortKI->setValue(it->text(PK).toInt()); PassLE->setText(it->text(PASS)); diff --git a/ksirc/KSPrefs/page_autoconnect.h b/ksirc/KSPrefs/page_autoconnect.h index 04b5b821..cce0f810 100644 --- a/ksirc/KSPrefs/page_autoconnect.h +++ b/ksirc/KSPrefs/page_autoconnect.h @@ -7,9 +7,10 @@ class PageAutoConnect : public PageAutoConnectBase { Q_OBJECT + TQ_OBJECT public: - PageAutoConnect( TQWidget* parent = 0, const char* name = 0); + PageAutoConnect( TQWidget* tqparent = 0, const char* name = 0); ~PageAutoConnect(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 71aafb49..815598ba 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PageAutoConnectBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageAutoConnectBase</cstring> </property> @@ -77,7 +77,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox12</cstring> </property> @@ -88,23 +88,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelSever</cstring> </property> @@ -112,22 +112,22 @@ <string>Server:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>ServerLE</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelPort</cstring> </property> @@ -145,15 +145,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelPass</cstring> </property> @@ -161,22 +161,22 @@ <string>Server password:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>PassLE</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelSSL</cstring> </property> @@ -187,7 +187,7 @@ <cstring>PortKI</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>sslCB</cstring> </property> @@ -199,23 +199,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelChan</cstring> </property> @@ -226,22 +226,22 @@ <cstring>ChannelLE</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>ChannelLE</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelKey</cstring> </property> @@ -252,7 +252,7 @@ <cstring>KeyLE</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>KeyLE</cstring> </property> @@ -261,15 +261,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>NewPB</cstring> </property> @@ -277,7 +277,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>AddPB</cstring> </property> @@ -285,7 +285,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>DeletePB</cstring> </property> @@ -356,9 +356,9 @@ </connection> <connection> <sender>KLVAutoConnect</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>PageAutoConnectBase</receiver> - <slot>kvl_clicked(QListViewItem*)</slot> + <slot>kvl_clicked(TQListViewItem*)</slot> </connection> </connections> <tabstops> @@ -373,16 +373,16 @@ <tabstop>AddPB</tabstop> <tabstop>DeletePB</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>item_changed()</slot> <slot>new_pressed()</slot> <slot>add_pressed()</slot> <slot>delete_pressed()</slot> - <slot>KLVAutoConnect_clicked(QListViewItem*)</slot> - <slot>kcl_clicked(QListViewItem *)</slot> - <slot>kvl_clicked(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>KLVAutoConnect_clicked(TQListViewItem*)</slot> + <slot>kcl_clicked(TQListViewItem *)</slot> + <slot>kvl_clicked(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>knuminput.h</includehint> diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp index e7b36af4..a31acb64 100644 --- a/ksirc/KSPrefs/page_colors.cpp +++ b/ksirc/KSPrefs/page_colors.cpp @@ -19,7 +19,7 @@ #include <kcolorbutton.h> #include <kdebug.h> -PageColors::PageColors( TQWidget *parent, const char *name ) : PageColorsBase( parent, name) +PageColors::PageColors( TQWidget *tqparent, const char *name ) : PageColorsBase( tqparent, name) { changing = 0; m_dcol.setAutoDelete(true); @@ -162,13 +162,13 @@ void PageColors::readConfig( const KSOColors *opts ) conf->setGroup("ColourSchemes"); themeLB->clear(); TQStringList names = conf->readListEntry("Names"); - if(names.contains("Custom")){ - names.remove(names.find("Custom")); + if(names.tqcontains("Custom")){ + names.remove(names.tqfind("Custom")); } names.prepend("Custom"); themeLB->insertStringList(names); - if(themeLB->findItem(ksopts->colourTheme, Qt::ExactMatch)) - themeLB->setCurrentItem(themeLB->findItem(ksopts->colourTheme, Qt::ExactMatch)); + if(themeLB->tqfindItem(ksopts->colourTheme, TQt::ExactMatch)) + themeLB->setCurrentItem(themeLB->tqfindItem(ksopts->colourTheme, TQt::ExactMatch)); else themeLB->setCurrentItem(0); themeLE->setText(themeLB->currentText()); @@ -243,7 +243,7 @@ void PageColors::themeAddPB_clicked() kdDebug(5008) << "Got add: " << themeLB->currentText() << endl; - m_dcol.replace(name, new KSOColors()); + m_dcol.tqreplace(name, new KSOColors()); m_dcol[name]->backgroundColor = backCBtn->color(); m_dcol[name]->selBackgroundColor = selBackCBtn->color(); @@ -257,11 +257,11 @@ void PageColors::themeAddPB_clicked() m_dcol[name]->nickForeground = nickFGCBtn->color(); m_dcol[name]->nickBackground = nickBGCBtn->color(); - if(themeLB->findItem(name, Qt::ExactMatch) == 0){ + if(themeLB->tqfindItem(name, TQt::ExactMatch) == 0){ themeLB->insertItem(name); } - themeLB->setCurrentItem(themeLB->findItem(name, Qt::ExactMatch)); + themeLB->setCurrentItem(themeLB->tqfindItem(name, TQt::ExactMatch)); } diff --git a/ksirc/KSPrefs/page_colors.h b/ksirc/KSPrefs/page_colors.h index 5401aecc..4b2313e4 100644 --- a/ksirc/KSPrefs/page_colors.h +++ b/ksirc/KSPrefs/page_colors.h @@ -20,9 +20,10 @@ class PageColors : public PageColorsBase { Q_OBJECT + TQ_OBJECT public: - PageColors( TQWidget *parent = 0, const char *name = 0 ); + PageColors( TQWidget *tqparent = 0, const char *name = 0 ); ~PageColors(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index 498c9c23..cffcc4cc 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PageColorsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageColorsBase</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>chatColorsGB</cstring> </property> @@ -54,7 +54,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>chanMsgLabel</cstring> </property> @@ -65,7 +65,7 @@ <cstring>chanMsgCBtn</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>genericTextLabel</cstring> </property> @@ -76,7 +76,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>errorLabel</cstring> </property> @@ -87,7 +87,7 @@ <cstring>errorCBtn</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>infoLabel</cstring> </property> @@ -98,7 +98,7 @@ <cstring>infoCBtn</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>backgrndLabel</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>genericTextCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -123,7 +123,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>backgrndLabel_2</cstring> </property> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="name"> <cstring>linkCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>backCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -183,7 +183,7 @@ <property name="name"> <cstring>errorCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -193,7 +193,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>backgrndLabel_2_2</cstring> </property> @@ -208,7 +208,7 @@ <property name="name"> <cstring>infoCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -222,7 +222,7 @@ <property name="name"> <cstring>chanMsgCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -236,7 +236,7 @@ <property name="name"> <cstring>selBackCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="name"> <cstring>selForeCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -260,7 +260,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>backgrndLabel_2_2_2</cstring> </property> @@ -271,7 +271,7 @@ <cstring>backCBtn</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>nickFGColorCB</cstring> </property> @@ -281,7 +281,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox11</cstring> </property> @@ -292,17 +292,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>themeLE</cstring> </property> </widget> - <widget class="QListBox" row="1" column="0" rowspan="4" colspan="1"> + <widget class="TQListBox" row="1" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>themeLB</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>themeNewPB</cstring> </property> @@ -310,7 +310,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>themeAddPB</cstring> </property> @@ -318,7 +318,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>themeDelPB</cstring> </property> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -347,7 +347,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -358,7 +358,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -369,7 +369,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nickMatchLabel_2_2</cstring> </property> @@ -384,7 +384,7 @@ <property name="name"> <cstring>ownNickCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -394,7 +394,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ownNickBoldCB</cstring> </property> @@ -402,7 +402,7 @@ <string>Bold</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ownNickRevCB</cstring> </property> @@ -410,7 +410,7 @@ <string>Reverse</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ownNickUlCB</cstring> </property> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>202</width> <height>20</height> @@ -437,7 +437,7 @@ </spacer> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -451,7 +451,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>noOtherColRB</cstring> </property> @@ -459,7 +459,7 @@ <string>N&o nick colors</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="6"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>autoOtherColRB</cstring> </property> @@ -467,7 +467,7 @@ <string>Au&to nick colorization</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>fixedOtherColRB</cstring> </property> @@ -475,7 +475,7 @@ <string>Fi&xed</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>nickFGColorLabel</cstring> </property> @@ -490,13 +490,13 @@ <property name="name"> <cstring>nickFGCBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -506,7 +506,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>nickBGColorLabel</cstring> </property> @@ -524,7 +524,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -544,7 +544,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>83</width> <height>21</height> @@ -553,7 +553,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>nickGB</cstring> </property> @@ -564,15 +564,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nickMatchLabel_2</cstring> </property> @@ -587,7 +587,7 @@ <property name="name"> <cstring>ownContainNickCBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>169</width> <height>21</height> @@ -616,15 +616,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nickMatchLabel_2_3</cstring> </property> @@ -635,7 +635,7 @@ <cstring>ownNickCBtn</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>msg1LE</cstring> </property> @@ -644,7 +644,7 @@ <property name="name"> <cstring>msg1CBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -654,7 +654,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>msg1Regex</cstring> </property> @@ -672,7 +672,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>104</width> <height>21</height> @@ -681,15 +681,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nickMatchLabel_2_3_2</cstring> </property> @@ -700,7 +700,7 @@ <cstring>ownNickCBtn</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>msg2LE</cstring> </property> @@ -709,7 +709,7 @@ <property name="name"> <cstring>msg2CBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -719,7 +719,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>msg2Regex</cstring> </property> @@ -737,7 +737,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>104</width> <height>21</height> @@ -748,7 +748,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorCodesGB</cstring> </property> @@ -765,7 +765,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allowKSircColorsCB</cstring> </property> @@ -776,7 +776,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allowMIRCColorsCB</cstring> </property> @@ -797,7 +797,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>16</height> @@ -915,9 +915,9 @@ </connection> <connection> <sender>themeLB</sender> - <signal>clicked(QListBoxItem*)</signal> + <signal>clicked(TQListBoxItem*)</signal> <receiver>PageColorsBase</receiver> - <slot>theme_clicked(QListBoxItem*)</slot> + <slot>theme_clicked(TQListBoxItem*)</slot> </connection> <connection> <sender>themeLB</sender> @@ -1049,8 +1049,8 @@ <tabstop>themeAddPB</tabstop> <tabstop>themeDelPB</tabstop> </tabstops> -<slots> - <slot>theme_clicked(QListBoxItem*)</slot> +<Q_SLOTS> + <slot>theme_clicked(TQListBoxItem*)</slot> <slot>themeNewPB_clicked()</slot> <slot>themeDelPB_clicked()</slot> <slot>themeAddPB_clicked()</slot> @@ -1058,6 +1058,6 @@ <slot>setColourEnabled()</slot> <slot>coloursSetEnable()</slot> <slot>changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index 5ea0dd9b..d10f8925 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -1,11 +1,11 @@ #include "page_font.h" #include "tqapplication.h" -PageFont::PageFont( TQWidget *parent, const char *name ) : - TQWidget( parent, name) +PageFont::PageFont( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name) { - layout = new TQHBoxLayout(this); + tqlayout = new TQHBoxLayout(this); fontchooser = new KFontChooser(this); - layout->addWidget(fontchooser); + tqlayout->addWidget(fontchooser); connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); } @@ -21,7 +21,7 @@ void PageFont::update( void ){ void PageFont::saveConfig( void ) { ksopts->defaultFont = fontchooser->font(); - TQApplication::setFont(fontchooser->font(), true, "KSirc::TextView" ); + TQApplication::tqsetFont(fontchooser->font(), true, "KSirc::TextView" ); } void PageFont::readConfig( const KSOColors * opts ) diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h index 44940170..d07babad 100644 --- a/ksirc/KSPrefs/page_font.h +++ b/ksirc/KSPrefs/page_font.h @@ -1,7 +1,7 @@ #ifndef _PAGE_FONT #define _PAGE_FONT #include <kfontdialog.h> // For the font selection widget -#include <tqlayout.h> // For the layout +#include <tqlayout.h> // For the tqlayout #include "ksopts.h" // For storing the info. /** @@ -9,15 +9,16 @@ * * @author Markus Weimer <markus.weimer@web.de> */ -class PageFont : public QWidget +class PageFont : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Create the Widget */ - PageFont( TQWidget *parent = 0, const char *name = 0 ); + PageFont( TQWidget *tqparent = 0, const char *name = 0 ); /* @@ -56,7 +57,7 @@ class PageFont : public QWidget private: KFontChooser* fontchooser; /** The font choosing widget from kdelib */ - TQHBoxLayout* layout; + TQHBoxLayout* tqlayout; }; #endif diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index 51a78ec3..119201e1 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -15,7 +15,7 @@ #include "page_general.h" #include "../servercontroller.h" -PageGeneral::PageGeneral( TQWidget *parent, const char *name ) : PageGeneralBase( parent, name) +PageGeneral::PageGeneral( TQWidget *tqparent, const char *name ) : PageGeneralBase( tqparent, name) { } @@ -87,15 +87,15 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); while ( encodingIt != encodings.end() ) { - if ( ( *encodingIt ).find( "utf16" ) != -1 || - ( *encodingIt ).find( "iso-10646" ) != -1 ) + if ( ( *encodingIt ).tqfind( "utf16" ) != -1 || + ( *encodingIt ).tqfind( "iso-10646" ) != -1 ) encodingIt = encodings.remove( encodingIt ); else ++encodingIt; } encodings.prepend( i18n( "Default" ) ); encodingsCB->insertStringList(encodings); - int eindex = encodings.findIndex(ksopts->channel["global"]["global"].encoding); + int eindex = encodings.tqfindIndex(ksopts->channel["global"]["global"].encoding); if(eindex == -1) encodingsCB->setCurrentItem(0); else diff --git a/ksirc/KSPrefs/page_general.h b/ksirc/KSPrefs/page_general.h index 253d6623..e7e3227c 100644 --- a/ksirc/KSPrefs/page_general.h +++ b/ksirc/KSPrefs/page_general.h @@ -16,9 +16,10 @@ class PageGeneral : public PageGeneralBase { Q_OBJECT + TQ_OBJECT public: - PageGeneral( TQWidget *parent = 0, const char *name = 0 ); + PageGeneral( TQWidget *tqparent = 0, const char *name = 0 ); ~PageGeneral(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index e8ae7e8f..d4dec93b 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PageGeneralBase</class> -<widget class="QFrame"> +<widget class="TQFrame"> <property name="name"> <cstring>PageGeneralBase</cstring> </property> @@ -12,7 +12,7 @@ <height>489</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>425</width> <height>0</height> @@ -34,7 +34,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>miscGB</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -65,11 +65,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>historyItemsLabel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>32767</height> @@ -82,7 +82,7 @@ <cstring>historySB</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>historySB</cstring> </property> @@ -112,7 +112,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>publicAway</cstring> </property> @@ -126,7 +126,7 @@ <string>If this is checked, you will see the messages when a user selects the away option. By default this option is not checked.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>autoCreateWindowCB</cstring> </property> @@ -140,7 +140,7 @@ <string>If selected, KSirc will automatically create a new window for each user who sends a /msg command to you. If not selected, any text sent to you with /msg is displayed in the current window and you can use /query username to create a window to chat to that user.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>autoCreateWindowForNoticeCB</cstring> </property> @@ -148,7 +148,7 @@ <string>Auto create &on notice</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>autoRejoinCB</cstring> </property> @@ -162,7 +162,7 @@ <string>If selected, it allows you to rejoin channels automatically if you are disconnected.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>dockPopupsCB</cstring> </property> @@ -170,7 +170,7 @@ <string>Dock &passive popups</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>displayTopicCB</cstring> </property> @@ -184,7 +184,7 @@ <string>Displays the topic of the current channel in the window caption. If not selected, the topic is only displayed inside the window.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>colorPickerPopupCB</cstring> </property> @@ -198,7 +198,7 @@ <string>If selected, a popup window from which to select the color of your text is presented when you press Ctrl K. If not, you have to type the color codes manually.</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>oneLineEditCB</cstring> </property> @@ -206,7 +206,7 @@ <string>One line te&xt entry box</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>useColourNickListCB</cstring> </property> @@ -230,14 +230,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>nickCompletionCB</cstring> </property> @@ -251,7 +251,7 @@ <string>If selected, switches nickname completion on. Nickname completion works as follows: Type the first letters of a user's nickname, press the Tab key, the text you typed will be completed to match the username, including changes in capitalization if necessary.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>dockedOnlyCB</cstring> </property> @@ -265,7 +265,7 @@ <string>This allows KSirc to be docked in the system tray. By default this is not enabled. When KSirc is docked in the system tray, you are able to access several options by clicking on the KSirc icon. When you close KSirc window, the icon stays in the systray until you quit KSirc.</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>autoSaveHistoryCB</cstring> </property> @@ -275,7 +275,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -286,7 +286,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>timeStampCB</cstring> </property> @@ -300,7 +300,7 @@ <string>Prepends each thing said in the channel with the time it was said, in the form [HH:MM:SS].</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>applyGloballyCB</cstring> </property> @@ -314,7 +314,7 @@ <string>If this is selected, the settings in this tab will override each channel's options so these settings will be applied in each channel, independently of your channel settings in the Channel menu. This setting will only work until next time you open the configuration dialog and it will be reset unchecked then; this is because you probably do not want to override the existing channels options all the time.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>showTopicCB</cstring> </property> @@ -328,7 +328,7 @@ <string>Displays the channel topic on top of each channel window.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>beepCB</cstring> </property> @@ -336,7 +336,7 @@ <string>&Beep on change</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>joinPartCB</cstring> </property> @@ -344,7 +344,7 @@ <string>Hide part/join messages</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>enLoggingCB</cstring> </property> @@ -355,15 +355,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>encodingsL</cstring> </property> @@ -374,7 +374,7 @@ <cstring>encodingsCB</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>encodingsCB</cstring> </property> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>71</height> @@ -531,10 +531,10 @@ <tabstop>showTopicCB</tabstop> <tabstop>enLoggingCB</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const QString &)</slot> <slot>changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_irccolors.cpp b/ksirc/KSPrefs/page_irccolors.cpp index 5ed96054..5177dc49 100644 --- a/ksirc/KSPrefs/page_irccolors.cpp +++ b/ksirc/KSPrefs/page_irccolors.cpp @@ -14,7 +14,7 @@ #include <kconfig.h> #include <kcolorbutton.h> -PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name) +PageIRCColors::PageIRCColors( TQWidget *tqparent, const char *name ) : PageIRCColorsBase( tqparent, name) { } diff --git a/ksirc/KSPrefs/page_irccolors.h b/ksirc/KSPrefs/page_irccolors.h index 34565b42..843a8391 100644 --- a/ksirc/KSPrefs/page_irccolors.h +++ b/ksirc/KSPrefs/page_irccolors.h @@ -16,9 +16,10 @@ class PageIRCColors : public PageIRCColorsBase { Q_OBJECT + TQ_OBJECT public: - PageIRCColors( TQWidget *parent = 0, const char *name = 0 ); + PageIRCColors( TQWidget *tqparent = 0, const char *name = 0 ); ~PageIRCColors(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui index 96fc18cc..7b7e31b9 100644 --- a/ksirc/KSPrefs/page_irccolorsbase.ui +++ b/ksirc/KSPrefs/page_irccolorsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PageIRCColorsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageIRCColorsBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -30,11 +30,11 @@ <string><p>This selection allows you to control what the colors displayed inline in the channel look like. These colors are used for both mIRC style colors in channels and colorful nicks. The sample box beside the button gives you an example of what it will look like in the channel. The checkbox controls if the color is used for the colorful nick features. Checked means use it.</p></string> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>dark</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox16</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>genericTextLabel_2</cstring> </property> @@ -71,7 +71,7 @@ <property name="name"> <cstring>CBtn_1</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -81,7 +81,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>TL_1</cstring> </property> @@ -106,7 +106,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>genericTextLabel</cstring> </property> @@ -137,7 +137,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -147,7 +147,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TL_0</cstring> </property> @@ -172,7 +172,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>genericTextLabel_3</cstring> </property> @@ -187,7 +187,7 @@ <property name="name"> <cstring>CBtn_2</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -197,7 +197,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>TL_2</cstring> </property> @@ -222,7 +222,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>genericTextLabel_5</cstring> </property> @@ -237,7 +237,7 @@ <property name="name"> <cstring>CBtn_4</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -247,7 +247,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>TL_4</cstring> </property> @@ -264,7 +264,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>genericTextLabel_4</cstring> </property> @@ -279,7 +279,7 @@ <property name="name"> <cstring>CBtn_3</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -289,7 +289,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>TL_3</cstring> </property> @@ -306,7 +306,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>genericTextLabel_6</cstring> </property> @@ -321,7 +321,7 @@ <property name="name"> <cstring>CBtn_5</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -331,7 +331,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>TL_5</cstring> </property> @@ -348,7 +348,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>genericTextLabel_7</cstring> </property> @@ -363,7 +363,7 @@ <property name="name"> <cstring>CBtn_6</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -373,7 +373,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="6" column="2"> + <widget class="TQLabel" row="6" column="2"> <property name="name"> <cstring>TL_6</cstring> </property> @@ -390,7 +390,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>genericTextLabel_8</cstring> </property> @@ -405,7 +405,7 @@ <property name="name"> <cstring>CBtn_7</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -415,7 +415,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="2"> + <widget class="TQLabel" row="7" column="2"> <property name="name"> <cstring>TL_7</cstring> </property> @@ -432,7 +432,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="3"> + <widget class="TQCheckBox" row="0" column="3"> <property name="name"> <cstring>CBox_0</cstring> </property> @@ -448,7 +448,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>CBox_1</cstring> </property> @@ -456,7 +456,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>CBox_2</cstring> </property> @@ -464,7 +464,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>CBox_3</cstring> </property> @@ -472,7 +472,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="4" column="3"> + <widget class="TQCheckBox" row="4" column="3"> <property name="name"> <cstring>CBox_4</cstring> </property> @@ -480,7 +480,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="5" column="3"> + <widget class="TQCheckBox" row="5" column="3"> <property name="name"> <cstring>CBox_5</cstring> </property> @@ -488,7 +488,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="3"> + <widget class="TQCheckBox" row="6" column="3"> <property name="name"> <cstring>CBox_6</cstring> </property> @@ -496,7 +496,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="3"> + <widget class="TQCheckBox" row="7" column="3"> <property name="name"> <cstring>CBox_7</cstring> </property> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>41</height> @@ -525,7 +525,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>light</cstring> </property> @@ -536,7 +536,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>ircColorsGB</cstring> </property> @@ -559,7 +559,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>genericTextLabel_11</cstring> </property> @@ -570,7 +570,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>genericTextLabel_12</cstring> </property> @@ -581,7 +581,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>genericTextLabel_13</cstring> </property> @@ -592,7 +592,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>genericTextLabel_14</cstring> </property> @@ -603,7 +603,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>genericTextLabel_15</cstring> </property> @@ -614,7 +614,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>genericTextLabel_16</cstring> </property> @@ -629,7 +629,7 @@ <property name="name"> <cstring>CBtn_8</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -643,7 +643,7 @@ <property name="name"> <cstring>CBtn_9</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -657,7 +657,7 @@ <property name="name"> <cstring>CBtn_10</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -671,7 +671,7 @@ <property name="name"> <cstring>CBtn_11</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -685,7 +685,7 @@ <property name="name"> <cstring>CBtn_12</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -699,7 +699,7 @@ <property name="name"> <cstring>CBtn_13</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>CBtn_14</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -727,7 +727,7 @@ <property name="name"> <cstring>CBtn_15</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -737,7 +737,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>genericTextLabel_10</cstring> </property> @@ -748,7 +748,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TL_8</cstring> </property> @@ -773,7 +773,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>TL_9</cstring> </property> @@ -790,7 +790,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>TL_11</cstring> </property> @@ -807,7 +807,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>TL_10</cstring> </property> @@ -824,7 +824,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>TL_12</cstring> </property> @@ -841,7 +841,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>TL_13</cstring> </property> @@ -858,7 +858,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="6" column="2"> + <widget class="TQLabel" row="6" column="2"> <property name="name"> <cstring>TL_14</cstring> </property> @@ -875,7 +875,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QLabel" row="7" column="2"> + <widget class="TQLabel" row="7" column="2"> <property name="name"> <cstring>TL_15</cstring> </property> @@ -892,7 +892,7 @@ <cstring>genericTextCBtn</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="3"> + <widget class="TQCheckBox" row="0" column="3"> <property name="name"> <cstring>CBox_8</cstring> </property> @@ -908,7 +908,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>CBox_9</cstring> </property> @@ -924,7 +924,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>CBox_10</cstring> </property> @@ -940,7 +940,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>CBox_11</cstring> </property> @@ -956,7 +956,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="4" column="3"> + <widget class="TQCheckBox" row="4" column="3"> <property name="name"> <cstring>CBox_12</cstring> </property> @@ -972,7 +972,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="5" column="3"> + <widget class="TQCheckBox" row="5" column="3"> <property name="name"> <cstring>CBox_13</cstring> </property> @@ -988,7 +988,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="6" column="3"> + <widget class="TQCheckBox" row="6" column="3"> <property name="name"> <cstring>CBox_14</cstring> </property> @@ -1004,7 +1004,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="3"> + <widget class="TQCheckBox" row="7" column="3"> <property name="name"> <cstring>CBox_15</cstring> </property> @@ -1020,7 +1020,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>genericTextLabel_9</cstring> </property> @@ -1043,7 +1043,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>121</height> @@ -1249,11 +1249,11 @@ <slot>changed()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>chanaged()</slot> <slot>changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp index 29608e04..f29523b8 100644 --- a/ksirc/KSPrefs/page_looknfeel.cpp +++ b/ksirc/KSPrefs/page_looknfeel.cpp @@ -16,7 +16,7 @@ #include <kfiledialog.h> #include "page_looknfeel.h" -PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name) +PageLooknFeel::PageLooknFeel( TQWidget *tqparent, const char *name ) : PageLooknFeelBase( tqparent, name) { modePreview->setPixmap(TQPixmap(locate("data","ksirc/pics/sdi.png"))); wallpaperPathLE->fileDialog()->setFilter( "*.jpg *.png *.gif" ); diff --git a/ksirc/KSPrefs/page_looknfeel.h b/ksirc/KSPrefs/page_looknfeel.h index 326498cb..cc9d0f08 100644 --- a/ksirc/KSPrefs/page_looknfeel.h +++ b/ksirc/KSPrefs/page_looknfeel.h @@ -16,9 +16,10 @@ class PageLooknFeel : public PageLooknFeelBase { Q_OBJECT + TQ_OBJECT public: - PageLooknFeel( TQWidget *parent = 0, const char *name = 0 ); + PageLooknFeel( TQWidget *tqparent = 0, const char *name = 0 ); ~PageLooknFeel(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index 6aee3a14..ba4ea3f4 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PageLooknFeelBase</class> -<widget class="QFrame"> +<widget class="TQFrame"> <property name="name"> <cstring>PageLooknFeelBase</cstring> </property> @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>425</width> <height>450</height> @@ -34,7 +34,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>windowModeGB</cstring> </property> @@ -61,14 +61,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> </size> </property> </spacer> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>mdiCB</cstring> </property> @@ -92,21 +92,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>wmLabel</cstring> </property> <property name="text"> <string>Choose your favorite window mode:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -114,7 +114,7 @@ <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>sdiCB</cstring> </property> @@ -128,17 +128,17 @@ <number>0</number> </property> </widget> - <widget class="QFrame" row="1" column="1" rowspan="4" colspan="1"> + <widget class="TQFrame" row="1" column="1" rowspan="4" colspan="1"> <property name="name"> <cstring>Frame3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>120</height> @@ -150,7 +150,7 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>modePreview</cstring> </property> @@ -169,7 +169,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>wallpaperGB</cstring> </property> @@ -180,7 +180,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -198,13 +198,13 @@ <property name="name"> <cstring>wallpaperPathLE</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>25</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>30</height> @@ -213,17 +213,17 @@ </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>120</width> <height>120</height> @@ -235,7 +235,7 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>wallpaperPreview</cstring> </property> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>1</height> @@ -309,12 +309,12 @@ <tabstop>sdiCB</tabstop> <tabstop>wallpaperPathLE</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const QString &)</slot> <slot>changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp index de30a829..c6bb24ee 100644 --- a/ksirc/KSPrefs/page_rmbmenu.cpp +++ b/ksirc/KSPrefs/page_rmbmenu.cpp @@ -20,7 +20,7 @@ -PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase( parent, name) +PageRMBMenu::PageRMBMenu( TQWidget *tqparent, const char *name ) : PageRMBMenuBase( tqparent, name) { UserControlMenu *ucm; diff --git a/ksirc/KSPrefs/page_rmbmenu.h b/ksirc/KSPrefs/page_rmbmenu.h index 1d4a8dac..39b8cd89 100644 --- a/ksirc/KSPrefs/page_rmbmenu.h +++ b/ksirc/KSPrefs/page_rmbmenu.h @@ -16,9 +16,10 @@ class PageRMBMenu : public PageRMBMenuBase { Q_OBJECT + TQ_OBJECT public: - PageRMBMenu( TQWidget *parent = 0, const char *name = 0 ); + PageRMBMenu( TQWidget *tqparent = 0, const char *name = 0 ); ~PageRMBMenu(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui index 1ef1e053..abeb6169 100644 --- a/ksirc/KSPrefs/page_rmbmenubase.ui +++ b/ksirc/KSPrefs/page_rmbmenubase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PageRMBMenuBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageRMBMenuBase</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>explLabel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -41,7 +41,7 @@ <property name="text"> <string>This page allows configuration of the RMB Menu for the nicklist located on the right. You can define names for certain actions. Look at the predefined commands to learn how it works.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -50,7 +50,7 @@ <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout28</cstring> </property> @@ -64,12 +64,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>commandLB</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout26</cstring> </property> @@ -83,7 +83,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>entryNameLabel</cstring> </property> @@ -94,12 +94,12 @@ <cstring>entryLE</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>entryLE</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>commandLabel</cstring> </property> @@ -110,12 +110,12 @@ <cstring>commandLE</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>commandLE</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>opEnableCB</cstring> </property> @@ -133,14 +133,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout24</cstring> </property> @@ -154,14 +154,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>moveUpPB</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -171,14 +171,14 @@ <string>Move Down</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>moveDownPB</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -200,14 +200,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insertSeperatorPB</cstring> </property> @@ -215,7 +215,7 @@ <string>Insert &Separator</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insertItemPB</cstring> </property> @@ -223,7 +223,7 @@ <string>&Insert Command</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>changeItemPB</cstring> </property> @@ -231,7 +231,7 @@ <string>M&odify</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteItemPB</cstring> </property> @@ -248,5 +248,5 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index f7587947..e1ed6413 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -15,7 +15,7 @@ #include <kapplication.h> #include <kconfig.h> -PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name) +PageServChan::PageServChan( TQWidget *tqparent, const char *name ) : PageServChanBase( tqparent, name) { connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL())); connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL())); diff --git a/ksirc/KSPrefs/page_servchan.h b/ksirc/KSPrefs/page_servchan.h index 1e20e8d7..8db7d223 100644 --- a/ksirc/KSPrefs/page_servchan.h +++ b/ksirc/KSPrefs/page_servchan.h @@ -16,9 +16,10 @@ class PageServChan : public PageServChanBase { Q_OBJECT + TQ_OBJECT public: - PageServChan( TQWidget *parent = 0, const char *name = 0 ); + PageServChan( TQWidget *tqparent = 0, const char *name = 0 ); ~PageServChan(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_servchanbase.ui b/ksirc/KSPrefs/page_servchanbase.ui index b24ce9dc..59ad646f 100644 --- a/ksirc/KSPrefs/page_servchanbase.ui +++ b/ksirc/KSPrefs/page_servchanbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PageServChanBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageServChanBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox33</cstring> </property> @@ -39,12 +39,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>serverLB</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15</cstring> </property> @@ -58,7 +58,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>serverDeleteItemPB</cstring> </property> @@ -77,7 +77,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>ServerAddItemPB</cstring> </property> @@ -85,7 +85,7 @@ <string>Add &Server to List</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit6</cstring> </property> @@ -94,7 +94,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox34</cstring> </property> @@ -111,12 +111,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>channelLB</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15_2</cstring> </property> @@ -130,7 +130,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>chanDeleteItmPB</cstring> </property> @@ -149,7 +149,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>ChanAddItemPB</cstring> </property> @@ -157,7 +157,7 @@ <string>Add Cha&nnel to List</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>LineEdit6_2</cstring> </property> @@ -168,5 +168,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index 4d2fda54..ab30824a 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -16,13 +16,13 @@ #include "page_shortcuts.h" #include "../servercontroller.h" -PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcutsBase( parent, name) +PageShortcuts::PageShortcuts( TQWidget *tqparent, const char *name ) : PageShortcutsBase( tqparent, name) { globalGB->setColumnLayout( 0, Qt::Horizontal ); m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); - globalGB->layout()->add(m_key); + globalGB->tqlayout()->add(m_key); } PageShortcuts::~PageShortcuts() diff --git a/ksirc/KSPrefs/page_shortcuts.h b/ksirc/KSPrefs/page_shortcuts.h index 36048f44..c551db9b 100644 --- a/ksirc/KSPrefs/page_shortcuts.h +++ b/ksirc/KSPrefs/page_shortcuts.h @@ -18,9 +18,10 @@ class KKeyChooser; class PageShortcuts : public PageShortcutsBase { Q_OBJECT + TQ_OBJECT public: - PageShortcuts( TQWidget *parent = 0, const char *name = 0 ); + PageShortcuts( TQWidget *tqparent = 0, const char *name = 0 ); ~PageShortcuts(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui index 57f21647..c570f73f 100644 --- a/ksirc/KSPrefs/page_shortcutsbase.ui +++ b/ksirc/KSPrefs/page_shortcutsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PageShortcutsBase</class> -<widget class="QFrame"> +<widget class="TQFrame"> <property name="name"> <cstring>PageShortcutslBase</cstring> </property> @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>425</width> <height>450</height> @@ -34,7 +34,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>globalGB</cstring> </property> @@ -48,10 +48,10 @@ </connections> <tabstops> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const QString &)</slot> <slot>changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp index e2ddfdc1..37b3f875 100644 --- a/ksirc/KSPrefs/page_startup.cpp +++ b/ksirc/KSPrefs/page_startup.cpp @@ -19,7 +19,7 @@ #include "page_startup.h" -PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase( parent, name) +PageStartup::PageStartup( TQWidget *tqparent, const char *name ) : PageStartupBase( tqparent, name) { notifyLB->upButton()->hide(); notifyLB->downButton()->hide(); @@ -49,7 +49,7 @@ void PageStartup::saveConfig() for( ; it != items.end(); ++it){ ksopts->server[*it] = server[*it]; } - if(!ksopts->server.contains("global")){ + if(!ksopts->server.tqcontains("global")){ ksopts->server["global"] = glb; } @@ -65,7 +65,7 @@ void PageStartup::readConfig( const KSOptions *opts ) if(it.data().globalCopy == false) serverLB->insertItem(it.key()); } - TQListBoxItem *item = serverLB->listBox()->findItem("global"); + TQListBoxItem *item = serverLB->listBox()->tqfindItem("global"); serverLB->listBox()->setSelected(item, true); changing = false; clickedLB(serverLB->listBox()->index(item)); @@ -107,7 +107,7 @@ void PageStartup::clickedLB(int index) { TQString text = serverLB->text(index); - if(!server.contains(text)){ + if(!server.tqcontains(text)){ server[text] = server["global"]; server[text].globalCopy = true; } diff --git a/ksirc/KSPrefs/page_startup.h b/ksirc/KSPrefs/page_startup.h index c2092e65..ab905770 100644 --- a/ksirc/KSPrefs/page_startup.h +++ b/ksirc/KSPrefs/page_startup.h @@ -16,9 +16,10 @@ class PageStartup : public PageStartupBase { Q_OBJECT + TQ_OBJECT public: - PageStartup( TQWidget *parent = 0, const char *name = 0 ); + PageStartup( TQWidget *tqparent = 0, const char *name = 0 ); ~PageStartup(); void saveConfig(); diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index 1a248806..125b0934 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PageStartupBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PageStartupBase</cstring> </property> @@ -38,11 +38,11 @@ <string>Server</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>nickGB</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -61,22 +61,22 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>nickLE</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>altNickLE</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>rnLE</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>nickLabel</cstring> </property> @@ -87,7 +87,7 @@ <cstring>nickLE</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>anLabel</cstring> </property> @@ -98,12 +98,12 @@ <cstring>altNickLE</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>uiLE</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>uiLabel</cstring> </property> @@ -114,7 +114,7 @@ <cstring>rnLE</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>rnLabel</cstring> </property> @@ -183,11 +183,11 @@ <slot>server_changed()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>changed()</slot> <slot>server_changed()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp index ccf3b194..d299f22a 100644 --- a/ksirc/KSProgress/ksprogress.cpp +++ b/ksirc/KSProgress/ksprogress.cpp @@ -10,11 +10,11 @@ KSProgress::KSProgress ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name ) + Inherited( tqparent, name ) { setCaption("KSProgress"); id = ""; @@ -39,7 +39,7 @@ void KSProgress::setTopText(TQString text) void KSProgress::setBotText(TQString text) { - transferStatus->setText(text); + transfertqStatus->setText(text); } void KSProgress::setValue(int value) diff --git a/ksirc/KSProgress/ksprogress.dlg b/ksirc/KSProgress/ksprogress.dlg index 5484c4d6..4d1b065d 100644 --- a/ksirc/KSProgress/ksprogress.dlg +++ b/ksirc/KSProgress/ksprogress.dlg @@ -124,7 +124,7 @@ </Frame> </Label> <Label nested="true" > - <Text >XferStatus</Text> + <Text >XfertqStatus</Text> <Alignment >AlignLeft|AlignVCenter|ExpandTabs</Alignment> <Indent type="integer">-1</Indent> <TextFormat type="qstring">AutoText</TextFormat> @@ -138,7 +138,7 @@ <Y type="integer">35</Y> </Rect> <Name >Label_2</Name> - <Variable >transferStatus</Variable> + <Variable >transfertqStatus</Variable> <SignalConnection list="true" nested="true" > </SignalConnection> <MinimumSize type="qsize" complex="true" nested="true" > diff --git a/ksirc/KSProgress/ksprogress.h b/ksirc/KSProgress/ksprogress.h index 2613047d..91f915c5 100644 --- a/ksirc/KSProgress/ksprogress.h +++ b/ksirc/KSProgress/ksprogress.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ksprogress.h Last generated: Thu Dec 18 08:01:39 1997 @@ -15,12 +15,13 @@ class KSProgress : public ksprogressData { Q_OBJECT + TQ_OBJECT public: KSProgress ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 7d146fd9..5abbc735 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ksprogressdata.cpp Last generated: Thu Dec 18 09:09:53 1997 @@ -13,7 +13,7 @@ #include "ksprogressdata.h" #undef Inherited -#define Inherited QFrame +#define Inherited TQFrame #include <kpushbutton.h> #include <kstdguiitem.h> @@ -22,11 +22,11 @@ ksprogressData::ksprogressData ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name, 0 ) + Inherited( tqparent, name, 0 ) { progress = new KProgress( this, "User_1" ); progress->setGeometry( 10, 60, 230, 20 ); @@ -46,16 +46,16 @@ ksprogressData::ksprogressData fileName->setMinimumSize( 10, 10 ); fileName->setMaximumSize( 32767, 32767 ); fileName->setText( i18n("File Name") ); - fileName->setAlignment( 289 ); + fileName->tqsetAlignment( 289 ); fileName->setMargin( -1 ); - transferStatus = new TQLabel( this, "Label_2" ); - transferStatus->setGeometry( 10, 35, 230, 20 ); - transferStatus->setMinimumSize( 10, 10 ); - transferStatus->setMaximumSize( 32767, 32767 ); - transferStatus->setText( i18n("Transfer Status") ); - transferStatus->setAlignment( 289 ); - transferStatus->setMargin( -1 ); + transfertqStatus = new TQLabel( this, "Label_2" ); + transfertqStatus->setGeometry( 10, 35, 230, 20 ); + transfertqStatus->setMinimumSize( 10, 10 ); + transfertqStatus->setMaximumSize( 32767, 32767 ); + transfertqStatus->setText( i18n("Transfer tqStatus") ); + transfertqStatus->tqsetAlignment( 289 ); + transfertqStatus->setMargin( -1 ); resize( 250,130 ); setMinimumSize( 250, 140 ); diff --git a/ksirc/KSProgress/ksprogressdata.h b/ksirc/KSProgress/ksprogressdata.h index 37e3cf29..afd3b15e 100644 --- a/ksirc/KSProgress/ksprogressdata.h +++ b/ksirc/KSProgress/ksprogressdata.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ksprogressdata.h Last generated: Thu Dec 18 09:09:53 1997 @@ -17,15 +17,16 @@ #include <tqlabel.h> #include "kprogress.h" -class ksprogressData : public QFrame +class ksprogressData : public TQFrame { Q_OBJECT + TQ_OBJECT public: ksprogressData ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); @@ -41,7 +42,7 @@ protected slots: protected: KProgress* progress; TQLabel* fileName; - TQLabel* transferStatus; + TQLabel* transfertqStatus; }; diff --git a/ksirc/KSTicker/kspainter.cpp b/ksirc/KSTicker/kspainter.cpp index 90ffac0d..e9e63bce 100644 --- a/ksirc/KSTicker/kspainter.cpp +++ b/ksirc/KSTicker/kspainter.cpp @@ -12,22 +12,22 @@ const TQColor KSPainter::lightCyan( 224, 255, 255 ); const TQColor KSPainter::lightBlue( 173, 216, 230 ); const TQColor KSPainter::pink ( 255, 192, 203 ); -TQColor KSPainter::num2colour[KSPainter::maxcolour] = { Qt::white, - Qt::black, - Qt::darkBlue, - Qt::darkGreen, - Qt::red, +TQColor KSPainter::num2colour[KSPainter::maxcolour] = { TQt::white, + TQt::black, + TQt::darkBlue, + TQt::darkGreen, + TQt::red, brown, - Qt::darkMagenta, + TQt::darkMagenta, orange, - Qt::yellow, - Qt::green, - Qt::darkCyan, - Qt::cyan, - Qt::blue, + TQt::yellow, + TQt::green, + TQt::darkCyan, + TQt::cyan, + TQt::blue, pink, - Qt::gray, - Qt::lightGray }; + TQt::gray, + TQt::lightGray }; void KSPainter::initOptColours() { @@ -67,7 +67,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, for(loc = 0; (str[loc] != 0x00) && (loc != length) ; loc++){ if(str[loc] == 0x03 || str[loc] == '~'){ i = loc; - p->drawText(startx, starty, str + offset, i-offset); + p->drawText(startx, starty, TQString(str + offset), i-offset); startx += p->fontMetrics().width(str + offset, i-offset); offset = i; // lastp = i; @@ -180,7 +180,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, offset += i - loc; } } - p->drawText(startx, starty, str + offset, loc-offset); + p->drawText(startx, starty, TQString(str + offset), loc-offset); } diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index e6199427..bedc0328 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -21,8 +21,8 @@ #include <kwin.h> #include <kdebug.h> -KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) -: TQFrame(parent, name, f) +KSTicker::KSTicker(TQWidget * tqparent, const char * name, WFlags f) +: TQFrame(tqparent, name, f) { pHeight = 1; @@ -90,7 +90,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) KSTicker::~KSTicker() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); delete pic; } @@ -110,26 +110,26 @@ void KSTicker::show() if(currentStr.length() != 0) startTicker(); currentChar = 0; - repaint(TRUE); + tqrepaint(TRUE); } void KSTicker::hide() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); TQFrame::hide(); } void KSTicker::iconify() { TQFrame::showMinimized(); - killTimers(); + TQT_TQOBJECT(this)->killTimers(); } void KSTicker::setString(TQString str) { strlist.clear(); strlist.append(str); - repaint(TRUE); + tqrepaint(TRUE); startTicker(); } @@ -138,7 +138,7 @@ void KSTicker::mergeString(TQString str, TQColor c) int num = KSPainter::colour2num(c); if(num != -1){ - str.prepend(TQString("~%1").arg(num)); + str.prepend(TQString("~%1").tqarg(num)); } mergeString(str); @@ -150,8 +150,8 @@ void KSTicker::mergeString(TQString str) if(rx.search(str) >= 0){ int value = nickColourMaker::colourMaker()->findIdx(rx.cap(1)); if(value >= 0){ - TQString newText = TQString("~%1\\1~c").arg(value); - str.replace(rx, newText); + TQString newText = TQString("~%1\\1~c").tqarg(value); + str.tqreplace(rx, newText); } } @@ -162,8 +162,8 @@ void KSTicker::mergeString(TQString str) int found = 0; TQStringList::Iterator it = strlist.begin(); for(; it != strlist.end(); it++){ - if(((*it).find(ksopts->server["global"].nick, 0, FALSE) == -1) && - ((*it).find(ksopts->server["global"].altNick, 0, FALSE) == -1)){ + if(((*it).tqfind(ksopts->server["global"].nick, 0, FALSE) == -1) && + ((*it).tqfind(ksopts->server["global"].altNick, 0, FALSE) == -1)){ strlist.remove(it); found = 1; break; @@ -231,7 +231,7 @@ void KSTicker::timerEvent(TQTimerEvent *) } bAtEnd = FALSE; - static BGMode bgmode = TransparentMode; + static Qt::BGMode bgmode = Qt::TransparentMode; bitBlt(pic, -tickStep, 0, pic); TQPainter p(pic); @@ -275,12 +275,12 @@ void KSTicker::timerEvent(TQTimerEvent *) int col = buf.toInt(); if((col >= 0) || (col <= KSPainter::maxcolour)){ bg = KSPainter::num2colour[col]; - bgmode = OpaqueMode; + bgmode = Qt::OpaqueMode; } } } else{ - bgmode = TransparentMode; + bgmode = Qt::TransparentMode; } } else { @@ -352,7 +352,7 @@ void KSTicker::timerEvent(TQTimerEvent *) p.setPen(fg); p.setBackgroundColor(bg); - p.setBackgroundMode(OpaqueMode); + p.setBackgroundMode(Qt::OpaqueMode); p.drawText(this->width() - cOffset + onechar, // remove -onechar. this->height() / 4 + p.fontMetrics().height() / 2, currentStr.mid(currentChar, 1), @@ -376,12 +376,12 @@ void KSTicker::resizeEvent( TQResizeEvent *e) TQFrame::resizeEvent(e); onechar = fontMetrics().width("X"); chars = this->width() / onechar; - killTimers(); + TQT_TQOBJECT(this)->killTimers(); TQPixmap *new_pic = new TQPixmap(width() + onechar, height()); new_pic->fill(backgroundColor()); - bitBlt(new_pic, + bitBlt(TQT_TQPAINTDEVICE(new_pic), new_pic->width() - pic->width(), 0, - pic, 0, 0, + TQT_TQPAINTDEVICE(pic), 0, 0, pic->width(), pic->height(), CopyROP, TRUE); delete pic; @@ -393,19 +393,19 @@ void KSTicker::resizeEvent( TQResizeEvent *e) void KSTicker::closeEvent( TQCloseEvent *) { emit closing(); - killTimers(); + TQT_TQOBJECT(this)->killTimers(); // delete this; } void KSTicker::startTicker() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer(tickRate); } void KSTicker::stopTicker() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); } void KSTicker::mouseDoubleClickEvent( TQMouseEvent * ) @@ -415,7 +415,7 @@ void KSTicker::mouseDoubleClickEvent( TQMouseEvent * ) void KSTicker::mousePressEvent( TQMouseEvent *e) { - if(e->button() == RightButton){ + if(e->button() == Qt::RightButton){ popup->popup(this->cursor().pos()); } else{ diff --git a/ksirc/KSTicker/ksticker.h b/ksirc/KSTicker/ksticker.h index 47beecac..0ded7da9 100644 --- a/ksirc/KSTicker/ksticker.h +++ b/ksirc/KSTicker/ksticker.h @@ -12,12 +12,13 @@ public: int length; }; -class KSTicker : public QFrame +class KSTicker : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KSTicker(TQWidget * parent=0, const char * name=0, WFlags f=0); + KSTicker(TQWidget * tqparent=0, const char * name=0, WFlags f=0); virtual ~KSTicker(); void setString(TQString); diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 36ad249a..904aedf1 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -35,8 +35,8 @@ StdInTicker::~StdInTicker() kConfig->writeEntry("font", KSTicker::font()); kConfig->writeEntry("tick", tick); kConfig->writeEntry("step", step); - kConfig->writeEntry("text", colorGroup().text() ); - kConfig->writeEntry("background", colorGroup().background() ); + kConfig->writeEntry("text", tqcolorGroup().text() ); + kConfig->writeEntry("background", tqcolorGroup().background() ); kConfig->sync(); } @@ -46,7 +46,7 @@ void StdInTicker::readsocket(int socket) int bytes = read(socket, buf, 1024); if(bytes){ TQCString str(buf, bytes); - str.replace(TQRegExp("\n"), " // "); + str.tqreplace(TQRegExp("\n"), " // "); mergeString(str); } } diff --git a/ksirc/KSTicker/ksttest.h b/ksirc/KSTicker/ksttest.h index d3e988ff..5b93d330 100644 --- a/ksirc/KSTicker/ksttest.h +++ b/ksirc/KSTicker/ksttest.h @@ -7,6 +7,7 @@ class StdInTicker : public KSTicker { Q_OBJECT + TQ_OBJECT public: StdInTicker(); ~StdInTicker(); diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp index 50cb8d80..e9597ace 100644 --- a/ksirc/KSTicker/speeddialog.cpp +++ b/ksirc/KSTicker/speeddialog.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: speeddialog.cpp Last generated: Sun Dec 21 08:52:31 1997 @@ -15,10 +15,10 @@ SpeedDialog::SpeedDialog ( int tick, int step, - TQWidget* parent, + TQWidget* tqparent, const char* name ) - : speeddialogData( parent, name ) + : speeddialogData( tqparent, name ) { setCaption(i18n( "Speed Setup") ); connect(sliderTick, TQT_SIGNAL(valueChanged(int)), diff --git a/ksirc/KSTicker/speeddialog.dlg b/ksirc/KSTicker/speeddialog.dlg index 00e26c67..aff83de2 100644 --- a/ksirc/KSTicker/speeddialog.dlg +++ b/ksirc/KSTicker/speeddialog.dlg @@ -18,7 +18,7 @@ MaxSize {32767 32767} Grid {10} Slider { - Orientation {Horizontal} + Qt::Orientation {Horizontal} MinValue {10} MaxValue {200} Initial {30} @@ -31,12 +31,12 @@ Slider { Name {Slider_1} Variable {sliderTick} Signal {[Protected] valueChanged --> updateTick (int)} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } Slider { - Orientation {Horizontal} + Qt::Orientation {Horizontal} MinValue {1} MaxValue {10} Initial {3} @@ -49,7 +49,7 @@ Slider { Name {Slider_2} Variable {sliderStep} Signal {[Protected] valueChanged --> updateStep (int)} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -62,7 +62,7 @@ LCDNumber { Rect {200 5 60 30} Name {LCDNumber_1} Variable {lcdTick} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -75,7 +75,7 @@ LCDNumber { Rect {200 40 60 30} Name {LCDNumber_2} Variable {lcdStep} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -85,7 +85,7 @@ Label { Margin {-1} Rect {10 5 80 30} Name {Label_1} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -95,7 +95,7 @@ Label { Margin {-1} Rect {10 40 80 30} Name {Label_2} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -109,7 +109,7 @@ PushButton { Rect {140 80 120 30} Name {PushButton_2} Signal {[Protected] pressed --> terminate ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/KSTicker/speeddialog.h b/ksirc/KSTicker/speeddialog.h index 514c72ee..c5ade254 100644 --- a/ksirc/KSTicker/speeddialog.h +++ b/ksirc/KSTicker/speeddialog.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: speeddialog.h Last generated: Sun Dec 21 08:52:31 1997 @@ -15,6 +15,7 @@ class SpeedDialog : public speeddialogData { Q_OBJECT + TQ_OBJECT public: @@ -22,7 +23,7 @@ public: ( int tick, int step, - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 822d6f7f..ddb733df 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: speeddialogData.cpp Last generated: Sun Dec 21 09:13:46 1997 @@ -19,14 +19,14 @@ #include <tqlayout.h> #include <kdialog.h> -speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) - :TQDialog( parent, name, 0 ) +speeddialogData::speeddialogData ( TQWidget* tqparent, const char* name ) + :TQDialog( tqparent, name, 0 ) { TQGridLayout *grid = new TQGridLayout( this, 3, 2 , KDialog::marginHint(), KDialog::spacingHint()); sliderTick = new TQSlider( this, "Slider_1" ); grid->addWidget( sliderTick, 0, 1 ); connect( sliderTick, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateTick(int)) ); - sliderTick->setOrientation( TQSlider::Horizontal ); + sliderTick->setOrientation( Qt::Horizontal ); sliderTick->setRange( 10, 200 ); sliderTick->setSteps( 10, 50 ); sliderTick->setValue( 30 ); @@ -38,7 +38,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) grid->addWidget( sliderStep, 1, 1 ); connect( sliderStep, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateStep(int)) ); - sliderStep->setOrientation( TQSlider::Horizontal ); + sliderStep->setOrientation( Qt::Horizontal ); sliderStep->setRange( 1, 10 ); sliderStep->setSteps( 1, 2 ); sliderStep->setValue( 3 ); @@ -66,7 +66,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQLabel* dlgedit_Label_1; dlgedit_Label_1 = new TQLabel( this, "Label_1" ); dlgedit_Label_1->setText( i18n("Tick interval:") ); - dlgedit_Label_1->setAlignment( 289 ); + dlgedit_Label_1->tqsetAlignment( 289 ); dlgedit_Label_1->setMargin( -1 ); grid->addWidget( dlgedit_Label_1, 0, 0 ); @@ -74,7 +74,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQLabel* dlgedit_Label_2; dlgedit_Label_2 = new TQLabel( this, "Label_2" ); dlgedit_Label_2->setText( i18n("Step size:") ); - dlgedit_Label_2->setAlignment( 289 ); + dlgedit_Label_2->tqsetAlignment( 289 ); dlgedit_Label_2->setMargin( -1 ); grid->addWidget( dlgedit_Label_2, 1, 0 ); diff --git a/ksirc/KSTicker/speeddialogData.h b/ksirc/KSTicker/speeddialogData.h index 27b6c27a..31dd21da 100644 --- a/ksirc/KSTicker/speeddialogData.h +++ b/ksirc/KSTicker/speeddialogData.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: speeddialogData.h Last generated: Sun Dec 21 09:13:46 1997 @@ -17,15 +17,16 @@ #include <tqslider.h> #include <tqlcdnumber.h> -class speeddialogData : public QDialog +class speeddialogData : public TQDialog { Q_OBJECT + TQ_OBJECT public: speeddialogData ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp index 1a0f2dba..aa0bccf7 100644 --- a/ksirc/NewWindowDialog.cpp +++ b/ksirc/NewWindowDialog.cpp @@ -8,8 +8,8 @@ #include <klineedit.h> #include "NewWindowDialog.h" -NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * parent, const char * name) - : KDialogBase(parent, name, true, i18n("New Window For"), Ok|Cancel, Ok, true), +NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * tqparent, const char * name) + : KDialogBase(tqparent, name, true, i18n("New Window For"), Ok|Cancel, Ok, true), m_channelInfo(channelInfo) { TQHBox * w = makeHBoxMainWidget(); diff --git a/ksirc/NewWindowDialog.h b/ksirc/NewWindowDialog.h index 3590c691..5f541d83 100644 --- a/ksirc/NewWindowDialog.h +++ b/ksirc/NewWindowDialog.h @@ -11,10 +11,11 @@ class KLineEdit; class NewWindowDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewWindowDialog(const KSircChannel &, TQWidget * parent = 0, const char * name = 0); + NewWindowDialog(const KSircChannel &, TQWidget * tqparent = 0, const char * name = 0); ~NewWindowDialog(); protected slots: diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 2455047d..80eb2eec 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -55,13 +55,13 @@ #include <kshortcut.h> -aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name) - : TQTextEdit(parent, name) +aHistLineEdit::aHistLineEdit(TQWidget *tqparent, const char *name) + : TQTextEdit(tqparent, name) { m_drawrect = false; m_height = 0; - current = hist.append(TQString::null); // Set the current as blank + current = hist.append(TQString()); // Set the current as blank setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); setVScrollBarMode( AlwaysOff ); setHScrollBarMode( AlwaysOff ); @@ -93,7 +93,7 @@ int aHistLineEdit::cursorPosition() const void aHistLineEdit::slotMaybeResize() { /* - if(TQTextEdit::text().contains("\n")){ + if(TQTextEdit::text().tqcontains("\n")){ setText(text()); setCursorPosition(text().length()); } @@ -102,13 +102,13 @@ void aHistLineEdit::slotMaybeResize() if(text().length() > IRC_SAFE_MAX_LINE){ if(m_drawrect == false){ m_drawrect = true; - repaint(); + tqrepaint(); } } else { if(m_drawrect == true){ m_drawrect = false; - repaint(); + tqrepaint(); } } @@ -116,9 +116,9 @@ void aHistLineEdit::slotMaybeResize() // int h = metrics.height() * lines(); int h = metrics.lineSpacing() * lines()+8; // only grow if we are less than 1/4 the size of the toplevel - if(h > (topLevelWidget()->height() >> 2)) { - if(this != topLevelWidget()) { - h = topLevelWidget()->height() >> 2; + if(h > (tqtopLevelWidget()->height() >> 2)) { + if(this != tqtopLevelWidget()) { + h = tqtopLevelWidget()->height() >> 2; setVScrollBarMode( Auto ); } } @@ -131,9 +131,9 @@ void aHistLineEdit::slotMaybeResize() s.setHeight(h); resize(s); setFixedHeight( h ); - TQLayout *l = topLevelWidget()->layout(); + TQLayout *l = tqtopLevelWidget()->tqlayout(); if(l){ - l->invalidate(); + l->tqinvalidate(); l->activate(); } emit resized(); @@ -304,7 +304,7 @@ bool aHistLineEdit::processKeyEvent( TQKeyEvent *e ) /* * Only put key sequences in here you * want us to ignore and to pass upto - * parent widgets for handling + * tqparent widgets for handling */ bool eat = false; @@ -352,7 +352,7 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e ) { if(e->button() == MidButton){ /* - * emit pasteText(TQApplication::clipboard()->text(QClipboard::Selection)); + * emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); */ } else{ @@ -362,8 +362,8 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e ) #endif bool aHistLineEdit::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == this && e->type() == TQEvent::AccelOverride ) - if(processKeyEvent( static_cast<TQKeyEvent*>( e ) ) == true) + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::AccelOverride ) + if(processKeyEvent( TQT_TQKEYEVENT( e ) ) == true) return true; return TQTextEdit::eventFilter( o, e ); @@ -381,11 +381,11 @@ void aHistLineEdit::paste() { /* we let the top level take it */ if(ksopts->oneLineEntry) { - emit pasteText(TQApplication::clipboard()->text(QClipboard::Selection)); + emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); } else { - TQString paste = TQApplication::clipboard()->text(QClipboard::Selection); - paste.replace("\n", " ~ "); + TQString paste = TQApplication::tqclipboard()->text(TQClipboard::Selection); + paste.tqreplace("\n", " ~ "); insert(paste); } } @@ -399,7 +399,7 @@ void aHistLineEdit::paintEvent ( TQPaintEvent *p ) TQPen pen = paint.pen(); pen.setWidth(5); pen.setStyle(Qt::SolidLine); - pen.setColor(palette().active().highlight()); + pen.setColor(tqpalette().active().highlight()); paint.setPen(pen); TQRect r = frameRect(); paint.drawRect(r); @@ -414,7 +414,7 @@ void aHistLineEdit::doEnterKey() if (!text().isEmpty()) { // text() has something -> store it in current and add a new empty one *current = text(); - hist.append(TQString::null); // always add empty line at end + hist.append(TQString()); // always add empty line at end if (hist.count() >= 256) { // if appended check if it will go beyond the max number of entries hist.remove(hist.begin()); // if so then delete the first entry } @@ -424,7 +424,7 @@ void aHistLineEdit::doEnterKey() // both !isEmpty() and != -> append at end current = hist.fromLast(); // goto last entry which is empty *current = text(); // change content to text() - hist.append(TQString::null); // always add empty line at end + hist.append(TQString()); // always add empty line at end if (hist.count() >= 256) { // if appended check if it will go beyond the max number of entries hist.remove(hist.begin()); // if so then delete the first entry } diff --git a/ksirc/ahistlineedit.h b/ksirc/ahistlineedit.h index 750d79a0..e66a634a 100644 --- a/ksirc/ahistlineedit.h +++ b/ksirc/ahistlineedit.h @@ -5,11 +5,12 @@ #include <tqstringlist.h> #include <tqsize.h> -class aHistLineEdit : public QTextEdit +class aHistLineEdit : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - aHistLineEdit(TQWidget *parent = 0, const char *name = 0); + aHistLineEdit(TQWidget *tqparent = 0, const char *name = 0); int cursorPosition () const; void setCursorPosition(int); diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 779bd730..9702cd5e 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -23,11 +23,11 @@ #include <kglobal.h> #include <kurldrag.h> -aListBox::aListBox(TQWidget *parent, const char *name ) - : TQListBox(parent,name) +aListBox::aListBox(TQWidget *tqparent, const char *name ) + : TQListBox(tqparent,name) { clear(); - p_scroll = palette().copy(); + p_scroll = TQPalette(tqpalette()); setAcceptDrops( true ); connect(this, TQT_SIGNAL(selected (const TQString&)), this, TQT_SIGNAL(selectedNick(const TQString&))); @@ -208,7 +208,7 @@ int aListBox::findNick(const TQString &str) index = searchFor(str, found, FALSE); if(found == TRUE) return index; -// debug("Did not find: %s", str.data()); +// debug("Did not tqfind: %s", str.data()); return -1; } @@ -402,25 +402,25 @@ void nickListItem::paint(TQPainter *p) if(is_voice == TRUE){ TQPen open = p->pen(); p->setPen(ksopts->channelColor); - p->drawText( nickPosX, yPos, "+" ); + p->drawText( nickPosX, yPos, TQString("+") ); nickPosX += fm.width( "+" ); p->setPen(open); -// p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->channelColor, Qt::Dense7Pattern)); +// p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->channelColor, TQt::Dense7Pattern)); } if(is_op == TRUE) { TQPen open = p->pen(); p->setPen(ksopts->errorColor); - p->drawText( nickPosX, yPos, "@" ); + p->drawText( nickPosX, yPos, TQString("@") ); nickPosX += fm.width( "@" ); p->setPen(open); -// p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->errorColor, Qt::Dense7Pattern)); +// p->fillRect(0,0, listBox()->maxItemWidth(), height(listBox()), TQBrush(ksopts->errorColor, TQt::Dense7Pattern)); } if(is_away == TRUE) p->setPen(p->pen().color().dark(150)); if(is_ircop == TRUE){ TQPen open = p->pen(); p->setPen(ksopts->errorColor); - p->drawText( nickPosX, yPos, "*" ); + p->drawText( nickPosX, yPos, TQString("*") ); nickPosX += fm.width( "*" ); p->setPen(open); diff --git a/ksirc/alistbox.h b/ksirc/alistbox.h index e1e4c2c9..d254c3ab 100644 --- a/ksirc/alistbox.h +++ b/ksirc/alistbox.h @@ -4,7 +4,7 @@ #include <tqlistbox.h> #include "ksopts.h" -class nickListItem : public QListBoxItem +class nickListItem : public TQListBoxItem { public: nickListItem(); @@ -47,12 +47,13 @@ protected: const TQColor *forcedCol; }; -class aListBox : public QListBox +class aListBox : public TQListBox { Q_OBJECT + TQ_OBJECT public: - aListBox(TQWidget *parent = 0, const char *name = 0); + aListBox(TQWidget *tqparent = 0, const char *name = 0); virtual ~aListBox(); @@ -79,10 +80,10 @@ public: virtual void fontChange( const TQFont &f ); - static TQString nickPrefixOp() { return TQString::fromLatin1( "o" ); } - static TQString nickPrefixVoice() { return TQString::fromLatin1( "v" ); } - static TQString nickPrefixAway() { return TQString::fromLatin1( "a" ); } - static TQString nickPrefixIrcOp() { return TQString::fromLatin1( "O" ); } + static TQString nickPrefixOp() { return TQString::tqfromLatin1( "o" ); } + static TQString nickPrefixVoice() { return TQString::tqfromLatin1( "v" ); } + static TQString nickPrefixAway() { return TQString::tqfromLatin1( "a" ); } + static TQString nickPrefixIrcOp() { return TQString::tqfromLatin1( "O" ); } signals: void contextMenuRequested(int index); diff --git a/ksirc/baserules.cpp b/ksirc/baserules.cpp index df4a40cc..9ea568f3 100644 --- a/ksirc/baserules.cpp +++ b/ksirc/baserules.cpp @@ -121,7 +121,7 @@ filterRuleList *KSMBaseRules::defaultRules() snprintf(msg1_match, 100, "(?i)<\\S+>.*\\s%s(,.*|\02:.*|:.*|\\s.*|$)", msg.latin1()); snprintf(msg1_to, 100, - "$1~%s", ksopts->msg1Contain.name().latin1());//, ksopts->ownNickColor); + "$1~%s", TQString(ksopts->msg1Contain.name()).latin1());//, ksopts->ownNickColor); fr = new filterRule(); fr->desc = "Highlight our msg1"; fr->search = msg1_match; @@ -145,7 +145,7 @@ filterRuleList *KSMBaseRules::defaultRules() snprintf(msg2_match, 100, "(?i)<\\S+>.*\\s%s(,.*|\02:.*|:.*|\\s.*|$)", msg.latin1()); snprintf(msg2_to, 100, - "$1~%s", ksopts->msg2Contain.name().latin1());//, ksopts->ownNickColor); + "$1~%s", TQString(ksopts->msg2Contain.name()).latin1());//, ksopts->ownNickColor); fr = new filterRule(); fr->desc = "Highlight our msg2"; fr->search = msg2_match; diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index 5aafba1c..fecfc068 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -17,13 +17,13 @@ static void makeSquare(TQWidget *w) { - TQSize sh = w->sizeHint(); + TQSize sh = w->tqsizeHint(); int s = sh.height(); w->setFixedSize(s,s); } -chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) -: TQWidget(parent, name), +chanButtons::chanButtons(KSircProcess *proc, TQWidget *tqparent, const char *name) +: TQWidget(tqparent, name), m_proc(proc) { Popupmenu = new KPopupMenu( this ); @@ -38,37 +38,37 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops())); toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices())); - layout = new TQHBoxLayout(this); - layout->setSpacing(0); - layout->setMargin(0); + tqlayout = new TQHBoxLayout(this); + tqlayout->setSpacing(0); + tqlayout->setMargin(0); protectButton = new TQPushButton(i18n("T"), this); protectButton->setToggleButton(true); makeSquare(protectButton); TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic")); connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode())); - layout->addWidget(protectButton); + tqlayout->addWidget(protectButton); outsideButton = new TQPushButton(i18n("N"), this); outsideButton->setToggleButton(true); makeSquare(outsideButton); TQToolTip::add(outsideButton, i18n("No outside messages")); connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode())); - layout->addWidget(outsideButton); + tqlayout->addWidget(outsideButton); moderateButton = new TQPushButton(i18n("M"), this); moderateButton->setToggleButton(true); makeSquare(moderateButton); TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak")); connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode())); - layout->addWidget(moderateButton); + tqlayout->addWidget(moderateButton); menuButton = new TQPushButton(i18n("..."), this); makeSquare(menuButton); menuButton->setFixedWidth(menuButton->width()*2); menuButton->setPopup(Popupmenu); TQToolTip::add(menuButton, i18n("More mode commands")); - layout->addWidget(menuButton); + tqlayout->addWidget(menuButton); } void chanButtons::invite() @@ -93,7 +93,7 @@ void chanButtons::limited() } else { Popupmenu->setItemChecked(toggleMenu[1], true); - emit mode(TQString("+l %1").arg(chanDialog->sendLimitedUsers()), 0); + emit mode(TQString("+l %1").tqarg(chanDialog->sendLimitedUsers()), 0); } delete chanDialog; } @@ -104,12 +104,12 @@ void chanButtons::key() if (Popupmenu->isItemChecked(toggleMenu[2])) { chanDialog->exec(); Popupmenu->setItemChecked(toggleMenu[2], false); - emit mode(TQString("-k %1").arg(chanDialog->sendKey()), 0); + emit mode(TQString("-k %1").tqarg(chanDialog->sendKey()), 0); } else { chanDialog->exec(); Popupmenu->setItemChecked(toggleMenu[2], true); - emit mode(TQString("+k %1").arg(chanDialog->sendKey()), 0); + emit mode(TQString("+k %1").tqarg(chanDialog->sendKey()), 0); } delete chanDialog; } @@ -203,8 +203,8 @@ void chanButtons::setMenuItemMode(int id, bool value) Popupmenu->setItemChecked(toggleMenu[id], value); } -chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, - const char *name, bool modal) : KDialog(parent, name, modal) +chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *tqparent, + const char *name, bool modal) : KDialog(tqparent, name, modal) { m_sendKey = ""; m_sendLimitedUsers = 0; @@ -230,7 +230,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->setMargin(0); okButton = new KPushButton(KStdGuiItem::ok(), this); - okButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + okButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, okButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(okButton); switch (modeType) { @@ -245,7 +245,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->addWidget(okButton); cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - cancelButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + cancelButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, cancelButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(cancelButton); connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); diff --git a/ksirc/chanButtons.h b/ksirc/chanButtons.h index c9eab5d5..092a9afd 100644 --- a/ksirc/chanButtons.h +++ b/ksirc/chanButtons.h @@ -16,12 +16,13 @@ class TQLineEdit; class KSircProcess; class KPushButton; -class chanButtons : public QWidget +class chanButtons : public TQWidget { Q_OBJECT + TQ_OBJECT friend class KSircTopLevel; public: - chanButtons(KSircProcess *proc, TQWidget* parent=0, const char* name=0); + chanButtons(KSircProcess *proc, TQWidget* tqparent=0, const char* name=0); ~chanButtons() {}; void setProtectMode(bool value) { protectButton->setOn(value); } @@ -31,7 +32,7 @@ class chanButtons : public QWidget void setMenuItemMode(int, bool); signals: - void mode(TQString, int, TQString nick = TQString::null); /// int == 0 channel mode, int == 1 user nick mode + void mode(TQString, int, TQString nick = TQString()); /// int == 0 channel mode, int == 1 user nick mode private slots: void protectMode(); @@ -47,7 +48,7 @@ class chanButtons : public QWidget private: int toggleMenu[7]; - TQHBoxLayout *layout; + TQHBoxLayout *tqlayout; TQPushButton *protectButton; TQPushButton *moderateButton; TQPushButton *outsideButton; @@ -60,10 +61,11 @@ class chanButtons : public QWidget class chanbuttonsDialog : public KDialog { Q_OBJECT + TQ_OBJECT friend class chanButtons; public: enum type { limited, key }; - chanbuttonsDialog(const type &modeType, TQWidget *parent=0, const char *name=0, bool modal=true); + chanbuttonsDialog(const type &modeType, TQWidget *tqparent=0, const char *name=0, bool modal=true); ~chanbuttonsDialog() {}; private slots: diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index f3015019..9c65c3bb 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -38,7 +38,7 @@ ChannelParser::ChannelParser(KSircTopLevel *_top) if(parserTable.isEmpty() == TRUE){ parserTable.setAutoDelete(TRUE); parserTable.insert("`l`", new parseFunc(&ChannelParser::parseSSFEClear)); - parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEStatus)); + parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEtqStatus)); parserTable.insert("`i`", new parseFunc(&ChannelParser::parseSSFEInit)); parserTable.insert("`t`", new parseFunc(&ChannelParser::parseSSFEMsg)); parserTable.insert("`o`", new parseFunc(&ChannelParser::parseSSFEOut)); @@ -66,7 +66,7 @@ ChannelParser::ChannelParser(KSircTopLevel *_top) parseResult *ChannelParser::parse(TQString string) { - // for older Qts + // for older TQts parseFunc *pf; if(string.length() < 3){ @@ -118,12 +118,12 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) { // top->mainw->clear(); top->clearWindow(); -// top->mainw->repaint(TRUE); +// top->mainw->tqrepaint(TRUE); string.truncate(0); - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } -parseResult * ChannelParser::parseSSFEStatus(TQString string) +parseResult * ChannelParser::parseSSFEtqStatus(TQString string) { string.remove(0, 12); // strip off the first 12 characters "<junk> [sirc] " if(string.length() == 0) @@ -143,12 +143,12 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) /* * fix up modes which may have gotten the (away) part */ - if(modes.contains("away")){ + if(modes.tqcontains("away")){ modes = ""; } bool away = false; - if(string.contains("(away)")) + if(string.tqcontains("(away)")) away = true; if(away){ @@ -159,39 +159,39 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) if ( nickItem ) { if(nickItem->away() != away){ nickItem->setAway( away ); - top->nicks->viewport()->repaint( top->nicks->itemRect( nickItem ), false ); + top->nicks->viewport()->tqrepaint( top->nicks->tqitemRect( nickItem ), false ); } nickItem->forceColour(&ksopts->ownNickColor); } top->ksircProcess()->setNick(nick); - if (chanmode.findRev("t") != -1) + if (chanmode.tqfindRev("t") != -1) top->channelButtons->setProtectMode(true); else top->channelButtons->setProtectMode(false); - if (chanmode.findRev("m") != -1) + if (chanmode.tqfindRev("m") != -1) top->channelButtons->setModerateMode(true); else top->channelButtons->setModerateMode(false); - if (chanmode.findRev("n") != -1) + if (chanmode.tqfindRev("n") != -1) top->channelButtons->setNooutsideMode(true); else top->channelButtons->setNooutsideMode(false); - if (chanmode.findRev("i") != -1) + if (chanmode.tqfindRev("i") != -1) top->channelButtons->setMenuItemMode(0, true); else top->channelButtons->setMenuItemMode(0, false); - if (chanmode.findRev("s") != -1) + if (chanmode.tqfindRev("s") != -1) top->channelButtons->setMenuItemMode(3, true); else top->channelButtons->setMenuItemMode(3, false); - if (modes.findRev("i") != -1) + if (modes.tqfindRev("i") != -1) top->channelButtons->setMenuItemMode(4, true); else top->channelButtons->setMenuItemMode(4, false); - if (modes.findRev("w") != -1) + if (modes.tqfindRev("w") != -1) top->channelButtons->setMenuItemMode(5, true); else top->channelButtons->setMenuItemMode(5, false); - if (modes.findRev("s") != -1) + if (modes.tqfindRev("s") != -1) top->channelButtons->setMenuItemMode(6, true); else top->channelButtons->setMenuItemMode(6, false); - TQString status_line = TQString("%1 (%2) %3 (%4) ").arg(chan).arg(chanmode).arg(nick).arg(modes); + TQString status_line = TQString("%1 (%2) %3 (%4) ").tqarg(chan).tqarg(chanmode).tqarg(nick).tqarg(modes); /* * Go srearching for key and limit messages @@ -199,7 +199,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) TQRegExp rxKey("<key: (\\S+)>"); if(rxKey.search(string) >= 0){ top->channelButtons->setMenuItemMode(2, true); - status_line += TQString("<key: %1>").arg(rxKey.cap(1)); + status_line += TQString("<key: %1>").tqarg(rxKey.cap(1)); } else { top->channelButtons->setMenuItemMode(2, false); @@ -208,7 +208,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) TQRegExp rxLimit("<limit: (\\S+)>"); if(rxLimit.search(string) >= 0){ top->channelButtons->setMenuItemMode(1, true); - status_line += TQString("<limit: %1>").arg(rxLimit.cap(1)); + status_line += TQString("<limit: %1>").tqarg(rxLimit.cap(1)); } else { top->channelButtons->setMenuItemMode(1, false); @@ -241,30 +241,30 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) top->caption = status_line; // Make copy so we're not // constantly changing the title bar } - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } parseResult * ChannelParser::parseSSFEInit(TQString) { - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } parseResult * ChannelParser::parseSSFEOut(TQString) { - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } parseResult * ChannelParser::parseSSFEMsg(TQString string) { if(string.length() > 100) - return new parseError(TQString::null, i18n("String length for nick is greater than 100 characters. This is unacceptably long.")); + return new parseError(TQString(), i18n("String length for nick is greater than 100 characters. This is unacceptably long.")); int l = string.length(); if (l <= 0) return new parseError(string, i18n("String not long enough")); - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } @@ -300,7 +300,7 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) } if(last[0] == '['){ /* strip time stamp */ - prompt = last.mid(last.find(' ')); + prompt = last.mid(last.tqfind(' ')); } else { prompt = last; @@ -319,7 +319,7 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) prompt_active = FALSE; } - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } parseResult * ChannelParser::parseSSFEReconnect(TQString) @@ -331,7 +331,7 @@ parseResult * ChannelParser::parseSSFEReconnect(TQString) emit top->outputUnicodeLine(str); } - return new parseSucc(TQString::null); // Null string, don't display anything + return new parseSucc(TQString()); // Null string, don't display anything } parseResult * ChannelParser::parseINFOInfo(TQString string) @@ -367,13 +367,13 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) if(current_item > 0) top->nicks->setCurrentItem(current_item); top->nicks->setTopItem(top_item); - top->nicks->repaint(TRUE); - return new parseSucc(TQString::null); // Parsing ok, don't print anything though + top->nicks->tqrepaint(TRUE); + return new parseSucc(TQString()); // Parsing ok, don't print anything though } else if(string[1] == '$'){ top->nicks->clearAdvOps(); //kdDebug(5008) << "Turning off advanced ops" << endl; - return new parseSucc(TQString::null); // Parsing ok, don't print anything though + return new parseSucc(TQString()); // Parsing ok, don't print anything though } @@ -399,7 +399,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) top->nicks->clear(); } - //int start = string.find(": ", 0, FALSE); // Find start of nicks + //int start = string.tqfind(": ", 0, FALSE); // Find start of nicks //if (start < 0) // return new parseError(string, i18n("Could not find start of nicks")); // @@ -417,7 +417,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) uint i; for(i = 0; i < nick.length();i++){ - switch(nick[0].unicode()){ + switch(nick[0].tqunicode()){ case '@': irc->setOp(TRUE); nick.remove(0,1); @@ -448,7 +448,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) top->nicks->inSort(irc); } - return new parseSucc(TQString::null); // Parsing ok, don't print anything though + return new parseSucc(TQString()); // Parsing ok, don't print anything though } parseResult * ChannelParser::parseINFOJoin(TQString string) @@ -525,7 +525,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) if(top->channelInfo().channel().lower() == channel.lower()) { TQApplication::postEvent(top, new TQCloseEvent()); // WE'RE DEAD - return new parseSucc(TQString::null); + return new parseSucc(TQString()); } pixname = "user|part"; } @@ -540,7 +540,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) return new parseWrongChannel(string, ksopts->errorColor, "user|kick"); if (ksopts->autoRejoin == TRUE) { - TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); /* if(top->ticker) top->ticker->show(); @@ -555,7 +555,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) int result = KMessageBox::questionYesNo(top, string, i18n("You Have Been Kicked"), i18n("Rejoin"), i18n("Leave")); if (result == KMessageBox::Yes) { - TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); /* if(top->ticker) * top->ticker->show(); @@ -584,7 +584,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) foundNick = true; } else{ - return new parseWrongChannel(TQString::null); + return new parseWrongChannel(TQString()); } pixname = "user|part"; highlightNick(string, nick); @@ -599,7 +599,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) if(top->channelInfo().channel().lower() == channel.lower()) { foundNick = true; } else { - return new parseWrongChannel(TQString::null); + return new parseWrongChannel(TQString()); } highlightNick(string, nick); pixname = "user|kick"; @@ -615,7 +615,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) return new parseJoinPart(" " + string, ksopts->channelColor, pixname); } else { - return new parseJoinPart(TQString::null); + return new parseJoinPart(TQString()); } } else { @@ -638,11 +638,11 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) //kdDebug(5008) << "Nick change: " << string << endl; TQRegExp rx("(\\S+) is now known as (\\S+)"); if(rx.search(string) == -1){ - if(string.contains("already taken")){ + if(string.tqcontains("already taken")){ return new parseSucc(" " + string, ksopts->errorColor, "user|error"); } - return new parseError(i18n("Unable to parse: %1").arg(string), i18n("Unable to parse change nick code")); + return new parseError(i18n("Unable to parse: %1").tqarg(string), i18n("Unable to parse change nick code")); } old_nick = rx.cap(1); @@ -678,7 +678,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) top->changeCompleteNick(old_nick, new_nick); top->nicks->setCurrentItem(selection); - top->nicks->repaint(TRUE); + top->nicks->tqrepaint(TRUE); // We're done, so let's finish up return new parseSucc(" " + string, ksopts->channelColor, "user|join"); } @@ -687,12 +687,12 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) top->channelInfo().channel() == old_nick) return new parseSucc(" " + string, ksopts->channelColor, "user|elipsis"); else - return new parseSucc(TQString::null); + return new parseSucc(TQString()); } // warning("Toplevel-N: nick change search failed on %s", s3.data()); - // return new parseSucc(TQString::null); + // return new parseSucc(TQString()); } class mode_info { @@ -747,7 +747,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) TQString modes, args, channel; int found = 0; - if(string.find("for user") >= 0) + if(string.tqfind("for user") >= 0) return new parseSucc(" " + string, ksopts->infoColor, "user|mode"); /* @@ -780,7 +780,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) if(found == 0) - return new parseError(" Failed to parse mode change: " + string, TQString::null); + return new parseError(" Failed to parse mode change: " + string, TQString()); /* * op specifie if it's a + or -. tru is + false is - @@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) pmList.setAutoDelete(true); for(uint pos = 0; pos < modes.length(); pos++){ - switch(modes.at(pos).unicode()){ + switch(modes.tqat(pos).tqunicode()){ case '+': op = true; break; @@ -814,15 +814,15 @@ parseResult * ChannelParser::parseINFOMode(TQString string) * +l otoh does, so read the argument */ if(op == false){ - pmList.append(new mode_info(op, 'l', TQString::null)); + pmList.append(new mode_info(op, 'l', TQString())); break; } case 'o': // Op, arg is the nick case 'v': // Voice, arg is the nick - case 'b': // Ban, arg is mask banned + case 'b': // Ban, arg is tqmask banned case 'k': // kcik, arg is nick if(ai == NULL) - return new parseError(i18n("Unable to parse mode change: %1").arg(string), TQString::null); + return new parseError(i18n("Unable to parse mode change: %1").tqarg(string), TQString()); pmList.append(new mode_info(op, modes.at(pos), *ai)); ai++; break; @@ -837,11 +837,11 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* * Mode changes which don't take args */ - pmList.append(new mode_info(op, modes.at(pos), TQString::null)); + pmList.append(new mode_info(op, modes.at(pos), TQString())); break; default: kdDebug(5008) << "Unknown mode change: " << modes.mid(pos, 1) << " Assume no args" << endl; - pmList.append(new mode_info(op, modes.at(pos), TQString::null)); + pmList.append(new mode_info(op, modes.at(pos), TQString())); } } // We have the modes set in mode and arg, now we go though @@ -858,7 +858,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* * Look at the second character, it's uniq, check for +,- latter */ - if(mi->mode().unicode() == 'o'){ + if(mi->mode().tqunicode() == 'o'){ mode_o_plus = mi->op(); mode_o_minus = !mi->op(); @@ -878,7 +878,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) irc->setOp(mi->op()); // add new nick in sorted pass,with colour top->nicks->inSort(irc); - top->nicks->repaint(TRUE); + top->nicks->tqrepaint(TRUE); } else{ kdDebug(5008) << "Toplevel+o: nick search failed on " << mi->arg() << endl; @@ -922,7 +922,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) irc->setVoice(voice) ; // add new nick in sorted pass,with colour top->nicks->inSort(irc); - top->nicks->repaint(); + top->nicks->tqrepaint(); } } else if(mi->mode() == 'b'){ @@ -993,7 +993,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) if(rx.search( string ) != -1){ TQString channel = rx.cap(1); TQString topic = rx.cap(2); - topic.replace( TQRegExp( "~~" ), "~" ); + topic.tqreplace( TQRegExp( "~~" ), "~" ); /* * check where it's going. @@ -1025,7 +1025,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) if(top->channelInfo().channel().lower() == channel.lower()){ TQString topic = rx.cap(3); //kdDebug(5008) << "Topic: " << topic << endl; - topic.replace(TQRegExp("~~"), "~"); + topic.tqreplace(TQRegExp("~~"), "~"); /* * topic is in double quotes, so remove them */ @@ -1041,7 +1041,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) void ChannelParser::highlightNick(TQString &string, TQString &nick) { - TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").arg(TQRegExp::escape(nick))); - string.replace(rx, "\\1~n" + nick + "~n\\2"); + TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").tqarg(TQRegExp::escape(nick))); + string.tqreplace(rx, "\\1~n" + nick + "~n\\2"); } diff --git a/ksirc/chanparser.h b/ksirc/chanparser.h index 15c76a9f..3eaf39b6 100644 --- a/ksirc/chanparser.h +++ b/ksirc/chanparser.h @@ -31,7 +31,7 @@ public: TQColor colour; TQString pm; - parseSucc(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString::null){ + parseSucc(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString()){ string = _s; colour = _c; pm = _pm; @@ -59,7 +59,7 @@ public: class parseWrongChannel : public parseSucc { public: - parseWrongChannel(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString::null) + parseWrongChannel(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString()) : parseSucc(_s, _c, _pm) { } @@ -69,7 +69,7 @@ public: class parseJoinPart : public parseSucc { public: - parseJoinPart(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString::null) + parseJoinPart(const TQString &_s, const TQColor &_c = TQColor(), const TQString &_pm = TQString()) : parseSucc(_s, _c, _pm) { } @@ -198,10 +198,10 @@ private: parseResult * parseSSFEClear(TQString string); /** - * SSFE Status is used to update caption, and op status + * SSFE tqStatus is used to update caption, and op status * */ - parseResult * parseSSFEStatus(TQString string); + parseResult * parseSSFEtqStatus(TQString string); /** * SSFE Init is called by ssfe when it's time to init and setup diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp index 30364565..49f5a364 100644 --- a/ksirc/charSelector.cpp +++ b/ksirc/charSelector.cpp @@ -8,8 +8,8 @@ #include <klocale.h> -charSelector::charSelector(TQWidget *parent, const char* name) - : KDialog(parent, name, false) +charSelector::charSelector(TQWidget *tqparent, const char* name) + : KDialog(tqparent, name, false) { testLayout = new TQVBoxLayout(this); testLayout->setSpacing( spacingHint() ); diff --git a/ksirc/charSelector.h b/ksirc/charSelector.h index df36c8d0..8c69b2a8 100644 --- a/ksirc/charSelector.h +++ b/ksirc/charSelector.h @@ -13,8 +13,9 @@ class TQPushButton; class charSelector : public KDialog { Q_OBJECT + TQ_OBJECT public: - charSelector(TQWidget *parent=0, const char *name=0); + charSelector(TQWidget *tqparent=0, const char *name=0); ~charSelector(); virtual bool eventFilter ( TQObject * watched, TQEvent * e ); diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index 9bb5f03f..ebdc9eed 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -30,8 +30,8 @@ #include <klocale.h> -ColorPicker::ColorPicker( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true /*modal*/, i18n( "Pick Color" ), +ColorPicker::ColorPicker( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true /*modal*/, i18n( "Pick Color" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel ), m_foregroundColor( -1 ), m_backgroundColor( -1 ) @@ -45,9 +45,9 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name ) sampleLayout->addWidget( preview ); m_sample = new TQLineEdit( i18n( "Sample Text" ), sampleBox ); - m_sample->setFocusPolicy( NoFocus ); - m_sample->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, - m_sample->sizePolicy().verData() ) ); + m_sample->setFocusPolicy( TQ_NoFocus ); + m_sample->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_sample->tqsizePolicy().verData() ) ); sampleLayout->addWidget( m_sample ); sampleLayout->addStretch(); @@ -111,7 +111,7 @@ void ColorPicker::setBackgroundColor( int col ) void ColorPicker::updateSample() { - TQColorGroup cg( colorGroup() ); + TQColorGroup cg( tqcolorGroup() ); TQColor col = ksopts->textColor; if ( m_foregroundColor != -1 ) @@ -130,9 +130,9 @@ void ColorPicker::updateSample() m_sample->setPalette( TQPalette( cg, cg, cg ) ); } -ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent, +ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *tqparent, const char *name ) - : TQFrame( parent, name, WStaticContents | WRepaintNoErase ), + : TQFrame( tqparent, name, WStaticContents | WRepaintNoErase ), m_currentCell( -1 ), m_focusedCell( - 1 ), m_colors( colors ), m_cellSize( 0 ) { @@ -140,7 +140,7 @@ ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent, updateCellSize(); - setFocusPolicy( StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); } void ColorBar::drawContents( TQPainter *p ) @@ -249,7 +249,7 @@ bool ColorBar::focusNextPrevChild( bool next ) void ColorBar::mousePressEvent( TQMouseEvent *ev ) { const TQPoint &p = ev->pos(); - if ( contentsRect().contains( p ) ) + if ( contentsRect().tqcontains( p ) ) { m_focusedCell = p.x() / m_cellSize; update(); @@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev ) void ColorBar::updateCellSize() { - setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); + setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); TQFontMetrics metrics( font() ); diff --git a/ksirc/colorpicker.h b/ksirc/colorpicker.h index 1a338bf4..3e7bf452 100644 --- a/ksirc/colorpicker.h +++ b/ksirc/colorpicker.h @@ -29,8 +29,9 @@ class TQLineEdit; class ColorPicker : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ColorPicker( TQWidget *parent, const char *name = 0 ); + ColorPicker( TQWidget *tqparent, const char *name = 0 ); TQString colorString() const; @@ -46,11 +47,12 @@ private: int m_backgroundColor; }; -class ColorBar : public QFrame +class ColorBar : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent, const char *name = 0 ); + ColorBar( const TQValueVector<TQColor> &colors, TQWidget *tqparent, const char *name = 0 ); signals: void colorPicked( int col ); diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index 386644b9..f0b65126 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -22,8 +22,8 @@ #define COL_CPS 4 #define COL_PER 5 -dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) - : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) +dccItem::dccItem( KListView *tqparent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) + : TQObject(), KListViewItem(tqparent), m_who(who), m_file(file), m_type(type) { m_percent = 0; m_status = status; @@ -34,17 +34,17 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); if(m_type == dccChat) setText(COL_SIZE, ""); else - setText(COL_SIZE, TQString("%1").arg(size)); + setText(COL_SIZE, TQString("%1").tqarg(size)); setText(COL_PER, ""); } -dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) -: TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) +dccItem::dccItem( KListViewItem *tqparent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) +: TQObject(), KListViewItem(tqparent), m_who(who), m_file(file), m_type(type) { m_percent = 0; m_status = status; @@ -54,9 +54,9 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); if(type != dccChat) - setText(COL_SIZE, TQString("%1").arg(size)); + setText(COL_SIZE, TQString("%1").tqarg(size)); setText(COL_PER, ""); } @@ -65,7 +65,7 @@ dccItem::~dccItem() { } -TQString dccItem::enumToStatus(enum dccStatus status) +TQString dccItem::enumTotqStatus(enum dcctqStatus status) { TQString str; switch(status){ @@ -108,7 +108,7 @@ TQString dccItem::enumToStatus(enum dccStatus status) void dccItem::setWhoPostfix(const TQString &post) { m_post = post; - setText(COL_WHO, TQString("%1 %2").arg(m_who).arg(post)); + setText(COL_WHO, TQString("%1 %2").tqarg(m_who).tqarg(post)); } void dccItem::changeFilename(const TQString &file) { @@ -121,10 +121,10 @@ void dccItem::changeWho(const TQString &who) { m_who = who; } -void dccItem::changeStatus(enum dccStatus status) +void dccItem::changetqStatus(enum dcctqStatus status) { m_manager->doChanged(); - setText(COL_STAT, enumToStatus(status)); + setText(COL_STAT, enumTotqStatus(status)); m_status = status; emit statusChanged(this); } @@ -146,13 +146,13 @@ void dccItem::setReceivedBytes(int bytes) (ctime >= (m_lasttime + 2)) ){ m_lasttime = ctime; - setText(COL_SIZE, TQString("%1/%2").arg(bytes).arg(m_size)); - setText(COL_PER, TQString("%1%").arg(per)); + setText(COL_SIZE, TQString("%1/%2").tqarg(bytes).tqarg(m_size)); + setText(COL_PER, TQString("%1%").tqarg(per)); m_percent = per; if(m_status == dccResumed) m_stime = 0; /* if we are got a resume request don't update CPS, reset it */ else - setText(COL_CPS, TQString("%1").arg(1.0*bytes/(time(NULL) - m_stime), 2)); + setText(COL_CPS, TQString("%1").tqarg(1.0*bytes/(time(NULL) - m_stime), 2)); } @@ -199,7 +199,7 @@ void dccItem::cancelRename(int col) } } -dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( parent, name) +dccManager::dccManager( TQWidget *tqparent, const char *name ) : dccManagerbase( tqparent, name) { dccNewDialog = 0x0; @@ -228,7 +228,7 @@ dccManager::~dccManager() { } -dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) +dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_sendit, this, dccItem::dccSend, file, who, status, size); @@ -237,7 +237,7 @@ dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccS return it; } -dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) +dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_getit, this, dccItem::dccGet, file, who, status, size); @@ -247,7 +247,7 @@ dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccSt } -dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus status) +dccItem *dccManager::newChatItem(TQString who, enum dccItem::dcctqStatus status) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_chatit, this, dccItem::dccChat, "", who, status, 0); diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h index f9d9a45a..7eb7822b 100644 --- a/ksirc/dccManager.h +++ b/ksirc/dccManager.h @@ -26,8 +26,9 @@ class dccItem : public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: - enum dccStatus { + enum dcctqStatus { dccRecving, dccOpen, dccWaitOnResume, @@ -46,11 +47,11 @@ public: dccSend }; - dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); - dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); + dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dcctqStatus, unsigned int size ); + dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dcctqStatus, unsigned int size ); virtual ~dccItem(); - void changeStatus(enum dccStatus); + void changetqStatus(enum dcctqStatus); void setReceivedBytes(int bytes); void setWhoPostfix(const TQString &post); @@ -59,7 +60,7 @@ public: const TQString who() { return m_who; } const TQString file() { return m_file; } - enum dccStatus status() { return m_status; } + enum dcctqStatus status() { return m_status; } enum dccType type() { return m_type; } double getPercent() { return m_percent; } @@ -70,7 +71,7 @@ signals: void itemRenamed(dccItem *, TQString oldNick, TQString oldFile); protected: - TQString enumToStatus(enum dccStatus); + TQString enumTotqStatus(enum dcctqStatus); virtual void okRename ( int col ); virtual void cancelRename ( int col ); @@ -83,7 +84,7 @@ private: TQString m_post; int m_percent; unsigned int m_size; - enum dccStatus m_status; + enum dcctqStatus m_status; const enum dccType m_type; time_t m_stime; time_t m_lasttime; @@ -95,14 +96,15 @@ class dccNew; class dccManager : public dccManagerbase { Q_OBJECT + TQ_OBJECT public: - dccManager( TQWidget *parent = 0, const char *name = 0 ); + dccManager( TQWidget *tqparent = 0, const char *name = 0 ); ~dccManager(); - dccItem *newSendItem(TQString file, TQString who, enum dccItem::dccStatus, unsigned int size); - dccItem *newGetItem(TQString file, TQString who, enum dccItem::dccStatus, unsigned int size); - dccItem *newChatItem(TQString who, enum dccItem::dccStatus); + dccItem *newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus, unsigned int size); + dccItem *newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus, unsigned int size); + dccItem *newChatItem(TQString who, enum dccItem::dcctqStatus); void doChanged() { emit changed(false, TQString("dcc activity")); }; diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index b925b1b2..bd1939ce 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>dccManagerbase</class> -<widget class="QFrame"> +<widget class="TQFrame"> <property name="name"> <cstring>dccManagerbase</cstring> </property> @@ -50,7 +50,7 @@ </column> <column> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -99,9 +99,9 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -183,14 +183,14 @@ <slot>kpbNew_clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>kpbResume_clicked()</slot> <slot>kpbConnect_clicked()</slot> <slot>kpbRename_clicked()</slot> <slot>kpbAbort_clicked()</slot> <slot>kpbNew_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp index 6d83938e..b37a8795 100644 --- a/ksirc/dccMgrTest.cpp +++ b/ksirc/dccMgrTest.cpp @@ -2,7 +2,7 @@ #include "dccManager.h" -class Timer : public QObject +class Timer : public TQObject { public: Timer( dccManager *view ) @@ -19,7 +19,7 @@ public: } void timerEvent( TQTimerEvent * ) { - m_it->changeStatus(dccItem::dccSending); + m_it->changetqStatus(dccItem::dccSending); bytes += 1000; m_it->setReceivedBytes(bytes); diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index 0ace8c56..961d01d4 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -27,11 +27,11 @@ #include "dccNew.h" #include "objFinder.h" -dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) - : dccNewBase( parent, name) +dccNew::dccNew( TQWidget *tqparent, const char *name, int type, TQString nick ) + : dccNewBase( tqparent, name) { - TQColorGroup cg_mainw = kapp->palette().active(); + TQColorGroup cg_mainw = kapp->tqpalette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); @@ -47,7 +47,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) TQString name = (*it).section("::", 1); kdDebug(5008) << "Looking at: " << *it << "/" << name << endl; - aListBox *a = static_cast<aListBox *>(objFinder::find(name.latin1(), "aListBox")); + aListBox *a = static_cast<aListBox *>(TQT_TQWIDGET(objFinder::tqfind(name.latin1(), "aListBox"))); if(a){ TQListBoxItem *i; for(i = a->firstItem(); i != 0x0; i = i->next()){ @@ -56,7 +56,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) } } else { - kdDebug(5008) << "Didn't find: " << name << endl; + kdDebug(5008) << "Didn't tqfind: " << name << endl; } } @@ -155,7 +155,7 @@ int dccNew::getType() { void dccNew::reject() { - emit accepted(-1, TQString::null, TQString::null); + emit accepted(-1, TQString(), TQString()); } diff --git a/ksirc/dccNew.h b/ksirc/dccNew.h index 35638b59..3f4a5a54 100644 --- a/ksirc/dccNew.h +++ b/ksirc/dccNew.h @@ -14,12 +14,13 @@ class dccNew : public dccNewBase { Q_OBJECT + TQ_OBJECT public: - dccNew( TQWidget *parent = 0, + dccNew( TQWidget *tqparent = 0, const char *name = 0, int type = -1, - TQString nick = TQString::null ); + TQString nick = TQString() ); ~dccNew(); enum { Chat, Send }; diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index 32106e48..06e90b46 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>dccNewBase</class> <author>Andrew Stanley-Jones</author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>dccNewBase</cstring> </property> @@ -20,7 +20,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbFileSend</cstring> </property> @@ -45,7 +45,7 @@ <string>&File send</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbChat</cstring> </property> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -72,7 +72,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -87,7 +87,7 @@ <property name="name"> <cstring>nickList</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> @@ -104,11 +104,11 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbFile</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -126,7 +126,7 @@ <cstring>leFile</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbFile</cstring> </property> @@ -139,15 +139,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbSend</cstring> </property> @@ -158,7 +158,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -219,15 +219,15 @@ <slot>fileClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>chatClicked()</slot> <slot>radioButton4_clicked()</slot> <slot>fileSendClicked()</slot> <slot>send()</slot> <slot>sendClicked()</slot> <slot>fileClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>alistbox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp index bd66b944..4d4d32a6 100644 --- a/ksirc/dccToplevel.cpp +++ b/ksirc/dccToplevel.cpp @@ -15,17 +15,17 @@ extern DisplayMgr *displayMgr; #define DTL_WINDOW_ID 10 -dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) - : KMainWindow(parent, name, Qt::WDestructiveClose) +dccTopLevel::dccTopLevel(TQWidget *tqparent, const char *name) + : KMainWindow(tqparent, name, TQt::WDestructiveClose) { - m_mgr = new dccManager(this, TQCString(TQObject::name()) + "_dccManager"); + m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager"); // m_mgr->show(); setCentralWidget(m_mgr); connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString))); - TQPopupMenu *win = new TQPopupMenu(this, TQCString(TQObject::name()) + "_popup_window"); - KAction *act = KStdAction::close(this, TQT_SLOT( close() ), actionCollection() ); + TQPopupMenu *win = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_window"); + KAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); act->plug(win); menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1); diff --git a/ksirc/dccToplevel.h b/ksirc/dccToplevel.h index 204c1d4f..33e129f6 100644 --- a/ksirc/dccToplevel.h +++ b/ksirc/dccToplevel.h @@ -10,9 +10,10 @@ class dccManager; class dccTopLevel : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - dccTopLevel(TQWidget *parent = 0, const char *name = 0); + dccTopLevel(TQWidget *tqparent = 0, const char *name = 0); virtual ~dccTopLevel(); dccManager *mgr() { return m_mgr; } diff --git a/ksirc/default.pl b/ksirc/default.pl index 7b42dd18..392204aa 100644 --- a/ksirc/default.pl +++ b/ksirc/default.pl @@ -427,7 +427,7 @@ sub cmd_fk { $n0thing_channel=$talkchannel; $n0thing_kickpat=$newarg; &slashify($n0thing_kickpat); - $n0thing_kickmsg=$args || "though names may change each face retains the mask it wore"; + $n0thing_kickmsg=$args || "though names may change each face retains the tqmask it wore"; &addhook("352", "dofklist"); &addhook("315", "donefk"); &sl("WHO $talkchannel"); diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index f8286ed6..ba169e4f 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -152,7 +152,7 @@ void DisplayMgrMDI::setCaption(TQWidget *w, const TQString& cap) w->setCaption(cap); TQString esc = cap; - esc.replace("&", "&&"); + esc.tqreplace("&", "&&"); kdDebug(5008) << "Set caption: " << esc << endl; m_topLevel->tabWidget()->setTabLabel( w, esc ); @@ -178,12 +178,12 @@ void DisplayMgrMDI::reparentReq() { kdDebug(5008) << "got reparent" << endl; - TQWidget *o = kapp->focusWidget(); + TQWidget *o = kapp->tqfocusWidget(); TQWidget *s; if(o == NULL){ kdDebug(5008) << "Kapp says no widget has focus!" << endl; - o = kapp->activeWindow(); + o = TQT_TQWIDGET(kapp->activeWindow()); if(o->inherits("KMainWindow") == false) return; @@ -196,9 +196,9 @@ void DisplayMgrMDI::reparentReq() s = o; - while(s->parentWidget()){ + while(s->tqparentWidget()){ kdDebug(5008) << "Got a: " << s->className() << endl; - s = s->parentWidget(); + s = s->tqparentWidget(); if(s->inherits("KMainWindow")) break; @@ -213,10 +213,10 @@ void DisplayMgrMDI::reparentReq() TQMenuData *tmenu = kst->menuBar(); if(tmenu){ - TQMenuItem *menui = tmenu->findItem(DMM_MDI_ID); + TQMenuItem *menui = tmenu->tqfindItem(DMM_MDI_ID); if(menui){ TQMenuData *cmenu = menui->popup(); - if(cmenu->findItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){ + if(cmenu->tqfindItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){ kst->reparent( topLevel()->tabWidget(), 0, TQPoint( 0, 0 ), true ); show(kst); cmenu->setItemChecked(DMM_DEATCH_ID, false); @@ -239,8 +239,8 @@ MDITopLevel *DisplayMgrMDI::topLevel() m_topLevel->show(); KAccel *a = new KAccel( m_topLevel ); - a->insert( "cycle left", i18n("Cycle left"), TQString::null, ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); - a->insert( "cycle right", i18n("Cycle right"), TQString::null, ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); + a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); + a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); } return m_topLevel; @@ -293,9 +293,9 @@ void DisplayMgrMDI::moveWindow(int step) m_topLevel->setUpdatesEnabled(false); m_topLevel->hideWidget(w); - int space = w->caption().find(" "); + int space = w->caption().tqfind(" "); TQString esc = space < 1 ? w->caption():w->caption().left(space); - esc.replace("&", "&&"); + esc.tqreplace("&", "&&"); kdDebug(5008) << "Insert tab: " << esc << endl; m_topLevel->tabWidget()->insertTab( w, esc, index ); m_topLevel->tabWidget()->showPage( w ); diff --git a/ksirc/displayMgrMDI.h b/ksirc/displayMgrMDI.h index 84e17631..aa589b86 100644 --- a/ksirc/displayMgrMDI.h +++ b/ksirc/displayMgrMDI.h @@ -7,6 +7,7 @@ class DisplayMgrMDI : public TQObject, public DisplayMgr { Q_OBJECT + TQ_OBJECT public: DisplayMgrMDI(); virtual ~DisplayMgrMDI(); diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index 6053e5ab..cdb3d2ae 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -53,8 +53,8 @@ dscNickInfo::~dscNickInfo() } -dockServerController::dockServerController(servercontroller *sc, TQWidget *parent, const char *_name) -: KSystemTray(parent, _name), +dockServerController::dockServerController(servercontroller *sc, TQWidget *tqparent, const char *_name) +: KSystemTray(tqparent, _name), m_sc(sc) { @@ -72,9 +72,9 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren pop->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), m_sc, TQT_SLOT(filter_rule_editor())); - KStdAction::preferences(m_sc, TQT_SLOT(general_prefs()), + KStdAction::preferences(TQT_TQOBJECT(m_sc), TQT_SLOT(general_prefs()), m_sc->actionCollection())->plug(pop); - KStdAction::configureNotifications(m_sc, TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); + KStdAction::configureNotifications(TQT_TQOBJECT(m_sc), TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); pop->insertSeparator(); pop->insertItem(i18n("New &Server..."), @@ -98,7 +98,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren m_blinkTimer = new TQTimer( this ); connect( m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( blinkDockedIcon() ) ); - m_blinkStatus = false; + m_blinktqStatus = false; m_blinkActive = false; servercontroller::self() @@ -106,14 +106,14 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren ->insert("Raise Last Window", i18n("Raise Last Window"), i18n("If someone said your nick in a window, this action " "will make that window active for you."), - ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, this, + ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, TQT_TQOBJECT(this), TQT_SLOT(raiseLastActiveWindow())); servercontroller::self() ->getGlobalAccel() ->insert("Clear Blink", i18n("Clear Blinking Dock Icon"), i18n("If the dock icon is blinking, but you don't want " "to go to the window this will clear the blinking."), - ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, this, + ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(blinkClear())); // mainPop = new KPopupMenu(this, "dockServerController_main_pop"); @@ -240,9 +240,9 @@ void dockServerController::subItemActivated(int sub_id) servercontroller::self()->new_toplevel(KSircChannel(server, nick)); } else { - KSircProcess *kp = servercontroller::self()->processes().find(server); + KSircProcess *kp = servercontroller::self()->processes().tqfind(server); if(kp){ - KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().find("!default")); + KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().tqfind("!default")); if(wm){ if(cmd == i18n("Ping")){ wm->sirc_line_return("/ping " + nick + "\n"); @@ -261,7 +261,7 @@ void dockServerController::subItemActivated(int sub_id) void dockServerController::mousePressEvent( TQMouseEvent *e ) { - if(e->button() == LeftButton){ + if(e->button() == Qt::LeftButton){ showPopupMenu(mainPop); } else { @@ -316,14 +316,14 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te if(m_blinkActive == false){ // change icon (to "someone's talking to you" icon) setPixmap( m_pic_info ); - m_blinkStatus = true; + m_blinktqStatus = true; m_blinkActive = true; m_blinkTimer->start( 500 ); // half a second } if(!reason.isNull()){ TQString br(reason); if(text.isNull() && ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("Notify: %1").arg(reason), this); + KPassivePopup::message(TQString("Notify: %1").tqarg(reason), this); else { TQStringList sl; TQString cutup = text; @@ -338,7 +338,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te cutup = sl.join("\n"); cutup.truncate(cutup.length()-1); if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("%1").arg(reason), cutup, this); + KPassivePopup::message(TQString("%1").tqarg(reason), cutup, this); } m_blink_reason.append(br); createMainPopup(); @@ -395,8 +395,8 @@ void dockServerController::raiseLastActiveWindow() void dockServerController::blinkDockedIcon() { - m_blinkStatus = !m_blinkStatus; - setPixmap( m_blinkStatus ? m_pic_info : m_pic_dock ); + m_blinktqStatus = !m_blinktqStatus; + setPixmap( m_blinktqStatus ? m_pic_info : m_pic_dock ); } void dockServerController::helpNotice() @@ -433,10 +433,10 @@ void dockServerController::configNotify() void dockServerController::raiseWindow(TQString server, TQString name) { TQCString txt = server.utf8() + "_" + name.utf8() + "_toplevel"; - TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); + TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); if(obj == 0x0){ txt = server.utf8() + "_!" + name.utf8() + "_toplevel"; - obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); + obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); } if(obj != 0x0){ diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h index 97d0befd..4083c044 100644 --- a/ksirc/dockservercontroller.h +++ b/ksirc/dockservercontroller.h @@ -36,7 +36,7 @@ public: void setOffline() { m_status = isOffline; m_offline = TQTime::currentTime(); } const TQTime offline() { return m_offline; } - void setStatus(enum status stat) { m_status = stat; } + void settqStatus(enum status stat) { m_status = stat; } enum status status() { return m_status; } private: @@ -51,12 +51,13 @@ private: class dockServerController : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - dockServerController(servercontroller *_sc, TQWidget *parent = 0x0, const char *_name = 0x0); + dockServerController(servercontroller *_sc, TQWidget *tqparent = 0x0, const char *_name = 0x0); ~dockServerController(); - void startBlink(const TQString& reason = TQString::null, const TQString& text = TQString::null); - void stopBlink(const TQString& reason = TQString::null, bool clear = false); + void startBlink(const TQString& reason = TQString(), const TQString& text = TQString()); + void stopBlink(const TQString& reason = TQString(), bool clear = false); void nickOnline(TQString server, TQString nick); void nickOffline(TQString server, TQString nick); @@ -99,7 +100,7 @@ private: bool m_mainPopVisible; bool m_blinkActive; - bool m_blinkStatus; // true: blue icon, false: normal icon + bool m_blinktqStatus; // true: blue icon, false: normal icon TQTimer* m_blinkTimer; TQStringList m_blink_reason; diff --git a/ksirc/dsirc b/ksirc/dsirc index f358fcd7..eddc5fd2 100755 --- a/ksirc/dsirc +++ b/ksirc/dsirc @@ -2082,7 +2082,7 @@ sub donumeric { if ($cmd eq '401') { &yetonearg; &yetonearg; - &tell("*\cb?\cb* Cannot find $newarg on irc$from"); + &tell("*\cb?\cb* Cannot tqfind $newarg on irc$from"); } elsif ($cmd eq '402') { &yetonearg; &yetonearg; @@ -2176,7 +2176,7 @@ sub donumeric { eval $err; $@ =~ s/\n$//, &tell("*\cbE\cb* error in userhost: $@") if $@ ne ''; } else { - &tell("*\cb?\cb* Cannot find $n on irc"); + &tell("*\cb?\cb* Cannot tqfind $n on irc"); } } } elsif ($cmd eq '303') { diff --git a/ksirc/ioBroadcast.cpp b/ksirc/ioBroadcast.cpp index b36e4420..ef0fa33b 100644 --- a/ksirc/ioBroadcast.cpp +++ b/ksirc/ioBroadcast.cpp @@ -5,7 +5,7 @@ $$Id$$ The IO broadcaster bassed on the ksircmessage receiver takes a - message and send it all ksircmessage receivers, except of course it + message and send it all ksircmessage tqreceivers, except of course it self. It does the same with control_messages. diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index ff2d5022..e718a452 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -58,10 +58,10 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // Then we look at the one time start/stop messages. They only arrive // once in a long long time (compared to the byte messages) so if it takes // a few extra clock cycles to find them, who cares? - if(str.find("DCC GET read:", 0) != -1){ /*fold01*/ + if(str.tqfind("DCC GET read:", 0) != -1){ /*fold01*/ TQRegExp rx("read: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); + TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); // @@ -73,10 +73,10 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.find("DCC SEND write:", 0) != -1){ /*fold01*/ + else if(str.tqfind("DCC SEND write:", 0) != -1){ /*fold01*/ TQRegExp rx("write: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); + TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); if(DCCSendItems[key]){ @@ -84,14 +84,14 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.find("INBOUND DCC SEND", 0) != -1){ /*FOLD01*/ + else if(str.tqfind("INBOUND DCC SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) size: (.*) ip: (.+) port: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString size = rx.cap(3); TQString ip = rx.cap(4); - //QSTring port = rx.cap(5); + //TQSTring port = rx.cap(5); int fileSize = size.toInt(); // Bytes per step fileSize /= 1024; @@ -103,7 +103,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ /* * don't add duplicates, this cuases real headaches @@ -113,11 +113,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) dccItem *old = DCCGetItems.take(key); int i; for(i = 0; i <= (int) DCCGetItems.count()+1; i++){ - renamed = TQString("%1 (finished %2)/%3").arg(filename).arg(i+1).arg(old->who()); + renamed = TQString("%1 (finished %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who()); if( DCCGetItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (finished %2)").arg(filename).arg(i+1)); + old->changeFilename(TQString("%1 (finished %2)").tqarg(filename).tqarg(i+1)); DCCGetItems.insert(renamed, it); } @@ -127,7 +127,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC SEND was unable to parse: " << str << endl; } } - else if(str.find("Sent DCC SEND", 0) != -1){ /*FOLD01*/ + else if(str.tqfind("Sent DCC SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) size: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -139,7 +139,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newSendItem(filename, who, dccItem::dccSentOffer, fileSize); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ /* * don't add duplicates, this cuases real headaches @@ -151,11 +151,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) dccItem *old = DCCSendItems.take(key); int i; for(i = 0; i <= (int) DCCSendItems.count()+1; i++){ - renamed = TQString("%1 (sent %2)/%3").arg(filename).arg(i+1).arg(old->who()); + renamed = TQString("%1 (sent %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who()); if( DCCSendItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (sent %2)").arg(filename).arg(i+1)); + old->changeFilename(TQString("%1 (sent %2)").tqarg(filename).tqarg(i+1)); DCCSendItems.insert(renamed, it); } DCCSendItems.insert(key, it); @@ -164,7 +164,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC SENT was unable to parse: " << str << endl; } } - else if(str.find("DCC CHAT OFFERED", 0) != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT OFFERED", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) ip: (.+) port: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -182,7 +182,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC CHAT SEND was unable to parse: " << str << endl; } } - else if(str.find("DCC CHAT SEND", 0) != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -198,201 +198,201 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC CHAT SEND was unable to parse: " << str << endl; } } - else if(str.find("DCC SEND terminated") != -1){ /*FOLD01*/ + else if(str.tqfind("DCC SEND terminated") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dccStatus status = dccItem::dccDone; + enum dccItem::dcctqStatus status = dccItem::dccDone; if(error == "CLOSE"){ status = dccItem::dccCancel; } if(error != "OK"){ status = dccItem::dccError; - KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ kdDebug(5008) << "SendPercent: " << DCCSendItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCSendItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCSendItems[key]->changeStatus(status); + DCCSendItems[key]->changetqStatus(status); } } } - else if(str.find ("DCC GET terminated") != -1){ /*fold01*/ + else if(str.tqfind ("DCC GET terminated") != -1){ /*fold01*/ kdDebug(5008) << "Term: " << str << endl; TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dccStatus status = dccItem::dccDone; + enum dccItem::dcctqStatus status = dccItem::dccDone; if(error != "OK"){ status = dccItem::dccError; - KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ kdDebug(5008) << "GetPercent: " << DCCGetItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCGetItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCGetItems[key]->changeStatus(status); + DCCGetItems[key]->changetqStatus(status); } } else { kdDebug(5008) << "DCC Get term failed to parse: " << str << endl; } } - else if(str.find("DCC GET resumed") != -1){ /*fold01*/ + else if(str.tqfind("DCC GET resumed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ dccItem *it = DCCGetItems[key]; kdDebug(5008) << "Got DCC GET resumed message..." << it->file() << endl; if(it->status() == dccItem::dccWaitOnResume) dccConnectClicked(it); - it->changeStatus(dccItem::dccResumed); + it->changetqStatus(dccItem::dccResumed); } } } - else if(str.find("DCC SEND resumed") != -1){ /*fold01*/ + else if(str.tqfind("DCC SEND resumed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ - DCCSendItems[key]->changeStatus(dccItem::dccResumed); + DCCSendItems[key]->changetqStatus(dccItem::dccResumed); } } } - else if(str.find("DCC GET established") != -1){ /*fold01*/ + else if(str.tqfind("DCC GET established") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changeStatus(dccItem::dccRecving); + DCCGetItems[key]->changetqStatus(dccItem::dccRecving); } } } - else if(str.find("DCC SEND established") != -1){ /*fold01*/ + else if(str.tqfind("DCC SEND established") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+) ip: (\\S+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString ip = rx.cap(3); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ DCCSendItems[key]->setWhoPostfix("(" + ip + ")"); - DCCSendItems[key]->changeStatus(dccItem::dccSending); + DCCSendItems[key]->changetqStatus(dccItem::dccSending); } } } - else if(str.find("DCC CHAT established") != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT established") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changeStatus(dccItem::dccOpen); + DCCChatItems[who]->changetqStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } } - else if(str.find("DCC CHAT inbound established") != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT inbound established") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) ip: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString ip = rx.cap(2); if(DCCChatItems[who]){ DCCChatItems[who]->setWhoPostfix("(" + ip + ")"); - DCCChatItems[who]->changeStatus(dccItem::dccOpen); + DCCChatItems[who]->changetqStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } } - else if(str.find("DCC GET failed") != -1){ /*fold01*/ + else if(str.tqfind("DCC GET failed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changeStatus(dccItem::dccError); + DCCGetItems[key]->changetqStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); } } - else if(str.find("DCC CHAT failed") != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT failed") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString error = rx.cap(2); if(DCCChatItems[who]){ - DCCChatItems[who]->changeStatus(dccItem::dccError); + DCCChatItems[who]->changetqStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").arg(who).arg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr()); } } - else if(str.find("DCC CHAT renamed") != -1){ /*FOLD01*/ + else if(str.tqfind("DCC CHAT renamed") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) to: (.+)"); if(rx.search(str)){ TQString oldwho = rx.cap(1); TQString newwho = rx.cap(2); TQString oldwin = "=" + oldwho; - if(proc->getWindowList().find(oldwin)){ - proc->getWindowList().find(oldwin)->control_message(CHANGE_CHANNEL,TQString("=" +newwho).lower()); + if(proc->getWindowList().tqfind(oldwin)){ + proc->getWindowList().tqfind(oldwin)->control_message(CHANGE_CHANNEL,TQString("=" +newwho).lower()); } } } - else if(str.find("Closing DCC GET") != -1){ /*fold01*/ + else if(str.tqfind("Closing DCC GET") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").arg(filename).arg(who); + TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changeStatus(dccItem::dccCancel); + DCCGetItems[key]->changetqStatus(dccItem::dccCancel); } } } -// else if(str.find("Closing DCC SEND") != -1){ /*FOLD01*/ +// else if(str.tqfind("Closing DCC SEND") != -1){ /*FOLD01*/ // TQRegExp rx("who: (.+) file: (.+)"); // if(rx.search(str)){ // TQString who = rx.cap(1); // TQString filename = rx.cap(2); -// TQString key = TQString("%1/%2").arg(filename).arg(who); +// TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); // if(DCCSendItems[key]){ -// DCCSendItems[key]->changeStatus(dccItem::dccCancel); +// DCCSendItems[key]->changetqStatus(dccItem::dccCancel); // } // } // } - else if(str.find("Closing DCC CHAT") != -1){ /*fold01*/ + else if(str.tqfind("Closing DCC CHAT") != -1){ /*fold01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changeStatus(dccItem::dccDone); + DCCChatItems[who]->changetqStatus(dccItem::dccDone); } } } - else if(str.find("No DCC SEND") != -1){ /*fold01*/ + else if(str.tqfind("No DCC SEND") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - //TQString key = TQString("%1/%2").arg(filename).arg(who); + //TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); TQPtrList<dccItem> toDel; TQDict<dccItem> new_list; @@ -412,7 +412,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) toDel.clear(); } } - else if(str.find("No DCC GET") != -1){ /*fold01*/ + else if(str.tqfind("No DCC GET") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -436,7 +436,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) toDel.clear(); } } - else if(str.find("No DCC CHAT") != -1){ /*fold01*/ + else if(str.tqfind("No DCC CHAT") != -1){ /*fold01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -470,11 +470,11 @@ void KSircIODCC::control_message(int, TQString) void KSircIODCC::cancelTransfer(TQString filename) { //if(DlgList[filename]){ - //emit outputLine(DCCStatus[filename]->cancelMessage.ascii()); + //emit outputLine(DCCtqStatus[filename]->cancelMessage.ascii()); //delete DlgList[filename]; //DlgList.remove(filename); - //delete DCCStatus[filename]; - //DCCStatus.remove(filename); + //delete DCCtqStatus[filename]; + //DCCtqStatus.remove(filename); //} } @@ -482,9 +482,9 @@ void KSircIODCC::getFile() { /* TQString text = pending->fileListing()->text(pending->fileListing()->currentItem()); - int pos = text.find(" ", 0); + int pos = text.tqfind(" ", 0); TQString nick = text.mid(0, pos); - pos = text.find(" ", pos+1) + 1; + pos = text.tqfind(" ", pos+1) + 1; TQString filename = text.mid(pos, text.length() - pos); //if(DlgList[filename]->isVisible() == FALSE) // DlgList[filename]->show(); @@ -503,9 +503,9 @@ void KSircIODCC::forgetFile() { /* TQString text = pending->fileListing()->text(pending->fileListing()->currentItem()); - int pos = text.find(" ", 0); + int pos = text.tqfind(" ", 0); TQString nick = text.mid(0, pos); - pos = text.find(" ", pos+1) + 1; + pos = text.tqfind(" ", pos+1) + 1; TQString filename = text.mid(pos, text.length() - pos); TQString command = "/dcc close get " + nick + " " + filename + "\n"; emit outputLine(command.ascii()); @@ -561,7 +561,7 @@ void KSircIODCC::dccResumeClicked(dccItem *it) kdDebug(5008) << "Got resume click on " << it->who() << " " << it->type() << endl; switch(it->type()){ case dccItem::dccGet: - it->changeStatus(dccItem::dccWaitOnResume); + it->changetqStatus(dccItem::dccWaitOnResume); str = "/resume " + it->who() + " " + it->file() + "\n"; emit outputLine(str.ascii()); break; @@ -583,10 +583,10 @@ void KSircIODCC::dccAbortClicked(dccItem *it) case dccItem::dccError: switch(it->type()) { case dccItem::dccGet: - DCCGetItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who())); + DCCGetItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who())); break; case dccItem::dccSend: - DCCSendItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who())); + DCCSendItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who())); break; case dccItem::dccChat: DCCChatItems.remove(it->who()); @@ -615,11 +615,11 @@ void KSircIODCC::dccAbortClicked(dccItem *it) void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile) { if(it->type() == dccItem::dccGet){ - TQString str = TQString("/dcc rename %1 %2 %3\n").arg(oldWho).arg(oldFile).arg(it->file()); - TQString key = TQString("%1/%2").arg(oldFile).arg(oldWho); + TQString str = TQString("/dcc rename %1 %2 %3\n").tqarg(oldWho).tqarg(oldFile).tqarg(it->file()); + TQString key = TQString("%1/%2").tqarg(oldFile).tqarg(oldWho); if(DCCGetItems[key]){ DCCGetItems.take(key); - TQString newkey = TQString("%1/%2").arg(it->file()).arg(it->who()); + TQString newkey = TQString("%1/%2").tqarg(it->file()).tqarg(it->who()); DCCGetItems.insert(newkey, it); } emit outputLine(str.ascii()); @@ -629,7 +629,7 @@ void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile) DCCChatItems.take(oldWho); DCCChatItems.insert(it->who(), it); } - TQString str = TQString("/dcc rchat %1 %2\n").arg(oldWho).arg(it->who()); + TQString str = TQString("/dcc rchat %1 %2\n").tqarg(oldWho).tqarg(it->who()); emit outputLine(str.ascii()); } diff --git a/ksirc/ioDCC.h b/ksirc/ioDCC.h index a9768f29..791d5d19 100644 --- a/ksirc/ioDCC.h +++ b/ksirc/ioDCC.h @@ -23,6 +23,7 @@ class KSircIODCC : public TQObject, public KSircMessageReceiver { Q_OBJECT + TQ_OBJECT public: KSircIODCC(KSircProcess *_proc); virtual ~KSircIODCC(); @@ -51,7 +52,7 @@ signals: private: // TQDict<TQProgressDialog> DlgList; //TQDict<KSProgress> DlgList; - //TQDict<DCCInfo> DCCStatus; + //TQDict<DCCInfo> DCCtqStatus; TQDict<dccItem> DCCGetItems; TQDict<dccItem> DCCSendItems; TQDict<dccItem> DCCChatItems; diff --git a/ksirc/ioLAG.cpp b/ksirc/ioLAG.cpp index 0a1a2ec7..ee79094d 100644 --- a/ksirc/ioLAG.cpp +++ b/ksirc/ioLAG.cpp @@ -32,9 +32,9 @@ KSircIOLAG::~KSircIOLAG() void KSircIOLAG::sirc_receive(TQCString str, bool) { - if(str.contains("*L*")){ + if(str.tqcontains("*L*")){ int s1, s2; - s1 = str.find("*L* ") + 4; + s1 = str.tqfind("*L* ") + 4; s2 = str.length(); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Lag mesage broken: " << str << endl; diff --git a/ksirc/ioLAG.h b/ksirc/ioLAG.h index 6fc99901..a9c5a5bf 100644 --- a/ksirc/ioLAG.h +++ b/ksirc/ioLAG.h @@ -9,6 +9,7 @@ class KSircIOLAG : public TQObject, public KSircMessageReceiver { Q_OBJECT + TQ_OBJECT public: KSircIOLAG(KSircProcess *_proc); virtual ~KSircIOLAG(); diff --git a/ksirc/ioNotify.cpp b/ksirc/ioNotify.cpp index b3b4a52f..c590c180 100644 --- a/ksirc/ioNotify.cpp +++ b/ksirc/ioNotify.cpp @@ -26,10 +26,10 @@ KSircIONotify::~KSircIONotify() void KSircIONotify::sirc_receive(TQCString str, bool) { - if(str.contains("*)*")){ + if(str.tqcontains("*)*")){ int s1, s2; - s1 = str.find("Signon by") + 10; - s2 = str.find(" ", s1); + s1 = str.tqfind("Signon by") + 10; + s2 = str.tqfind(" ", s1); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Nick Notify mesage broken: " << str << endl; return; @@ -37,10 +37,10 @@ void KSircIONotify::sirc_receive(TQCString str, bool) TQString nick = str.mid(s1, s2 - s1); emit notify_online(nick); } - else if(str.contains("*(*")){ + else if(str.tqcontains("*(*")){ int s1, s2; - s1 = str.find("Signoff by") + 11; - s2 = str.find(" ", s1); + s1 = str.tqfind("Signoff by") + 11; + s2 = str.tqfind(" ", s1); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Nick Notify mesage broken: " << str << endl; return; diff --git a/ksirc/ioNotify.h b/ksirc/ioNotify.h index b5a9890e..69c80666 100644 --- a/ksirc/ioNotify.h +++ b/ksirc/ioNotify.h @@ -9,6 +9,7 @@ class KSircIONotify : public TQObject, public KSircMessageReceiver { Q_OBJECT + TQ_OBJECT public: KSircIONotify(KSircProcess *_proc); virtual ~KSircIONotify(); diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index d63fba7b..e6514537 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -193,7 +193,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) } if(buffer[buffer.length()-1] != '\n'){ - pos = buffer.findRev('\n'); + pos = buffer.tqfindRev('\n'); if(pos != -1){ holder = buffer.right(buffer.length()-(pos+1)); buffer.truncate(pos+1); @@ -222,7 +222,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) m_debugLB->setUpdatesEnabled(false); do{ - pos2 = buffer.find('\n', pos); + pos2 = buffer.tqfind('\n', pos); if(pos2 == -1) pos2 = buffer.length(); @@ -236,7 +236,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) //kdDebug(5008) << "Line: " << line << endl; if((line.length() > 0) && (line[0] == '~')){ - pos3 = line.find('~', 1); + pos3 = line.tqfind('~', 1); if(pos3 > 1){ name = line.mid(1,pos3-1).lower(); name = name.lower(); diff --git a/ksirc/iocontroller.h b/ksirc/iocontroller.h index 77086239..3702159c 100644 --- a/ksirc/iocontroller.h +++ b/ksirc/iocontroller.h @@ -8,10 +8,11 @@ class KSircProcess; class TQListBox; class TQListBoxItem; -class KSircIOController : public QObject +class KSircIOController : public TQObject { Q_OBJECT + TQ_OBJECT friend class KSircProcess; public: KSircIOController(KProcess *, KSircProcess *); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index 88abb6d6..b391b28a 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -50,7 +50,7 @@ class KSircSessionManaged : public KSessionManaged public: KSircSessionManaged() {} - virtual bool commitData( QSessionManager &sm ) + virtual bool commitData( TQSessionManager &sm ) { servercontroller *controller = servercontroller::self(); if ( !controller || !sm.allowsInteraction() ) return true; @@ -103,10 +103,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) sc->restore(1, false ); } else - { // no Session management -> care about docking, geometry, etc. + { // no Session management -> care about docking, tqgeometry, etc. - if( !opts.geometry.isEmpty() ) - sc->setGeometry( opts.geometry ); + if( !opts.tqgeometry.isEmpty() ) + sc->setGeometry( opts.tqgeometry ); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -120,7 +120,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) if ( !server.isEmpty() ) { TQString ser = TQString::fromLocal8Bit( server ); TQString port = "6667"; - if(ser.contains(":")){ + if(ser.tqcontains(":")){ port = ser.section(":", 1, 1); ser = ser.section(":", 0, 0); } diff --git a/ksirc/ksirc.pl b/ksirc/ksirc.pl index a1768f63..5d925a59 100644 --- a/ksirc/ksirc.pl +++ b/ksirc/ksirc.pl @@ -13,8 +13,8 @@ is used. Port and password are optional."); "\cbAdded by KSirc.pl\cb Usage: BAN <nickname> bans the specified user on the current channel. Only channel operators -can use this command. Bans the user in the form *!*user\@hostmask. -hostmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise +can use this command. Bans the user in the form *!*user\@hosttqmask. +hosttqmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise it is *.domain.com See Also: UNBAN, CLRBAN, BANLIST"); @@ -126,8 +126,8 @@ sub cmd_banlist { sub hook_banlist { $silent = 1; - my (undef, $channel, $mask, $banner, $time) = split(/ +/, $_[0]); - &print("~!default~*** \cb$mask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb"); + my (undef, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]); + &print("~!default~*** \cb$tqmask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb"); } sub hook_rmbanlist { @@ -168,8 +168,8 @@ sub cmd_clrban { sub hook_tban { $silent = 1; - my ($shit, $channel, $mask, $banner, $time) = split(/ +/, $_[0]); - push @bans, $mask; + my ($shit, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]); + push @bans, $tqmask; if (@bans == 6) { &print("mode $channel -bbbbbb @bans"); @bans = (); @@ -193,14 +193,14 @@ sub hook_disconnectd { #&addhook("kick","kickd"); sub cmd_fcmd { - ($names,$mask,$command) = split(/ /, $args,3); - $mask =~ s/\!/\!/; - $mask =~ s/\@/\@/; - $mask =~ s/\./\\./g; - $mask =~ s/\*/.*/g; + ($names,$tqmask,$command) = split(/ /, $args,3); + $tqmask =~ s/\!/\!/; + $tqmask =~ s/\@/\@/; + $tqmask =~ s/\./\\./g; + $tqmask =~ s/\*/.*/g; &addhook("353","filtercommand"); &addhook("366","removefiltercommand"); - &tell("\t\cb~4Matching /$mask/i on $names..."); + &tell("\t\cb~4Matching /$tqmask/i on $names..."); &docommand("names $names"); } &addcmd("fcmd"); @@ -217,8 +217,8 @@ sub hook_filtercommand { sub dofilter { $s = "$who\!$user\@$host"; - #&tell("$s =~ /$mask/"); - if ($s =~ /$mask/i) { + #&tell("$s =~ /$tqmask/"); + if ($s =~ /$tqmask/i) { $d = $command; $d =~ s/\$1/$who/; &docommand($d); @@ -228,12 +228,12 @@ sub dofilter { sub hook_removefiltercommand { &remhook("353","filtercommand"); &remhook("366","removefiltercommand"); - &tell("*\cbI\cb* Filter on $names, /$mask/i, Done."); + &tell("*\cbI\cb* Filter on $names, /$tqmask/i, Done."); } sub cmd_fc { - my ($mask, $cmd) = split(/ /, $args, 2); - &docommand("fcmd $talkchannel $mask $cmd"); + my ($tqmask, $cmd) = split(/ /, $args, 2); + &docommand("fcmd $talkchannel $tqmask $cmd"); } &addcmd("fc"); diff --git a/ksirc/ksircchannel.h b/ksirc/ksircchannel.h index a70f0ef6..883b5794 100644 --- a/ksirc/ksircchannel.h +++ b/ksirc/ksircchannel.h @@ -9,8 +9,8 @@ class KSircChannel public: KSircChannel( const TQString server, const TQString channel, - const TQString key = TQString::null, - const TQString encoding = TQString::null + const TQString key = TQString(), + const TQString encoding = TQString() ) : m_server(server), m_channel(channel), m_key(key), m_encoding(encoding) {} diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 26dbc8c7..e0eb019c 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -11,10 +11,10 @@ Interface: public: - KSircProcess(*server=0L, *parent=0, *name=0) + KSircProcess(*server=0L, *tqparent=0, *name=0) server: is the name of the server to connect to. It must be provided or else start sirc will barf. :( - parent: parent window, this _should_ be null + tqparent: tqparent window, this _should_ be null name: name, passed to TQObject... ~KSirProcess: @@ -117,8 +117,8 @@ extern DisplayMgr *displayMgr; -KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * parent, const char * name ) - : TQObject(parent, name), m_kss(kss), m_serverid(server_id) +KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * tqparent, const char * name ) + : TQObject(tqparent, name), m_kss(kss), m_serverid(server_id) { proc = new KProcess(); @@ -203,7 +203,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa default_follow_focus = TRUE; KSircChannel ci(kss.server(), "!no_channel"); new_toplevel(ci, true); // - TopList.replace("!default", TopList[ci.channel()]); + TopList.tqreplace("!default", TopList[ci.channel()]); running_window = FALSE; // set false so next changes the first name @@ -341,7 +341,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) // TopList.remove("!no_channel"); // We're no longer !no_channel TopList["!no_channel"]->control_message(CHANGE_CHANNEL, channelInfo.server() + "!!!" + channelInfo.channel() + "!!!" + channelInfo.key()); } - else if(TopList.find(channelInfo.channel()) == 0x0){ // If the window doesn't exist, continue + else if(TopList.tqfind(channelInfo.channel()) == 0x0){ // If the window doesn't exist, continue // If AutoCreate windows is on, let's make sure we're not being flooded. if(ksopts->autoCreateWin == TRUE && safe == false){ time_t current_time = time(NULL); @@ -407,7 +407,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) wm->lineEdit()->setFocus(); // Give focus back to the linee, someone takes it away on new create } else { - TQWidget *w = dynamic_cast<TQWidget *>(TopList.find(channelInfo.channel())); + TQWidget *w = dynamic_cast<TQWidget *>(TopList.tqfind(channelInfo.channel())); if(w) displayMgr->raise(w); } @@ -421,7 +421,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) kdDebug(5008) << "KSP: get close_toplevel: " << name << endl; // the removeTopLevel below also deletes the mditoplevel (in case - // we are using mdi) , which deletes its children, which deletes + // we are using mdi) , which deletes its tqchildren, which deletes // 'wm' , so watch out not to delete twice! (Simon) TQGuardedPtr<KSircTopLevel> guardedwm = wm; // Do this now or we get junk left on the screen @@ -452,7 +452,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) } if (isDefault) - TopList.replace("!default", it.current()); + TopList.tqreplace("!default", it.current()); // Let's let em know she's deleted! if(ksopts->autoCreateWin == TRUE){ @@ -526,7 +526,7 @@ void KSircProcess::default_window(KSircTopLevel *w) // if(w && (default_follow_focus == TRUE)) - TopList.replace("!default", w); + TopList.tqreplace("!default", w); } diff --git a/ksirc/ksircprocess.h b/ksirc/ksircprocess.h index bf61245a..97c3ab88 100644 --- a/ksirc/ksircprocess.h +++ b/ksirc/ksircprocess.h @@ -16,12 +16,13 @@ class KSircIOController; class KSircMessageReceiver; class KSircIOController; -class KSircProcess : public QObject +class KSircProcess : public TQObject { Q_OBJECT + TQ_OBJECT friend class KSircIOController; public: - KSircProcess(TQString &server_id, KSircServer &kss, TQObject * parent=0, const char * name=0); + KSircProcess(TQString &server_id, KSircServer &kss, TQObject * tqparent=0, const char * name=0); virtual ~KSircProcess(); TQDict<KSircMessageReceiver> &getWindowList() diff --git a/ksirc/ksircserver.h b/ksirc/ksircserver.h index d2d9ab70..0c60aba4 100644 --- a/ksirc/ksircserver.h +++ b/ksirc/ksircserver.h @@ -10,8 +10,8 @@ class KSircServer public: KSircServer( const TQString &server, const TQString &port, - const TQString &script = TQString::null, - const TQString &password = TQString::null, + const TQString &script = TQString(), + const TQString &password = TQString(), bool ssl = false ) : m_server(server), m_port(port), m_script(script), m_password(password), m_ssl(ssl) {} diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index b1df2f40..38bf27fa 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -73,11 +73,11 @@ KSOServer::KSOServer() KSOColors::KSOColors() { - textColor = Qt::black; - linkColor = Qt::blue; - infoColor = Qt::blue; - channelColor = Qt::green; - errorColor = Qt::red; + textColor = TQt::black; + linkColor = TQt::blue; + infoColor = TQt::blue; + channelColor = TQt::green; + errorColor = TQt::red; ksircColors = true; mircColors = false; @@ -93,22 +93,22 @@ KSOColors::KSOColors() selBackgroundColor = kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ); selForegroundColor = kapp->palette().color( TQPalette::Active, TQColorGroup::HighlightedText ); - ircColors[0] = Qt::white; - ircColors[1] = Qt::black; - ircColors[2] = Qt::darkBlue; - ircColors[3] = Qt::darkGreen; - ircColors[4] = Qt::red; + ircColors[0] = TQt::white; + ircColors[1] = TQt::black; + ircColors[2] = TQt::darkBlue; + ircColors[3] = TQt::darkGreen; + ircColors[4] = TQt::red; ircColors[5] = TQColor ( 165, 42, 42 ); - ircColors[6] = Qt::darkMagenta; + ircColors[6] = TQt::darkMagenta; ircColors[7] = TQColor( 255, 0x7b, 00 ); - ircColors[8] = Qt::yellow; - ircColors[9] = Qt::green; - ircColors[10] = Qt::darkCyan; - ircColors[11] = Qt::cyan; - ircColors[12] = Qt::blue; + ircColors[8] = TQt::yellow; + ircColors[9] = TQt::green; + ircColors[10] = TQt::darkCyan; + ircColors[11] = TQt::cyan; + ircColors[12] = TQt::blue; ircColors[13] = TQColor( 255, 0, 255 ); - ircColors[14] = Qt::gray; - ircColors[15] = Qt::lightGray; + ircColors[14] = TQt::gray; + ircColors[15] = TQt::lightGray; uint i; for(i = 0; i < numColors; i++){ @@ -142,7 +142,7 @@ void KSOptions::load( int sections ) { KConfig *conf = kapp->config(); conf->setGroup( "ServerController" ); - geometry = conf->readRectEntry( "Size" ); + tqgeometry = conf->readRectEntry( "Size" ); // Using the fields itself as default values as they are already // set to the defaults. @@ -232,17 +232,17 @@ void KSOptions::load( int sections ) colourTheme = conf->readEntry("ColourTheme", colourTheme ); for ( int i = 0; i < 16; ++i ) { ircColors[i] = - conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).arg( i ), + conf->readColorEntry(TQString::tqfromLatin1( "IRC-%1" ).tqarg( i ), &ircColors[i] ); nickHighlight[i] = - conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), + conf->readBoolEntry(TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), &nickHighlight[i] ); } } conf->setGroup( "GlobalOptions" ); - TQFont df = kapp->font(0); + TQFont df = kapp->font((TQWidget*)0); defaultFont = conf->readFontEntry( "MainFont", &df); - TQApplication::setFont( defaultFont, true, "KSirc::TextView" ); + TQApplication::tqsetFont( defaultFont, true, "KSirc::TextView" ); } if ( sections & Channels ) { @@ -251,7 +251,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(channel.contains("global") == FALSE){ + if(channel.tqcontains("global") == FALSE){ KSOChannel global; ChannelOpMap coMap; channel.insert(TQString("global"), coMap); @@ -268,7 +268,7 @@ void KSOptions::load( int sections ) channel["global"]["global"].encoding = conf->readEntry("globalglobalEncoding", "Default"); } - TQDateTime now(TQDateTime::currentDateTime()); + TQDateTime now(TQDateTime::tqcurrentDateTime()); TQStringList servers = conf->readListEntry("Servers"); TQStringList::ConstIterator ser = servers.begin(); for( ; ser != servers.end(); ser++){ @@ -315,7 +315,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(server.contains("global") == FALSE){ + if(server.tqcontains("global") == FALSE){ KSOServer global; server.insert(TQString("global"), global); server["global"].server = "global"; @@ -422,8 +422,8 @@ void KSOptions::save( int sections ) conf->writeEntry( "nickColourization", nickColourization ); conf->writeEntry( "ColourTheme", colourTheme ); for ( int i = 0; i < 16; ++i ) { - conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).arg( i ), ircColors[i] ); - conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), nickHighlight[i] ); + conf->writeEntry( TQString::tqfromLatin1( "IRC-%1" ).tqarg( i ), ircColors[i] ); + conf->writeEntry( TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), nickHighlight[i] ); } /* Store the font setting */ conf->setGroup( "GlobalOptions" ); @@ -490,20 +490,20 @@ void KSOptions::save( int sections ) void KSOptions::channelSetup(TQString serv, TQString chan) { - if(channel.contains(serv) == FALSE){ + if(channel.tqcontains(serv) == FALSE){ ChannelOpMap coMap; channel.insert(serv, coMap); } - if(channel[serv].contains(chan) == FALSE){ + if(channel[serv].tqcontains(chan) == FALSE){ KSOChannel ksoc; ksoc = channel["global"]["global"]; channel[serv].insert(chan, ksoc); channel[serv][chan].server = serv; channel[serv][chan].channel = chan; - channel[serv][chan].lastUsed = TQDateTime::currentDateTime(); + channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime(); } else { - channel[serv][chan].lastUsed = TQDateTime::currentDateTime(); + channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime(); } } @@ -524,16 +524,16 @@ void KSOptions::applyChannelGlobal(void) void KSOptions::serverSetup(TQString serv) { - if(server.contains(serv) == FALSE){ + if(server.tqcontains(serv) == FALSE){ KSOServer ksos; ksos = server["global"]; server.insert(serv, ksos); server[serv].server = serv; server[serv].globalCopy = true; - server[serv].lastUsed = TQDateTime::currentDateTime(); + server[serv].lastUsed = TQDateTime::tqcurrentDateTime(); } else { - server[serv].lastUsed = TQDateTime::currentDateTime(); + server[serv].lastUsed = TQDateTime::tqcurrentDateTime(); } } diff --git a/ksirc/ksopts.h b/ksirc/ksopts.h index 9bd96192..421370fb 100644 --- a/ksirc/ksopts.h +++ b/ksirc/ksopts.h @@ -99,7 +99,7 @@ class KSOStartup public: KSOStartup(); - TQRect geometry; + TQRect tqgeometry; // TQString nick; // TQString altNick; // TQString realName; diff --git a/ksirc/ksparser.cpp b/ksirc/ksparser.cpp index a02bd3bd..cfdf59f5 100644 --- a/ksirc/ksparser.cpp +++ b/ksirc/ksparser.cpp @@ -63,12 +63,12 @@ TQString KSParser::parse( const TQString &message ) TQString at; TQColor c = ircColor(fg); if ( c.isValid() ) { - at += TQString( "color=\"%1\" " ).arg( c.name() ); + at += TQString( "color=\"%1\" " ).tqarg( c.name() ); } c = ircColor(bg); if ( c.isValid() ) { - at += TQString( "bgcolor=\"%1\" " ).arg( c.name() ); + at += TQString( "bgcolor=\"%1\" " ).tqarg( c.name() ); } if(at.length() > 0){ res += pushTag( "font", at ); @@ -108,13 +108,13 @@ TQString KSParser::parse( const TQString &message ) res += toggleTag( "u" ); break; case 'n': - res += toggleTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->nickForeground.name() ) ); + res += toggleTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->nickForeground.name() ) ); break; case 'o': - res += pushTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->msgContainNick.name() ) ); + res += pushTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->msgContainNick.name() ) ); break; case '#': - res += pushTag( "font", TQString( "color=\"#%1\"" ).arg( message.mid(i, 6) )); + res += pushTag( "font", TQString( "color=\"#%1\"" ).tqarg( message.mid(i, 6) )); i+=6; break; case '~': @@ -141,10 +141,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if (!m_attributes.contains(tag)) + if (!m_attributes.tqcontains(tag)) m_attributes.insert(tag, attributes); else if (!attributes.isEmpty()) - m_attributes.replace(tag, attributes); + m_attributes.tqreplace(tag, attributes); res.append("<" + tag); if (!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -153,8 +153,8 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.contains(tag)) - return TQString::null; + if (!m_tags.tqcontains(tag)) + return TQString(); TQString res; TQValueStack<TQString> savedTags; @@ -172,7 +172,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag, const TQString &attributes) { - return m_attributes.contains(tag) ? popTag(tag) : pushTag(tag, attributes); + return m_attributes.tqcontains(tag) ? popTag(tag) : pushTag(tag, attributes); } TQString KSParser::popAll() diff --git a/ksirc/ksparser.h b/ksirc/ksparser.h index b6e95a5c..0a57aec2 100644 --- a/ksirc/ksparser.h +++ b/ksirc/ksparser.h @@ -26,9 +26,9 @@ public: bool beeped() const { return m_beeped; } private: - TQString pushTag(const TQString &, const TQString & = TQString::null); + TQString pushTag(const TQString &, const TQString & = TQString()); TQString popTag(const TQString &); - TQString toggleTag(const TQString &, const TQString & = TQString::null); + TQString toggleTag(const TQString &, const TQString & = TQString()); TQString popAll(); TQColor ircColor(int); diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 2589e59a..8b2e5e45 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -57,12 +57,12 @@ TQPixmap ksTextViewLoadPixmap( const TQString &icon ) qAddPostRoutine( cleanupKSTextViewPixmapDict ); } - TQPixmap *pix = ksTextViewPixmapDict->find( icon ); + TQPixmap *pix = ksTextViewPixmapDict->tqfind( icon ); if ( !pix ) { TQImage img; - const TQMimeSource *src = kapp->mimeSourceFactory()->data( icon, TQString::null ); + const TQMimeSource *src = kapp->mimeSourceFactory()->data( icon, TQString() ); if ( !src || !TQImageDrag::decode( src, img ) || img.isNull() ) return TQPixmap(); @@ -245,7 +245,7 @@ Item *TextChunk::breakLine( int width ) return 0; } -Item::LayoutResetStatus TextChunk::resetLayout() +Item::LayoutResettqStatus TextChunk::resetLayout() { if ( m_originalTextLength == 0 ) @@ -376,12 +376,12 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide ) selStart->offset -= m_text.len; selEnd->offset -= m_text.len; selStart->item = selEnd->item = chunk; - chunk->setSelectionStatus( m_selection ); + chunk->setSelectiontqStatus( m_selection ); m_selection = NoSelection; } else if ( selEnd->offset >= m_text.len ) { selEnd->offset -= m_text.len; selEnd->item = chunk; - chunk->setSelectionStatus( SelectionEnd ); + chunk->setSelectiontqStatus( SelectionEnd ); m_selection = SelectionStart; } } @@ -389,7 +389,7 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide ) if ( selection && selection->offset >= m_text.len ) { selection->offset -= m_text.len; selection->item = chunk; - chunk->setSelectionStatus( m_selection ); + chunk->setSelectiontqStatus( m_selection ); m_selection = NoSelection; } @@ -433,7 +433,7 @@ int TextChunk::paintSelection( TQPainter &p, int x, const StringPtr &text ) const int width = m_metrics.width( str ); - const TQColorGroup &cg = m_parag->textView()->colorGroup(); + const TQColorGroup &cg = m_parag->textView()->tqcolorGroup(); if (m_props.bgSelColor.isValid()) p.fillRect( x, 0, width, height(), m_props.bgSelColor ); @@ -475,18 +475,18 @@ void TextChunk::mergeSelection( TextChunk *child, SelectionPoint *selection ) selection->offset += child->m_text.ptr - m_text.ptr; if(selection->offset > m_originalTextLength){ - kdDebug(5008) << "Child: " << child->m_text.toQString() << " Parent: " << m_text.toQString() << endl; + kdDebug(5008) << "Child: " << child->m_text.toTQString() << " Parent: " << m_text.toTQString() << endl; kdDebug(5008) << "Length all wrong!" << endl; //assert(0); } selection->item = this; - if ( ( m_selection == SelectionStart && child->selectionStatus() == SelectionEnd ) || - ( m_selection == SelectionEnd && child->selectionStatus() == SelectionStart ) ) + if ( ( m_selection == SelectionStart && child->selectiontqStatus() == SelectionEnd ) || + ( m_selection == SelectionEnd && child->selectiontqStatus() == SelectionStart ) ) m_selection = SelectionBoth; else - m_selection = child->selectionStatus(); + m_selection = child->selectiontqStatus(); } ImageItem::ImageItem( TextParag *parag, const TQPixmap &pixmap ) @@ -512,7 +512,7 @@ void ImageItem::paint( TQPainter &painter ) if (m_props.bgSelColor.isValid()) painter.fillRect( 0, 0, width(), h, m_props.bgSelColor ); else { - const TQColorGroup &cg = m_parag->textView()->colorGroup(); + const TQColorGroup &cg = m_parag->textView()->tqcolorGroup(); painter.fillRect( 0, 0, width(), h, cg.highlight() ); } } @@ -520,7 +520,7 @@ void ImageItem::paint( TQPainter &painter ) painter.drawPixmap( 0, y, m_pixmap ); } -Item::LayoutResetStatus ImageItem::resetLayout() +Item::LayoutResettqStatus ImageItem::resetLayout() { // nothin' to do return KeepItem; @@ -586,22 +586,22 @@ TQString Tokenizer::convertToRichText( const PString &ptext ) { TQString entity = KGlobal::charsets()->toEntity( ch ); indexAdjustment = entity.length() - 1; - result.replace( i, 1, entity ); + result.tqreplace( i, 1, entity ); } */ if ( ch == '<' ) { - result.replace( i, 1, "<" ); + result.tqreplace( i, 1, "<" ); indexAdjustment = 3; } else if ( ch == '>' ) { - result.replace( i, 1, ">" ); + result.tqreplace( i, 1, ">" ); indexAdjustment = 3; } else if ( ch == '&' ) { - result.replace( i, 1, "&" ); + result.tqreplace( i, 1, "&" ); indexAdjustment = 4; } @@ -645,7 +645,7 @@ bool Tokenizer::parseNextToken( Token &tok ) return false; tok.id = Token::Text; - tok.value = StringPtr( m_text.unicode() + idx, + tok.value = StringPtr( m_text.tqunicode() + idx, m_text.length() - idx ); tok.attributes.clear(); return true; @@ -658,7 +658,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { tok.id = Token::Text; tok.attributes.clear(); - tok.value = StringPtr( m_text.unicode(), + tok.value = StringPtr( m_text.tqunicode(), (*m_lastTag).index ); m_textBeforeFirstTagProcessed = true; @@ -676,7 +676,7 @@ bool Tokenizer::parseNextToken( Token &tok ) if ( lastType == TagIndex::Open && type == TagIndex::Close ) { - const TQChar *tagStart = m_text.unicode() + lastIndex + 1; + const TQChar *tagStart = m_text.tqunicode() + lastIndex + 1; uint tagLen = ( index - 1 ) - ( lastIndex + 1 ) + 1; // </bleh> ? if ( *tagStart == '/' ) @@ -699,7 +699,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { tok.id = Token::Text; tok.attributes.clear(); - tok.value = StringPtr( m_text.unicode() + lastIndex + 1, + tok.value = StringPtr( m_text.tqunicode() + lastIndex + 1, ( index - 1 ) - lastIndex ); m_lastTag = it; @@ -715,7 +715,7 @@ bool Tokenizer::parseNextToken( Token &tok ) Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text ) { - const TQChar *start = text.unicode(); + const TQChar *start = text.tqunicode(); const TQChar *p = start; const TQChar *endP = p + text.length(); bool quoted = false; @@ -754,7 +754,7 @@ Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text ) void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags ) { - const TQChar *p = text.unicode(); + const TQChar *p = text.tqunicode(); const TQChar *endP = p + text.length(); uint i = 0; bool scanForSemicolon = false; @@ -793,13 +793,13 @@ void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags ) if ( entityValue.isNull() ) continue; - const uint ampersandPos = ampersand - text.unicode(); + const uint ampersandPos = ampersand - text.tqunicode(); text[ ampersandPos ] = entityValue; text.remove( ampersandPos + 1, entityLength + 1 ); i = ampersandPos; - p = text.unicode() + i; - endP = text.unicode() + text.length(); + p = text.tqunicode() + i; + endP = text.tqunicode() + text.length(); ampersand = 0; uint adjustment = entityLength + 1; @@ -921,11 +921,11 @@ void Tokenizer::parseTag( const StringPtr &text, } /* - kdDebug(5008) << "tagName: " << tag.toQString() << endl; + kdDebug(5008) << "tagName: " << tag.toTQString() << endl; AttributeMap::ConstIterator it = attributes.begin(); for (; it != attributes.end(); ++it ) - kdDebug(5008) << "attribute: " << it.key().toQString() << - " -> " << it.data().toQString() << endl; + kdDebug(5008) << "attribute: " << it.key().toTQString() << + " -> " << it.data().toTQString() << endl; */ } @@ -1052,11 +1052,11 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection // fixes a crash where because of an empty list i becomes null if ( m_items.isEmpty() ) - return TQString::null; + return TQString(); if ( start.line == this ) { - const int idx = m_items.findRef( start.item ); + const int idx = m_items.tqfindRef( start.item ); assert( idx != -1 ); } else @@ -1070,7 +1070,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection { const int oldCurrent = m_items.at(); - const int idx = m_items.findRef( end.item ); + const int idx = m_items.tqfindRef( end.item ); assert( idx != -1 ); lastItem = m_items.next(); @@ -1081,7 +1081,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection { if ( i == start.item ) { - i->setSelectionStatus( Item::SelectionStart ); + i->setSelectiontqStatus( Item::SelectionStart ); StringPtr txt = i->text(); if ( !txt.isNull() ) @@ -1090,7 +1090,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection } else if ( i == end.item ) { - i->setSelectionStatus( Item::SelectionEnd ); + i->setSelectiontqStatus( Item::SelectionEnd ); StringPtr txt = i->text(); if ( !txt.isNull() ) @@ -1098,9 +1098,9 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectionStatus( Item::InSelection ); + i->setSelectiontqStatus( Item::InSelection ); - selectedText += i->text().toQString(); + selectedText += i->text().toTQString(); } } @@ -1111,15 +1111,15 @@ void TextLine::clearSelection() { Item *i = m_items.first(); for (; i; i = m_items.next() ) - i->setSelectionStatus( Item::NoSelection ); + i->setSelectiontqStatus( Item::NoSelection ); } -void TextLine::appendItem( Item *i, int layoutUpdatePolicy ) +void TextLine::appendItem( Item *i, int tqlayoutUpdatePolicy ) { m_items.append( i ); i->setLine(this); - if ( layoutUpdatePolicy == UpdateMaxHeight ) + if ( tqlayoutUpdatePolicy == UpdateMaxHeight ) m_maxHeight = kMax( m_maxHeight, i->height() ); } @@ -1198,7 +1198,7 @@ TQString TextLine::plainText() const TQString res; TQPtrListIterator<Item> it( m_items ); for (; it.current(); ++it ) - res += it.current()->text().toQString(); + res += it.current()->text().toTQString(); return res; } @@ -1225,7 +1225,7 @@ TextParag::~TextParag() { } -void TextParag::layout( int width ) +void TextParag::tqlayout( int width ) { TQPtrList<Item> items; @@ -1381,11 +1381,11 @@ TQString TextParag::updateSelection( const SelectionPoint &start, const Selectio // sanity check // (don't put it lower because it changes the current list item) if ( end.parag == this ) - assert( m_lines.findRef( end.line ) != -1 ); + assert( m_lines.tqfindRef( end.line ) != -1 ); if ( start.parag == this ) { - int idx = m_lines.findRef( start.line ); + int idx = m_lines.tqfindRef( start.line ); assert( idx != -1 ); } else @@ -1471,7 +1471,7 @@ void TextParag::setRichText( const TQString &richText ) Tag tag = tagStack.pop(); if( !( tok.value == tag.name ) ) { - kdDebug(5008) << "ASSERT failed! tok.value=" << tok.value.toQString() << " tag.name=" << tag.name.toQString() << endl; + kdDebug(5008) << "ASSERT failed! tok.value=" << tok.value.toTQString() << " tag.name=" << tag.name.toTQString() << endl; kdDebug(5008) << "while parsing " << richText << endl; } @@ -1613,12 +1613,12 @@ void ContentsPaintAlgorithm::paint() } } -TextView::TextView( TQWidget *parent, const char *name ) - : TQScrollView( parent, name, WRepaintNoErase ), +TextView::TextView( TQWidget *tqparent, const char *name ) + : TQScrollView( tqparent, name, WRepaintNoErase ), m_paintBuffer( PaintBufferExtend, PaintBufferExtend ), m_selectionEndBeforeStart( false ), m_mousePressed( false ), m_mmbPressed( false ), - m_linkColor( Qt::blue ), m_height(-1), m_inScroll(false), + m_linkColor( TQt::blue ), m_height(-1), m_inScroll(false), m_lastScroll(0) { m_parags.setAutoDelete( true ); @@ -1658,7 +1658,7 @@ void TextView::viewportResizeEvent( TQResizeEvent *ev ) TQScrollView::viewportResizeEvent(ev); if ( ev->size().width() != ev->oldSize().width() ) - layout(); + tqlayout(); int newdiff = ev->size().height() - ev->oldSize().height(); setContentsPos( 0, contentsY()-newdiff ); @@ -1720,7 +1720,7 @@ void TextView::clear() stopAutoScroll(); clearSelection(); m_parags.clear(); - layout(); + tqlayout(); viewport()->erase(); } @@ -1728,7 +1728,7 @@ TextParagIterator TextView::appendParag( const TQString &richText ) { TextParag *parag = new TextParag( this, richText ); m_parags.append( parag ); - layout( false ); + tqlayout( false ); scrollToBottom(); TQPtrListIterator<TextParag> it( m_parags ); it.toLast(); @@ -1742,7 +1742,7 @@ bool TextView::removeParag( const TextParagIterator ¶g ) return false; TextParag *paragPtr = parag.m_paragIt.current(); - const int idx = m_parags.findRef( paragPtr ); + const int idx = m_parags.tqfindRef( paragPtr ); if ( idx == -1 ) return false; @@ -1758,7 +1758,7 @@ bool TextView::removeParag( const TextParagIterator ¶g ) if(m_selectionEnd.item != 0) m_selectionEnd.pos.ry() -= height; - //layout( false ); + //tqlayout( false ); contentsChange(-height, true); @@ -1768,14 +1768,14 @@ bool TextView::removeParag( const TextParagIterator ¶g ) return true; } -void TextView::clearSelection( bool repaint ) +void TextView::clearSelection( bool tqrepaint ) { m_selectionStart = SelectionPoint(); m_selectionEnd = SelectionPoint(); m_selectionEndBeforeStart = false; - m_selectedText = TQString::null; + m_selectedText = TQString(); clearSelectionInternal(); - if ( repaint ) + if ( tqrepaint ) updateContents(); } @@ -1787,7 +1787,7 @@ TextParagIterator TextView::firstParag() const TQString TextView::plainText() const { if ( m_parags.isEmpty() ) - return TQString::null; + return TQString(); TQString result; TQPtrListIterator<TextParag> paragIt( m_parags ); @@ -1814,7 +1814,7 @@ void TextView::setLinkColor( const TQColor &linkColor ) void TextView::copy() { - TQApplication::clipboard()->setText( m_selectedText ); + TQApplication::tqclipboard()->setText( m_selectedText ); } void TextView::clearSelectionInternal() @@ -1827,27 +1827,27 @@ void TextView::clearSelectionInternal() void TextView::contentsMousePressEvent( TQMouseEvent *ev ) { - if ( ev->button() & RightButton ) { + if ( ev->button() & Qt::RightButton ) { emitLinkClickedForMouseEvent( ev ); return; } - if ( !( ev->button() & LeftButton ) && !(ev->button() & MidButton ) ) + if ( !( ev->button() & Qt::LeftButton ) && !(ev->button() & Qt::MidButton ) ) return; clearSelection( true ); SelectionPoint p; Item *itemUnderMouse = itemAt( ev->pos(), &p, Item::SelectFuzzy ); - if ( p.item && ( ev->button() & LeftButton ) ) { + if ( p.item && ( ev->button() & Qt::LeftButton ) ) { m_selectionMaybeStart = p; - p.item->setSelectionStatus( Item::NoSelection ); + p.item->setSelectiontqStatus( Item::NoSelection ); } if ( TextChunk *text = dynamic_cast<TextChunk *>( itemUnderMouse ) ) { StringPtr href = text->props().attributes[ "href" ]; if ( !href.isNull() ) { m_dragStartPos = ev->pos(); - m_dragURL = href.toQString(); - if ( ev->button() & LeftButton ) + m_dragURL = href.toTQString(); + if ( ev->button() & Qt::LeftButton ) m_mousePressed = true; else m_mmbPressed = true; @@ -1857,7 +1857,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev ) void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) { - if ( m_mousePressed && ev->state() == NoButton ) + if ( m_mousePressed && ev->state() == Qt::NoButton ) { m_mousePressed = false; m_mmbPressed = false; @@ -1871,7 +1871,7 @@ void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) startDrag(); - m_dragURL = TQString::null; + m_dragURL = TQString(); return; } @@ -1881,8 +1881,8 @@ void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) if ( !i && !p.item ) return; - if ( (ev->state() & LeftButton && m_selectionStart.item && p.item) || - (ev->state() & LeftButton && m_selectionMaybeStart.item && p.item)) + if ( (ev->state() & Qt::LeftButton && m_selectionStart.item && p.item) || + (ev->state() & Qt::LeftButton && m_selectionMaybeStart.item && p.item)) { if(m_selectionMaybeStart.item != 0){ @@ -1904,10 +1904,10 @@ void TextView::contentsMouseMoveEvent( TQMouseEvent *ev ) if ( start.item == end.item ) { if ( start.offset > end.offset ) - qSwap( start.offset, end.offset ); + tqSwap( start.offset, end.offset ); } else - qSwap( start, end ); + tqSwap( start, end ); } m_selectedText = updateSelection( start, end ); @@ -1948,12 +1948,12 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) m_mousePressed = false; m_mmbPressed = false; m_dragStartPos = TQPoint(); - m_dragURL = TQString::null; + m_dragURL = TQString(); m_selectionMaybeStart = SelectionPoint(); if ( (ev->button() & Qt::LeftButton) && !m_selectedText.isEmpty() ) - TQApplication::clipboard()->setText( m_selectedText, QClipboard::Selection ); + TQApplication::tqclipboard()->setText( m_selectedText, TQClipboard::Selection ); if ( clicked ) { emitLinkClickedForMouseEvent( ev ); @@ -1962,7 +1962,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) if (ev->button() & Qt::MidButton) { - emit pasteReq( KApplication::clipboard()->text( QClipboard::Selection ) ); + emit pasteReq( KApplication::tqclipboard()->text( TQClipboard::Selection ) ); return; } } @@ -1973,7 +1973,7 @@ void TextView::fontChange( const TQFont & ) for (; it.current(); ++it ) it.current()->fontChange( font() ); - layout( true ); + tqlayout( true ); } void TextView::startDrag() @@ -2057,7 +2057,7 @@ void TextView::selectionOffsets( int &startOffset, int &endOffset ) } if ( m_selectionStart.item == m_selectionEnd.item && startOffset > endOffset ) - qSwap( startOffset, endOffset ); + tqSwap( startOffset, endOffset ); } void TextView::updateSelectionOrder() @@ -2103,11 +2103,11 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection { if ( start.pos.x() == end.pos.x() ) { - i->setSelectionStatus( Item::NoSelection ); - return TQString::null; + i->setSelectiontqStatus( Item::NoSelection ); + return TQString(); } - i->setSelectionStatus( Item::SelectionBoth ); + i->setSelectiontqStatus( Item::SelectionBoth ); // ### ugly const TextChunk *t = dynamic_cast<TextChunk *>( i ); @@ -2119,7 +2119,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectionStatus( Item::SelectionBoth ); + i->setSelectiontqStatus( Item::SelectionBoth ); // ### ugly TextChunk *t = dynamic_cast<TextChunk *>( i ); @@ -2138,8 +2138,8 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection } else { - assert( m_parags.findRef( end.parag ) != -1 ); - const int idx = m_parags.findRef( start.parag ); + assert( m_parags.tqfindRef( end.parag ) != -1 ); + const int idx = m_parags.tqfindRef( start.parag ); assert( idx != -1 ); TextParag *p = m_parags.current(); @@ -2156,7 +2156,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection return selectedText; } -void TextView::layout( bool force ) +void TextView::tqlayout( bool force ) { int height = 0; int contentsWidth = visibleWidth(); @@ -2166,7 +2166,7 @@ void TextView::layout( bool force ) for (; it.current(); ++it ) { if ( !it.current()->isLayouted() || force ) - it.current()->layout( width ); + it.current()->tqlayout( width ); height += it.current()->height(); contentsWidth = kMax( contentsWidth, it.current()->minWidth() ); @@ -2182,7 +2182,7 @@ void TextView::layout( bool force ) void TextView::contentsChange(int heightChange, bool force) { if(m_height == -1){ - layout(force); + tqlayout(force); } else { m_height += heightChange; @@ -2235,7 +2235,7 @@ Item *TextView::itemAt( const TQPoint &pos, SelectionPoint *selectionInfo, TQString TextParagIterator::richText() const { if ( atEnd() ) - return TQString::null; + return TQString(); return Tokenizer::convertToRichText( m_paragIt.current()->processedRichText() ); } @@ -2248,7 +2248,7 @@ void TextParagIterator::setRichText( const TQString &richText ) m_paragIt.current()->setRichText( richText ); TextView *textView = m_paragIt.current()->textView(); - textView->layout( false ); + textView->tqlayout( false ); if ( textView->isUpdatesEnabled() ) textView->updateContents(); @@ -2257,7 +2257,7 @@ void TextParagIterator::setRichText( const TQString &richText ) TQString TextParagIterator::plainText() const { if ( atEnd() ) - return TQString::null; + return TQString(); return m_paragIt.current()->plainText(); } diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 6e852b08..f8bf755f 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -40,13 +40,13 @@ struct StringPtr StringPtr( const TQChar *_ptr, uint _len ) : ptr( _ptr ), len( _len ) {} explicit StringPtr( const TQString &s ) // use with care! - : ptr( s.unicode() ), len( s.length() ) {} + : ptr( s.tqunicode() ), len( s.length() ) {} inline bool isNull() const { return ptr == 0; } // makes deep copy - inline TQString toQString() const - { return ( ptr && len > 0 ) ? TQString( ptr, len ) : TQString::null; } + inline TQString toTQString() const + { return ( ptr && len > 0 ) ? TQString( ptr, len ) : TQString(); } const TQChar *ptr; uint len; @@ -81,12 +81,12 @@ public: ConstIterator findAttribute( const char *key ) const { TQString qkey( key ); - return find( StringPtr( qkey ) ); + return tqfind( StringPtr( qkey ) ); } Iterator findAttribute( const char *key ) { TQString qkey( key ); - return find( StringPtr( qkey ) ); + return tqfind( StringPtr( qkey ) ); } StringPtr operator[]( const char *key ) const @@ -142,8 +142,8 @@ class SelectionPoint; class Item { public: - enum LayoutResetStatus { DeleteItem, KeepItem }; - enum SelectionStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, + enum LayoutResettqStatus { DeleteItem, KeepItem }; + enum SelectiontqStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, NoSelection }; enum SelectionAccuracy { SelectExact, SelectFuzzy }; @@ -163,13 +163,13 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResetStatus resetLayout() = 0; + virtual LayoutResettqStatus resetLayout() = 0; virtual int calcSelectionOffset( int x ); - void setSelectionStatus( SelectionStatus status ) { m_selection = status; } + void setSelectiontqStatus( SelectiontqStatus status ) { m_selection = status; } - SelectionStatus selectionStatus() const { return m_selection; } + SelectiontqStatus selectiontqStatus() const { return m_selection; } void selectionOffsets( int &startOffset, int &endOffset ); @@ -194,7 +194,7 @@ protected: virtual void calcExtends() const = 0; - SelectionStatus m_selection; + SelectiontqStatus m_selection; TextLine *m_line; TextParag *m_parag; ItemProperties m_props; @@ -211,7 +211,7 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResetStatus resetLayout(); + virtual LayoutResettqStatus resetLayout(); virtual int calcSelectionOffset( int x ); @@ -247,7 +247,7 @@ public: virtual void paint( TQPainter &painter ); - virtual LayoutResetStatus resetLayout(); + virtual LayoutResettqStatus resetLayout(); protected: virtual void calcExtends() const; @@ -323,7 +323,7 @@ public: void clearSelection(); // transfers ownership - void appendItem( Item *i, int layoutUpdatePolicy = NoUpdate ); + void appendItem( Item *i, int tqlayoutUpdatePolicy = NoUpdate ); bool isEmpty() const { return m_items.isEmpty(); } @@ -354,7 +354,7 @@ public: ~TextParag(); - void layout( int width ); + void tqlayout( int width ); void paint( TQPainter &p, int y, int maxY ); @@ -464,15 +464,16 @@ private: int m_overshoot; }; -class TextView : public QScrollView +class TextView : public TQScrollView { Q_OBJECT + TQ_OBJECT friend class Item; friend class TextChunk; friend class TextParag; friend class TextParagIterator; public: - TextView( TQWidget *parent, const char *name = 0 ); + TextView( TQWidget *tqparent, const char *name = 0 ); virtual ~TextView(); virtual void clear(); @@ -481,7 +482,7 @@ public: bool removeParag( const TextParagIterator ¶g ); - void clearSelection( bool repaint = false ); // ### re-consider the repaint arg... + void clearSelection( bool tqrepaint = false ); // ### re-consider the tqrepaint arg... TQString selectedText() const { return m_selectedText; } @@ -536,7 +537,7 @@ private: SelectionPoint *selectionStart(); SelectionPoint *selectionEnd(); - void layout( bool force = true ); + void tqlayout( bool force = true ); Item *itemAt( const TQPoint &pos, SelectionPoint *selectionInfo = 0, Item::SelectionAccuracy accuracy = Item::SelectExact ); diff --git a/ksirc/kstextviewtest.cpp b/ksirc/kstextviewtest.cpp index d20e6e50..fd5133ac 100644 --- a/ksirc/kstextviewtest.cpp +++ b/ksirc/kstextviewtest.cpp @@ -3,7 +3,7 @@ #include "kstextview.h" -class Timer : public QObject +class Timer : public TQObject { public: Timer( KSirc::TextView *view ) @@ -16,8 +16,8 @@ public: m_lines++; if ( m_lines > 15 ) m_view->removeParag( m_view->firstParag() ); - m_view->appendParag( TQString::fromLatin1( "<font color=#0000ff>color test</font><font color=#00ff00>color test</font><font color=#ff0000>color test</font><font color=#000088>color test</font><font color=#008800>color test</font><font color=#880000>color test</font><font color=#0000ff>color test</font><font color=#02ff00>color test</font><font color=#2000ff>color test</font>" ) ); - m_view->appendParag( TQString::fromLatin1( "<r>aaaaaa</r> bbbbbb cccccccc ddddddddd eeeeeee " ) ); + m_view->appendParag( TQString::tqfromLatin1( "<font color=#0000ff>color test</font><font color=#00ff00>color test</font><font color=#ff0000>color test</font><font color=#000088>color test</font><font color=#008800>color test</font><font color=#880000>color test</font><font color=#0000ff>color test</font><font color=#02ff00>color test</font><font color=#2000ff>color test</font>" ) ); + m_view->appendParag( TQString::tqfromLatin1( "<r>aaaaaa</r> bbbbbb cccccccc ddddddddd eeeeeee " ) ); m_view->setContentsPos( 0, m_view->contentsHeight() ); } private: @@ -33,17 +33,17 @@ int main( int argc, char **argv ) app.setMainWidget( &view ); view.show(); - view.appendParag( TQString::fromLatin1( "<b>bold</b>Normal<i>Italic hey!</i><r>reverse!</r>" ) ); - view.appendParag( TQString::fromLatin1( "bleh foo hey bar schubidu bliep blop" ) ); - view.appendParag( TQString::fromLatin1( "more longish paragraphs .. yaddayadda yadda" ) ); - view.appendParag( TQString::fromLatin1( "<tronical> hah! &" ) ); - view.appendParag( TQString::fromLatin1( "<a href=\"http://www.kde.org/\">url</a>" ) ); - view.appendParag( TQString::fromLatin1( "<font color=#0000ff bgcolor=#ff0000>color test</font>" ) ); - view.appendParag( TQString::fromLatin1( "<font color=\"#00ff00\">another color test</font>" ) ); - view.appendParag( TQString::fromLatin1( "<font color=\"#00ff00\" bgcolor=\"#ff0000\">another color test</font>" ) ); - view.appendParag( TQString::fromLatin1( "<i bleh>simple attr test</i><b leh foo=15 doo=\"& > 123 \" oof>complicated attr test</b>" ) ); - view.appendParag( TQString::fromLatin1( "\"<b doo=\"& > 123 \" oof>\"third attr test 2</b>\"" ) ); - view.appendParag( TQString::fromLatin1( "aaaaaa bbbbbb cccccccc ddddddddd eeeeeee" ) ); + view.appendParag( TQString::tqfromLatin1( "<b>bold</b>Normal<i>Italic hey!</i><r>reverse!</r>" ) ); + view.appendParag( TQString::tqfromLatin1( "bleh foo hey bar schubidu bliep blop" ) ); + view.appendParag( TQString::tqfromLatin1( "more longish paragraphs .. yaddayadda yadda" ) ); + view.appendParag( TQString::tqfromLatin1( "<tronical> hah! &" ) ); + view.appendParag( TQString::tqfromLatin1( "<a href=\"http://www.kde.org/\">url</a>" ) ); + view.appendParag( TQString::tqfromLatin1( "<font color=#0000ff bgcolor=#ff0000>color test</font>" ) ); + view.appendParag( TQString::tqfromLatin1( "<font color=\"#00ff00\">another color test</font>" ) ); + view.appendParag( TQString::tqfromLatin1( "<font color=\"#00ff00\" bgcolor=\"#ff0000\">another color test</font>" ) ); + view.appendParag( TQString::tqfromLatin1( "<i bleh>simple attr test</i><b leh foo=15 doo=\"& > 123 \" oof>complicated attr test</b>" ) ); + view.appendParag( TQString::tqfromLatin1( "\"<b doo=\"& > 123 \" oof>\"third attr test 2</b>\"" ) ); + view.appendParag( TQString::tqfromLatin1( "aaaaaa bbbbbb cccccccc ddddddddd eeeeeee" ) ); Timer t( &view ); return app.exec(); diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index d9cac283..85d0fd1f 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -42,8 +42,8 @@ #include "nickColourMaker.h" #include "ksircprocess.h" -KSircView::KSircView(KSircProcess *proc, TQWidget *parent, const char *name) - : KSirc::TextView(parent, name), m_proc(proc) +KSircView::KSircView(KSircProcess *proc, TQWidget *tqparent, const char *name) + : KSirc::TextView(tqparent, name), m_proc(proc) { m_acceptFiles = false; m_timestamps = false; @@ -73,10 +73,10 @@ void KSircView::clear() TQString KSircView::makeTimeStamp() { TQTime now = TQTime::currentTime(); - TQString timeStamp = TQString::fromLatin1( "[%1:%2:%3] " ) - .arg( TQString::number( now.hour() ).rightJustify( 2, '0' ) ) - .arg( TQString::number( now.minute() ).rightJustify( 2, '0' ) ) - .arg( TQString::number( now.second() ).rightJustify( 2, '0' ) ); + TQString timeStamp = TQString::tqfromLatin1( "[%1:%2:%3] " ) + .tqarg( TQString::number( now.hour() ).rightJustify( 2, '0' ) ) + .tqarg( TQString::number( now.minute() ).rightJustify( 2, '0' ) ) + .tqarg( TQString::number( now.second() ).rightJustify( 2, '0' ) ); return timeStamp; } @@ -84,7 +84,7 @@ void KSircView::saveURL( const TQString &url ) { KURL kurl( url ); - KFileDialog *dlg = new KFileDialog( TQString::null, TQString::null /*filter*/, this /*parent*/, "filedialog" /*name*/, true /*modal*/ ); + KFileDialog *dlg = new KFileDialog( TQString(), TQString() /*filter*/, this /*tqparent*/, "filedialog" /*name*/, true /*modal*/ ); dlg->setKeepLocation( true ); @@ -109,14 +109,14 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const //kdDebug(5008) << "Start Text: " << _text << endl; TQString richText( "<font color=\"%1\">" ); - richText = richText.arg( color.name() ); + richText = richText.tqarg( color.name() ); if ( !pixmap.isEmpty() ) - richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).arg( pixmap ) ); + richText.prepend( TQString::tqfromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); - TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) - .arg( ksopts->textColor.name() ) - .arg( makeTimeStamp() ); + TQString timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + .tqarg( ksopts->textColor.name() ) + .tqarg( makeTimeStamp() ); m_timeStamps.append(timeStamp); if ( m_timestamps ) richText.prepend( timeStamp ); @@ -128,14 +128,14 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const // enforces the creation of separate item objects and hence separate // drawing of '<nick>' and 'message' , which is needed for BiDi users, // according to UV Kochavi <uv1st@yahoo.com> , to prevent output like - // '<nick message<' , which is supposedly a bug in Qt's reordering. The + // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp nickCol( "~n(.+)~n" ); nickCol.setMinimal(true); @@ -147,13 +147,13 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const if( nickCol.cap(1) != m_proc->getNick()){ TQColor col = nickColourMaker::colourMaker()->findFg(nickCol.cap(1)); - newText.prepend(TQString("<font color=\"%1\">").arg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name())); newText.append("</font>"); } else { TQColor col = ksopts->ownNickColor.name(); if( ! col.isValid()) nickColourMaker::colourMaker()->findFg(nickCol.cap(1)); - newText.prepend(TQString("<font color=\"%1\">").arg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name())); newText.append("</font>"); if(ksopts->ownNickBold){ newText.prepend("<b>"); @@ -168,7 +168,7 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const newText.append("</r>"); } } - text.replace(pos, nickCol.matchedLength(), newText); + text.tqreplace(pos, nickCol.matchedLength(), newText); } //kdDebug(5008) << "After Text: " << text << endl; @@ -199,7 +199,7 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const } if (parser.beeped()) { - KNotifyClient::event(winId(), TQString::fromLatin1("BeepReceived"), + KNotifyClient::event(winId(), TQString::tqfromLatin1("BeepReceived"), i18n("Beep Received")); } @@ -224,9 +224,9 @@ void KSircView::addRichText(const TQString &_text) timeStamp = re.cap(1); } else { - timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) - .arg( ksopts->textColor.name() ) - .arg( makeTimeStamp() ); + timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + .tqarg( ksopts->textColor.name() ) + .tqarg( makeTimeStamp() ); if ( m_timestamps ) text.prepend( timeStamp ); } @@ -270,13 +270,13 @@ void KSircView::enableTimeStamps(bool enable) void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url) { - if ( (ev->button() & LeftButton) && (ev->state() & ShiftButton ) ) + if ( (ev->button() & Qt::LeftButton) && (ev->state() & ShiftButton ) ) saveURL( url ); - else if ( (ev->button() & LeftButton) || (ev->button() & MidButton) ) + else if ( (ev->button() & Qt::LeftButton) || (ev->button() & Qt::MidButton) ) { openBrowser( url ); } - else if ( ev->button() & RightButton ) + else if ( ev->button() & Qt::RightButton ) { static const int openURLID = 0; static const int copyLinkLocationID = 1; @@ -303,12 +303,12 @@ void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url) void KSircView::openBrowser(const TQString &url ) { - (void) new KRun( KURL( url.startsWith("www") ? TQString::fromLatin1("http://") + url : url)); + (void) new KRun( KURL( url.startsWith("www") ? TQString::tqfromLatin1("http://") + url : url)); } void KSircView::copyLinkToClipboard( const TQString &url ) { - TQApplication::clipboard()->setText( url, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( url, TQClipboard::Clipboard ); } TQColor KSircView::ircColor(int code) diff --git a/ksirc/ksview.h b/ksirc/ksview.h index a4ee782e..aa79118d 100644 --- a/ksirc/ksview.h +++ b/ksirc/ksview.h @@ -28,8 +28,9 @@ class KSircProcess; class KSircView : public KSirc::TextView { Q_OBJECT + TQ_OBJECT public: - KSircView(KSircProcess *proc, TQWidget *parent, const char *name); + KSircView(KSircProcess *proc, TQWidget *tqparent, const char *name); virtual ~KSircView(); virtual void clear(); diff --git a/ksirc/logfile.cpp b/ksirc/logfile.cpp index 2246cd30..e65be271 100644 --- a/ksirc/logfile.cpp +++ b/ksirc/logfile.cpp @@ -39,16 +39,16 @@ void LogFile::open() assert( m_file->isOpen() == true ); - log( TQString::fromLatin1( "### Log session started at " ) - + TQDateTime::currentDateTime().toString() - + TQString::fromLatin1( "###\n" ) ); + log( TQString::tqfromLatin1( "### Log session started at " ) + + TQDateTime::tqcurrentDateTime().toString() + + TQString::tqfromLatin1( "###\n" ) ); } void LogFile::closeLog() { - log( TQString::fromLatin1( "### Log session terminated at " ) - + TQDateTime::currentDateTime().toString() - + TQString::fromLatin1( "###\n" ) ); + log( TQString::tqfromLatin1( "### Log session terminated at " ) + + TQDateTime::tqcurrentDateTime().toString() + + TQString::tqfromLatin1( "###\n" ) ); if ( m_flushTimerId != -1 ) killTimer( m_flushTimerId ); @@ -77,7 +77,7 @@ TQString LogFile::makeLogFileName( const TQString &channel, const TQString &serv { TQString res = channel + '_'; - TQDate dt = TQDate::currentDate(); + TQDate dt = TQDate::tqcurrentDate(); TQString dateStr; dateStr.sprintf( "%.4d_%.2d_%.2d_", dt.year(), dt.month(), dt.day() ); res += dateStr; diff --git a/ksirc/logfile.h b/ksirc/logfile.h index 653bf6ae..731dc40b 100644 --- a/ksirc/logfile.h +++ b/ksirc/logfile.h @@ -11,7 +11,7 @@ class TQFile; -class LogFile : public QObject +class LogFile : public TQObject { public: LogFile( const TQString &channel, const TQString &server ); diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 73c464c3..122a934a 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -19,7 +19,7 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e) { - if(e->button() == RightButton){ + if(e->button() == Qt::RightButton){ TQPoint p = tabBar()->mapFromParent(e->pos()); TQTab *tab = tabBar()->selectTab(p); if(tab){ @@ -29,8 +29,8 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e) } } -MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) - : KMainWindow(parent, name) +MDITopLevel::MDITopLevel(TQWidget *tqparent, const char *name) + : KMainWindow(tqparent, name) { m_closing = false; @@ -76,7 +76,7 @@ MDITopLevel::~MDITopLevel() void MDITopLevel::addWidget( TQWidget *widget, bool show ) { - if ( m_tabWidgets.containsRef( widget ) ) + if ( m_tabWidgets.tqcontainsRef( widget ) ) return; kdDebug(5008) << "In add widget" << endl; @@ -121,7 +121,7 @@ void MDITopLevel::hideWidget( TQWidget *widget ) void MDITopLevel::showWidget( TQWidget *widget ) { if(m_tab->indexOf(widget) == -1){ - int space = widget->caption().find(" "); + int space = widget->caption().tqfind(" "); TQString cap = space < 1 ? widget->caption():widget->caption().left(space); m_tab->addTab( widget, cap); m_tab->showPage( widget ); @@ -180,7 +180,7 @@ bool MDITopLevel::eventFilter( TQObject *obj, TQEvent *ev ) TQWidget *widget = dynamic_cast<TQWidget *>( obj ); - if ( !widget || !m_tabWidgets.containsRef( widget ) ) + if ( !widget || !m_tabWidgets.tqcontainsRef( widget ) ) return false; if ( m_tab->currentPage() == widget ) @@ -207,14 +207,14 @@ void MDITopLevel::slotMarkPageDirty( bool addressed ) { // This is called when a line appeared in this channel. // addressed is true if it was addressed to the user - KMainWindow *window = dynamic_cast<KMainWindow *>( const_cast<TQObject *>( sender() ) ); + KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); if ( !window ) return; if ( window != m_tab->currentPage() ) { - if ( m_addressed.containsRef( window ) ) + if ( m_addressed.tqcontainsRef( window ) ) addressed = true; else if ( addressed ) { m_addressed.append( window ); @@ -225,13 +225,13 @@ void MDITopLevel::slotMarkPageDirty( bool addressed ) void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &channelName ) { - KMainWindow *window = dynamic_cast<KMainWindow *>( const_cast<TQObject *>( sender() ) ); + KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); if ( !window ) return; TQString esc = channelName; - esc.replace("&", "&&"); + esc.tqreplace("&", "&&"); m_tab->setTabLabel( window, esc ); removeFromAddressedList( window ); } diff --git a/ksirc/mditoplevel.h b/ksirc/mditoplevel.h index 68c1382e..c24186d2 100644 --- a/ksirc/mditoplevel.h +++ b/ksirc/mditoplevel.h @@ -6,12 +6,13 @@ #include <kmainwindow.h> -class KSTabWidget : public QTabWidget +class KSTabWidget : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - KSTabWidget ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) - : TQTabWidget(parent, name, f) + KSTabWidget ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ) + : TQTabWidget(tqparent, name, f) { } @@ -29,8 +30,9 @@ class KPopupMenu; class MDITopLevel : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - MDITopLevel(TQWidget *parent = 0, const char *name = 0); + MDITopLevel(TQWidget *tqparent = 0, const char *name = 0); virtual ~MDITopLevel(); void addWidget( TQWidget *widget, bool show ); diff --git a/ksirc/nickColourMaker.cpp b/ksirc/nickColourMaker.cpp index ce866349..c5a3b972 100644 --- a/ksirc/nickColourMaker.cpp +++ b/ksirc/nickColourMaker.cpp @@ -43,7 +43,7 @@ int nickColourMaker::findIdx(TQString nick) const return -1; for(i = 0; i < nick.length(); i++){ - c = nick[i].unicode(); + c = nick[i].tqunicode(); switch(c){ case '|': case '-': diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index 5988903d..27b3d0f2 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -49,7 +49,7 @@ void objFinder::insert(TQObject *obj, const char *key){ emit objFind->inserted(obj); } -TQObject *objFinder::find(const char *name, const char *inherits){ +TQObject *objFinder::tqfind(const char *name, const char *inherits){ TQObject *found; TQDictIterator<TQObject> it(*objList); uint len = strlen(name); @@ -67,7 +67,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ delete qobl; ++it; } - TQWidgetList *all = TQApplication::allWidgets(); + TQWidgetList *all = TQApplication::tqallWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ if(len == strlen(itW.current()->name()) && @@ -76,7 +76,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ ++itW; continue; } - found = itW.current(); + found = TQT_TQOBJECT(itW.current()); delete all; return found; } @@ -93,7 +93,7 @@ void objFinder::dumpTree(){ it.current()->dumpObjectTree(); ++it; } - TQWidgetList *all = TQApplication::allWidgets(); + TQWidgetList *all = TQApplication::tqallWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ kdDebug(5008) << itW.current()->className() << "::" << itW.current()->name("unnamed") << endl; @@ -119,7 +119,7 @@ TQStringList objFinder::allObjects(){ delete qobl; ++it; } - TQWidgetList *all = TQApplication::allWidgets(); + TQWidgetList *all = TQApplication::tqallWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ TQString name; diff --git a/ksirc/objFinder.h b/ksirc/objFinder.h index f4f6fbd2..7303a31b 100644 --- a/ksirc/objFinder.h +++ b/ksirc/objFinder.h @@ -7,13 +7,14 @@ class objFinder : public TQObject { Q_OBJECT + TQ_OBJECT public: objFinder(); virtual ~objFinder(); static void insert(TQObject *obj, const char *key = 0); - static TQObject *find(const char *name, const char *inherits); + static TQObject *tqfind(const char *name, const char *inherits); static void dumpTree(); static TQStringList allObjects(); diff --git a/ksirc/openksircproc.dlg b/ksirc/openksircproc.dlg index 1378f569..080199d9 100644 --- a/ksirc/openksircproc.dlg +++ b/ksirc/openksircproc.dlg @@ -26,7 +26,7 @@ Label { Rect {10 10 100 30} Name {Label_1} Font {"helvetica" 12 63 0 0 0 0 0 0} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -42,7 +42,7 @@ PushButton { Variable {okButton} Font {"helvetica" 12 63 0 0 0 0 0 0} Signal {[Protected] clicked --> create_toplevel ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -56,7 +56,7 @@ PushButton { Rect {10 50 180 30} Name {PushButton_2} Signal {[Protected] clicked --> terminate ()} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ ComboBox { Rect {70 10 320 30} Name {ComboBox_1} Variable {nameSLE} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index cf44e77e..9a09acd4 100644 --- a/ksirc/puke/HOWTO-PUKE.pod +++ b/ksirc/puke/HOWTO-PUKE.pod @@ -11,7 +11,7 @@ under Linux. Puke's a generic protocol allowing dsirc to communicate with ksirc. Communications works over a unix domain socket between multiple client dsirc process's to a single ksirc process. All communications -is done via a variable length message with the following layout: +is done via a variable length message with the following tqlayout: =begin text @@ -67,18 +67,18 @@ supporting perl5-oop object. =head2 2.1 C++ Widget code The C++ code must be able to hand all required settings and messages -for the widget. Each new widget iherites it's parent and so forth -allowing for a nice oop layout. The widget structure the author is +for the widget. Each new widget iherites it's tqparent and so forth +allowing for a nice oop tqlayout. The widget structure the author is following is the same as Qt's. Their seems to work well, why re-invent the wheel? =item 2.1.1 General Layout, etc Figure where your new widget goes in the heirachy. If it's a simple -Qt widget, I recommend using their existing layout. Man pages list +Qt widget, I recommend using their existing tqlayout. Man pages list what widgets inherit what. -The general idea behind the widget layout should be to be to provide +The general idea behind the widget tqlayout should be to be to provide all the functionality of the widget to dsirc perl script. Incoming messages are handled via the messageHandler and ALL messages should return an ACK with current state info. @@ -106,7 +106,7 @@ These set and return your widget. If you care about inheritance, which you should, all these functions should be virtual. (Since we are using pointers to PWidget's -everywhere, it's a good bet you want your children's overriden +everywhere, it's a good bet you want your tqchildren's overriden functions called, not yours) The structure internally will have to hold a local copy of the widget, @@ -117,27 +117,27 @@ destroyed. createWidget is defined as: -PWidget *createWidget(widgetId *pwi, PWidget *parent); +PWidget *createWidget(widgetId *pwi, PWidget *tqparent); It is called everytime a new widget of yours is required. The widgetId will be the identifier for your widget and must be kept for all future commands. PWidget::setWidgetId(pwi) should be called to -set the widget id. The *parent is the parent of the current widget. +set the widget id. The *tqparent is the tqparent of the current widget. Generally PWidget->widget() is passed to the contructor of your -widget. If it's 0, there is no parent. Simeplfied code for a the +widget. If it's 0, there is no tqparent. Simeplfied code for a the PFrame is: =begin text extern "C" { -PWidget *createWidget(widgetId *pwi, PWIdget *parent); +PWidget *createWidget(widgetId *pwi, PWIdget *tqparent); } -PWidget *createWidget(widgetId *pwi, PWIdget *parent){ +PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){ QFrame *f; - PFrame *pf = new PFrame(parent); - if(parent != 0){ - f = new QFrame(parent->widget()); + PFrame *pf = new PFrame(tqparent); + if(tqparent != 0){ + f = new QFrame(tqparent->widget()); } else{ f = new QPFrame(); @@ -149,13 +149,13 @@ PWidget *createWidget(widgetId *pwi, PWIdget *parent){ =end text -Note: you have to check parent for null since calling NULL->widget() +Note: you have to check tqparent for null since calling NULL->widget() results in Bad Things (tm). =item 2.1.3 messageHandler This receives all commands, etc. It should process required commands, -if a command is unkown pass it to the parent. PFrame example: +if a command is unkown pass it to the tqparent. PFrame example: =begin text @@ -186,9 +186,9 @@ void PFrame::messageHandler(int fd, PukeMessage *pm) { Both these functions should be overriden and return your widget type, and set your widget. For setWidget you should connect required -signals and eventFilters you are using. +Q_SIGNALS and eventFilters you are using. -Make sure to call the parents setWidget in setWidget so it can connect +Make sure to call the tqparents setWidget in setWidget so it can connect filters etc. BEWARE: You might get the widget into setWidget being null (from the @@ -222,7 +222,7 @@ Call the destructor as such: delete widget(); setWidget(0); -This will clear the widget from now and all parents and delete it. +This will clear the widget from now and all tqparents and delete it. you never want it deleted twice. (deleting 0 won't hurt) =head2 2.2 The Perl code diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h index 50ff88b2..8a8158e0 100644 --- a/ksirc/puke/commands.h +++ b/ksirc/puke/commands.h @@ -66,7 +66,7 @@ // Fetch widgets -// Desc: get widget from parent +// Desc: get widget from tqparent // iWinId: not defined // iArg: not defined // cArg: 2 feilds, tab sperated, must be returned unchanged. 1. random string. 3. Object Name. @@ -82,7 +82,7 @@ // Widget commands starts at 1000 and end at 10000 // Desc: create new widget -// iWinId: parent widget id +// iWinId: tqparent widget id // iArg: widget type as defined by PWIDGET_* // cArg: Must be return unchanged #define PUKE_WIDGET_CREATE 1000 @@ -130,38 +130,38 @@ // cArg: not define #define PUKE_WIDGET_HIDE_ACK -1003 -// Desc: repaint widget -// iWinId: widget to repaint +// Desc: tqrepaint widget +// iWinId: widget to tqrepaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_REPAINT 1005 -// Desc: repaint widget ack -// iWinId: widget to repaint +// Desc: tqrepaint widget ack +// iWinId: widget to tqrepaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_REPAINT_ACK -1005 // Desc: update widget on next event loop -// iWinId: widget to repaint +// iWinId: widget to tqrepaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_UPDATE 1010 -// Desc: repaint widget ack -// iWinId: widget to repaint +// Desc: tqrepaint widget ack +// iWinId: widget to tqrepaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_UPDATE_ACK -1010 // Desc: resize the widget -// iWinId: widget to repaint +// iWinId: widget to tqrepaint // iArg: width in the low 16 bit, height in next 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE 1015 -// Desc: repaint widget ack -// iWinId: widget to repaint +// Desc: tqrepaint widget ack +// iWinId: widget to tqrepaint // iArg: new widget in lower 16 bit, new height in lower 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE_ACK -1015 @@ -335,13 +335,13 @@ // cArg: not defined #define PUKE_WIDGET_SET_ENABLED_ACK -1090 -// Desc: recreate widget with new parent, etc +// Desc: recreate widget with new tqparent, etc // IwinId: window id -// iArg: window ID for new parent, 0x0 for no parent, toplevel +// iArg: window ID for new tqparent, 0x0 for no tqparent, toplevel // cArg: 3 packed ints, 0 = x, 1 = y, 2 = showit #define PUKE_WIDGET_RECREATE 1091 -// Desc: ACK recreate widget with new parent, etc +// Desc: ACK recreate widget with new tqparent, etc // IwinId: window id // iArg: 0 (for all ok, other for error) // cArg: 0 @@ -349,33 +349,33 @@ // TQFrame gets 1100 -// 1100 defines QFrame +// 1100 defines TQFrame // Desc: set Frame style // iWinId: widget to chanse // iArg: frame style to set. // cArg: no define -#define PUKE_QFRAME_SET_FRAME 1100 +#define PUKE_TQFRAME_SET_FRAME 1100 // Desc: get/ack Frame style // iWinId: widget to changed // iArg: frame style. // cArg: no define -#define PUKE_QFRAME_SET_FRAME_ACK -1100 +#define PUKE_TQFRAME_SET_FRAME_ACK -1100 // Desc: set Frame line width // iWinId: widget to chanse // iArg: newline width. // cArg: no define -#define PUKE_QFRAME_SET_LINEWIDTH 1105 +#define PUKE_TQFRAME_SET_LINEWIDTH 1105 // Desc: get/ack Frame line width // iWinId: widget to changed // iArg: line width. // cArg: no define -#define PUKE_QFRAME_SET_LINEWIDTH_ACK -1105 +#define PUKE_TQFRAME_SET_LINEWIDTH_ACK -1105 //---------------------------------------------------- -// 1200 is a QLineEdit +// 1200 is a TQLineEdit // Desc: set max line length // iWinId: widget to change @@ -766,13 +766,13 @@ // Desc: Set label's allignment // iWinId: window id -// iArg: alignment +// iArg: tqalignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT 1715 // Desc: Set label's allignment, ACK // iWinId: window id -// iArg: alignment +// iArg: tqalignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT_ACK -1715 @@ -944,7 +944,7 @@ // LINED defines the simple SLE #define PWIDGET_LINED 4 -// BUTTON defines the abstract class QButton +// BUTTON defines the abstract class TQButton #define PWIDGET_BUTTON 5 // PUSH defined the push button @@ -993,14 +993,14 @@ #define PWIDGET_OBJFINDER 18 -// Group layout commands exist between 10000 and 11000 +// Group tqlayout commands exist between 10000 and 11000 -// Desc: create new box layout -// iWinId: PWidget parent +// Desc: create new box tqlayout +// iWinId: PWidget tqparent // iArg: 2 shorts, short[0] direction, short[1] border // cArg: random character string #define PUKE_LAYOUT_NEW 11000 -// Desc: ack for box layout +// Desc: ack for box tqlayout // iWinId: Layout ID. // iArg: not define // cArg: same random m character string as PUKE_LAYOUT_NEW @@ -1009,10 +1009,10 @@ #define PUKE_LAYOUT_ADDLAYOUT 11005 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005 -// Desc: add widget into layout manager +// Desc: add widget into tqlayout manager // iWinId: Layout Manager to add widget too // iArg: Widget Id to be added -// cArg: 2 characters, char[0] strech, char[1] alignment +// cArg: 2 characters, char[0] strech, char[1] tqalignment #define PUKE_LAYOUT_ADDWIDGET 11010 // Desc: ack for add widget // iWinId: Layout manager @@ -1032,7 +1032,7 @@ // cArg: not define #define PUKE_LAYOUT_ADDSTRUT_ACK -11015 -// Desc: activates layout management, like show() for widget +// Desc: activates tqlayout management, like show() for widget // iWinId: Layout Manager to activate // iArg: undef // cArg: undef diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 04017529..faa5cf23 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -15,7 +15,7 @@ #include <sys/stat.h> using namespace std; // iostream.h include cstring which puts strlen into - // std:: namespace, which breaks Qt's strlen() call + // std:: namespace, which breaks TQt's strlen() call // in tqcstring.h (in gcc3's libstdc++) #include <klibloader.h> @@ -32,7 +32,7 @@ using namespace std; // iostream.h include cstring which puts strlen into #include "pframe.h" #include "pkfiledialog.h" #include "plabel.h" -#include "playout.h" +#include "ptqlayout.h" #include "plined.h" #include "plistbox.h" #include "pmenudta.h" @@ -50,7 +50,7 @@ using namespace std; // iostream.h include cstring which puts strlen into uint PukeController::uiBaseWinId = 10; // Gives a little seperation from the controller id -PukeController::PukeController(TQString sock, TQObject *parent, const char *name) : PObject( parent, name ) +PukeController::PukeController(TQString sock, TQObject *tqparent, const char *name) : PObject( tqparent, name ) { int len, prev_umask; struct sockaddr_un unix_addr; @@ -173,7 +173,7 @@ void PukeController::NewConnect(int) fcntl(cfd, F_SETFL, O_NONBLOCK); // Set it non-block so that // cfd() never blocks. - fdStatus *fds = new fdStatus(); + fdtqStatus *fds = new fdtqStatus(); fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this); fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this); connect(fds->sr, TQT_SIGNAL(activated(int)), @@ -562,7 +562,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm) widgetId wIret; /* - * The parent widget ID and type are packed into the iArg + * The tqparent widget ID and type are packed into the iArg * the pattern is 2 shorts. */ @@ -580,17 +580,17 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm) wIret.iWinId = uiBaseWinId; wIret.fd = fd; - // CreateArgs arg = CreateArgs(this, pm, &wIret, parent) + // CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent) CreateArgs arg(this, pm, &wIret, 0); // Let's go looking for the widget // Match any class with the right name TQObject *obj = 0x0; - if(parent() && (strcmp(name, parent()->name()) == 0)){ - obj = parent(); + if(tqparent() && (strcmp(name, tqparent()->name()) == 0)){ + obj = tqparent(); } else { - obj = objFinder::find(name, 0x0); + obj = objFinder::tqfind(name, 0x0); if(obj == 0){ wIret.fd = 0; wIret.iWinId = 0; @@ -642,10 +642,10 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) kdDebug(5008) << "WidgetRunner:: no such set of widget descriptors?" << endl; throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_CONNECTION)); } - if(qidWS->find(wI.iWinId)){ + if(qidWS->tqfind(wI.iWinId)){ // Remove the list item then delete the widget. This will stop // the destroyed signal from trying to remove it again. - PObject *pw = qidWS->find(wI.iWinId)->pwidget; + PObject *pw = qidWS->tqfind(wI.iWinId)->pwidget; qidWS->remove(wI.iWinId); delete pw; pw = 0; pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; @@ -661,8 +661,8 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } - WidgetList[fd]->find(wI.iWinId)->pwidget->manTerm(); - delete WidgetList[fd]->find(wI.iWinId)->pwidget; + WidgetList[fd]->tqfind(wI.iWinId)->pwidget->manTerm(); + delete WidgetList[fd]->tqfind(wI.iWinId)->pwidget; PukeMessage pmRet = *pm; pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; @@ -711,7 +711,7 @@ void PukeController::closefd(int fd) PObject *po = 0x0; while(it.current()){ /* - * Delete all the layouts first + * Delete all the tqlayouts first * */ if(it.current()->type == POBJECT_LAYOUT){ @@ -745,7 +745,7 @@ void PukeController::closefd(int fd) bool PukeController::checkWidgetId(widgetId *pwi) { if(WidgetList[pwi->fd] != NULL) - if(WidgetList[pwi->fd]->find(pwi->iWinId) != NULL) + if(WidgetList[pwi->fd]->tqfind(pwi->iWinId) != NULL) return TRUE; return FALSE; @@ -753,7 +753,7 @@ bool PukeController::checkWidgetId(widgetId *pwi) PObject *PukeController::id2pobject(widgetId *pwi){ if(checkWidgetId(pwi) == TRUE){ - return WidgetList[pwi->fd]->find(pwi->iWinId)->pwidget; + return WidgetList[pwi->fd]->tqfind(pwi->iWinId)->pwidget; } throw(errorNoSuchWidget(*pwi)); return 0; // never reached @@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { return; } - TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg); + TQString libName = "ksirc/lib"+TQString::tqfromLatin1(pm->cArg); if (libName.right(3) == ".so") libName = libName.left(libName.length()-2)+"la"; @@ -899,7 +899,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { } else{ if(checkWidgetId(&wI) == TRUE){ - WidgetList[wI.fd]->find(wI.iWinId)->pwidget->messageHandler(fd, pm); + WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget->messageHandler(fd, pm); } else{ PukeMessage pmRet; @@ -915,11 +915,11 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) { widgetId wIret; - PWidget *parent = 0; // Defaults to no parent + PWidget *tqparent = 0; // Defaults to no tqparent WidgetS *ws = new WidgetS; /* - * The parent widget ID and type are packed into the iArg + * The tqparent widget ID and type are packed into the iArg * the pattern is 2 shorts. */ @@ -928,7 +928,7 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) if(found != 2) throw(errorCommandFailed(PUKE_INVALID,7)); - wI.iWinId = iParent; // wI is the identifier for the parent widget + wI.iWinId = iParent; // wI is the identifier for the tqparent widget if(widgetCF[iType] == NULL){ // No such widget, bail out. wIret.fd = 0; @@ -943,15 +943,15 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) wIret.fd = wI.fd; if(checkWidgetId(&wI) == TRUE){ - PObject *obj = WidgetList[wI.fd]->find(wI.iWinId)->pwidget; + PObject *obj = WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget; if(obj->widget()->isWidgetType() == FALSE){ throw(errorCommandFailed(PUKE_INVALID, 0)); } - parent = (PWidget *) obj; + tqparent = (PWidget *) obj; } - // CreateArgs arg = CreateArgs(this, pm, &wIret, parent) - CreateArgs arg(this, pm, &wIret, parent); + // CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent) + CreateArgs arg(this, pm, &wIret, tqparent); ws->pwidget = (widgetCF[iType]->wc)(arg); if (ws->pwidget->hasError()) { diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h index 5daa1629..5d22cef3 100644 --- a/ksirc/puke/controller.h +++ b/ksirc/puke/controller.h @@ -27,7 +27,7 @@ typedef struct { TQString server; bool writeable; TQSocketNotifier *sr,*sw; -} fdStatus; +} fdtqStatus; struct commandStruct { @@ -80,8 +80,9 @@ private: class PukeController : public PObject { Q_OBJECT + TQ_OBJECT public: - PukeController(TQString socket = "", TQObject *parent=0, const char *name=0); + PukeController(TQString socket = "", TQObject *tqparent=0, const char *name=0); virtual ~PukeController(); bool running; @@ -136,7 +137,7 @@ private: int iListenFd; bool bClosing; // Set true if we are closing, we don't try and close twice at the same time. TQSocketNotifier *qsnListen; - TQIntDict<fdStatus> qidConnectFd; + TQIntDict<fdtqStatus> qidConnectFd; /** * Controller ID is defined as 1 @@ -168,7 +169,7 @@ private: /** * Create new Widget, returns new iWinId for it. - * Takes server fd and parent winid, and type as arguments + * Takes server fd and tqparent winid, and type as arguments */ widgetId createWidget(widgetId wI, PukeMessage *pm); diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm index 65bc1b07..5101cc58 100644 --- a/ksirc/puke/dcc_status.pm +++ b/ksirc/puke/dcc_status.pm @@ -6,7 +6,7 @@ &docommand("/load ptablevw.pm"); &docommand("/load plistbox.pm"); &docommand("/load pbutton.pm");; -&docommand("/load pboxlayout.pm"); +&docommand("/load pboxtqlayout.pm"); &docommand("/load plabel.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); @@ -123,7 +123,7 @@ sub sendClicked { use vars qw(@ISA $KSIRC_DCC %KSIRC_DCC); -package DCCStatus; +package DCCtqStatus; use vars qw(@ISA); @ISA = qw(PFrame); @@ -178,7 +178,7 @@ sub new { = ( $gm_main, $label, $lb, $button_get, $button_send, $button_forget, $gm_but1, $gm_but2, $button_send ); - print "*I* Finished creating DCCStatus\n"; + print "*I* Finished creating DCCtqStatus\n"; return $self; } @@ -330,7 +330,7 @@ sub hook_ksirc_dcc_request { my($size) = shift; my($mwho) = $who; if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCStatus; + $KSIRC_DCCSTATUS = new DCCtqStatus; $KSIRC_DCCSTATUS->resize(400, 275); } @@ -371,7 +371,7 @@ sub hook_ksirc_dcc_send { $window->setRange(0, $size); $window->setCaption("$file=>$nick"); $window->setTopText("Sending: $file Size: $size"); - $window->setBotText("Status: pending"); + $window->setBotText("tqStatus: pending"); $window->setCancel("dcc close send $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; @@ -417,7 +417,7 @@ sub hook_ksirc_dcc_get { $window->setRange(0, $size); $window->setCaption("$file<=$nick"); $window->setTopText("Receiver: $file Size: $size"); - $window->setBotText("Status: pending"); + $window->setBotText("tqStatus: pending"); $window->setCancel("dcc close get $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; @@ -438,7 +438,7 @@ sub hook_ksirc_dcc_get_status { $window->setRange(0, 1); $window->setCaption("$file<=$nick"); $window->setTopText("Receiver: $file Size: Unkown"); - $window->setBotText("Status: pending"); + $window->setBotText("tqStatus: pending"); $window->setCancel("dcc close get $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; @@ -472,14 +472,14 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect"); -&print("*I* Done DCC Status"); -#$::test = new DCCStatus; +&print("*I* Done DCC tqStatus"); +#$::test = new DCCtqStatus; #$::test->resize(400, 275); #$::test->show(); sub popup_dccstatus{ if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCStatus; + $KSIRC_DCCSTATUS = new DCCtqStatus; $KSIRC_DCCSTATUS->resize(400, 275); } $KSIRC_DCCSTATUS->show(); @@ -487,7 +487,7 @@ sub popup_dccstatus{ sub popup_dccsend{ if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCStatus; + $KSIRC_DCCSTATUS = new DCCtqStatus; $KSIRC_DCCSTATUS->resize(400, 275); } $KSIRC_DCCSTATUS->sendClicked(); diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm index 26594c0f..048eb9eb 100644 --- a/ksirc/puke/load_all.pm +++ b/ksirc/puke/load_all.pm @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxlayout.pm"); +&docommand("/load pboxtqlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp index 9f43b124..211cbf91 100644 --- a/ksirc/puke/palistbox.cpp +++ b/ksirc/puke/palistbox.cpp @@ -6,14 +6,14 @@ PObject * PAListBox::createWidget(CreateArgs &ca) { - PAListBox *plb = new PAListBox(ca.parent); + PAListBox *plb = new PAListBox(ca.tqparent); aListBox *lb; if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox") == TRUE){ lb = (aListBox *) ca.fetchedObj; plb->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - lb = new aListBox((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + lb = new aListBox((TQWidget *) ca.tqparent->widget()); else lb = new aListBox(); plb->setWidget(lb); @@ -22,8 +22,8 @@ PAListBox::createWidget(CreateArgs &ca) } -PAListBox::PAListBox(PObject *parent) - : PListBox(parent) +PAListBox::PAListBox(PObject *tqparent) + : PListBox(tqparent) { // kdDebug(5008) << "PListBox PListBox called" << endl; lb = 0; @@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm) widget()->removeItem(index); item->setVoice(pm->iArg); widget()->inSort(item); - widget()->repaint(TRUE); + widget()->tqrepaint(TRUE); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; @@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm) widget()->removeItem(index); item->setOp(pm->iArg); widget()->inSort(item); - widget()->repaint(TRUE); + widget()->tqrepaint(TRUE); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; diff --git a/ksirc/puke/palistbox.h b/ksirc/puke/palistbox.h index a902b018..5c50023e 100644 --- a/ksirc/puke/palistbox.h +++ b/ksirc/puke/palistbox.h @@ -11,10 +11,11 @@ class PAListBox; class PAListBox : public PListBox { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PAListBox ( PObject * parent ); + PAListBox ( PObject * tqparent ); virtual ~PAListBox (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/pbase.pm b/ksirc/puke/pbase.pm index b8345cdb..b5b13be7 100644 --- a/ksirc/puke/pbase.pm +++ b/ksirc/puke/pbase.pm @@ -40,19 +40,19 @@ sub rndchr { sub new { my $class = shift; - my $parent = $_[$#_]; + my $tqparent = $_[$#_]; my $self = {}; -# print "Parent: $parent\n"; +# print "Parent: $tqparent\n"; bless($self, $class); - $parent = 0 if($parent == undef); + $tqparent = 0 if($tqparent == undef); $self->{iWinId} = -1; - $self->{Parent} = $parent if $parent != 0; + $self->{Parent} = $tqparent if $tqparent != 0; $self->{initId} = $self->rndchr(); $self->{widgetType} = $PBase::NO_WIDGET; $self->{cmdQueue} = (); @@ -77,13 +77,13 @@ sub create { return; } - my $parent = $self->{Parent} ? $self->{Parent}->{iWinId} : 0; + my $tqparent = $self->{Parent} ? $self->{Parent}->{iWinId} : 0; - # print "*I* Createing widget of type: " . $self->{widgetType} . " with parent " . $parent . "\n"; + # print "*I* Createing widget of type: " . $self->{widgetType} . " with tqparent " . $tqparent . "\n"; $self->{runable} = 1; - my $carg = $parent . "\t" . $self->{widgetType} . "\t" . $self->{initId}; + my $carg = $tqparent . "\t" . $self->{widgetType} . "\t" . $self->{initId}; my %REPLY = $self->sendMessage('iCommand' => $::PUKE_WIDGET_CREATE, 'iWinId' => $::PUKE_CONTROLLER, diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm index 505ddc0d..22087b5f 100644 --- a/ksirc/puke/pboxlayout.pm +++ b/ksirc/puke/pboxlayout.pm @@ -28,7 +28,7 @@ sub new { # print "Widget: " . ref($widget) . "\n"; # if(ref($widget) eq ''){ - # print "*E* Error Creating PBoxLayout, did not give valid parent\n"; + # print "*E* Error Creating PBoxLayout, did not give valid tqparent\n"; # return; #} # elsif(ref($widget) eq 'PBoxLayout'){ @@ -40,7 +40,7 @@ sub new { #} # else{ if(ref($widget) ne ''){ - # print "*\cbI\cb* Generic Non-topleve layout type\n"; + # print "*\cbI\cb* Generic Non-topleve tqlayout type\n"; $self->{Parent} = $widget; $self->{ParentType} = 'Widget'; $self->{Direction} = shift; @@ -99,7 +99,7 @@ sub addWidget { my $align = shift; if($self->{Added} == 0){ - print "*E* Burp: Can't add widget without first being added to parent layout\n"; + print "*E* Burp: Can't add widget without first being added to tqparent tqlayout\n"; return; } @@ -128,41 +128,41 @@ sub addLayout { my $self = shift; if($self->{Added} == 0){ - print "*E* Burp: Can't add layout without first being added to parent layout\n"; + print "*E* Burp: Can't add tqlayout without first being added to tqparent tqlayout\n"; } - my $layout = shift; - if(ref($layout) ne 'PBoxLayout'){ - print "*E* Passed non layout type to addLayout\n"; + my $tqlayout = shift; + if(ref($tqlayout) ne 'PBoxLayout'){ + print "*E* Passed non tqlayout type to addLayout\n"; return 1; } - if($layout->{iWinId} <= 0){ - print "*E* Trying to add invalid layout " . ref($layout) . "\n"; + if($tqlayout->{iWinId} <= 0){ + print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n"; return; } # make sure we can run, and the widget we want to add can run. - # my @ARG = ($layout); + # my @ARG = ($tqlayout); #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; - #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; + #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT, 'iWinId' => $self->{iWinId}, - 'iArg' => $layout->{iWinId}, + 'iArg' => $tqlayout->{iWinId}, 'cArg' => pack("C", 0), 'CallBack' => sub { }, 'WaitFor' => 1); - # print "*I* Adding layout\n"; + # print "*I* Adding tqlayout\n"; if($REPLY{'iArg'} != 0){ print "*E* AddLayout call failed\n"; } else{ - # print "*I* Added new Layout for " . $layout->{iWinId} . "\n"; - $layout->{Added} = 1; + # print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n"; + $tqlayout->{Added} = 1; } } diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp index f21cdf03..828b7f2f 100644 --- a/ksirc/puke/pbutton.cpp +++ b/ksirc/puke/pbutton.cpp @@ -10,10 +10,10 @@ PObject * PButton::createWidget(CreateArgs &ca) { - PButton *pb = new PButton(ca.parent); + PButton *pb = new PButton(ca.tqparent); TQButton *qb; - if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - qb = new TQButton((TQWidget *) ca.parent->widget()); + if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + qb = new TQButton((TQWidget *) ca.tqparent->widget()); else qb = new TQButton(); pb->setWidget(qb); @@ -22,8 +22,8 @@ PButton::createWidget(CreateArgs &ca) } -PButton::PButton(PObject *parent) - : PWidget(parent) +PButton::PButton(PObject *tqparent) + : PWidget(tqparent) { // kdDebug(5008) << "PLineEdit PLineEdit called" << endl; button = 0; diff --git a/ksirc/puke/pbutton.h b/ksirc/puke/pbutton.h index addc7713..2ee1fb1f 100644 --- a/ksirc/puke/pbutton.h +++ b/ksirc/puke/pbutton.h @@ -13,10 +13,11 @@ class PButton; class PButton : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PButton ( PObject * parent ); + PButton ( PObject * tqparent ); virtual ~PButton (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp index ed58d5a7..6acad37e 100644 --- a/ksirc/puke/pframe.cpp +++ b/ksirc/puke/pframe.cpp @@ -4,11 +4,11 @@ PObject * PFrame::createWidget(CreateArgs &ca) { - PFrame *pw = new PFrame(ca.parent); + PFrame *pw = new PFrame(ca.tqparent); TQFrame *tf; - if(ca.parent != 0 && - ca.parent->widget()->isWidgetType() == TRUE) - tf = new TQFrame((TQWidget *) ca.parent->widget()); + if(ca.tqparent != 0 && + ca.tqparent->widget()->isWidgetType() == TRUE) + tf = new TQFrame((TQWidget *) ca.tqparent->widget()); else tf = new TQFrame(); pw->setWidget(tf); @@ -18,8 +18,8 @@ PFrame::createWidget(CreateArgs &ca) } -PFrame::PFrame( PObject *parent) - : PWidget(parent) +PFrame::PFrame( PObject *tqparent) + : PWidget(tqparent) { // kdDebug(5008) << "PFrame PFrame called" << endl; frame = 0; @@ -40,17 +40,17 @@ void PFrame::messageHandler(int fd, PukeMessage *pm) // kdDebug(5008) << "PFrame handler called" << endl; PukeMessage pmRet; switch(pm->iCommand){ - case PUKE_QFRAME_SET_FRAME: + case PUKE_TQFRAME_SET_FRAME: widget()->setFrameStyle(pm->iArg); - pmRet.iCommand = PUKE_QFRAME_SET_FRAME_ACK; + pmRet.iCommand = PUKE_TQFRAME_SET_FRAME_ACK; pmRet.iWinId = pm->iWinId; pmRet.iArg = widget()->frameStyle(); pmRet.cArg = 0; emit outputMessage(fd, &pmRet); break; - case PUKE_QFRAME_SET_LINEWIDTH: + case PUKE_TQFRAME_SET_LINEWIDTH: widget()->setLineWidth(pm->iArg); - pmRet.iCommand = PUKE_QFRAME_SET_LINEWIDTH_ACK; + pmRet.iCommand = PUKE_TQFRAME_SET_LINEWIDTH_ACK; pmRet.iWinId = pm->iWinId; pmRet.iArg = widget()->lineWidth(); pmRet.cArg = 0; diff --git a/ksirc/puke/pframe.h b/ksirc/puke/pframe.h index 8d7fbc82..0405f99b 100644 --- a/ksirc/puke/pframe.h +++ b/ksirc/puke/pframe.h @@ -10,10 +10,11 @@ class PFrame; class PFrame : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PFrame ( PObject * parent ); + PFrame ( PObject * tqparent ); virtual ~PFrame (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm index f851cdb8..2ef36ebc 100644 --- a/ksirc/puke/pframe.pm +++ b/ksirc/puke/pframe.pm @@ -44,13 +44,13 @@ sub setFrameStyle { my $self = shift; my $frame = shift; - my $repaint = shift; + my $tqrepaint = shift; $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME, 'iArg' => $frame, 'CallBack' => sub {}); - $self->repaint(1) if($repaint == 1); + $self->tqrepaint(1) if($tqrepaint == 1); } diff --git a/ksirc/puke/pkfiledialog.cpp b/ksirc/puke/pkfiledialog.cpp index f78ae895..255ed2b8 100644 --- a/ksirc/puke/pkfiledialog.cpp +++ b/ksirc/puke/pkfiledialog.cpp @@ -9,22 +9,22 @@ PObject * PKFileDialog::createWidget(CreateArgs &ca) { - PKFileDialog *pw = new PKFileDialog(ca.parent); + PKFileDialog *pw = new PKFileDialog(ca.tqparent); KFileDialog *kfbd; if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog") == TRUE){ kfbd = (KFileDialog *) ca.fetchedObj; pw->setDeleteAble(FALSE); } - else // Never takes a parent in Puke - kfbd = new KFileDialog("/", TQString::null, 0L, "PukeKFileDialog", TRUE); + else // Never takes a tqparent in Puke + kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", TRUE); pw->setWidget(kfbd); pw->setWidgetId(ca.pwI); return pw; } -PKFileDialog::PKFileDialog(PObject *parent) - : PWidget(parent) +PKFileDialog::PKFileDialog(PObject *tqparent) + : PWidget(tqparent) { kfbd = 0; setWidget(kfbd); diff --git a/ksirc/puke/pkfiledialog.h b/ksirc/puke/pkfiledialog.h index dbfd7dd5..5b5802bb 100644 --- a/ksirc/puke/pkfiledialog.h +++ b/ksirc/puke/pkfiledialog.h @@ -11,10 +11,11 @@ class PKFileDialog; class PKFileDialog : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PKFileDialog ( PObject * parent ); + PKFileDialog ( PObject * tqparent ); virtual ~PKFileDialog (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp index 7567ac08..2c313e3a 100644 --- a/ksirc/puke/plabel.cpp +++ b/ksirc/puke/plabel.cpp @@ -8,14 +8,14 @@ PObject * PLabel::createWidget(CreateArgs &ca) { - PLabel *pw = new PLabel(ca.parent); + PLabel *pw = new PLabel(ca.tqparent); TQLabel *le; if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){ le = (TQLabel *) ca.fetchedObj; pw->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - le = new TQLabel((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + le = new TQLabel((TQWidget *) ca.tqparent->widget()); else le = new TQLabel((TQWidget *)0L); pw->setWidget(le); @@ -24,8 +24,8 @@ PLabel::createWidget(CreateArgs &ca) } -PLabel::PLabel(PObject *parent) - : PFrame(parent) +PLabel::PLabel(PObject *tqparent) + : PFrame(tqparent) { // kdDebug(5008) << "PLabel PLabel called" << endl; label = 0; @@ -83,7 +83,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm) if(!checkWidget()) return; - widget()->setAlignment(pm->iArg); + widget()->tqsetAlignment(pm->iArg); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/plabel.h b/ksirc/puke/plabel.h index f68ffd28..8fd0bceb 100644 --- a/ksirc/puke/plabel.h +++ b/ksirc/puke/plabel.h @@ -11,10 +11,11 @@ class PLabel; class PLabel : public PFrame { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PLabel ( PObject * parent ); + PLabel ( PObject * tqparent ); virtual ~PLabel (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/plabel.pm b/ksirc/puke/plabel.pm index bc557b5e..efdcf490 100644 --- a/ksirc/puke/plabel.pm +++ b/ksirc/puke/plabel.pm @@ -83,7 +83,7 @@ sub text { -sub setAlignment { +sub tqsetAlignment { my $self = shift; my $align = shift; diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp index 9bcdfa2a..e3242a81 100644 --- a/ksirc/puke/playout.cpp +++ b/ksirc/puke/playout.cpp @@ -1,7 +1,7 @@ #include <stdio.h> -#include "playout.h" +#include "ptqlayout.h" #include "commands.h" PLayout::PLayout(TQObject *pobject) @@ -16,14 +16,14 @@ PLayout::~PLayout() // kdDebug(5008) << "PObject: in destructor" << endl; /* delete widget(); - layout = 0; + tqlayout = 0; setWidget(); */ } PObject *PLayout::createWidget(CreateArgs &ca) { - PLayout *pw = new PLayout(ca.parent); + PLayout *pw = new PLayout(ca.tqparent); TQBoxLayout *qbl; int direction, border, iType, iParent; // Retreive the border and direction information out of the @@ -31,15 +31,15 @@ PObject *PLayout::createWidget(CreateArgs &ca) if(sscanf(ca.pm->cArg, "%d\t%d\t%d\t%d", &iParent, &iType, &direction, &border) < 4) throw(errorCommandFailed(-ca.pm->iCommand, -1)); - if((ca.parent != 0) && - (ca.parent->widget()->isWidgetType() == TRUE)){ - qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl; + if((ca.tqparent != 0) && + (ca.tqparent->widget()->isWidgetType() == TRUE)){ + qbl = new TQBoxLayout((TQWidget *) ca.tqparent->widget(), (TQBoxLayout::Direction) direction, border); + // kdDebug(5008) << "Creating tqlayout with tqparent: " << tqparent.iWinId << endl; } else{ qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating layout NO PARENT" << endl; + // kdDebug(5008) << "Creating tqlayout NO PARENT" << endl; } pw->setWidget(qbl); pw->setWidgetId(ca.pwI); @@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout) return; } - layout = (TQBoxLayout *) _layout; + tqlayout = (TQBoxLayout *) _layout; PObject::setWidget(_layout); } TQBoxLayout *PLayout::widget() { - return layout; + return tqlayout; } -#include "playout.moc" +#include "ptqlayout.moc" diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h index 90a606b8..45f1975c 100644 --- a/ksirc/puke/playout.h +++ b/ksirc/puke/playout.h @@ -11,10 +11,11 @@ class PLayout; class PLayout : public PObject { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PLayout(TQObject *parent = 0); + PLayout(TQObject *tqparent = 0); virtual ~PLayout(); /** @@ -35,7 +36,7 @@ public: private: - TQBoxLayout *layout; + TQBoxLayout *tqlayout; }; diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp index 250edc13..0b50ee5f 100644 --- a/ksirc/puke/plined.cpp +++ b/ksirc/puke/plined.cpp @@ -8,10 +8,10 @@ PObject * PLineEdit::createWidget(CreateArgs &ca) { - PLineEdit *pw = new PLineEdit(ca.parent); + PLineEdit *pw = new PLineEdit(ca.tqparent); TQLineEdit *le; - if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - le = new TQLineEdit((TQWidget *) ca.parent->widget()); + if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + le = new TQLineEdit((TQWidget *) ca.tqparent->widget()); else le = new TQLineEdit(0L); pw->setWidget(le); @@ -20,8 +20,8 @@ PLineEdit::createWidget(CreateArgs &ca) } -PLineEdit::PLineEdit(PObject *parent) - : PWidget(parent) +PLineEdit::PLineEdit(PObject *tqparent) + : PWidget(tqparent) { // kdDebug(5008) << "PLineEdit PLineEdit called" << endl; lineedit = 0; diff --git a/ksirc/puke/plined.h b/ksirc/puke/plined.h index 91ca7413..6bcd3bb3 100644 --- a/ksirc/puke/plined.h +++ b/ksirc/puke/plined.h @@ -11,10 +11,11 @@ class PLineEdit; class PLineEdit : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PLineEdit ( PObject * parent ); + PLineEdit ( PObject * tqparent ); virtual ~PLineEdit (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp index c244f81b..6766d58a 100644 --- a/ksirc/puke/plistbox.cpp +++ b/ksirc/puke/plistbox.cpp @@ -6,14 +6,14 @@ PObject * PListBox::createWidget(CreateArgs &ca) { - PListBox *plb = new PListBox(ca.parent); + PListBox *plb = new PListBox(ca.tqparent); TQListBox *lb; if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){ lb = (TQListBox *) ca.fetchedObj; plb->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - lb = new TQListBox((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + lb = new TQListBox((TQWidget *) ca.tqparent->widget()); else lb = new TQListBox(); plb->setWidget(lb); @@ -22,8 +22,8 @@ PListBox::createWidget(CreateArgs &ca) } -PListBox::PListBox(PObject *parent) - : PFrame(parent) +PListBox::PListBox(PObject *tqparent) + : PFrame(tqparent) { // kdDebug(5008) << "PListBox PListBox called" << endl; lb = 0; diff --git a/ksirc/puke/plistbox.h b/ksirc/puke/plistbox.h index c7683b22..f2e1c191 100644 --- a/ksirc/puke/plistbox.h +++ b/ksirc/puke/plistbox.h @@ -11,10 +11,11 @@ class PListBox; class PListBox : public PFrame { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PListBox ( PObject * parent ); + PListBox ( PObject * tqparent ); virtual ~PListBox (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp index 576ebc39..7ca4ddee 100644 --- a/ksirc/puke/pmenudta.cpp +++ b/ksirc/puke/pmenudta.cpp @@ -13,7 +13,7 @@ PMenuData::PMenuData(PObject *_child) PMenuData::~PMenuData() { - // We don't nuke anything since we're kind of abstract and we let the parent take care of it + // We don't nuke anything since we're kind of abstract and we let the tqparent take care of it } void PMenuData::messageHandler(int , PukeMessage *) diff --git a/ksirc/puke/pmenudta.h b/ksirc/puke/pmenudta.h index 03227134..3e2a4b52 100644 --- a/ksirc/puke/pmenudta.h +++ b/ksirc/puke/pmenudta.h @@ -12,10 +12,10 @@ class PMenuData; /** * Little helper class here gives us access to needed info inside - * QMenuData + * TQMenuData */ -class PMenuDataHelper : public QMenuData +class PMenuDataHelper : public TQMenuData { public: PMenuDataHelper(TQMenuData &qmd) { @@ -35,6 +35,7 @@ public: class PMenuData : public PObject { Q_OBJECT + TQ_OBJECT public: PMenuData (PObject *_child); virtual ~PMenuData (); diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index 9e46e042..f1457302 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -23,10 +23,10 @@ PObject::~PObject() PObject *PObject::createWidget(CreateArgs &ca) { - PObject *pw = new PObject(ca.parent); + PObject *pw = new PObject(ca.tqparent); TQObject *o; - if(ca.parent != 0) - o = new TQObject(ca.parent->widget()); + if(ca.tqparent != 0) + o = new TQObject(ca.tqparent->widget()); else o = new TQObject(); pw->setWidget(o); @@ -131,7 +131,7 @@ void PObject::manTerm() { void PObject::errorInvalidSet(TQObject *_w) { - m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className()); + m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className()); m_hasError = true; } #include "pobject.moc" diff --git a/ksirc/puke/pobject.h b/ksirc/puke/pobject.h index d27fab58..ef1589b3 100644 --- a/ksirc/puke/pobject.h +++ b/ksirc/puke/pobject.h @@ -14,13 +14,13 @@ public: CreateArgs(PukeController *_pc, PukeMessage *_pm, widgetId *_pwI, PObject *_parent){ pc = _pc; pwI = _pwI; - parent = _parent; + tqparent = _parent; pm = _pm; fetchedObj = 0; } PukeController *pc; widgetId *pwI; - PObject *parent; + PObject *tqparent; PukeMessage *pm; /** @@ -29,11 +29,12 @@ public: TQObject *fetchedObj; }; -class PObject : public QObject +class PObject : public TQObject { Q_OBJECT + TQ_OBJECT public: - PObject(TQObject *parent = 0, const char *name = 0); + PObject(TQObject *tqparent = 0, const char *name = 0); virtual ~PObject(); /** diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp index 6870e142..c8ca6557 100644 --- a/ksirc/puke/pobjfinder.cpp +++ b/ksirc/puke/pobjfinder.cpp @@ -5,7 +5,7 @@ PObject * PObjFinder::createWidget(CreateArgs &ca) { - PObjFinder *pw = new PObjFinder(ca.parent); + PObjFinder *pw = new PObjFinder(ca.tqparent); pw->setWidget(0x0); pw->setWidgetId(ca.pwI); pw->setPukeController(ca.pc); @@ -13,8 +13,8 @@ PObjFinder::createWidget(CreateArgs &ca) } -PObjFinder::PObjFinder(PObject *parent) - : PObject(parent) +PObjFinder::PObjFinder(PObject *tqparent) + : PObject(tqparent) { // We don't actually encase a widget since all the ObjFinder interface // is static diff --git a/ksirc/puke/pobjfinder.h b/ksirc/puke/pobjfinder.h index 32b4ff86..8eac2424 100644 --- a/ksirc/puke/pobjfinder.h +++ b/ksirc/puke/pobjfinder.h @@ -10,10 +10,11 @@ class PObjFinder : public PObject { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PObjFinder ( PObject * parent ); + PObjFinder ( PObject * tqparent ); virtual ~PObjFinder (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp index 3ed66aa3..225aa203 100644 --- a/ksirc/puke/ppopmenu.cpp +++ b/ksirc/puke/ppopmenu.cpp @@ -6,14 +6,14 @@ PObject * PPopupMenu::createWidget(CreateArgs &ca) { - PPopupMenu *pm = new PPopupMenu(ca.parent); + PPopupMenu *pm = new PPopupMenu(ca.tqparent); TQPopupMenu *qpm; if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){ qpm= (TQPopupMenu *) ca.fetchedObj; pm->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - qpm = new TQPopupMenu((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + qpm = new TQPopupMenu((TQWidget *) ca.tqparent->widget()); else qpm = new TQPopupMenu(); pm->setWidget(qpm); @@ -22,8 +22,8 @@ PPopupMenu::createWidget(CreateArgs &ca) } -PPopupMenu::PPopupMenu(PObject *parent) - : PFrame(parent) +PPopupMenu::PPopupMenu(PObject *tqparent) + : PFrame(tqparent) { // kdDebug(5008) << "PLineEdit PLineEdit called" << endl; menu = 0; diff --git a/ksirc/puke/ppopmenu.h b/ksirc/puke/ppopmenu.h index 4f5af16e..7f3e420c 100644 --- a/ksirc/puke/ppopmenu.h +++ b/ksirc/puke/ppopmenu.h @@ -13,6 +13,7 @@ class PPopupMenu; class PPopupMenu : public PFrame { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp index 09ed39d2..41838bca 100644 --- a/ksirc/puke/pprogress.cpp +++ b/ksirc/puke/pprogress.cpp @@ -8,10 +8,10 @@ PObject * PProgress::createWidget(CreateArgs &ca) { - PProgress *pw = new PProgress(ca.parent); + PProgress *pw = new PProgress(ca.tqparent); KSProgress *ksp; - if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - ksp = new KSProgress((TQWidget *) ca.parent->widget()); + if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + ksp = new KSProgress((TQWidget *) ca.tqparent->widget()); else ksp = new KSProgress(); pw->setWidget(ksp); @@ -20,8 +20,8 @@ PProgress::createWidget(CreateArgs &ca) } -PProgress::PProgress( PObject *parent) - : PWidget(parent) +PProgress::PProgress( PObject *tqparent) + : PWidget(tqparent) { // kdDebug(5008) << "PProgress PProgress called" << endl; ksp = 0; diff --git a/ksirc/puke/pprogress.h b/ksirc/puke/pprogress.h index 8542abab..f88023c2 100644 --- a/ksirc/puke/pprogress.h +++ b/ksirc/puke/pprogress.h @@ -11,10 +11,11 @@ class PProgress; class PProgress : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PProgress ( PObject * parent = 0); + PProgress ( PObject * tqparent = 0); virtual ~PProgress (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp index f006fbd2..cf61d642 100644 --- a/ksirc/puke/ppushbt.cpp +++ b/ksirc/puke/ppushbt.cpp @@ -5,10 +5,10 @@ PObject * PPushButton::createWidget(CreateArgs &ca) { - PPushButton *pb = new PPushButton(ca.parent); + PPushButton *pb = new PPushButton(ca.tqparent); TQPushButton *qb; - if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - qb = new TQPushButton((TQWidget *) ca.parent->widget()); + if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + qb = new TQPushButton((TQWidget *) ca.tqparent->widget()); else qb = new TQPushButton(0L); pb->setWidget(qb); @@ -17,8 +17,8 @@ PPushButton::createWidget(CreateArgs &ca) } -PPushButton::PPushButton(PObject *parent) - : PButton(parent) +PPushButton::PPushButton(PObject *tqparent) + : PButton(tqparent) { // kdDebug(5008) << "PLineEdit PLineEdit called" << endl; button = 0; diff --git a/ksirc/puke/ppushbt.h b/ksirc/puke/ppushbt.h index fd624a24..e887afb8 100644 --- a/ksirc/puke/ppushbt.h +++ b/ksirc/puke/ppushbt.h @@ -12,10 +12,11 @@ class PPushButton; class PPushButton : public PButton { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PPushButton ( PObject * parent ); + PPushButton ( PObject * tqparent ); virtual ~PPushButton (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp index ee3054ff..cd25f64a 100644 --- a/ksirc/puke/ptabdialog.cpp +++ b/ksirc/puke/ptabdialog.cpp @@ -8,7 +8,7 @@ PObject * PTabDialog::createWidget(CreateArgs &ca) { - PTabDialog *ptd = new PTabDialog(ca.parent); + PTabDialog *ptd = new PTabDialog(ca.tqparent); TQTabDialog *qtd; // Retreive the border and direction information out of the // carg string @@ -16,8 +16,8 @@ PTabDialog::createWidget(CreateArgs &ca) qtd = (TQTabDialog *) ca.fetchedObj; ptd->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - qtd = new TQTabDialog((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + qtd = new TQTabDialog((TQWidget *) ca.tqparent->widget()); else qtd = new TQTabDialog(); ptd->setWidget(qtd); @@ -49,7 +49,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm) if(pm->iCommand == PUKE_TABDIALOG_ADDTAB){ if(!(pm->iTextSize > 0)){ - qWarning("QTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); + qWarning("TQTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); pmRet.iCommand = PUKE_TABDIALOG_ADDTAB_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; diff --git a/ksirc/puke/ptabdialog.h b/ksirc/puke/ptabdialog.h index 17132301..0e4c9b94 100644 --- a/ksirc/puke/ptabdialog.h +++ b/ksirc/puke/ptabdialog.h @@ -10,10 +10,11 @@ class PTabDialog; class PTabDialog : public PWidget { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PTabDialog(TQObject *parent = 0); + PTabDialog(TQObject *tqparent = 0); virtual ~PTabDialog(); /** diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp index 64c8fa2e..3c77eeab 100644 --- a/ksirc/puke/ptablevw.cpp +++ b/ksirc/puke/ptablevw.cpp @@ -5,15 +5,15 @@ PObject * PTableView::createWidget(CreateArgs &ca) { qWarning("Table View is abstract class, cannot create an object from it!!!"); - PTableView *pt = new PTableView(ca.parent); + PTableView *pt = new PTableView(ca.tqparent); pt->setWidget(0); pt->setWidgetId(ca.pwI); return pt; } -PTableView::PTableView(PObject *parent) - : PFrame(parent) +PTableView::PTableView(PObject *tqparent) + : PFrame(tqparent) { // kdDebug(5008) << "PTableView PTableView called" << endl; tbl = 0; diff --git a/ksirc/puke/ptablevw.h b/ksirc/puke/ptablevw.h index c1043a4b..1974aec4 100644 --- a/ksirc/puke/ptablevw.h +++ b/ksirc/puke/ptablevw.h @@ -13,10 +13,11 @@ class PTableView; class PTableView : public PFrame { Q_OBJECT + TQ_OBJECT public: static PObject *createWidget(CreateArgs &ca); - PTableView ( PObject * parent ); + PTableView ( PObject * tqparent ); virtual ~PTableView (); virtual void messageHandler(int fd, PukeMessage *pm); diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index b62f64c1..20507b55 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -59,8 +59,8 @@ PObject *PWidget::createWidget(CreateArgs &ca) tw = (TQWidget *) ca.fetchedObj; pw->setDeleteAble(FALSE); } - else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE) - tw = new TQWidget((TQWidget *) ca.parent->widget()); + else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE) + tw = new TQWidget((TQWidget *) ca.tqparent->widget()); else tw = new TQWidget(); pw->setWidget(tw); @@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) emit outputMessage(fd, &pmRet); break; case PUKE_WIDGET_REPAINT: - widget()->repaint(pm->iArg); + widget()->tqrepaint(pm->iArg); pmRet.iCommand = PUKE_WIDGET_REPAINT_ACK; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; @@ -209,12 +209,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) int *pos; pos = (int *) pm->cArg; TQColor bg(pos[0], pos[1], pos[2]); - TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(), + TQColorGroup cg = TQColorGroup(widget()->tqcolorGroup().foreground(), bg, - widget()->colorGroup().light(), - widget()->colorGroup().dark(), - widget()->colorGroup().mid(), - widget()->colorGroup().text(), + widget()->tqcolorGroup().light(), + widget()->tqcolorGroup().dark(), + widget()->tqcolorGroup().mid(), + widget()->tqcolorGroup().text(), bg); widget()->setPalette(TQPalette(cg,cg,cg)); @@ -236,12 +236,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) break; case PUKE_WIDGET_RECREATE: { - TQWidget *nparent = 0x0; + TQWidget *ntqparent = 0x0; if(pm->iArg != 0x0){ widgetId wiWidget; wiWidget.fd = fd; wiWidget.iWinId = pm->iArg; - nparent = controller()->id2pwidget(&wiWidget)->widget(); + ntqparent = controller()->id2pwidget(&wiWidget)->widget(); } if(pm->iTextSize != 3*sizeof(int)){ throw(errorCommandFailed(pm->iCommand, pm->iArg)); @@ -250,7 +250,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) qWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]); - widget()->reparent(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]); + widget()->reparent(ntqparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]); pmRet.iCommand = PUKE_WIDGET_RECREATE_ACK; pmRet.iWinId = pm->iWinId; diff --git a/ksirc/puke/pwidget.h b/ksirc/puke/pwidget.h index 68853e63..294203b2 100644 --- a/ksirc/puke/pwidget.h +++ b/ksirc/puke/pwidget.h @@ -11,8 +11,9 @@ class PWidget; class PWidget : public PObject { Q_OBJECT + TQ_OBJECT public: - PWidget(PObject *parent = 0); + PWidget(PObject *tqparent = 0); virtual ~PWidget(); // Init and setup code diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm index 5a73d393..b0f1c014 100644 --- a/ksirc/puke/pwidget.pm +++ b/ksirc/puke/pwidget.pm @@ -61,7 +61,7 @@ sub hide { $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE); } -sub repaint { +sub tqrepaint { my $self = shift; my $erase = shift; # 1 for erase and reapint @@ -216,11 +216,11 @@ sub setEnabled { sub recreate { my $self = shift; - my $nparent = shift; + my $ntqparent = shift; my $wflags = shift; # Not used! $self->sendMessage('iCommand' => $::PUKE_WIDGET_RECREATE, - 'iArg' => $nparent ? $nparent->{'iWinId'} : 0, + 'iArg' => $ntqparent ? $ntqparent->{'iWinId'} : 0, 'cArg' => pack("iii", shift(), shift(), shift()), 'CallBack' => sub {}); diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl index 7e7b251d..fdeae902 100644 --- a/ksirc/puke/small.pl +++ b/ksirc/puke/small.pl @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxlayout.pm"); +&docommand("/load pboxtqlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl index 4b4c3169..369a2dc9 100644 --- a/ksirc/puke/test.pl +++ b/ksirc/puke/test.pl @@ -1,7 +1,7 @@ &docommand("/load pbase.pm"); &docommand("/load pwidget.pm"); &docommand("/load pframe.pm"); -&docommand("/load pboxlayout.pm"); +&docommand("/load pboxtqlayout.pm"); &docommand("/load plined.pm"); &docommand("/load pbutton.pm"); &docommand("/load ppushbt.pm"); diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks index a0b2a56a..d73fa513 100644 --- a/ksirc/puke/user_monitor.ks +++ b/ksirc/puke/user_monitor.ks @@ -3,7 +3,7 @@ &docommand("/load pframe.pm"); &docommand("/load ptablevw.pm"); &docommand("/load plistbox.pm"); -&docommand("/load pboxlayout.pm"); +&docommand("/load pboxtqlayout.pm"); &docommand("/load plabel.pm"); &docommand("/load pmenudta.pm"); &docommand("/load ppopmenu.pm"); diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 0e7892b9..7fc945db 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -20,23 +20,23 @@ Creates a new sirc process and window !default connected to the server. Does nothing if a server connection already exists. - add_toplevel(TQString parent, TQString child): + add_toplevel(TQString tqparent, TQString child): Args: - parent: the server name that the new channel is being joined on + tqparent: the server name that the new channel is being joined on child: the new channel name Action: Adds "child" to the list of joined channles in the main window. Always call this on new window creation! - delete_toplevel(TQString parent, TQString child): + delete_toplevel(TQString tqparent, TQString child): Args: - parent: the server name of which channel is closing - child: the channle that is closing. IFF Emtpy, parent is + tqparent: the server name of which channel is closing + child: the channle that is closing. IFF Emtpy, tqparent is deleted. Action: Deletes the "child" window from the list of connections. If the child is Empty the whole tree is removed since it is assumed - the parent has disconnected and is closing. + the tqparent has disconnected and is closing. new_channel: Creates popup asking for new channel name @@ -48,9 +48,9 @@ list and join the requested channel. Does nothing if nothing is selected in the tree list. - recvChangeChanel(TQString parent, TQString old, TQString new): + recvChangeChanel(TQString tqparent, TQString old, TQString new): Args: - parent: parent server connection + tqparent: tqparent server connection old: the old name for the window new: the new name for the window Action: @@ -151,7 +151,7 @@ servercontroller::servercontroller( TQWidget*, const char* name ) setFrameBorderWidth(5); TQPopupMenu *file = new TQPopupMenu(this, TQCString(name) + "_menu_file"); - KStdAction::quit(this, TQT_SLOT(endksirc()), actionCollection())->plug(file); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(endksirc()), actionCollection())->plug(file); #ifndef NDEBUG file->insertItem(i18n("Dump Object Tree"), this, TQT_SLOT(dump_obj())); file->insertItem(i18n("Server Debug Window"), this, TQT_SLOT(server_debug())); @@ -173,21 +173,21 @@ servercontroller::servercontroller( TQWidget*, const char* name ) options->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), this, TQT_SLOT(filter_rule_editor())); options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(notification_prefs()), actionCollection())->plug(options); + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(notification_prefs()), actionCollection())->plug(options); - KStdAction::preferences(this, TQT_SLOT(general_prefs()), actionCollection())->plug(options); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(general_prefs()), actionCollection())->plug(options); MenuBar->insertItem(i18n("&Settings"), options); KHelpMenu *help = new KHelpMenu( this, kapp->aboutData() ); MenuBar->insertItem( KStdGuiItem::help().text(), help->menu() ); - m_kga = new KGlobalAccel(this, "globalAccess"); + m_kga = new KGlobalAccel(TQT_TQOBJECT(this), "globalAccess"); m_kga->insert("New Server", i18n("New Server"), i18n("This action allows you to open a new server more easily " "when in docked mode, since you don't need to click on the " "dock icon."), - ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, this, + ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(new_connection())); open_toplevels = 0; @@ -253,7 +253,7 @@ void servercontroller::new_ksircprocess(KSircServer &kss) return; server_id = kss.server(); while(proc_list[server_id]){ // if it already exists, quit - server_id = TQString("%1 %2").arg(kss.server()).arg(id++); + server_id = TQString("%1 %2").tqarg(kss.server()).tqarg(id++); } // Insert new base @@ -292,10 +292,10 @@ void servercontroller::new_channel() if(proc_list[citem->text(0)]){ // If it's a match with a server, ok server = citem->text(0); } - // Otherwise, check the parent to see it's perhaps a server. - else if ( citem->parent() ) { - if(proc_list[citem->parent()->text(0)]){ - server = citem->parent()->text(0); + // Otherwise, check the tqparent to see it's perhaps a server. + else if ( citem->tqparent() ) { + if(proc_list[citem->tqparent()->text(0)]){ + server = citem->tqparent()->text(0); } } } @@ -303,7 +303,7 @@ void servercontroller::new_channel() if(server.isEmpty()) return; - KSircChannel ci(server, TQString::null); + KSircChannel ci(server, TQString()); NewWindowDialog w(ci); connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), this, TQT_SLOT(new_toplevel(const KSircChannel &))); @@ -355,9 +355,9 @@ void servercontroller::server_debug() if(proc_list[citem->text(0)]){ // If it's a match with a server, ok server = citem->text(0); } - else if ( citem->parent() ) { - if(proc_list[citem->parent()->text(0)]){ - server = citem->parent()->text(0); + else if ( citem->tqparent() ) { + if(proc_list[citem->tqparent()->text(0)]){ + server = citem->tqparent()->text(0); } } @@ -386,7 +386,7 @@ void servercontroller::font_update(const TQFont &font) KConfig *kConfig = kapp->config(); kConfig->setGroup("GlobalOptions"); kConfig->sync(); - TQApplication::setFont( font, true, "KSirc::TextView" ); + TQApplication::tqsetFont( font, true, "KSirc::TextView" ); } void servercontroller::configChange() @@ -406,7 +406,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) TQListViewItem *serverItem = 0L; TQListViewItem *item = ConnectionTree->firstChild(); while ( item ) { - if ( !item->parent() && item->text(0) == server ) { + if ( !item->tqparent() && item->text(0) == server ) { serverItem = item; break; } @@ -435,7 +435,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) if(online_item->childCount() == 0) delete online_item; if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(i18n("%1 just went offline on %2").arg(args).arg(server), dockWidget); + KPassivePopup::message(i18n("%1 just went offline on %2").tqarg(args).tqarg(server), dockWidget); } dockWidget->nickOffline(server, args); break; @@ -457,19 +457,19 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) item = new TQListViewItem(online_item, args); item->setPixmap( 0, pic_run ); if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(i18n("%1 just came online on %2").arg(args).arg(server), dockWidget); + KPassivePopup::message(i18n("%1 just came online on %2").tqarg(args).tqarg(server), dockWidget); dockWidget->nickOnline(server, args); break; } /* - // Add new channel, first add the parent to the path + // Add new channel, first add the tqparent to the path path.push(&server); path.push(&online); path.push(&args); // Remove old one if it's there ConnectionTree->removeItem(&path); // Remove the item path.pop(); - // add a new child item with parent as its parent + // add a new child item with tqparent as its tqparent ConnectionTree->addChildItem(args, pic_run, &path); if (kSircConfig->BeepNotify) { KNotifyClient::beep(); @@ -479,7 +479,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) /** * Args: - * parent: the server name that the new channel is being joined on + * tqparent: the server name that the new channel is being joined on * child: the new channel name * Action: * Adds "child" to the list of joined channles in the main @@ -489,7 +489,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) // Add new channel if(args[0] == '!') args.remove(0, 1); // If the first char is !, it's control, remove it - // add a new child item with parent as it's parent + // add a new child item with tqparent as it's tqparent item = new TQListViewItem( serverItem, args ); item->setPixmap( 0, pic_ppl ); @@ -497,13 +497,13 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) break; /** * Args: - * parent: the server name of which channel is closing - * child: the channle that is closing. IFF Emtpy, parent is + * tqparent: the server name of which channel is closing + * child: the channle that is closing. IFF Emtpy, tqparent is * deleted. * Action: * Deletes the "child" window from the list of connections. If * the child is Empty the whole tree is removed since it is assumed - * the parent has disconnected and is closing. + * the tqparent has disconnected and is closing. */ case ProcCommand::deleteTopLevel: // If the child is emtpy, delete the whole tree, otherwise just the child @@ -520,7 +520,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) /** * Args: - * parent: parent server connection + * tqparent: tqparent server connection * old: the old name for the window * new: the new name for the window * Action: @@ -615,7 +615,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc) ksc->setGroup("ServerController"); // ksc->writeEntry("Docked", !isVisible()); - ksc->writeEntry("Size", geometry()); + ksc->writeEntry("Size", tqgeometry()); ksc->setGroup(group); } @@ -661,7 +661,7 @@ void servercontroller::readGlobalProperties(KConfig *ksc) int desktop = ( *desktopNumberIt ).toInt(); if ( desktop == -1 ) continue; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo winInfo( qt_xdisplay(), topLevel->winId(), qt_xrootwin(), NET::WMDesktop ); winInfo.setDesktop( desktop ); #endif @@ -700,7 +700,7 @@ void servercontroller::saveSessionConfig() sessionInfo.port = ksp.current()->serverPort(); KSircTopLevel *topLev = dynamic_cast<KSircTopLevel *>( ksm.current() ); if ( topLev && topLev->isTopLevel() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo winInfo( qt_xdisplay(), topLev->winId(), qt_xrootwin(), NET::WMDesktop ); sessionInfo.desktop = winInfo.desktop(); #endif @@ -718,7 +718,7 @@ void servercontroller::showEvent( TQShowEvent *e ) { TQWidget::showEvent( e ); if ( !e->spontaneous() ) - saveDockingStatus(); + saveDockingtqStatus(); } void servercontroller::hideEvent( TQHideEvent * ) @@ -726,7 +726,7 @@ void servercontroller::hideEvent( TQHideEvent * ) /* TQWidget::hideEvent( e ); if ( !e->spontaneous() ) - saveDockingStatus(); + saveDockingtqStatus(); if(TQWidget::isMinimized()){ hide(); KWin::setState(winId(), NET::SkipTaskbar); @@ -734,7 +734,7 @@ void servercontroller::hideEvent( TQHideEvent * ) */ } -void servercontroller::saveDockingStatus() +void servercontroller::saveDockingtqStatus() { if ( we_are_exiting ) // we are hidden by closeEvent return; @@ -762,15 +762,15 @@ void servercontroller::WindowSelected(TQListViewItem *item) if ( !item ) return; - TQListViewItem *parent_server = item->parent(); - if(!parent_server) + TQListViewItem *tqparent_server = item->tqparent(); + if(!tqparent_server) return; - TQString txt = TQString(parent_server->text(0)) + "_" + item->text(0) + "_toplevel"; - TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::find(txt.utf8(), "KSircTopLevel")); + TQString txt = TQString(tqparent_server->text(0)) + "_" + item->text(0) + "_toplevel"; + TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); if(obj == 0x0){ - txt =TQString(parent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; - obj = dynamic_cast<TQWidget *>( objFinder::find(txt.utf8(), "KSircTopLevel")); + txt =TQString(tqparent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; + obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); } if(obj != 0x0){ @@ -782,14 +782,14 @@ void servercontroller::WindowSelected(TQListViewItem *item) } -TQListViewItem * servercontroller::findChild( TQListViewItem *parent, +TQListViewItem * servercontroller::findChild( TQListViewItem *tqparent, const TQString& text ) { - if ( !parent || parent->childCount() == 0 ) { + if ( !tqparent || tqparent->childCount() == 0 ) { return 0L; } - TQListViewItem *item = parent->firstChild(); + TQListViewItem *item = tqparent->firstChild(); while ( item ) { if ( item->text(0) == text ) { return item; @@ -821,7 +821,7 @@ void servercontroller::decreaseNotificationCount(TQString reason) void servercontroller::resetNotification() { m_notificationCount = 0; - dockWidget->stopBlink(TQString::null, true); + dockWidget->stopBlink(TQString(), true); TQDictIterator<KSircProcess> it( proc_list ); while(it.current()){ it.current()->filters_update(); @@ -852,7 +852,7 @@ void servercontroller::do_autoconnect() TQString server = *ser; TQString port = "6667"; bool usessl = false; - TQString pass = TQString::null; + TQString pass = TQString(); TQRegExp rx("(.+) \\(SSL\\)(.*)"); if(rx.search(server) >= 0){ @@ -888,7 +888,7 @@ void servercontroller::do_autoconnect() if(loop++ == ctime){ ctime++; TQString channel = *chan; - TQString key = TQString::null; + TQString key = TQString(); TQRegExp crx("(.+) \\(key: (\\S+)\\)"); if(crx.search(channel) >= 0){ channel = crx.cap(1); @@ -944,9 +944,9 @@ void servercontroller::start_autoconnect_check() { } -scInside::scInside ( TQWidget * parent, const char * name, WFlags +scInside::scInside ( TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame(parent, name, f) + : TQFrame(tqparent, name, f) { ASConn = new TQLabel(i18n("Active server connections:"), this, "servercontroller_label"); TQFont asfont = ASConn->font(); @@ -954,7 +954,7 @@ scInside::scInside ( TQWidget * parent, const char * name, WFlags ASConn->setFont(asfont); ConnectionTree = new KListView(this, "connectiontree"); - ConnectionTree->addColumn(TQString::null); + ConnectionTree->addColumn(TQString()); ConnectionTree->setRootIsDecorated( true ); ConnectionTree->setSorting( 0 ); ConnectionTree->header()->hide(); diff --git a/ksirc/servercontroller.dlg b/ksirc/servercontroller.dlg index 7e515bdc..208d4508 100644 --- a/ksirc/servercontroller.dlg +++ b/ksirc/servercontroller.dlg @@ -25,7 +25,7 @@ User { Rect {0 0 410 30} Name {User_2} Variable {MenuBar} - LayoutStatus {NoLayout} + LayouttqStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 3b24a04c..d27aef50 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: servercontroller.h Last generated: Sat Nov 29 08:50:19 1997 @@ -64,12 +64,13 @@ class ServCommand // ServerController message } command; }; -class scInside : QFrame +class scInside : TQFrame { Q_OBJECT + TQ_OBJECT friend class servercontroller; public: - scInside ( TQWidget *parent = 0L, const char * name = 0, WFlags f=0 ); + scInside ( TQWidget *tqparent = 0L, const char * name = 0, WFlags f=0 ); ~scInside(); protected: @@ -84,10 +85,11 @@ class scInside : QFrame class servercontroller : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class dockServerController; public: - servercontroller ( TQWidget* parent = 0L, const char* name = NULL ); + servercontroller ( TQWidget* tqparent = 0L, const char* name = NULL ); virtual ~servercontroller(); const TQDict<KSircProcess> &processes() const { return proc_list; } @@ -97,13 +99,13 @@ public: /** * Someone is talking to the user (blue icon), notify him (using the docked icon). */ - void increaseNotificationCount(const TQString& reason = TQString::null, const TQString& text = TQString::null); + void increaseNotificationCount(const TQString& reason = TQString(), const TQString& text = TQString()); /** * The channel in which the user was talked to, has been read. * -> decrease count of blue icons. */ - void decreaseNotificationCount(TQString reason = TQString::null); + void decreaseNotificationCount(TQString reason = TQString()); /** * This resets all notificaiton counts and allows new ones @@ -191,7 +193,7 @@ public slots: void start_autoconnect_check(); - TQListViewItem * findChild( TQListViewItem *parent, const TQString& text ); + TQListViewItem * findChild( TQListViewItem *tqparent, const TQString& text ); protected slots: void WindowSelected(TQListViewItem *); @@ -204,7 +206,7 @@ protected: virtual void showEvent( TQShowEvent *e ); virtual void hideEvent( TQHideEvent *e ); virtual void closeEvent( TQCloseEvent * ); - void saveDockingStatus(); + void saveDockingtqStatus(); void saveGlobalProperties(KConfig *); void readGlobalProperties(KConfig *); diff --git a/ksirc/ssfeprompt.cpp b/ksirc/ssfeprompt.cpp index 74868c5b..aa3e9908 100644 --- a/ksirc/ssfeprompt.cpp +++ b/ksirc/ssfeprompt.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ssfeprompt.cpp Last generated: Thu Jan 15 20:49:56 1998 @@ -16,11 +16,11 @@ ssfePrompt::ssfePrompt ( TQString prompttext, - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name ) + Inherited( tqparent, name ) { setCaption( i18n("Prompt") ); prompt->setText(prompttext); diff --git a/ksirc/ssfeprompt.h b/ksirc/ssfeprompt.h index 5a239869..47500c66 100644 --- a/ksirc/ssfeprompt.h +++ b/ksirc/ssfeprompt.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ssfeprompt.h Last generated: Thu Jan 15 20:49:55 1998 @@ -15,13 +15,14 @@ class ssfePrompt : public ssfepromptdata { Q_OBJECT + TQ_OBJECT public: ssfePrompt ( TQString prompttext, - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index 94e52002..7e1f1aa0 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ssfepromptdata.cpp Last generated: Thu Jan 15 21:21:29 1998 @@ -13,25 +13,25 @@ #include "ssfepromptdata.h" #undef Inherited -#define Inherited QDialog +#define Inherited TQDialog #include <kpushbutton.h> #include <kstdguiitem.h> ssfepromptdata::ssfepromptdata ( - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - Inherited( parent, name, TRUE, 20480 ) + Inherited( tqparent, name, TRUE, 20480 ) { prompt = new TQLabel( this, "Label_1" ); prompt->setGeometry( 10, 10, 220, 30 ); prompt->setMinimumSize( 10, 10 ); prompt->setMaximumSize( 32767, 32767 ); prompt->setText( "" ); - prompt->setAlignment( 289 ); + prompt->tqsetAlignment( 289 ); prompt->setMargin( -1 ); SLine = new TQLineEdit( this, "LineEdit_1" ); diff --git a/ksirc/ssfepromptdata.h b/ksirc/ssfepromptdata.h index e4b97994..292d4304 100644 --- a/ksirc/ssfepromptdata.h +++ b/ksirc/ssfepromptdata.h @@ -1,6 +1,6 @@ /********************************************************************** - --- Qt Architect generated file --- + --- TQt Architect generated file --- File: ssfepromptdata.h Last generated: Thu Jan 15 21:21:29 1998 @@ -17,15 +17,16 @@ #include <tqlabel.h> #include <tqlineedit.h> -class ssfepromptdata : public QDialog +class ssfepromptdata : public TQDialog { Q_OBJECT + TQ_OBJECT public: ssfepromptdata ( - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/ksirc/stringparserstate.h b/ksirc/stringparserstate.h index 04fb96ea..06167267 100644 --- a/ksirc/stringparserstate.h +++ b/ksirc/stringparserstate.h @@ -33,7 +33,7 @@ public: { if ( m_current >= m_end ) return true; - return m_endItems.findIndex( currentValue() ) != -1; + return m_endItems.tqfindIndex( currentValue() ) != -1; } ConstIterator current() const { return m_current; } diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index 49334f43..3afa199d 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -28,19 +28,19 @@ #include "ksparser.h" -KSircTopic::KSircTopic( TQWidget *parent, const char *name ) - : KActiveLabel( parent, name ) +KSircTopic::KSircTopic( TQWidget *tqparent, const char *name ) + : KActiveLabel( tqparent, name ) { m_editor = 0; m_doEdit = false; m_height = 0; -// setBackgroundColor( colorGroup().light() ); +// setBackgroundColor( tqcolorGroup().light() ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setTextFormat( RichText ); setWordWrap(TQTextEdit::NoWrap); doResize(); -// setAlignment( alignment() | WordBreak ); +// tqsetAlignment( tqalignment() | WordBreak ); } void KSircTopic::setText( const TQString &_text) @@ -49,27 +49,27 @@ void KSircTopic::setText( const TQString &_text) TQString text = _text; TQString richText( "<font color=\"%1\">" ); - richText = richText.arg( ksopts->textColor.name() ); + richText = richText.tqarg( ksopts->textColor.name() ); - text.replace('&', "&"); - text.replace('<', "<"); - text.replace('>', ">"); + text.tqreplace('&', "&"); + text.tqreplace('<', "<"); + text.tqreplace('>', ">"); - text.replace('~', "~~"); + text.tqreplace('~', "~~"); // ### a bit of a hack: turn '<nick> message' into // <span><nick><span> message' . span itself isn't supported but it // enforces the creation of separate item objects and hence separate // drawing of '<nick>' and 'message' , which is needed for BiDi users, // according to UV Kochavi <uv1st@yahoo.com> , to prevent output like - // '<nick message<' , which is supposedly a bug in Qt's reordering. The + // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); + text.tqreplace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); KSParser parser; richText += parser.parse( text ); @@ -111,7 +111,7 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e ) * the size really breaks and you get * a huge widget */ - m_editor->setGeometry( geometry() ); + m_editor->setGeometry( tqgeometry() ); m_editor->setFocus(); m_editor->show(); @@ -180,11 +180,11 @@ void KSircTopic::fontChange(TQFont &f) doResize(); } -KSircTopicEditor::KSircTopicEditor( TQWidget *parent, const char *name ) - : TQTextEdit( parent, name ) +KSircTopicEditor::KSircTopicEditor( TQWidget *tqparent, const char *name ) + : TQTextEdit( tqparent, name ) { setWFlags( WDestructiveClose ); - setFocusPolicy( TQWidget::ClickFocus ); + setFocusPolicy( TQ_ClickFocus ); connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) ); } @@ -205,13 +205,13 @@ void KSircTopicEditor::keyPressEvent( TQKeyEvent *ev ) TQTextEdit::keyPressEvent( ev ); } -void KSircTopicEditor::focusOutEvent( TQFocusEvent * ) +void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) { - // we don't want to quit editing when someone brings up QLE's popup + // we don't want to quit editing when someone brings up TQLE's popup // menu - if ( TQFocusEvent::reason() == TQFocusEvent::Popup ) + if ( fe->reason() == TQFocusEvent::Popup ) { - TQWidget *focusw = qApp->focusWidget(); + TQWidget *focusw = tqApp->tqfocusWidget(); if ( focusw && m_popup && focusw == m_popup ) return; } @@ -228,9 +228,9 @@ TQPopupMenu *KSircTopicEditor::createPopupMenu( const TQPoint &pos ) void KSircTopicEditor::slotMaybeResize() { - if(text().contains("\n")){ + if(text().tqcontains("\n")){ TQString s = text(); - s.replace('\n', " "); + s.tqreplace('\n', " "); setText(s); setCursorPosition(0, s.length()); } diff --git a/ksirc/topic.h b/ksirc/topic.h index e435d864..f006bcc6 100644 --- a/ksirc/topic.h +++ b/ksirc/topic.h @@ -18,8 +18,9 @@ class KSircTopicEditor; class KSircTopic : public KActiveLabel { Q_OBJECT + TQ_OBJECT public: - KSircTopic( TQWidget *parent, const char *name = 0 ); + KSircTopic( TQWidget *tqparent, const char *name = 0 ); public slots: virtual void setText( const TQString &); @@ -46,11 +47,12 @@ private: TQString m_text; }; -class KSircTopicEditor : public QTextEdit +class KSircTopicEditor : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - KSircTopicEditor( TQWidget *parent, const char *name = 0 ); + KSircTopicEditor( TQWidget *tqparent, const char *name = 0 ); signals: void resized(); diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index f5f4d002..43b2201e 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -85,7 +85,7 @@ TQStringList KSircTopLevel::cmd_menu; void KSircTopLevel::initColors() { - TQColorGroup cg_mainw = kapp->palette().active(); + TQColorGroup cg_mainw = kapp->tqpalette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); @@ -119,9 +119,9 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kapp->ref(); - m_topic = TQString::null; + m_topic = TQString(); - TQCString kstl_name = TQCString(TQObject::name()) + "_" + "toplevel"; + TQCString kstl_name = TQCString(TQT_TQOBJECT(this)->name()) + "_" + "toplevel"; setName(kstl_name); if(!m_channelInfo.channel().isEmpty()) { @@ -130,7 +130,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf } else { - caption = TQString::null; + caption = TQString(); } Buffer = FALSE; @@ -152,10 +152,10 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf connect(selector, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertText())); selector->setFont(ksopts->defaultFont.family()); - file = new TQPopupMenu(this, TQCString(TQObject::name()) + "_popup_file"); + file = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_file"); file->setCheckable(true); - KAction *act = KStdAction::openNew( this, TQT_SLOT( newWindow() ), actionCollection() ); + KAction *act = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection() ); act->plug( file ); file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2); file->insertSeparator(); @@ -172,7 +172,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P); file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); - encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, this ); + encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); @@ -189,8 +189,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); while ( encodingIt != encodings.end() ) { - if ( ( *encodingIt ).find( "utf16" ) != -1 || - ( *encodingIt ).find( "iso-10646" ) != -1 ) + if ( ( *encodingIt ).tqfind( "utf16" ) != -1 || + ( *encodingIt ).tqfind( "iso-10646" ) != -1 ) encodingIt = encodings.remove( encodingIt ); else ++encodingIt; @@ -200,7 +200,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf encodingAction->setItems( encodings ); encodingAction->plug( file ); - int eindex = encodings.findIndex(ksopts->chan(m_channelInfo).encoding); + int eindex = encodings.tqfindIndex(ksopts->chan(m_channelInfo).encoding); if(eindex == -1) encodingAction->setCurrentItem( 0 ); else @@ -208,7 +208,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf setEncoding(); file->insertSeparator(); - act = KStdAction::close( this, TQT_SLOT( terminate() ), actionCollection() ); + act = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( terminate() ), actionCollection() ); act->plug( file ); kmenu = menuBar(); @@ -216,11 +216,11 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->setAccel(Key_F, KST_CHANNEL_ID); /* - * Ok, let's look at the basic widget "layout" + * Ok, let's look at the basic widget "tqlayout" * Everything belongs to q TQFrame F, this is use so we * can give the KApplication a single main client widget, which is needs. * - * A QVbox and a QHbox is used to ctronl the 3 sub widget + * A TQVbox and a TQHbox is used to ctronl the 3 sub widget * The Modified TQListBox is then added side by side with the User list box. * The SLE is then fit bello. */ @@ -234,9 +234,9 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf connect( ksTopic, TQT_SIGNAL( topicChange( const TQString & ) ), this, TQT_SLOT( setTopicIntern( const TQString & ) ) ); - TQCString kstn = TQCString(TQObject::name()) + "_"; + TQCString kstn = TQCString(TQT_TQOBJECT(this)->name()) + "_"; - pan = new TQSplitter(TQSplitter::Horizontal, top, kstn + "splitter"); + pan = new TQSplitter(Qt::Horizontal, top, kstn + "splitter"); #if KDE_IS_VERSION(3,1,92) pan->setOpaqueResize( KGlobalSettings::opaqueResize() ); #else @@ -244,7 +244,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf #endif mainw = new KSircView(ksircProcess(), pan, kstn + "KSircView" ); - mainw->setFocusPolicy(TQWidget::NoFocus); + mainw->setFocusPolicy(TQ_NoFocus); nicks_box = new TQVBox(pan); @@ -253,12 +253,12 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf this, TQT_SLOT(setMode(TQString, int, TQString))); nicks = new aListBox(nicks_box, kstn + "aListBox"); - nicks->setFocusPolicy(TQWidget::NoFocus); + nicks->setFocusPolicy(TQ_NoFocus); //nicks->hide(); // default = only the main widget lag = new TQLabel(nicks_box); lag->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - lag->setAlignment(Qt::AlignCenter | Qt::SingleLine); + lag->tqsetAlignment(TQt::AlignCenter | TQt::SingleLine); lag->setText(i18n("Lag: Wait")); @@ -312,9 +312,9 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf mainw->enableTimeStamps(ksopts->chan(m_channelInfo).timeStamp); edit = new TQPopupMenu(this); - act = KStdAction::copy( mainw, TQT_SLOT( copy() ), actionCollection() ); + act = KStdAction::copy( TQT_TQOBJECT(mainw), TQT_SLOT( copy() ), actionCollection() ); act->plug( edit ); - act = KStdAction::paste( this, TQT_SLOT( pasteToWindow() ), actionCollection() ); + act = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( pasteToWindow() ), actionCollection() ); act->plug( edit ); edit->insertItem(i18n("C&lear Window"), this, TQT_SLOT(clearWindow()), CTRL + Key_L); kmenu->insertItem(i18n("&Edit"), edit, -1, -1); @@ -360,7 +360,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf // setup line editor - linee->setFocusPolicy(TQWidget::StrongFocus); + linee->setFocusPolicy(TQ_StrongFocus); linee->setFont(ksopts->defaultFont); if(ksopts->oneLineEntry == true) { @@ -447,7 +447,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->insertItem(i18n("C&ommand"), command); - kmenu->insertItem( KStdGuiItem::help().text(), helpMenu( TQString::null, false )); + kmenu->insertItem( KStdGuiItem::help().text(), helpMenu( TQString(), false )); connect(user_controls, TQT_SIGNAL(activated(int)), this, TQT_SLOT(UserParseMenu(int))); @@ -553,7 +553,7 @@ KSircTopLevel::~KSircTopLevel() ksit.atEnd() == 0; ++ksit) { TQString rt = ksit.richText(); - if(rt.contains("<img src=\"user|servinfo\">")) + if(rt.tqcontains("<img src=\"user|servinfo\">")) continue; kdDebug(5008) << rt << endl; @@ -587,9 +587,9 @@ void KSircTopLevel::setMode(TQString mode, int mode_type, TQString currentNick) { TQString command; if (mode_type == 0) - command = TQString::fromLatin1("/mode %1 %2\n").arg(m_channelInfo.channel()).arg(mode); + command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode); else - command = TQString::fromLatin1("/mode %1 %2\n").arg(currentNick).arg(mode); + command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); sirc_write(command); linee->setFocus(); } @@ -598,8 +598,8 @@ void KSircTopLevel::setEncoding() { int index = encodingAction->currentItem(); if ( index == 0 ) {// default (locale) encoding - ksopts->chan(m_channelInfo).encoding = TQString::null; - UnicodeMessageReceiver::setEncoding( TQString::null ); + ksopts->chan(m_channelInfo).encoding = TQString(); + UnicodeMessageReceiver::setEncoding( TQString() ); } else { ksopts->chan(m_channelInfo).encoding = encodingAction->currentText(); @@ -719,7 +719,7 @@ void KSircTopLevel::TabNickCompletion(int dir) s = linee->text(); tab_saved = s; end = linee->cursorPosition() - 1; - start = s.findRev(" ", end, FALSE); + start = s.tqfindRev(" ", end, FALSE); tab_start = start; tab_end = end; first = true; @@ -765,9 +765,9 @@ void KSircTopLevel::TabNickCompletion(int dir) tab_pressed -= 1; tab_nick = findNick(s.mid(0, end+1), tab_pressed); } - s.replace(0, end + 1, ""); + s.tqreplace(0, end + 1, ""); if(s[0] == ':') - s.replace(0, 2, ""); + s.tqreplace(0, 2, ""); s.prepend(tab_nick + ": "); extra = 2; } @@ -784,11 +784,11 @@ void KSircTopLevel::TabNickCompletion(int dir) } if((uint) end == s.length() - 1){ /* if we're at the end add a space */ - s.replace(start + 1, end - start, tab_nick + " "); + s.tqreplace(start + 1, end - start, tab_nick + " "); extra = 1; } else { - s.replace(start + 1, end - start, tab_nick); + s.tqreplace(start + 1, end - start, tab_nick); extra = 0; } } @@ -829,7 +829,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) // that we enter a local event loop (think of the ssfeprompt dialog!) // which might trigger a socketnotifier activation which in turn // might result in the execution of code that modifies the LineBuffer, - // which would invalidate iterators (Simon) + // which would tqinvalidate iterators (Simon) while ( LineBuffer.begin() != LineBuffer.end() ) { TQString plainText(""); @@ -845,12 +845,12 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) bool addressedLine = false; - if(line.message.contains( ">~o")){ /* highlighted with our nick */ + if(line.message.tqcontains( ">~o")){ /* highlighted with our nick */ addressedLine = true; } // detect /msg's -- needed when auto-create-window is off - if ( line.message.find( TQRegExp( "^\\[~b.+~b\\].+$" ) ) == 0 ) + if ( line.message.tqfind( TQRegExp( "^\\[~b.+~b\\].+$" ) ) == 0 ) addressedLine = true; if ( addressedLine == true && line.message.startsWith("* " + ksircProcess()->getNick())) @@ -877,7 +877,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) list = pan->sizes(); it = list.begin(); while( it != list.end()){ - values += TQString("%1 ").arg(*it); + values += TQString("%1 ").tqarg(*it); ++it; } } @@ -911,7 +911,7 @@ void KSircTopLevel::sirc_write(const TQString &str) plain.startsWith("/j ") || plain.startsWith("/query ")) { - TQString s = plain.mid(plain.find(' ')+1); + TQString s = plain.mid(plain.tqfind(' ')+1); TQStringList channels = TQStringList::split(",", s); TQStringList::ConstIterator it = channels.begin(); @@ -924,11 +924,11 @@ void KSircTopLevel::sirc_write(const TQString &str) KSircChannel ci(m_channelInfo.server(), rx.cap(1), // channel rx.cap(2)); // optional key - linee->setText(TQString::null); + linee->setText(TQString()); emit open_toplevel(ci); /* if(name[0] != '#'){ emit open_toplevel(name); - linee->setText(TQString::null); + linee->setText(TQString()); } else { emit outputUnicodeLine(plain + "\n"); @@ -949,11 +949,11 @@ void KSircTopLevel::sirc_write(const TQString &str) bool ssl = false; if(server.startsWith("+")){ - server.replace(0, 1, ""); + server.tqreplace(0, 1, ""); ssl = true; } - KSircServer serv(server, port, TQString::null, pass, ssl); + KSircServer serv(server, port, TQString(), pass, ssl); servercontroller::self()->new_ksircprocess(serv); return; @@ -963,18 +963,18 @@ void KSircTopLevel::sirc_write(const TQString &str) plain.startsWith("/leave") || plain.startsWith("/hop")) { TQApplication::postEvent(this, new TQCloseEvent()); // WE'RE DEAD - linee->setText(TQString::null); + linee->setText(TQString()); return; } else if( plain.startsWith( "/bye" ) || plain.startsWith( "/exit" ) || plain.startsWith( "/quit" )) { - linee->setText( TQString::null ); + linee->setText( TQString() ); emit requestQuit( command.ascii() ); return; } else if ( plain.startsWith( "/away" ) ) { - TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).arg( ksopts->publicAway ? '1' : '0' ); + TQString awayEvalCommand = TQString::tqfromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' ); emit outputUnicodeLine( awayEvalCommand ); } @@ -985,7 +985,7 @@ void KSircTopLevel::sirc_write(const TQString &str) if(!isSpecialWindow()) { // channel or private chat if(plain[0].latin1() != '/'){ - command.prepend(TQString::fromLatin1("/msg %1 ").arg(m_channelInfo.channel())); + command.prepend(TQString::tqfromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); } else if(plain.startsWith("/me ")) { command.remove(0, 3); @@ -1069,13 +1069,13 @@ bool KSircTopLevel::parse_input(const TQString &string, TQString &plainText) } else { - logString = mainw->addLine( TQString::null, ksopts->textColor, string ); + logString = mainw->addLine( TQString(), ksopts->textColor, string ); if(ticker != NULL){ ticker->mergeString(string); } // If it contains our nick, move the speaker to the top // of the nick completion list - if(string.contains("~o")){ + if(string.tqcontains("~o")){ TQRegExp rx("<(\\S+)>"); if ( (rx.search(logString) >= 0) && (rx.cap(1) != ksircProcess()->getNick()) ) { @@ -1104,7 +1104,7 @@ void KSircTopLevel::returnPressed() uint i; TQChar c; for(i = 0; (c = s[i]); i++){ - switch(c.unicode()){ + switch(c.tqunicode()){ case 0336: s[i] = 002; break; @@ -1121,7 +1121,7 @@ void KSircTopLevel::returnPressed() } while(s.length() > IRC_SAFE_MAX_LINE){ - int wrap = s.findRev(' ', IRC_SAFE_MAX_LINE); + int wrap = s.tqfindRev(' ', IRC_SAFE_MAX_LINE); if(wrap == -1) wrap = IRC_SAFE_MAX_LINE; sirc_line_return(s.left(wrap)); @@ -1147,16 +1147,16 @@ void KSircTopLevel::UserParseMenu(int id) return; TQString s; - s = TQString("/eval $dest_nick='%1';\n").arg(nicks->text(nicks->currentItem())); + s = TQString("/eval $dest_nick='%1';\n").tqarg(nicks->text(nicks->currentItem())); sirc_write(s); // set $$dest_chan variable - s = TQString("/eval $dest_chan='%1';\n").arg(m_channelInfo.channel()); + s = TQString("/eval $dest_chan='%1';\n").tqarg(m_channelInfo.channel()); sirc_write(s); TQString action = user_menu->at(id)->action; if (action.length() && action[0] == '/') action.remove(0, 1); - s = TQString("/eval &docommand(eval{\"%1\"});\n").arg(action); - s.replace(TQRegExp("\\$\\$"), "$"); + s = TQString("/eval &docommand(eval{\"%1\"});\n").tqarg(action); + s.tqreplace(TQRegExp("\\$\\$"), "$"); sirc_write(s); } @@ -1192,7 +1192,7 @@ void KSircTopLevel::AccelScrollUpPage() void KSircTopLevel::newWindow() { - NewWindowDialog w(KSircChannel(m_channelInfo.server(), TQString::null)); + NewWindowDialog w(KSircChannel(m_channelInfo.server(), TQString())); connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), TQT_SIGNAL(open_toplevel(const KSircChannel &))); w.exec(); } @@ -1211,7 +1211,7 @@ void KSircTopLevel::closeEvent(TQCloseEvent *e) // Hide ourselves until we finally die hide(); - qApp->flushX(); + tqApp->flushX(); // Let's say we're closing kdDebug(5008) << "Toplevel closing: " << m_channelInfo.channel() << endl; emit closing(this, m_channelInfo.channel()); @@ -1233,7 +1233,7 @@ void KSircTopLevel::gotFocus() if(isVisible() == TRUE){ if(have_focus == 0){ if(m_channelInfo.channel()[0] != '!' ){ - TQString str = TQString("/join %1").arg(m_channelInfo.channel()); + TQString str = TQString("/join %1").tqarg(m_channelInfo.channel()); if(m_channelInfo.key().length() > 0){ str.append(" " + m_channelInfo.key()); } @@ -1247,7 +1247,7 @@ void KSircTopLevel::gotFocus() } if(m_gotMsgWithoutFocus == true){ m_gotMsgWithoutFocus = false; - servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel())); + servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel())); } } @@ -1264,7 +1264,7 @@ void KSircTopLevel::control_message(int command, TQString str) switch(command){ case CHANGE_CHANNEL: // 001 is defined as changeChannel { - KSircChannel ci(m_channelInfo.server(), TQString::null); + KSircChannel ci(m_channelInfo.server(), TQString()); TQRegExp rx("([^!]+)!+([^!]+)!*([^!]*)"); if(rx.search(str) < 0){ ci.setChannel(str); @@ -1285,22 +1285,22 @@ void KSircTopLevel::control_message(int command, TQString str) logFile->open(); } setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel"); - pan->setName(TQCString(TQObject::name()) + "_" + "TQSplitter"); - kmenu->setName(TQCString(TQObject::name()) + "_ktoolframe"); - linee->setName(TQCString(TQObject::name()) + "_" + "LineEnter"); + pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING); + kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_ktoolframe"); + linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter"); kmenu->show(); setCaption(m_channelInfo.channel()); emit currentWindow(this); if(m_channelInfo.channel()[0] == '#' || m_channelInfo.channel()[0] == '&'){ - TQString str = TQString("/join %1 %2\n").arg(m_channelInfo.channel()).arg(m_channelInfo.key()); + TQString str = TQString("/join %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(m_channelInfo.key()); kdDebug(5008) << "Doing /join " << m_channelInfo.channel() << " :" << str << endl; emit outputUnicodeLine(str); emit outputLine("/eval $query=''\n"); } else if (m_channelInfo.channel()[0] != '!') { - emit outputUnicodeLine(TQString("/eval $query='%1'\n").arg(m_channelInfo.channel())); + emit outputUnicodeLine(TQString("/eval $query='%1'\n").tqarg(m_channelInfo.channel())); } bool isPrivate = isPrivateChat(); @@ -1327,13 +1327,13 @@ void KSircTopLevel::control_message(int command, TQString str) // nicks->show(); // lag->show(); } - if(layout()) { - //kdDebug(5008) << "Redoeing layout" << endl; - layout()->invalidate(); - layout()->activate(); + if(tqlayout()) { + //kdDebug(5008) << "Redoeing tqlayout" << endl; + tqlayout()->tqinvalidate(); + tqlayout()->activate(); } else { - //kdDebug(5008) << "No layout" << endl; + //kdDebug(5008) << "No tqlayout" << endl; } pan->refresh(); @@ -1342,7 +1342,7 @@ void KSircTopLevel::control_message(int command, TQString str) file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); file->setItemChecked(tsitem, ksopts->chan(m_channelInfo).timeStamp); file->setItemChecked(fjpitem, ksopts->chan(m_channelInfo).filterJoinPart); - int eindex = encodingAction->items().findIndex(ksopts->chan(m_channelInfo).encoding); + int eindex = encodingAction->items().tqfindIndex(ksopts->chan(m_channelInfo).encoding); //kdDebug(5008) << "in change channel we want: " << ksopts->chan(m_channelInfo).encoding << " eindex: " << eindex << endl; encodingAction->setCurrentItem(eindex < 0 ? 0 : eindex); setEncoding(); @@ -1356,7 +1356,7 @@ void KSircTopLevel::control_message(int command, TQString str) case RESUME_UPDATES: Buffer = FALSE; if(LineBuffer.isEmpty() == FALSE) - sirc_receive(TQString::null); + sirc_receive(TQString()); break; case REREAD_CONFIG: emit freezeUpdates(TRUE); // Stop the list boxes update @@ -1373,7 +1373,7 @@ void KSircTopLevel::control_message(int command, TQString str) file->setItemChecked(beepitem, ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].beepOnMsg); file->setItemChecked(tsitem, ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].timeStamp); { - int eindex = encodingAction->items().findIndex(ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding); + int eindex = encodingAction->items().tqfindIndex(ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding); //kdDebug(5008) << "in re-readconfig we want: " << ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding << " eindex: " << eindex << endl; encodingAction->setCurrentItem(eindex < 0 ? 0 : eindex); setEncoding(); @@ -1448,7 +1448,7 @@ TQString KSircTopLevel::findNick(TQString part, uint which) } for(uint i=0; i < nicks->count(); i++){ - if (matches.contains(nicks->text(i))) + if (matches.tqcontains(nicks->text(i))) continue; if(nicks->text(i).length() >= part.length()){ if(nicks->text(i).lower().startsWith( part.lower())){ @@ -1462,15 +1462,15 @@ TQString KSircTopLevel::findNick(TQString part, uint which) if(which < matches.count()) return *(matches.at(which)); else - return TQString::null; + return TQString(); } - return TQString::null; + return TQString(); } void KSircTopLevel::removeCompleteNick(const TQString &nick) { - TQStringList::Iterator it = completeNicks.find(nick); + TQStringList::Iterator it = completeNicks.tqfind(nick); if (it != completeNicks.end()) completeNicks.remove(it); } @@ -1483,7 +1483,7 @@ void KSircTopLevel::addCompleteNick(const TQString &nick) void KSircTopLevel::changeCompleteNick(const TQString &oldNick, const TQString &newNick) { - TQStringList::Iterator it = completeNicks.find(oldNick); + TQStringList::Iterator it = completeNicks.tqfind(oldNick); if (it != completeNicks.end()) *it = newNick; } @@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick) void KSircTopLevel::pasteToWindow() { // Ctrl-V - //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( QClipboard::Clipboard ) << endl; - slotTextDropped(KApplication::clipboard()->text( QClipboard::Clipboard ) ); + //kdDebug(5008) << "Going to paste: " << KApplication::tqclipboard()->text( TQClipboard::Clipboard ) << endl; + slotTextDropped(KApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); } void KSircTopLevel::pasteToNickList(int button, @@ -1510,7 +1510,7 @@ void KSircTopLevel::pasteToNickList(int button, emit open_toplevel(ci); TQStringList lines = TQStringList::split( '\n', - KApplication::clipboard()->text( QClipboard::Selection ), + KApplication::tqclipboard()->text( TQClipboard::Selection ), true ); TQStringList::ConstIterator it = lines.begin(); TQStringList::ConstIterator end = lines.end(); @@ -1568,14 +1568,14 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) if (text[text.length()-1] != '\n') text += "\n"; - int lines = text.contains("\n"); + int lines = text.tqcontains("\n"); int approx_lines = text.length() / 75; if ( lines > approx_lines ) approx_lines = lines; if (lines > 4) { int result = KMessageBox::warningContinueCancel(this, - i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").arg(approx_lines), - TQString::null, i18n("Send")); + i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").tqarg(approx_lines), + TQString(), i18n("Send")); if (result != KMessageBox::Continue) { // linee->setText(""); @@ -1601,7 +1601,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) if ( commands == Ask ) switch ( KMessageBox::questionYesNo( this, i18n( "The text you pasted contains lines that start with /.\n" - "Should they be interpreted as IRC commands?" ), TQString::null, i18n("Interpret"), i18n("Do Not Interpret") ) ) + "Should they be interpreted as IRC commands?" ), TQString(), i18n("Interpret"), i18n("Do Not Interpret") ) ) { case KMessageBox::Yes: commands = Parse; @@ -1622,7 +1622,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) linee->update(); } else{ - text.replace(TQRegExp("\n"), ""); + text.tqreplace(TQRegExp("\n"), ""); linee->setText(text); linee->setCursorPosition( curPos + _text.length() ); } @@ -1659,7 +1659,7 @@ bool KSircTopLevel::event( TQEvent *e) void KSircTopLevel::saveCurrLog() { - KURL url = KURL( KFileDialog::getSaveFileName(TQString::null, + KURL url = KURL( KFileDialog::getSaveFileName(TQString(), "*.log", 0L, i18n("Save Chat/Query Logfile"))); if( url.isEmpty()) @@ -1700,7 +1700,7 @@ void KSircTopLevel::slotDccURLs( const TQStringList& urls, const TQString& nick TQString file( *it ); kdDebug(5008) << "........ " << file << endl; if ( !file.isEmpty() ) - sirc_write(s.arg( file )); + sirc_write(s.tqarg( file )); } } @@ -1727,7 +1727,7 @@ void KSircTopLevel::outputUnicodeLine( const TQString &message ) void KSircTopLevel::setTopicIntern( const TQString &topic ) { - TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).arg( m_channelInfo.channel() ).arg( topic ); + TQString command = TQString::tqfromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); sirc_write( command ); linee->setFocus(); } @@ -1737,17 +1737,17 @@ void KSircTopLevel::doChange(bool pers, TQString text) TQTime ctime = TQTime::currentTime(); if (ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].beepOnMsg) { // beep only every 2 seconds otherwise it'll get very noisy in the room ;) - if ( QABS( lastBeep.secsTo( ctime ) ) > 1 ) { + if ( TQABS( lastBeep.secsTo( ctime ) ) > 1 ) { if ( pers ) { - int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::fromLatin1("ChannelPersonal"), - i18n("Your nick appeared on channel %1").arg(m_channelInfo.channel())); + TQString::tqfromLatin1("ChannelPersonal"), + i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel())); } else { - int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::fromLatin1("ChannelChanged"), - i18n("Channel %1 changed").arg(m_channelInfo.channel())); + TQString::tqfromLatin1("ChannelChanged"), + i18n("Channel %1 changed").tqarg(m_channelInfo.channel())); } lastBeep = ctime; } @@ -1755,7 +1755,7 @@ void KSircTopLevel::doChange(bool pers, TQString text) if(have_focus == 0 && pers == true && m_gotMsgWithoutFocus == false){ m_gotMsgWithoutFocus = true; - servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()), text); + servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel()), text); } } @@ -1834,7 +1834,7 @@ void KSircTopLevel::cmd_process(int id) void KSircTopLevel::showDCCMgr() { - KSircMessageReceiver *kmr = ksircProcess()->mrList().find("!dcc"); + KSircMessageReceiver *kmr = ksircProcess()->mrList().tqfind("!dcc"); if(kmr){ KSircIODCC *dcc = static_cast<KSircIODCC *>(kmr); if(dcc){ diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index 463dd408..ba1a25bc 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -31,6 +31,7 @@ class KSircTopLevel : public KMainWindow, public UnicodeMessageReceiver { Q_OBJECT + TQ_OBJECT friend class ChannelParser; public: /** @@ -392,7 +393,7 @@ private: bool Buffer; TQValueList<BufferedLine> LineBuffer; - // QPopupMenu's used for the menubar + // TQPopupMenu's used for the menubar TQPopupMenu *file, *edit, *command; bool parse_input(const TQString &string, TQString &plainText); @@ -453,7 +454,7 @@ private: */ TQPoint mypoint; /** - * Ticker's size and geometry + * Ticker's size and tqgeometry */ TQRect tickerrect; /** |