diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:49:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:49:40 -0600 |
| commit | 808e453c56036211f57482ed847d54aca01bba68 (patch) | |
| tree | 75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /ksirc | |
| parent | cd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff) | |
| download | tdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'ksirc')
89 files changed, 555 insertions, 555 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index 76a6a2ef..76fd1190 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -132,7 +132,7 @@ void FilterRuleEditor::updateListBox(int citem ) } if(filter->RuleList->count() > 0) filter->RuleList->setCurrentItem(citem); - filter->RuleList->tqrepaint(); + filter->RuleList->repaint(); filter->DeleteButton->setEnabled( filter->RuleList->currentItem() > -1 ); filter->ModifyButton->setEnabled( filter->RuleList->currentItem() > -1 ); diff --git a/ksirc/FilterRuleEditor.dlg b/ksirc/FilterRuleEditor.dlg index bbfa72e2..5461d839 100644 --- a/ksirc/FilterRuleEditor.dlg +++ b/ksirc/FilterRuleEditor.dlg @@ -24,7 +24,7 @@ Label { Margin {-1} Rect {140 10 80 30} Name {Label_1} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -36,7 +36,7 @@ LineEdit { Rect {220 10 280 30} Name {LineEdit_1} Variable {LineTitle} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -46,7 +46,7 @@ Label { Margin {-1} Rect {140 50 70 30} Name {Label_4} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -58,7 +58,7 @@ LineEdit { Rect {220 50 280 30} Name {LineEdit_2} Variable {LineSearch} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ Label { Margin {-1} Rect {140 90 80 30} Name {Label_7} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -78,7 +78,7 @@ Label { Margin {-1} Rect {140 130 70 30} Name {Label_9} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -90,7 +90,7 @@ LineEdit { Rect {220 90 280 30} Name {LineEdit_3} Variable {LineFrom} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -102,7 +102,7 @@ LineEdit { Rect {220 130 280 30} Name {LineEdit_4} Variable {LineTo} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -117,7 +117,7 @@ PushButton { Name {PushButton_1} Variable {ApplyButton} Signal {[Protected] clicked --> OkPressed ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -131,7 +131,7 @@ PushButton { Rect {390 210 110 30} Name {PushButton_2} Signal {[Protected] clicked --> closePressed ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -145,7 +145,7 @@ PushButton { Rect {270 170 110 30} Name {PushButton_7} Signal {[Protected] clicked --> newRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -160,7 +160,7 @@ PushButton { Name {PushButton_8} Variable {deleteButton} Signal {[Protected] clicked --> deleteRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -174,7 +174,7 @@ PushButton { Rect {10 210 55 30} Name {PushButton_9} Signal {[Protected] clicked --> raiseRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -188,7 +188,7 @@ PushButton { Rect {75 210 55 30} Name {PushButton_10} Signal {[Protected] clicked --> lowerRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -208,7 +208,7 @@ ListBox { Variable {RuleList} Signal {[Protected] highlighted --> newHighlight (int)} Signal {[Protected] selected --> newHighlight (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index 423e90c0..54d1f7f9 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -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::tqfromLatin1(KCodecs::base64Encode(result)); + return TQString::fromLatin1(KCodecs::base64Encode(result)); } TQString open_ksirc::decryptPassword( const TQString &scrambled ) diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index 0bc3374d..24dcccd7 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -134,7 +134,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp index 40ccc56f..181d6e68 100644 --- a/ksirc/KSPrefs/ksprefs.cpp +++ b/ksirc/KSPrefs/ksprefs.cpp @@ -7,7 +7,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kiconloader.h> diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index 49920e42..1b311682 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -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)").tqarg(it->text(PASS)); + server += TQString(" (pass: %1)").arg(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)").tqarg(ch->text(PK)); + channel += TQString(" (key: %1)").arg(ch->text(PK)); channels << channel; @@ -183,7 +183,7 @@ void PageAutoConnect::add_pressed() } parent->setText(NAME, ServerLE->text()); - parent->setText(PK, TQString("%1").tqarg(PortKI->value())); + parent->setText(PK, TQString("%1").arg(PortKI->value())); parent->setText(PASS, PassLE->text()); if(sslCB->isChecked()) parent->setText(SSL, i18n("SSL")); diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 3f9943c4..dae19a85 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -90,7 +90,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -98,7 +98,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -170,7 +170,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -201,7 +201,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -235,7 +235,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -263,7 +263,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index 9c14536f..e793d755 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -113,7 +113,7 @@ <property name="name"> <cstring>genericTextCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="name"> <cstring>linkCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>backCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -183,7 +183,7 @@ <property name="name"> <cstring>errorCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -208,7 +208,7 @@ <property name="name"> <cstring>infoCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -222,7 +222,7 @@ <property name="name"> <cstring>chanMsgCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -236,7 +236,7 @@ <property name="name"> <cstring>selBackCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="name"> <cstring>selForeCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -384,7 +384,7 @@ <property name="name"> <cstring>ownNickCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>202</width> <height>20</height> @@ -490,13 +490,13 @@ <property name="name"> <cstring>nickFGCBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -524,7 +524,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -544,7 +544,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>21</height> @@ -566,7 +566,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -587,7 +587,7 @@ <property name="name"> <cstring>ownContainNickCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>169</width> <height>21</height> @@ -618,7 +618,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -644,7 +644,7 @@ <property name="name"> <cstring>msg1CBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -672,7 +672,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>21</height> @@ -683,7 +683,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -709,7 +709,7 @@ <property name="name"> <cstring>msg2CBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -737,7 +737,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>21</height> @@ -797,7 +797,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index d320a3f5..5ea0dd9b 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -3,9 +3,9 @@ PageFont::PageFont( TQWidget *parent, const char *name ) : TQWidget( parent, name) { - tqlayout = new TQHBoxLayout(this); + layout = new TQHBoxLayout(this); fontchooser = new KFontChooser(this); - tqlayout->addWidget(fontchooser); + layout->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::tqsetFont(fontchooser->font(), true, "KSirc::TextView" ); + TQApplication::setFont(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 fcda96f2..c5fbe44d 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 tqlayout +#include <layout.h> // For the layout #include "ksopts.h" // For storing the info. /** @@ -57,7 +57,7 @@ class PageFont : public TQWidget private: KFontChooser* fontchooser; /** The font choosing widget from kdelib */ - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; }; #endif diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index e5811a1a..839c0f59 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -12,7 +12,7 @@ <height>489</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>0</height> @@ -69,7 +69,7 @@ <property name="name"> <cstring>historyItemsLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -357,7 +357,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>71</height> diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui index b83b9b05..ae87e929 100644 --- a/ksirc/KSPrefs/page_irccolorsbase.ui +++ b/ksirc/KSPrefs/page_irccolorsbase.ui @@ -71,7 +71,7 @@ <property name="name"> <cstring>CBtn_1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -137,7 +137,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -187,7 +187,7 @@ <property name="name"> <cstring>CBtn_2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -237,7 +237,7 @@ <property name="name"> <cstring>CBtn_4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -279,7 +279,7 @@ <property name="name"> <cstring>CBtn_3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>CBtn_5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -363,7 +363,7 @@ <property name="name"> <cstring>CBtn_6</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -405,7 +405,7 @@ <property name="name"> <cstring>CBtn_7</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>41</height> @@ -629,7 +629,7 @@ <property name="name"> <cstring>CBtn_8</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -643,7 +643,7 @@ <property name="name"> <cstring>CBtn_9</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -657,7 +657,7 @@ <property name="name"> <cstring>CBtn_10</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -671,7 +671,7 @@ <property name="name"> <cstring>CBtn_11</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -685,7 +685,7 @@ <property name="name"> <cstring>CBtn_12</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -699,7 +699,7 @@ <property name="name"> <cstring>CBtn_13</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>CBtn_14</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -727,7 +727,7 @@ <property name="name"> <cstring>CBtn_15</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -1043,7 +1043,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>121</height> diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index 49688ab9..5b366680 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>450</height> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -106,7 +106,7 @@ <property name="text"> <string>Choose your favorite window mode:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -132,13 +132,13 @@ <property name="name"> <cstring>Frame3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>120</height> @@ -198,13 +198,13 @@ <property name="name"> <cstring>wallpaperPathLE</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -217,13 +217,13 @@ <property name="name"> <cstring>Frame3_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>120</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>1</height> diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui index 09fbef0d..1073d179 100644 --- a/ksirc/KSPrefs/page_rmbmenubase.ui +++ b/ksirc/KSPrefs/page_rmbmenubase.ui @@ -26,7 +26,7 @@ <property name="name"> <cstring>explLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <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="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -161,7 +161,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -178,7 +178,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>21</height> diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index 6dce178b..6947f97b 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -7,7 +7,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <kglobalaccel.h> @@ -22,7 +22,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcu m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); - globalGB->tqlayout()->add(m_key); + globalGB->layout()->add(m_key); } PageShortcuts::~PageShortcuts() diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui index 1c40bdca..ca76ff9b 100644 --- a/ksirc/KSPrefs/page_shortcutsbase.ui +++ b/ksirc/KSPrefs/page_shortcutsbase.ui @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>450</height> diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index 42dfefeb..629e3d30 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>nickGB</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp index 361c171c..ccf3b194 100644 --- a/ksirc/KSProgress/ksprogress.cpp +++ b/ksirc/KSProgress/ksprogress.cpp @@ -39,7 +39,7 @@ void KSProgress::setTopText(TQString text) void KSProgress::setBotText(TQString text) { - transfertqStatus->setText(text); + transferStatus->setText(text); } void KSProgress::setValue(int value) diff --git a/ksirc/KSProgress/ksprogress.dlg b/ksirc/KSProgress/ksprogress.dlg index 4d1b065d..5484c4d6 100644 --- a/ksirc/KSProgress/ksprogress.dlg +++ b/ksirc/KSProgress/ksprogress.dlg @@ -124,7 +124,7 @@ </Frame> </Label> <Label nested="true" > - <Text >XfertqStatus</Text> + <Text >XferStatus</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 >transfertqStatus</Variable> + <Variable >transferStatus</Variable> <SignalConnection list="true" nested="true" > </SignalConnection> <MinimumSize type="qsize" complex="true" nested="true" > diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 6b528f5c..ab098df9 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -46,16 +46,16 @@ ksprogressData::ksprogressData fileName->setMinimumSize( 10, 10 ); fileName->setMaximumSize( 32767, 32767 ); fileName->setText( i18n("File Name") ); - fileName->tqsetAlignment( 289 ); + fileName->setAlignment( 289 ); fileName->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 Status") ); - transfertqStatus->tqsetAlignment( 289 ); - transfertqStatus->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 ); resize( 250,130 ); setMinimumSize( 250, 140 ); diff --git a/ksirc/KSProgress/ksprogressdata.h b/ksirc/KSProgress/ksprogressdata.h index 0bffb520..a52e099b 100644 --- a/ksirc/KSProgress/ksprogressdata.h +++ b/ksirc/KSProgress/ksprogressdata.h @@ -42,7 +42,7 @@ protected slots: protected: KProgress* progress; TQLabel* fileName; - TQLabel* transfertqStatus; + TQLabel* transferStatus; }; diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 4f3933db..84821e7d 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -110,7 +110,7 @@ void KSTicker::show() if(currentStr.length() != 0) startTicker(); currentChar = 0; - tqrepaint(TRUE); + repaint(TRUE); } void KSTicker::hide() @@ -129,7 +129,7 @@ void KSTicker::setString(TQString str) { strlist.clear(); strlist.append(str); - tqrepaint(TRUE); + repaint(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").tqarg(num)); + str.prepend(TQString("~%1").arg(num)); } mergeString(str); @@ -150,7 +150,7 @@ 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").tqarg(value); + TQString newText = TQString("~%1\\1~c").arg(value); str.replace(rx, newText); } } diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 581bd2dc..36ad249a 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", tqcolorGroup().text() ); - kConfig->writeEntry("background", tqcolorGroup().background() ); + kConfig->writeEntry("text", colorGroup().text() ); + kConfig->writeEntry("background", colorGroup().background() ); kConfig->sync(); } diff --git a/ksirc/KSTicker/speeddialog.dlg b/ksirc/KSTicker/speeddialog.dlg index aff83de2..08526647 100644 --- a/ksirc/KSTicker/speeddialog.dlg +++ b/ksirc/KSTicker/speeddialog.dlg @@ -31,7 +31,7 @@ Slider { Name {Slider_1} Variable {sliderTick} Signal {[Protected] valueChanged --> updateTick (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -49,7 +49,7 @@ Slider { Name {Slider_2} Variable {sliderStep} Signal {[Protected] valueChanged --> updateStep (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -62,7 +62,7 @@ LCDNumber { Rect {200 5 60 30} Name {LCDNumber_1} Variable {lcdTick} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -75,7 +75,7 @@ LCDNumber { Rect {200 40 60 30} Name {LCDNumber_2} Variable {lcdStep} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -85,7 +85,7 @@ Label { Margin {-1} Rect {10 5 80 30} Name {Label_1} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -95,7 +95,7 @@ Label { Margin {-1} Rect {10 40 80 30} Name {Label_2} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -109,7 +109,7 @@ PushButton { Rect {140 80 120 30} Name {PushButton_2} Signal {[Protected] pressed --> terminate ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 04102569..eaa0c8af 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -16,7 +16,7 @@ #include <klocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <tqlayout.h> +#include <layout.h> #include <kdialog.h> speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) @@ -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->tqsetAlignment( 289 ); + dlgedit_Label_1->setAlignment( 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->tqsetAlignment( 289 ); + dlgedit_Label_2->setAlignment( 289 ); dlgedit_Label_2->setMargin( -1 ); grid->addWidget( dlgedit_Label_2, 1, 0 ); diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 4928155c..9e538672 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -43,10 +43,10 @@ #include "ahistlineedit.h" #include "colorpicker.h" #include "ksopts.h" -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpen.h> #include <tqpainter.h> #include <kdebug.h> @@ -102,13 +102,13 @@ void aHistLineEdit::slotMaybeResize() if(text().length() > IRC_SAFE_MAX_LINE){ if(m_drawrect == false){ m_drawrect = true; - tqrepaint(); + repaint(); } } else { if(m_drawrect == true){ m_drawrect = false; - tqrepaint(); + repaint(); } } @@ -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 > (tqtopLevelWidget()->height() >> 2)) { - if(this != tqtopLevelWidget()) { - h = tqtopLevelWidget()->height() >> 2; + if(h > (topLevelWidget()->height() >> 2)) { + if(this != topLevelWidget()) { + h = topLevelWidget()->height() >> 2; setVScrollBarMode( Auto ); } } @@ -131,9 +131,9 @@ void aHistLineEdit::slotMaybeResize() s.setHeight(h); resize(s); setFixedHeight( h ); - TQLayout *l = tqtopLevelWidget()->tqlayout(); + TQLayout *l = topLevelWidget()->layout(); if(l){ - l->tqinvalidate(); + l->invalidate(); l->activate(); } emit resized(); @@ -352,7 +352,7 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e ) { if(e->button() == MidButton){ /* - * emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); + * emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection)); */ } else{ @@ -381,10 +381,10 @@ void aHistLineEdit::paste() { /* we let the top level take it */ if(ksopts->oneLineEntry) { - emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection)); + emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection)); } else { - TQString paste = TQApplication::tqclipboard()->text(TQClipboard::Selection); + TQString paste = TQApplication::clipboard()->text(TQClipboard::Selection); paste.replace("\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(tqpalette().active().highlight()); + pen.setColor(palette().active().highlight()); paint.setPen(pen); TQRect r = frameRect(); paint.drawRect(r); diff --git a/ksirc/ahistlineedit.h b/ksirc/ahistlineedit.h index c25508d8..bacb1615 100644 --- a/ksirc/ahistlineedit.h +++ b/ksirc/ahistlineedit.h @@ -1,7 +1,7 @@ #ifndef AHISTLINEEDIT_H #define AHISTLINEEDIT_H -#include <tqtextedit.h> +#include <textedit.h> #include <tqstringlist.h> #include <tqsize.h> diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 60e27cdf..cf7a4581 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -27,7 +27,7 @@ aListBox::aListBox(TQWidget *parent, const char *name ) : TQListBox(parent,name) { clear(); - p_scroll = TQPalette(tqpalette()); + p_scroll = TQPalette(palette()); setAcceptDrops( true ); connect(this, TQT_SIGNAL(selected (const TQString&)), this, TQT_SIGNAL(selectedNick(const TQString&))); diff --git a/ksirc/alistbox.h b/ksirc/alistbox.h index 244a2fcb..cc636f4d 100644 --- a/ksirc/alistbox.h +++ b/ksirc/alistbox.h @@ -80,10 +80,10 @@ public: virtual void fontChange( const TQFont &f ); - 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" ); } + 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" ); } signals: void contextMenuRequested(int index); diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index d5f59939..9ca78aec 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -9,7 +9,7 @@ #include <kstdguiitem.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqlineedit.h> @@ -17,7 +17,7 @@ static void makeSquare(TQWidget *w) { - TQSize sh = w->tqsizeHint(); + TQSize sh = w->sizeHint(); int s = sh.height(); w->setFixedSize(s,s); } @@ -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())); - tqlayout = new TQHBoxLayout(this); - tqlayout->setSpacing(0); - tqlayout->setMargin(0); + layout = new TQHBoxLayout(this); + layout->setSpacing(0); + layout->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())); - tqlayout->addWidget(protectButton); + layout->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())); - tqlayout->addWidget(outsideButton); + layout->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())); - tqlayout->addWidget(moderateButton); + layout->addWidget(moderateButton); menuButton = new TQPushButton(i18n("..."), this); makeSquare(menuButton); menuButton->setFixedWidth(menuButton->width()*2); menuButton->setPopup(Popupmenu); TQToolTip::add(menuButton, i18n("More mode commands")); - tqlayout->addWidget(menuButton); + layout->addWidget(menuButton); } void chanButtons::invite() @@ -93,7 +93,7 @@ void chanButtons::limited() } else { Popupmenu->setItemChecked(toggleMenu[1], true); - emit mode(TQString("+l %1").tqarg(chanDialog->sendLimitedUsers()), 0); + emit mode(TQString("+l %1").arg(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").tqarg(chanDialog->sendKey()), 0); + emit mode(TQString("-k %1").arg(chanDialog->sendKey()), 0); } else { chanDialog->exec(); Popupmenu->setItemChecked(toggleMenu[2], true); - emit mode(TQString("+k %1").tqarg(chanDialog->sendKey()), 0); + emit mode(TQString("+k %1").arg(chanDialog->sendKey()), 0); } delete chanDialog; } @@ -230,7 +230,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->setMargin(0); okButton = new KPushButton(KStdGuiItem::ok(), this); - okButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + okButton->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + cancelButton->setSizePolicy(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 ec5ebe9d..8e998bdf 100644 --- a/ksirc/chanButtons.h +++ b/ksirc/chanButtons.h @@ -48,7 +48,7 @@ class chanButtons : public TQWidget private: int toggleMenu[7]; - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; TQPushButton *protectButton; TQPushButton *moderateButton; TQPushButton *outsideButton; diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index b2bdc93c..32f2d670 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::parseSSFEtqStatus)); + parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEStatus)); parserTable.insert("`i`", new parseFunc(&ChannelParser::parseSSFEInit)); parserTable.insert("`t`", new parseFunc(&ChannelParser::parseSSFEMsg)); parserTable.insert("`o`", new parseFunc(&ChannelParser::parseSSFEOut)); @@ -118,12 +118,12 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) { // top->mainw->clear(); top->clearWindow(); -// top->mainw->tqrepaint(TRUE); +// top->mainw->repaint(TRUE); string.truncate(0); return new parseSucc(TQString()); // Null string, don't display anything } -parseResult * ChannelParser::parseSSFEtqStatus(TQString string) +parseResult * ChannelParser::parseSSFEStatus(TQString string) { string.remove(0, 12); // strip off the first 12 characters "<junk> [sirc] " if(string.length() == 0) @@ -159,7 +159,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) if ( nickItem ) { if(nickItem->away() != away){ nickItem->setAway( away ); - top->nicks->viewport()->tqrepaint( top->nicks->tqitemRect( nickItem ), false ); + top->nicks->viewport()->repaint( top->nicks->itemRect( nickItem ), false ); } nickItem->forceColour(&ksopts->ownNickColor); } @@ -191,7 +191,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) top->channelButtons->setMenuItemMode(6, true); else top->channelButtons->setMenuItemMode(6, false); - TQString status_line = TQString("%1 (%2) %3 (%4) ").tqarg(chan).tqarg(chanmode).tqarg(nick).tqarg(modes); + TQString status_line = TQString("%1 (%2) %3 (%4) ").arg(chan).arg(chanmode).arg(nick).arg(modes); /* * Go srearching for key and limit messages @@ -199,7 +199,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) TQRegExp rxKey("<key: (\\S+)>"); if(rxKey.search(string) >= 0){ top->channelButtons->setMenuItemMode(2, true); - status_line += TQString("<key: %1>").tqarg(rxKey.cap(1)); + status_line += TQString("<key: %1>").arg(rxKey.cap(1)); } else { top->channelButtons->setMenuItemMode(2, false); @@ -208,7 +208,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) TQRegExp rxLimit("<limit: (\\S+)>"); if(rxLimit.search(string) >= 0){ top->channelButtons->setMenuItemMode(1, true); - status_line += TQString("<limit: %1>").tqarg(rxLimit.cap(1)); + status_line += TQString("<limit: %1>").arg(rxLimit.cap(1)); } else { top->channelButtons->setMenuItemMode(1, false); @@ -367,7 +367,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) if(current_item > 0) top->nicks->setCurrentItem(current_item); top->nicks->setTopItem(top_item); - top->nicks->tqrepaint(TRUE); + top->nicks->repaint(TRUE); return new parseSucc(TQString()); // Parsing ok, don't print anything though } else if(string[1] == '$'){ @@ -417,7 +417,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) uint i; for(i = 0; i < nick.length();i++){ - switch(nick[0].tqunicode()){ + switch(nick[0].unicode()){ case '@': irc->setOp(TRUE); nick.remove(0,1); @@ -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").tqarg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").arg(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").tqarg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); /* if(top->ticker) * top->ticker->show(); @@ -642,7 +642,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) return new parseSucc(" " + string, ksopts->errorColor, "user|error"); } - return new parseError(i18n("Unable to parse: %1").tqarg(string), i18n("Unable to parse change nick code")); + return new parseError(i18n("Unable to parse: %1").arg(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->tqrepaint(TRUE); + top->nicks->repaint(TRUE); // We're done, so let's finish up return new parseSucc(" " + string, ksopts->channelColor, "user|join"); } @@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) pmList.setAutoDelete(true); for(uint pos = 0; pos < modes.length(); pos++){ - switch(modes.tqat(pos).tqunicode()){ + switch(modes.at(pos).unicode()){ case '+': op = true; break; @@ -822,7 +822,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) case 'b': // Ban, arg is mask banned case 'k': // kcik, arg is nick if(ai == NULL) - return new parseError(i18n("Unable to parse mode change: %1").tqarg(string), TQString()); + return new parseError(i18n("Unable to parse mode change: %1").arg(string), TQString()); pmList.append(new mode_info(op, modes.at(pos), *ai)); ai++; break; @@ -858,7 +858,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* * Look at the second character, it's uniq, check for +,- latter */ - if(mi->mode().tqunicode() == 'o'){ + if(mi->mode().unicode() == '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->tqrepaint(TRUE); + top->nicks->repaint(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->tqrepaint(); + top->nicks->repaint(); } } else if(mi->mode() == 'b'){ @@ -1041,7 +1041,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) void ChannelParser::highlightNick(TQString &string, TQString &nick) { - TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").tqarg(TQRegExp::escape(nick))); + TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").arg(TQRegExp::escape(nick))); string.replace(rx, "\\1~n" + nick + "~n\\2"); } diff --git a/ksirc/chanparser.h b/ksirc/chanparser.h index 3eaf39b6..7a6a0e77 100644 --- a/ksirc/chanparser.h +++ b/ksirc/chanparser.h @@ -198,10 +198,10 @@ private: parseResult * parseSSFEClear(TQString string); /** - * SSFE tqStatus is used to update caption, and op status + * SSFE Status is used to update caption, and op status * */ - parseResult * parseSSFEtqStatus(TQString string); + parseResult * parseSSFEStatus(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..86f8614a 100644 --- a/ksirc/charSelector.cpp +++ b/ksirc/charSelector.cpp @@ -3,7 +3,7 @@ #include "charSelector.h" #include "charSelector.moc" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <klocale.h> diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index be5fca73..5a6ed878 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -20,7 +20,7 @@ #include "colorpicker.h" #include "ksopts.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqvbox.h> #include <tqstyle.h> @@ -46,8 +46,8 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name ) m_sample = new TQLineEdit( i18n( "Sample Text" ), sampleBox ); m_sample->setFocusPolicy( TQ_NoFocus ); - m_sample->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, - m_sample->tqsizePolicy().verData() ) ); + m_sample->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_sample->sizePolicy().verData() ) ); sampleLayout->addWidget( m_sample ); sampleLayout->addStretch(); @@ -111,7 +111,7 @@ void ColorPicker::setBackgroundColor( int col ) void ColorPicker::updateSample() { - TQColorGroup cg( tqcolorGroup() ); + TQColorGroup cg( colorGroup() ); TQColor col = ksopts->textColor; if ( m_foregroundColor != -1 ) @@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev ) void ColorBar::updateCellSize() { - setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); + setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); TQFontMetrics metrics( font() ); diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index cbf63109..386644b9 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -22,7 +22,7 @@ #define COL_CPS 4 #define COL_PER 5 -dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) +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) { m_percent = 0; @@ -34,16 +34,16 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(status)); if(m_type == dccChat) setText(COL_SIZE, ""); else - setText(COL_SIZE, TQString("%1").tqarg(size)); + setText(COL_SIZE, TQString("%1").arg(size)); setText(COL_PER, ""); } -dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) +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) { m_percent = 0; @@ -54,9 +54,9 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(status)); if(type != dccChat) - setText(COL_SIZE, TQString("%1").tqarg(size)); + setText(COL_SIZE, TQString("%1").arg(size)); setText(COL_PER, ""); } @@ -65,7 +65,7 @@ dccItem::~dccItem() { } -TQString dccItem::enumTotqStatus(enum dcctqStatus status) +TQString dccItem::enumToStatus(enum dccStatus status) { TQString str; switch(status){ @@ -108,7 +108,7 @@ TQString dccItem::enumTotqStatus(enum dcctqStatus status) void dccItem::setWhoPostfix(const TQString &post) { m_post = post; - setText(COL_WHO, TQString("%1 %2").tqarg(m_who).tqarg(post)); + setText(COL_WHO, TQString("%1 %2").arg(m_who).arg(post)); } void dccItem::changeFilename(const TQString &file) { @@ -121,10 +121,10 @@ void dccItem::changeWho(const TQString &who) { m_who = who; } -void dccItem::changetqStatus(enum dcctqStatus status) +void dccItem::changeStatus(enum dccStatus status) { m_manager->doChanged(); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(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").tqarg(bytes).tqarg(m_size)); - setText(COL_PER, TQString("%1%").tqarg(per)); + setText(COL_SIZE, TQString("%1/%2").arg(bytes).arg(m_size)); + setText(COL_PER, TQString("%1%").arg(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").tqarg(1.0*bytes/(time(NULL) - m_stime), 2)); + setText(COL_CPS, TQString("%1").arg(1.0*bytes/(time(NULL) - m_stime), 2)); } @@ -228,7 +228,7 @@ dccManager::~dccManager() { } -dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) +dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccStatus 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::dcct return it; } -dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) +dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccStatus 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::dcctq } -dccItem *dccManager::newChatItem(TQString who, enum dccItem::dcctqStatus status) +dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus 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 ec5b9bbe..524c886f 100644 --- a/ksirc/dccManager.h +++ b/ksirc/dccManager.h @@ -28,7 +28,7 @@ class dccItem : public TQObject, Q_OBJECT TQ_OBJECT public: - enum dcctqStatus { + enum dccStatus { dccRecving, dccOpen, dccWaitOnResume, @@ -47,11 +47,11 @@ public: dccSend }; - 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 ); + 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 ); virtual ~dccItem(); - void changetqStatus(enum dcctqStatus); + void changeStatus(enum dccStatus); void setReceivedBytes(int bytes); void setWhoPostfix(const TQString &post); @@ -60,7 +60,7 @@ public: const TQString who() { return m_who; } const TQString file() { return m_file; } - enum dcctqStatus status() { return m_status; } + enum dccStatus status() { return m_status; } enum dccType type() { return m_type; } double getPercent() { return m_percent; } @@ -71,7 +71,7 @@ signals: void itemRenamed(dccItem *, TQString oldNick, TQString oldFile); protected: - TQString enumTotqStatus(enum dcctqStatus); + TQString enumToStatus(enum dccStatus); virtual void okRename ( int col ); virtual void cancelRename ( int col ); @@ -84,7 +84,7 @@ private: TQString m_post; int m_percent; unsigned int m_size; - enum dcctqStatus m_status; + enum dccStatus m_status; const enum dccType m_type; time_t m_stime; time_t m_lasttime; @@ -102,9 +102,9 @@ public: dccManager( TQWidget *parent = 0, const char *name = 0 ); ~dccManager(); - 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); + 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); void doChanged() { emit changed(false, TQString("dcc activity")); }; diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index b3b070b4..542a28eb 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -50,7 +50,7 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp index b37a8795..ac2b76cb 100644 --- a/ksirc/dccMgrTest.cpp +++ b/ksirc/dccMgrTest.cpp @@ -19,7 +19,7 @@ public: } void timerEvent( TQTimerEvent * ) { - m_it->changetqStatus(dccItem::dccSending); + m_it->changeStatus(dccItem::dccSending); bytes += 1000; m_it->setReceivedBytes(bytes); diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index 871c044d..fef6b27b 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -31,7 +31,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) : dccNewBase( parent, name) { - TQColorGroup cg_mainw = kapp->tqpalette().active(); + TQColorGroup cg_mainw = kapp->palette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index 661ed5f5..8c6e9fef 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -87,7 +87,7 @@ <property name="name"> <cstring>nickList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -108,7 +108,7 @@ <property name="name"> <cstring>gbFile</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -141,7 +141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index b7bbf16c..d554004a 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -178,7 +178,7 @@ void DisplayMgrMDI::reparentReq() { kdDebug(5008) << "got reparent" << endl; - TQWidget *o = kapp->tqfocusWidget(); + TQWidget *o = kapp->focusWidget(); TQWidget *s; if(o == NULL){ diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index bd669edb..7deb5b2f 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -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_blinktqStatus = false; + m_blinkStatus = false; m_blinkActive = false; servercontroller::self() @@ -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_blinktqStatus = true; + m_blinkStatus = 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").tqarg(reason), this); + KPassivePopup::message(TQString("Notify: %1").arg(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").tqarg(reason), cutup, this); + KPassivePopup::message(TQString("%1").arg(reason), cutup, this); } m_blink_reason.append(br); createMainPopup(); @@ -395,8 +395,8 @@ void dockServerController::raiseLastActiveWindow() void dockServerController::blinkDockedIcon() { - m_blinktqStatus = !m_blinktqStatus; - setPixmap( m_blinktqStatus ? m_pic_info : m_pic_dock ); + m_blinkStatus = !m_blinkStatus; + setPixmap( m_blinkStatus ? m_pic_info : m_pic_dock ); } void dockServerController::helpNotice() diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h index 51020fdd..94f13674 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 settqStatus(enum status stat) { m_status = stat; } + void setStatus(enum status stat) { m_status = stat; } enum status status() { return m_status; } private: @@ -100,7 +100,7 @@ private: bool m_mainPopVisible; bool m_blinkActive; - bool m_blinktqStatus; // true: blue icon, false: normal icon + bool m_blinkStatus; // true: blue icon, false: normal icon TQTimer* m_blinkTimer; TQStringList m_blink_reason; diff --git a/ksirc/ioBroadcast.cpp b/ksirc/ioBroadcast.cpp index ef0fa33b..b36e4420 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 tqreceivers, except of course it + message and send it all ksircmessage receivers, except of course it self. It does the same with control_messages. diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index 7f601ace..f994cfa7 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -61,7 +61,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(str.find("DCC GET read:", 0) != -1){ /*fold01*/ TQRegExp rx("read: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); + TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); // @@ -76,7 +76,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) else if(str.find("DCC SEND write:", 0) != -1){ /*fold01*/ TQRegExp rx("write: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); + TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); if(DCCSendItems[key]){ @@ -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").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(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").tqarg(filename).tqarg(i+1).tqarg(old->who()); + renamed = TQString("%1 (finished %2)/%3").arg(filename).arg(i+1).arg(old->who()); if( DCCGetItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (finished %2)").tqarg(filename).tqarg(i+1)); + old->changeFilename(TQString("%1 (finished %2)").arg(filename).arg(i+1)); DCCGetItems.insert(renamed, it); } @@ -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").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(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").tqarg(filename).tqarg(i+1).tqarg(old->who()); + renamed = TQString("%1 (sent %2)/%3").arg(filename).arg(i+1).arg(old->who()); if( DCCSendItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (sent %2)").tqarg(filename).tqarg(i+1)); + old->changeFilename(TQString("%1 (sent %2)").arg(filename).arg(i+1)); DCCSendItems.insert(renamed, it); } DCCSendItems.insert(key, it); @@ -204,21 +204,21 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dcctqStatus status = dccItem::dccDone; + enum dccItem::dccStatus 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").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ kdDebug(5008) << "SendPercent: " << DCCSendItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCSendItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCSendItems[key]->changetqStatus(status); + DCCSendItems[key]->changeStatus(status); } } } @@ -229,18 +229,18 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dcctqStatus status = dccItem::dccDone; + enum dccItem::dccStatus status = dccItem::dccDone; if(error != "OK"){ status = dccItem::dccError; - KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ kdDebug(5008) << "GetPercent: " << DCCGetItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCGetItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCGetItems[key]->changetqStatus(status); + DCCGetItems[key]->changeStatus(status); } } else { @@ -252,13 +252,13 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(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->changetqStatus(dccItem::dccResumed); + it->changeStatus(dccItem::dccResumed); } } } @@ -267,9 +267,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ - DCCSendItems[key]->changetqStatus(dccItem::dccResumed); + DCCSendItems[key]->changeStatus(dccItem::dccResumed); } } } @@ -278,9 +278,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccRecving); + DCCGetItems[key]->changeStatus(dccItem::dccRecving); } } } @@ -290,10 +290,10 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString ip = rx.cap(3); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ DCCSendItems[key]->setWhoPostfix("(" + ip + ")"); - DCCSendItems[key]->changetqStatus(dccItem::dccSending); + DCCSendItems[key]->changeStatus(dccItem::dccSending); } } } @@ -302,7 +302,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccOpen); + DCCChatItems[who]->changeStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } @@ -314,7 +314,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString ip = rx.cap(2); if(DCCChatItems[who]){ DCCChatItems[who]->setWhoPostfix("(" + ip + ")"); - DCCChatItems[who]->changetqStatus(dccItem::dccOpen); + DCCChatItems[who]->changeStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } @@ -325,11 +325,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccError); + DCCGetItems[key]->changeStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } } else if(str.find("DCC CHAT failed") != -1){ /*FOLD01*/ @@ -338,9 +338,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString error = rx.cap(2); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccError); + DCCChatItems[who]->changeStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").arg(who).arg(error), mgr->mgr()); } } else if(str.find("DCC CHAT renamed") != -1){ /*FOLD01*/ @@ -360,9 +360,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccCancel); + DCCGetItems[key]->changeStatus(dccItem::dccCancel); } } } @@ -371,9 +371,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // if(rx.search(str)){ // TQString who = rx.cap(1); // TQString filename = rx.cap(2); -// TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); +// TQString key = TQString("%1/%2").arg(filename).arg(who); // if(DCCSendItems[key]){ -// DCCSendItems[key]->changetqStatus(dccItem::dccCancel); +// DCCSendItems[key]->changeStatus(dccItem::dccCancel); // } // } // } @@ -382,7 +382,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccDone); + DCCChatItems[who]->changeStatus(dccItem::dccDone); } } } @@ -392,7 +392,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); - //TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + //TQString key = TQString("%1/%2").arg(filename).arg(who); TQPtrList<dccItem> toDel; TQDict<dccItem> new_list; @@ -470,11 +470,11 @@ void KSircIODCC::control_message(int, TQString) void KSircIODCC::cancelTransfer(TQString filename) { //if(DlgList[filename]){ - //emit outputLine(DCCtqStatus[filename]->cancelMessage.ascii()); + //emit outputLine(DCCStatus[filename]->cancelMessage.ascii()); //delete DlgList[filename]; //DlgList.remove(filename); - //delete DCCtqStatus[filename]; - //DCCtqStatus.remove(filename); + //delete DCCStatus[filename]; + //DCCStatus.remove(filename); //} } @@ -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->changetqStatus(dccItem::dccWaitOnResume); + it->changeStatus(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").tqarg(it->file()).tqarg(it->who())); + DCCGetItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who())); break; case dccItem::dccSend: - DCCSendItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who())); + DCCSendItems.remove(TQString("%1/%2").arg(it->file()).arg(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").tqarg(oldWho).tqarg(oldFile).tqarg(it->file()); - TQString key = TQString("%1/%2").tqarg(oldFile).tqarg(oldWho); + 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); if(DCCGetItems[key]){ DCCGetItems.take(key); - TQString newkey = TQString("%1/%2").tqarg(it->file()).tqarg(it->who()); + TQString newkey = TQString("%1/%2").arg(it->file()).arg(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").tqarg(oldWho).tqarg(it->who()); + TQString str = TQString("/dcc rchat %1 %2\n").arg(oldWho).arg(it->who()); emit outputLine(str.ascii()); } diff --git a/ksirc/ioDCC.h b/ksirc/ioDCC.h index 791d5d19..216c0419 100644 --- a/ksirc/ioDCC.h +++ b/ksirc/ioDCC.h @@ -52,7 +52,7 @@ signals: private: // TQDict<TQProgressDialog> DlgList; //TQDict<KSProgress> DlgList; - //TQDict<DCCInfo> DCCtqStatus; + //TQDict<DCCInfo> DCCStatus; TQDict<dccItem> DCCGetItems; TQDict<dccItem> DCCSendItems; TQDict<dccItem> DCCChatItems; diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index d16f798a..f295989b 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -75,7 +75,7 @@ #include "ksopts.h" #include <tqlistbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kcharsets.h> #include <kglobal.h> #include <tqpopupmenu.h> diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index 296e9049..ae3222bb 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -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, tqgeometry, etc. + { // no Session management -> care about docking, geometry, etc. - if( !opts.tqgeometry.isEmpty() ) - sc->setGeometry( opts.tqgeometry ); + if( !opts.geometry.isEmpty() ) + sc->setGeometry( opts.geometry ); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 2aa02e63..26dbc8c7 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -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 tqchildren, which deletes + // we are using mdi) , which deletes its children, 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 diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index c0d6a927..de03ab79 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -142,7 +142,7 @@ void KSOptions::load( int sections ) { KConfig *conf = kapp->config(); conf->setGroup( "ServerController" ); - tqgeometry = conf->readRectEntry( "Size" ); + geometry = 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::tqfromLatin1( "IRC-%1" ).tqarg( i ), + conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).arg( i ), &ircColors[i] ); nickHighlight[i] = - conf->readBoolEntry(TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), + conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), &nickHighlight[i] ); } } conf->setGroup( "GlobalOptions" ); TQFont df = kapp->font((TQWidget*)0); defaultFont = conf->readFontEntry( "MainFont", &df); - TQApplication::tqsetFont( defaultFont, true, "KSirc::TextView" ); + TQApplication::setFont( defaultFont, true, "KSirc::TextView" ); } if ( sections & Channels ) { @@ -268,7 +268,7 @@ void KSOptions::load( int sections ) channel["global"]["global"].encoding = conf->readEntry("globalglobalEncoding", "Default"); } - TQDateTime now(TQDateTime::tqcurrentDateTime()); + TQDateTime now(TQDateTime::currentDateTime()); TQStringList servers = conf->readListEntry("Servers"); TQStringList::ConstIterator ser = servers.begin(); for( ; ser != servers.end(); ser++){ @@ -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::tqfromLatin1( "IRC-%1" ).tqarg( i ), ircColors[i] ); - conf->writeEntry( TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), nickHighlight[i] ); + conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).arg( i ), ircColors[i] ); + conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), nickHighlight[i] ); } /* Store the font setting */ conf->setGroup( "GlobalOptions" ); @@ -500,10 +500,10 @@ void KSOptions::channelSetup(TQString serv, TQString chan) channel[serv].insert(chan, ksoc); channel[serv][chan].server = serv; channel[serv][chan].channel = chan; - channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime(); + channel[serv][chan].lastUsed = TQDateTime::currentDateTime(); } else { - channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime(); + channel[serv][chan].lastUsed = TQDateTime::currentDateTime(); } } @@ -530,10 +530,10 @@ void KSOptions::serverSetup(TQString serv) server.insert(serv, ksos); server[serv].server = serv; server[serv].globalCopy = true; - server[serv].lastUsed = TQDateTime::tqcurrentDateTime(); + server[serv].lastUsed = TQDateTime::currentDateTime(); } else { - server[serv].lastUsed = TQDateTime::tqcurrentDateTime(); + server[serv].lastUsed = TQDateTime::currentDateTime(); } } diff --git a/ksirc/ksopts.h b/ksirc/ksopts.h index 421370fb..9bd96192 100644 --- a/ksirc/ksopts.h +++ b/ksirc/ksopts.h @@ -99,7 +99,7 @@ class KSOStartup public: KSOStartup(); - TQRect tqgeometry; + TQRect geometry; // TQString nick; // TQString altNick; // TQString realName; diff --git a/ksirc/ksparser.cpp b/ksirc/ksparser.cpp index e2ebf903..100fc4c4 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\" " ).tqarg( c.name() ); + at += TQString( "color=\"%1\" " ).arg( c.name() ); } c = ircColor(bg); if ( c.isValid() ) { - at += TQString( "bgcolor=\"%1\" " ).tqarg( c.name() ); + at += TQString( "bgcolor=\"%1\" " ).arg( 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\"" ).tqarg( ksopts->nickForeground.name() ) ); + res += toggleTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->nickForeground.name() ) ); break; case 'o': - res += pushTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->msgContainNick.name() ) ); + res += pushTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->msgContainNick.name() ) ); break; case '#': - res += pushTag( "font", TQString( "color=\"#%1\"" ).tqarg( message.mid(i, 6) )); + res += pushTag( "font", TQString( "color=\"#%1\"" ).arg( message.mid(i, 6) )); i+=6; break; case '~': diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index bd43d82c..151a3be6 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -24,7 +24,7 @@ #include <tqvaluestack.h> #include <tqdragobject.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdict.h> #include <kcharsets.h> #include <kapplication.h> @@ -245,7 +245,7 @@ Item *TextChunk::breakLine( int width ) return 0; } -Item::LayoutResettqStatus TextChunk::resetLayout() +Item::LayoutResetStatus 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->setSelectiontqStatus( m_selection ); + chunk->setSelectionStatus( m_selection ); m_selection = NoSelection; } else if ( selEnd->offset >= m_text.len ) { selEnd->offset -= m_text.len; selEnd->item = chunk; - chunk->setSelectiontqStatus( SelectionEnd ); + chunk->setSelectionStatus( 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->setSelectiontqStatus( m_selection ); + chunk->setSelectionStatus( 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()->tqcolorGroup(); + const TQColorGroup &cg = m_parag->textView()->colorGroup(); if (m_props.bgSelColor.isValid()) p.fillRect( x, 0, width, height(), m_props.bgSelColor ); @@ -482,11 +482,11 @@ void TextChunk::mergeSelection( TextChunk *child, SelectionPoint *selection ) selection->item = this; - if ( ( m_selection == SelectionStart && child->selectiontqStatus() == SelectionEnd ) || - ( m_selection == SelectionEnd && child->selectiontqStatus() == SelectionStart ) ) + if ( ( m_selection == SelectionStart && child->selectionStatus() == SelectionEnd ) || + ( m_selection == SelectionEnd && child->selectionStatus() == SelectionStart ) ) m_selection = SelectionBoth; else - m_selection = child->selectiontqStatus(); + m_selection = child->selectionStatus(); } 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()->tqcolorGroup(); + const TQColorGroup &cg = m_parag->textView()->colorGroup(); painter.fillRect( 0, 0, width(), h, cg.highlight() ); } } @@ -520,7 +520,7 @@ void ImageItem::paint( TQPainter &painter ) painter.drawPixmap( 0, y, m_pixmap ); } -Item::LayoutResettqStatus ImageItem::resetLayout() +Item::LayoutResetStatus ImageItem::resetLayout() { // nothin' to do return KeepItem; @@ -645,7 +645,7 @@ bool Tokenizer::parseNextToken( Token &tok ) return false; tok.id = Token::Text; - tok.value = StringPtr( m_text.tqunicode() + idx, + tok.value = StringPtr( m_text.unicode() + 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.tqunicode(), + tok.value = StringPtr( m_text.unicode(), (*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.tqunicode() + lastIndex + 1; + const TQChar *tagStart = m_text.unicode() + 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.tqunicode() + lastIndex + 1, + tok.value = StringPtr( m_text.unicode() + 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.tqunicode(); + const TQChar *start = text.unicode(); 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.tqunicode(); + const TQChar *p = text.unicode(); 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.tqunicode(); + const uint ampersandPos = ampersand - text.unicode(); text[ ampersandPos ] = entityValue; text.remove( ampersandPos + 1, entityLength + 1 ); i = ampersandPos; - p = text.tqunicode() + i; - endP = text.tqunicode() + text.length(); + p = text.unicode() + i; + endP = text.unicode() + text.length(); ampersand = 0; uint adjustment = entityLength + 1; @@ -1081,7 +1081,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection { if ( i == start.item ) { - i->setSelectiontqStatus( Item::SelectionStart ); + i->setSelectionStatus( 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->setSelectiontqStatus( Item::SelectionEnd ); + i->setSelectionStatus( Item::SelectionEnd ); StringPtr txt = i->text(); if ( !txt.isNull() ) @@ -1098,7 +1098,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectiontqStatus( Item::InSelection ); + i->setSelectionStatus( Item::InSelection ); selectedText += i->text().toTQString(); } @@ -1111,7 +1111,7 @@ void TextLine::clearSelection() { Item *i = m_items.first(); for (; i; i = m_items.next() ) - i->setSelectiontqStatus( Item::NoSelection ); + i->setSelectionStatus( Item::NoSelection ); } void TextLine::appendItem( Item *i, int layoutUpdatePolicy ) @@ -1225,7 +1225,7 @@ TextParag::~TextParag() { } -void TextParag::tqlayout( int width ) +void TextParag::layout( int width ) { TQPtrList<Item> items; @@ -1658,7 +1658,7 @@ void TextView::viewportResizeEvent( TQResizeEvent *ev ) TQScrollView::viewportResizeEvent(ev); if ( ev->size().width() != ev->oldSize().width() ) - tqlayout(); + layout(); int newdiff = ev->size().height() - ev->oldSize().height(); setContentsPos( 0, contentsY()-newdiff ); @@ -1720,7 +1720,7 @@ void TextView::clear() stopAutoScroll(); clearSelection(); m_parags.clear(); - tqlayout(); + layout(); viewport()->erase(); } @@ -1728,7 +1728,7 @@ TextParagIterator TextView::appendParag( const TQString &richText ) { TextParag *parag = new TextParag( this, richText ); m_parags.append( parag ); - tqlayout( false ); + layout( false ); scrollToBottom(); TQPtrListIterator<TextParag> it( m_parags ); it.toLast(); @@ -1758,7 +1758,7 @@ bool TextView::removeParag( const TextParagIterator ¶g ) if(m_selectionEnd.item != 0) m_selectionEnd.pos.ry() -= height; - //tqlayout( false ); + //layout( false ); contentsChange(-height, true); @@ -1768,14 +1768,14 @@ bool TextView::removeParag( const TextParagIterator ¶g ) return true; } -void TextView::clearSelection( bool tqrepaint ) +void TextView::clearSelection( bool repaint ) { m_selectionStart = SelectionPoint(); m_selectionEnd = SelectionPoint(); m_selectionEndBeforeStart = false; m_selectedText = TQString(); clearSelectionInternal(); - if ( tqrepaint ) + if ( repaint ) updateContents(); } @@ -1814,7 +1814,7 @@ void TextView::setLinkColor( const TQColor &linkColor ) void TextView::copy() { - TQApplication::tqclipboard()->setText( m_selectedText ); + TQApplication::clipboard()->setText( m_selectedText ); } void TextView::clearSelectionInternal() @@ -1840,7 +1840,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev ) Item *itemUnderMouse = itemAt( ev->pos(), &p, Item::SelectFuzzy ); if ( p.item && ( ev->button() & Qt::LeftButton ) ) { m_selectionMaybeStart = p; - p.item->setSelectiontqStatus( Item::NoSelection ); + p.item->setSelectionStatus( Item::NoSelection ); } if ( TextChunk *text = dynamic_cast<TextChunk *>( itemUnderMouse ) ) { StringPtr href = text->props().attributes[ "href" ]; @@ -1953,7 +1953,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) m_selectionMaybeStart = SelectionPoint(); if ( (ev->button() & Qt::LeftButton) && !m_selectedText.isEmpty() ) - TQApplication::tqclipboard()->setText( m_selectedText, TQClipboard::Selection ); + TQApplication::clipboard()->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::tqclipboard()->text( TQClipboard::Selection ) ); + emit pasteReq( KApplication::clipboard()->text( TQClipboard::Selection ) ); return; } } @@ -1973,7 +1973,7 @@ void TextView::fontChange( const TQFont & ) for (; it.current(); ++it ) it.current()->fontChange( font() ); - tqlayout( true ); + layout( true ); } void TextView::startDrag() @@ -2103,11 +2103,11 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection { if ( start.pos.x() == end.pos.x() ) { - i->setSelectiontqStatus( Item::NoSelection ); + i->setSelectionStatus( Item::NoSelection ); return TQString(); } - i->setSelectiontqStatus( Item::SelectionBoth ); + i->setSelectionStatus( Item::SelectionBoth ); // ### ugly const TextChunk *t = dynamic_cast<TextChunk *>( i ); @@ -2119,7 +2119,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectiontqStatus( Item::SelectionBoth ); + i->setSelectionStatus( Item::SelectionBoth ); // ### ugly TextChunk *t = dynamic_cast<TextChunk *>( i ); @@ -2156,7 +2156,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection return selectedText; } -void TextView::tqlayout( bool force ) +void TextView::layout( bool force ) { int height = 0; int contentsWidth = visibleWidth(); @@ -2166,7 +2166,7 @@ void TextView::tqlayout( bool force ) for (; it.current(); ++it ) { if ( !it.current()->isLayouted() || force ) - it.current()->tqlayout( width ); + it.current()->layout( width ); height += it.current()->height(); contentsWidth = kMax( contentsWidth, it.current()->minWidth() ); @@ -2182,7 +2182,7 @@ void TextView::tqlayout( bool force ) void TextView::contentsChange(int heightChange, bool force) { if(m_height == -1){ - tqlayout(force); + layout(force); } else { m_height += heightChange; @@ -2248,7 +2248,7 @@ void TextParagIterator::setRichText( const TQString &richText ) m_paragIt.current()->setRichText( richText ); TextView *textView = m_paragIt.current()->textView(); - textView->tqlayout( false ); + textView->layout( false ); if ( textView->isUpdatesEnabled() ) textView->updateContents(); diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 6b3813a8..1c537e95 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -40,7 +40,7 @@ struct StringPtr StringPtr( const TQChar *_ptr, uint _len ) : ptr( _ptr ), len( _len ) {} explicit StringPtr( const TQString &s ) // use with care! - : ptr( s.tqunicode() ), len( s.length() ) {} + : ptr( s.unicode() ), len( s.length() ) {} inline bool isNull() const { return ptr == 0; } @@ -142,8 +142,8 @@ class SelectionPoint; class Item { public: - enum LayoutResettqStatus { DeleteItem, KeepItem }; - enum SelectiontqStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, + enum LayoutResetStatus { DeleteItem, KeepItem }; + enum SelectionStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, NoSelection }; enum SelectionAccuracy { SelectExact, SelectFuzzy }; @@ -163,13 +163,13 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResettqStatus resetLayout() = 0; + virtual LayoutResetStatus resetLayout() = 0; virtual int calcSelectionOffset( int x ); - void setSelectiontqStatus( SelectiontqStatus status ) { m_selection = status; } + void setSelectionStatus( SelectionStatus status ) { m_selection = status; } - SelectiontqStatus selectiontqStatus() const { return m_selection; } + SelectionStatus selectionStatus() const { return m_selection; } void selectionOffsets( int &startOffset, int &endOffset ); @@ -194,7 +194,7 @@ protected: virtual void calcExtends() const = 0; - SelectiontqStatus m_selection; + SelectionStatus m_selection; TextLine *m_line; TextParag *m_parag; ItemProperties m_props; @@ -211,7 +211,7 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResettqStatus resetLayout(); + virtual LayoutResetStatus resetLayout(); virtual int calcSelectionOffset( int x ); @@ -247,7 +247,7 @@ public: virtual void paint( TQPainter &painter ); - virtual LayoutResettqStatus resetLayout(); + virtual LayoutResetStatus resetLayout(); protected: virtual void calcExtends() const; @@ -354,7 +354,7 @@ public: ~TextParag(); - void tqlayout( int width ); + void layout( int width ); void paint( TQPainter &p, int y, int maxY ); @@ -482,7 +482,7 @@ public: bool removeParag( const TextParagIterator ¶g ); - void clearSelection( bool tqrepaint = false ); // ### re-consider the tqrepaint arg... + void clearSelection( bool repaint = false ); // ### re-consider the repaint arg... TQString selectedText() const { return m_selectedText; } @@ -537,7 +537,7 @@ private: SelectionPoint *selectionStart(); SelectionPoint *selectionEnd(); - void tqlayout( bool force = true ); + void layout( 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 fd5133ac..ded2f45c 100644 --- a/ksirc/kstextviewtest.cpp +++ b/ksirc/kstextviewtest.cpp @@ -16,8 +16,8 @@ public: m_lines++; if ( m_lines > 15 ) m_view->removeParag( m_view->firstParag() ); - 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->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->setContentsPos( 0, m_view->contentsHeight() ); } private: @@ -33,17 +33,17 @@ int main( int argc, char **argv ) app.setMainWidget( &view ); view.show(); - 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" ) ); + 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" ) ); Timer t( &view ); return app.exec(); diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 4fb90d9b..fec60844 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -18,12 +18,12 @@ // $Id$ -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdatetime.h> #include <tqregexp.h> #include <tqdragobject.h> #include <tqvaluestack.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kapplication.h> #include <kdebug.h> @@ -73,10 +73,10 @@ void KSircView::clear() TQString KSircView::makeTimeStamp() { TQTime now = TQTime::currentTime(); - 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' ) ); + 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' ) ); return timeStamp; } @@ -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.tqarg( color.name() ); + richText = richText.arg( color.name() ); if ( !pixmap.isEmpty() ) - richText.prepend( TQString::tqfromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); + richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).arg( pixmap ) ); - TQString timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) - .tqarg( ksopts->textColor.name() ) - .tqarg( makeTimeStamp() ); + TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) + .arg( ksopts->textColor.name() ) + .arg( makeTimeStamp() ); m_timeStamps.append(timeStamp); if ( m_timestamps ) richText.prepend( timeStamp ); @@ -131,11 +131,11 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const // '<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::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::fromLatin1( "<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\">").tqarg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").arg(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\">").tqarg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").arg(col.name())); newText.append("</font>"); if(ksopts->ownNickBold){ newText.prepend("<b>"); @@ -199,7 +199,7 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const } if (parser.beeped()) { - KNotifyClient::event(winId(), TQString::tqfromLatin1("BeepReceived"), + KNotifyClient::event(winId(), TQString::fromLatin1("BeepReceived"), i18n("Beep Received")); } @@ -224,9 +224,9 @@ void KSircView::addRichText(const TQString &_text) timeStamp = re.cap(1); } else { - timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) - .tqarg( ksopts->textColor.name() ) - .tqarg( makeTimeStamp() ); + timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) + .arg( ksopts->textColor.name() ) + .arg( makeTimeStamp() ); if ( m_timestamps ) text.prepend( timeStamp ); } @@ -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::tqfromLatin1("http://") + url : url)); + (void) new KRun( KURL( url.startsWith("www") ? TQString::fromLatin1("http://") + url : url)); } void KSircView::copyLinkToClipboard( const TQString &url ) { - TQApplication::tqclipboard()->setText( url, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( url, TQClipboard::Clipboard ); } TQColor KSircView::ircColor(int code) diff --git a/ksirc/logfile.cpp b/ksirc/logfile.cpp index e65be271..2246cd30 100644 --- a/ksirc/logfile.cpp +++ b/ksirc/logfile.cpp @@ -39,16 +39,16 @@ void LogFile::open() assert( m_file->isOpen() == true ); - log( TQString::tqfromLatin1( "### Log session started at " ) - + TQDateTime::tqcurrentDateTime().toString() - + TQString::tqfromLatin1( "###\n" ) ); + log( TQString::fromLatin1( "### Log session started at " ) + + TQDateTime::currentDateTime().toString() + + TQString::fromLatin1( "###\n" ) ); } void LogFile::closeLog() { - log( TQString::tqfromLatin1( "### Log session terminated at " ) - + TQDateTime::tqcurrentDateTime().toString() - + TQString::tqfromLatin1( "###\n" ) ); + log( TQString::fromLatin1( "### Log session terminated at " ) + + TQDateTime::currentDateTime().toString() + + TQString::fromLatin1( "###\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::tqcurrentDate(); + TQDate dt = TQDate::currentDate(); TQString dateStr; dateStr.sprintf( "%.4d_%.2d_%.2d_", dt.year(), dt.month(), dt.day() ); res += dateStr; diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp index e60d82e3..26fb0d6a 100644 --- a/ksirc/messageReceiver.cpp +++ b/ksirc/messageReceiver.cpp @@ -1,6 +1,6 @@ #include "messageReceiver.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include <kcharsets.h> #include <kglobal.h> #include <kdebug.h> diff --git a/ksirc/nickColourMaker.cpp b/ksirc/nickColourMaker.cpp index c5a3b972..ce866349 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].tqunicode(); + c = nick[i].unicode(); switch(c){ case '|': case '-': diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index c5283dbd..bb4fe5dc 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -67,7 +67,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ delete qobl; ++it; } - TQWidgetList *all = TQApplication::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ if(len == strlen(itW.current()->name()) && @@ -93,7 +93,7 @@ void objFinder::dumpTree(){ it.current()->dumpObjectTree(); ++it; } - TQWidgetList *all = TQApplication::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); 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::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ TQString name; diff --git a/ksirc/openksircproc.dlg b/ksirc/openksircproc.dlg index 080199d9..1378f569 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} - LayouttqStatus {NoLayout} + LayoutStatus {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 ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -56,7 +56,7 @@ PushButton { Rect {10 50 180 30} Name {PushButton_2} Signal {[Protected] clicked --> terminate ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ ComboBox { Rect {70 10 320 30} Name {ComboBox_1} Variable {nameSLE} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index 600f2111..c6bf8136 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 tqlayout: +is done via a variable length message with the following layout: =begin text @@ -68,17 +68,17 @@ supporting perl5-oop object. 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 tqlayout. The widget structure the author is +allowing for a nice oop layout. 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 tqlayout. Man pages list +Qt widget, I recommend using their existing layout. Man pages list what widgets inherit what. -The general idea behind the widget tqlayout should be to be to provide +The general idea behind the widget layout 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 tqchildren's overriden +everywhere, it's a good bet you want your children's overriden functions called, not yours) The structure internally will have to hold a local copy of the widget, diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h index 2baa316e..ead9fb07 100644 --- a/ksirc/puke/commands.h +++ b/ksirc/puke/commands.h @@ -130,38 +130,38 @@ // cArg: not define #define PUKE_WIDGET_HIDE_ACK -1003 -// Desc: tqrepaint widget -// iWinId: widget to tqrepaint +// Desc: repaint widget +// iWinId: widget to repaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_REPAINT 1005 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_REPAINT_ACK -1005 // Desc: update widget on next event loop -// iWinId: widget to tqrepaint +// iWinId: widget to repaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_UPDATE 1010 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_UPDATE_ACK -1010 // Desc: resize the widget -// iWinId: widget to tqrepaint +// iWinId: widget to repaint // iArg: width in the low 16 bit, height in next 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE 1015 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: new widget in lower 16 bit, new height in lower 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE_ACK -1015 @@ -766,13 +766,13 @@ // Desc: Set label's allignment // iWinId: window id -// iArg: tqalignment +// iArg: alignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT 1715 // Desc: Set label's allignment, ACK // iWinId: window id -// iArg: tqalignment +// iArg: alignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT_ACK -1715 @@ -993,14 +993,14 @@ #define PWIDGET_OBJFINDER 18 -// Group tqlayout commands exist between 10000 and 11000 +// Group layout commands exist between 10000 and 11000 -// Desc: create new box tqlayout +// Desc: create new box layout // iWinId: PWidget parent // iArg: 2 shorts, short[0] direction, short[1] border // cArg: random character string #define PUKE_LAYOUT_NEW 11000 -// Desc: ack for box tqlayout +// Desc: ack for box layout // 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 tqlayout manager +// Desc: add widget into layout manager // iWinId: Layout Manager to add widget too // iArg: Widget Id to be added -// cArg: 2 characters, char[0] strech, char[1] tqalignment +// cArg: 2 characters, char[0] strech, char[1] alignment #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 tqlayout management, like show() for widget +// Desc: activates layout 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 20c020c7..a790436d 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -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 "ptqlayout.h" +#include "playout.h" #include "plined.h" #include "plistbox.h" #include "pmenudta.h" @@ -173,7 +173,7 @@ void PukeController::NewConnect(int) fcntl(cfd, F_SETFL, O_NONBLOCK); // Set it non-block so that // cfd() never blocks. - fdtqStatus *fds = new fdtqStatus(); + fdStatus *fds = new fdStatus(); fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this); fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this); connect(fds->sr, TQT_SIGNAL(activated(int)), @@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { return; } - TQString libName = "ksirc/lib"+TQString::tqfromLatin1(pm->cArg); + TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg); if (libName.right(3) == ".so") libName = libName.left(libName.length()-2)+"la"; diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h index 92c8be98..c2a086f7 100644 --- a/ksirc/puke/controller.h +++ b/ksirc/puke/controller.h @@ -27,7 +27,7 @@ typedef struct { TQString server; bool writeable; TQSocketNotifier *sr,*sw; -} fdtqStatus; +} fdStatus; struct commandStruct { @@ -137,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<fdtqStatus> qidConnectFd; + TQIntDict<fdStatus> qidConnectFd; /** * Controller ID is defined as 1 diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm index 799c8cf5..65bc1b07 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 pboxtqlayout.pm"); +&docommand("/load pboxlayout.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 DCCtqStatus; +package DCCStatus; use vars qw(@ISA); @ISA = qw(PFrame); @@ -330,7 +330,7 @@ sub hook_ksirc_dcc_request { my($size) = shift; my($mwho) = $who; if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $KSIRC_DCCSTATUS->resize(400, 275); } @@ -473,13 +473,13 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect"); &print("*I* Done DCC Status"); -#$::test = new DCCtqStatus; +#$::test = new DCCStatus; #$::test->resize(400, 275); #$::test->show(); sub popup_dccstatus{ if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $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 DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $KSIRC_DCCSTATUS->resize(400, 275); } $KSIRC_DCCSTATUS->sendClicked(); diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm index 048eb9eb..26594c0f 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 pboxtqlayout.pm"); +&docommand("/load pboxlayout.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 05124441..9f43b124 100644 --- a/ksirc/puke/palistbox.cpp +++ b/ksirc/puke/palistbox.cpp @@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm) widget()->removeItem(index); item->setVoice(pm->iArg); widget()->inSort(item); - widget()->tqrepaint(TRUE); + widget()->repaint(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()->tqrepaint(TRUE); + widget()->repaint(TRUE); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm index 9896fd1c..505ddc0d 100644 --- a/ksirc/puke/pboxlayout.pm +++ b/ksirc/puke/pboxlayout.pm @@ -40,7 +40,7 @@ sub new { #} # else{ if(ref($widget) ne ''){ - # print "*\cbI\cb* Generic Non-topleve tqlayout type\n"; + # print "*\cbI\cb* Generic Non-topleve layout 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 tqlayout\n"; + print "*E* Burp: Can't add widget without first being added to parent layout\n"; return; } @@ -128,41 +128,41 @@ sub addLayout { my $self = shift; if($self->{Added} == 0){ - print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n"; + print "*E* Burp: Can't add layout without first being added to parent layout\n"; } - my $tqlayout = shift; - if(ref($tqlayout) ne 'PBoxLayout'){ - print "*E* Passed non tqlayout type to addLayout\n"; + my $layout = shift; + if(ref($layout) ne 'PBoxLayout'){ + print "*E* Passed non layout type to addLayout\n"; return 1; } - if($tqlayout->{iWinId} <= 0){ - print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n"; + if($layout->{iWinId} <= 0){ + print "*E* Trying to add invalid layout " . ref($layout) . "\n"; return; } # make sure we can run, and the widget we want to add can run. - # my @ARG = ($tqlayout); + # my @ARG = ($layout); #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; - #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; + #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return; my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT, 'iWinId' => $self->{iWinId}, - 'iArg' => $tqlayout->{iWinId}, + 'iArg' => $layout->{iWinId}, 'cArg' => pack("C", 0), 'CallBack' => sub { }, 'WaitFor' => 1); - # print "*I* Adding tqlayout\n"; + # print "*I* Adding layout\n"; if($REPLY{'iArg'} != 0){ print "*E* AddLayout call failed\n"; } else{ - # print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n"; - $tqlayout->{Added} = 1; + # print "*I* Added new Layout for " . $layout->{iWinId} . "\n"; + $layout->{Added} = 1; } } diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm index 2ef36ebc..f851cdb8 100644 --- a/ksirc/puke/pframe.pm +++ b/ksirc/puke/pframe.pm @@ -44,13 +44,13 @@ sub setFrameStyle { my $self = shift; my $frame = shift; - my $tqrepaint = shift; + my $repaint = shift; $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME, 'iArg' => $frame, 'CallBack' => sub {}); - $self->tqrepaint(1) if($tqrepaint == 1); + $self->repaint(1) if($repaint == 1); } diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp index 41a68636..7567ac08 100644 --- a/ksirc/puke/plabel.cpp +++ b/ksirc/puke/plabel.cpp @@ -83,7 +83,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm) if(!checkWidget()) return; - widget()->tqsetAlignment(pm->iArg); + widget()->setAlignment(pm->iArg); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/plabel.pm b/ksirc/puke/plabel.pm index efdcf490..bc557b5e 100644 --- a/ksirc/puke/plabel.pm +++ b/ksirc/puke/plabel.pm @@ -83,7 +83,7 @@ sub text { -sub tqsetAlignment { +sub setAlignment { my $self = shift; my $align = shift; diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp index 3dbe5c87..9bcdfa2a 100644 --- a/ksirc/puke/playout.cpp +++ b/ksirc/puke/playout.cpp @@ -1,7 +1,7 @@ #include <stdio.h> -#include "ptqlayout.h" +#include "playout.h" #include "commands.h" PLayout::PLayout(TQObject *pobject) @@ -16,7 +16,7 @@ PLayout::~PLayout() // kdDebug(5008) << "PObject: in destructor" << endl; /* delete widget(); - tqlayout = 0; + layout = 0; setWidget(); */ } @@ -34,12 +34,12 @@ PObject *PLayout::createWidget(CreateArgs &ca) if((ca.parent != 0) && (ca.parent->widget()->isWidgetType() == TRUE)){ qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl; + // kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl; } else{ qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border); - // kdDebug(5008) << "Creating tqlayout NO PARENT" << endl; + // kdDebug(5008) << "Creating layout NO PARENT" << endl; } pw->setWidget(qbl); pw->setWidgetId(ca.pwI); @@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout) return; } - tqlayout = (TQBoxLayout *) _layout; + layout = (TQBoxLayout *) _layout; PObject::setWidget(_layout); } TQBoxLayout *PLayout::widget() { - return tqlayout; + return layout; } -#include "ptqlayout.moc" +#include "playout.moc" diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h index 4124cb14..439a87a2 100644 --- a/ksirc/puke/playout.h +++ b/ksirc/puke/playout.h @@ -4,7 +4,7 @@ class PLayout; #include <tqobject.h> -#include <tqlayout.h> +#include <layout.h> #include "pmessage.h" #include "pobject.h" @@ -36,7 +36,7 @@ public: private: - TQBoxLayout *tqlayout; + TQBoxLayout *layout; }; diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index ab729315..9e46e042 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -131,7 +131,7 @@ void PObject::manTerm() { void PObject::errorInvalidSet(TQObject *_w) { - m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className()); + m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className()); m_hasError = true; } #include "pobject.moc" diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index cf3ac667..b62f64c1 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) emit outputMessage(fd, &pmRet); break; case PUKE_WIDGET_REPAINT: - widget()->tqrepaint(pm->iArg); + widget()->repaint(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()->tqcolorGroup().foreground(), + TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(), bg, - widget()->tqcolorGroup().light(), - widget()->tqcolorGroup().dark(), - widget()->tqcolorGroup().mid(), - widget()->tqcolorGroup().text(), + widget()->colorGroup().light(), + widget()->colorGroup().dark(), + widget()->colorGroup().mid(), + widget()->colorGroup().text(), bg); widget()->setPalette(TQPalette(cg,cg,cg)); diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm index 56381db6..5a73d393 100644 --- a/ksirc/puke/pwidget.pm +++ b/ksirc/puke/pwidget.pm @@ -61,7 +61,7 @@ sub hide { $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE); } -sub tqrepaint { +sub repaint { my $self = shift; my $erase = shift; # 1 for erase and reapint diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl index fdeae902..7e7b251d 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 pboxtqlayout.pm"); +&docommand("/load pboxlayout.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 369a2dc9..4b4c3169 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 pboxtqlayout.pm"); +&docommand("/load pboxlayout.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 d73fa513..a0b2a56a 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 pboxtqlayout.pm"); +&docommand("/load pboxlayout.pm"); &docommand("/load plabel.pm"); &docommand("/load pmenudta.pm"); &docommand("/load ppopmenu.pm"); diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 9ad1b913..73d32daf 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -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").tqarg(kss.server()).tqarg(id++); + server_id = TQString("%1 %2").arg(kss.server()).arg(id++); } // Insert new base @@ -386,7 +386,7 @@ void servercontroller::font_update(const TQFont &font) KConfig *kConfig = kapp->config(); kConfig->setGroup("GlobalOptions"); kConfig->sync(); - TQApplication::tqsetFont( font, true, "KSirc::TextView" ); + TQApplication::setFont( font, true, "KSirc::TextView" ); } void servercontroller::configChange() @@ -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").tqarg(args).tqarg(server), dockWidget); + KPassivePopup::message(i18n("%1 just went offline on %2").arg(args).arg(server), dockWidget); } dockWidget->nickOffline(server, args); break; @@ -457,7 +457,7 @@ 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").tqarg(args).tqarg(server), dockWidget); + KPassivePopup::message(i18n("%1 just came online on %2").arg(args).arg(server), dockWidget); dockWidget->nickOnline(server, args); break; } @@ -615,7 +615,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc) ksc->setGroup("ServerController"); // ksc->writeEntry("Docked", !isVisible()); - ksc->writeEntry("Size", tqgeometry()); + ksc->writeEntry("Size", geometry()); ksc->setGroup(group); } @@ -718,7 +718,7 @@ void servercontroller::showEvent( TQShowEvent *e ) { TQWidget::showEvent( e ); if ( !e->spontaneous() ) - saveDockingtqStatus(); + saveDockingStatus(); } void servercontroller::hideEvent( TQHideEvent * ) @@ -726,7 +726,7 @@ void servercontroller::hideEvent( TQHideEvent * ) /* TQWidget::hideEvent( e ); if ( !e->spontaneous() ) - saveDockingtqStatus(); + saveDockingStatus(); if(TQWidget::isMinimized()){ hide(); KWin::setState(winId(), NET::SkipTaskbar); @@ -734,7 +734,7 @@ void servercontroller::hideEvent( TQHideEvent * ) */ } -void servercontroller::saveDockingtqStatus() +void servercontroller::saveDockingStatus() { if ( we_are_exiting ) // we are hidden by closeEvent return; diff --git a/ksirc/servercontroller.dlg b/ksirc/servercontroller.dlg index 208d4508..7e515bdc 100644 --- a/ksirc/servercontroller.dlg +++ b/ksirc/servercontroller.dlg @@ -25,7 +25,7 @@ User { Rect {0 0 410 30} Name {User_2} Variable {MenuBar} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 891ececd..781627b3 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -206,7 +206,7 @@ protected: virtual void showEvent( TQShowEvent *e ); virtual void hideEvent( TQHideEvent *e ); virtual void closeEvent( TQCloseEvent * ); - void saveDockingtqStatus(); + void saveDockingStatus(); void saveGlobalProperties(KConfig *); void readGlobalProperties(KConfig *); diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index 563fc7eb..15349f44 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -31,7 +31,7 @@ ssfepromptdata::ssfepromptdata prompt->setMinimumSize( 10, 10 ); prompt->setMaximumSize( 32767, 32767 ); prompt->setText( "" ); - prompt->tqsetAlignment( 289 ); + prompt->setAlignment( 289 ); prompt->setMargin( -1 ); SLine = new TQLineEdit( this, "LineEdit_1" ); diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index a470c3c7..bcaa4408 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -11,8 +11,8 @@ #include <tqapplication.h> #include <tqtimer.h> #include <tqregexp.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqtooltip.h> #include <kapplication.h> @@ -34,13 +34,13 @@ KSircTopic::KSircTopic( TQWidget *parent, const char *name ) m_editor = 0; m_doEdit = false; m_height = 0; -// setBackgroundColor( tqcolorGroup().light() ); +// setBackgroundColor( colorGroup().light() ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setTextFormat( RichText ); setWordWrap(TQTextEdit::NoWrap); doResize(); -// tqsetAlignment( tqalignment() | WordBreak ); +// setAlignment( alignment() | WordBreak ); } void KSircTopic::setText( const TQString &_text) @@ -49,7 +49,7 @@ void KSircTopic::setText( const TQString &_text) TQString text = _text; TQString richText( "<font color=\"%1\">" ); - richText = richText.tqarg( ksopts->textColor.name() ); + richText = richText.arg( ksopts->textColor.name() ); text.replace('&', "&"); text.replace('<', "<"); @@ -65,11 +65,11 @@ void KSircTopic::setText( const TQString &_text) // '<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::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::fromLatin1( "<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( tqgeometry() ); + m_editor->setGeometry( geometry() ); m_editor->setFocus(); m_editor->show(); @@ -211,7 +211,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) // menu if ( fe->reason() == TQFocusEvent::Popup ) { - TQWidget *focusw = tqApp->tqfocusWidget(); + TQWidget *focusw = tqApp->focusWidget(); if ( focusw && m_popup && focusw == m_popup ) return; } diff --git a/ksirc/topic.h b/ksirc/topic.h index ccd59a8a..c5570b67 100644 --- a/ksirc/topic.h +++ b/ksirc/topic.h @@ -8,7 +8,7 @@ #define __topic_h__ #include <kactivelabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqpopupmenu.h> #include <tqguardedptr.h> diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index fa53cded..f68a9cc5 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -50,12 +50,12 @@ #include <stdlib.h> #include <tqaccel.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqregexp.h> #include <tqcursor.h> #include <tqtimer.h> -#include <tqlayout.h> -#include <tqtextcodec.h> +#include <layout.h> +#include <textcodec.h> #include <tqvbox.h> #include <tqlabel.h> @@ -85,7 +85,7 @@ TQStringList KSircTopLevel::cmd_menu; void KSircTopLevel::initColors() { - TQColorGroup cg_mainw = kapp->tqpalette().active(); + TQColorGroup cg_mainw = kapp->palette().active(); cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor); cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor); cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor); @@ -216,7 +216,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->setAccel(Key_F, KST_CHANNEL_ID); /* - * Ok, let's look at the basic widget "tqlayout" + * Ok, let's look at the basic widget "layout" * Everything belongs to q TQFrame F, this is use so we * can give the KApplication a single main client widget, which is needs. * @@ -258,7 +258,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf lag = new TQLabel(nicks_box); lag->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - lag->tqsetAlignment(TQt::AlignCenter | TQt::SingleLine); + lag->setAlignment(TQt::AlignCenter | TQt::SingleLine); lag->setText(i18n("Lag: Wait")); @@ -587,9 +587,9 @@ void KSircTopLevel::setMode(TQString mode, int mode_type, TQString currentNick) { TQString command; if (mode_type == 0) - command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").arg(m_channelInfo.channel()).arg(mode); else - command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").arg(currentNick).arg(mode); sirc_write(command); linee->setFocus(); } @@ -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 tqinvalidate iterators (Simon) + // which would invalidate iterators (Simon) while ( LineBuffer.begin() != LineBuffer.end() ) { TQString plainText(""); @@ -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 ").tqarg(*it); + values += TQString("%1 ").arg(*it); ++it; } } @@ -974,7 +974,7 @@ void KSircTopLevel::sirc_write(const TQString &str) return; } else if ( plain.startsWith( "/away" ) ) { - TQString awayEvalCommand = TQString::tqfromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' ); + TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).arg( 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::tqfromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); + command.prepend(TQString::fromLatin1("/msg %1 ").arg(m_channelInfo.channel())); } else if(plain.startsWith("/me ")) { command.remove(0, 3); @@ -1104,7 +1104,7 @@ void KSircTopLevel::returnPressed() uint i; TQChar c; for(i = 0; (c = s[i]); i++){ - switch(c.tqunicode()){ + switch(c.unicode()){ case 0336: s[i] = 002; break; @@ -1147,15 +1147,15 @@ void KSircTopLevel::UserParseMenu(int id) return; TQString s; - s = TQString("/eval $dest_nick='%1';\n").tqarg(nicks->text(nicks->currentItem())); + s = TQString("/eval $dest_nick='%1';\n").arg(nicks->text(nicks->currentItem())); sirc_write(s); // set $$dest_chan variable - s = TQString("/eval $dest_chan='%1';\n").tqarg(m_channelInfo.channel()); + s = TQString("/eval $dest_chan='%1';\n").arg(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").tqarg(action); + s = TQString("/eval &docommand(eval{\"%1\"});\n").arg(action); s.replace(TQRegExp("\\$\\$"), "$"); sirc_write(s); } @@ -1233,7 +1233,7 @@ void KSircTopLevel::gotFocus() if(isVisible() == TRUE){ if(have_focus == 0){ if(m_channelInfo.channel()[0] != '!' ){ - TQString str = TQString("/join %1").tqarg(m_channelInfo.channel()); + TQString str = TQString("/join %1").arg(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").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel())); + servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel())); } } @@ -1293,14 +1293,14 @@ void KSircTopLevel::control_message(int command, TQString str) emit currentWindow(this); if(m_channelInfo.channel()[0] == '#' || m_channelInfo.channel()[0] == '&'){ - TQString str = TQString("/join %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(m_channelInfo.key()); + TQString str = TQString("/join %1 %2\n").arg(m_channelInfo.channel()).arg(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").tqarg(m_channelInfo.channel())); + emit outputUnicodeLine(TQString("/eval $query='%1'\n").arg(m_channelInfo.channel())); } bool isPrivate = isPrivateChat(); @@ -1327,13 +1327,13 @@ void KSircTopLevel::control_message(int command, TQString str) // nicks->show(); // lag->show(); } - if(tqlayout()) { - //kdDebug(5008) << "Redoeing tqlayout" << endl; - tqlayout()->tqinvalidate(); - tqlayout()->activate(); + if(layout()) { + //kdDebug(5008) << "Redoeing layout" << endl; + layout()->invalidate(); + layout()->activate(); } else { - //kdDebug(5008) << "No tqlayout" << endl; + //kdDebug(5008) << "No layout" << endl; } pan->refresh(); @@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick) void KSircTopLevel::pasteToWindow() { // Ctrl-V - //kdDebug(5008) << "Going to paste: " << KApplication::tqclipboard()->text( TQClipboard::Clipboard ) << endl; - slotTextDropped(KApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( TQClipboard::Clipboard ) << endl; + slotTextDropped(KApplication::clipboard()->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::tqclipboard()->text( TQClipboard::Selection ), + KApplication::clipboard()->text( TQClipboard::Selection ), true ); TQStringList::ConstIterator it = lines.begin(); TQStringList::ConstIterator end = lines.end(); @@ -1574,7 +1574,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) 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?").tqarg(approx_lines), + i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").arg(approx_lines), TQString(), i18n("Send")); if (result != KMessageBox::Continue) { @@ -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.tqarg( file )); + sirc_write(s.arg( file )); } } @@ -1727,7 +1727,7 @@ void KSircTopLevel::outputUnicodeLine( const TQString &message ) void KSircTopLevel::setTopicIntern( const TQString &topic ) { - TQString command = TQString::tqfromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); + TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).arg( m_channelInfo.channel() ).arg( topic ); sirc_write( command ); linee->setFocus(); } @@ -1739,15 +1739,15 @@ void KSircTopLevel::doChange(bool pers, TQString text) // beep only every 2 seconds otherwise it'll get very noisy in the room ;) if ( TQABS( lastBeep.secsTo( ctime ) ) > 1 ) { if ( pers ) { - int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::tqfromLatin1("ChannelPersonal"), - i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel())); + TQString::fromLatin1("ChannelPersonal"), + i18n("Your nick appeared on channel %1").arg(m_channelInfo.channel())); } else { - int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::tqfromLatin1("ChannelChanged"), - i18n("Channel %1 changed").tqarg(m_channelInfo.channel())); + TQString::fromLatin1("ChannelChanged"), + i18n("Channel %1 changed").arg(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").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel()), text); + servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()), text); } } diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index ba1a25bc..47da2064 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -454,7 +454,7 @@ private: */ TQPoint mypoint; /** - * Ticker's size and tqgeometry + * Ticker's size and geometry */ TQRect tickerrect; /** |