diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:51 -0600 |
| commit | 089118c18533dfa3e6ce5065dbebdd4db94051f1 (patch) | |
| tree | ce014fb2326a80fcfafa2362b7ff88486aa17c96 /ksirc | |
| parent | 83677e35509b4dafac63b76995652bdf3b49f209 (diff) | |
| download | tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.tar.gz tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'ksirc')
54 files changed, 288 insertions, 288 deletions
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..b3dcc2da 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -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/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index 9c14536f..a44d9b2e 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> @@ -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> @@ -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> @@ -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..627c6ce4 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -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_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index e5811a1a..2c31912f 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> @@ -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..a691708f 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> @@ -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..b4234c4b 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> @@ -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_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/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..f0a6a931 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -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..5477cf5a 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -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,7 +131,7 @@ void aHistLineEdit::slotMaybeResize() s.setHeight(h); resize(s); setFixedHeight( h ); - TQLayout *l = tqtopLevelWidget()->tqlayout(); + TQLayout *l = topLevelWidget()->tqlayout(); if(l){ l->tqinvalidate(); l->activate(); 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..b79ba1e2 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -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); } @@ -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/chanparser.cpp b/ksirc/chanparser.cpp index b2bdc93c..a297dc95 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)); @@ -123,7 +123,7 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) 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()->tqrepaint( top->nicks->itemRect( nickItem ), false ); } nickItem->forceColour(&ksopts->ownNickColor); } 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/colorpicker.cpp b/ksirc/colorpicker.cpp index be5fca73..5c88ccac 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -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..47763faa 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,7 +34,7 @@ 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 @@ -43,7 +43,7 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con } -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,7 +54,7 @@ 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_PER, ""); @@ -65,7 +65,7 @@ dccItem::~dccItem() { } -TQString dccItem::enumTotqStatus(enum dcctqStatus status) +TQString dccItem::enumToStatus(enum dccStatus status) { TQString str; switch(status){ @@ -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); } @@ -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..c475f05c 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> 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/dccNewbase.ui b/ksirc/dccNewbase.ui index 661ed5f5..fce40055 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> 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..dc9a96d6 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,7 +316,7 @@ 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 } @@ -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/ioDCC.cpp b/ksirc/ioDCC.cpp index 7f601ace..52c5dc9a 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -204,7 +204,7 @@ 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; @@ -218,7 +218,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) 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,7 +229,7 @@ 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; @@ -240,7 +240,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) 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 { @@ -258,7 +258,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) 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); } } } @@ -269,7 +269,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ - DCCSendItems[key]->changetqStatus(dccItem::dccResumed); + DCCSendItems[key]->changeStatus(dccItem::dccResumed); } } } @@ -280,7 +280,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccRecving); + DCCGetItems[key]->changeStatus(dccItem::dccRecving); } } } @@ -293,7 +293,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString key = TQString("%1/%2").tqarg(filename).tqarg(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())); } } @@ -327,7 +327,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString error = rx.cap(3); TQString key = TQString("%1/%2").tqarg(filename).tqarg(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()); } @@ -338,7 +338,7 @@ 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()); } @@ -362,7 +362,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccCancel); + DCCGetItems[key]->changeStatus(dccItem::dccCancel); } } } @@ -373,7 +373,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // TQString filename = rx.cap(2); // TQString key = TQString("%1/%2").tqarg(filename).tqarg(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); } } } @@ -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; 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/ksopts.cpp b/ksirc/ksopts.cpp index c0d6a927..b62579db 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -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" ).tqarg( i ), &ircColors[i] ); nickHighlight[i] = - conf->readBoolEntry(TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), + conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).tqarg( 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" ).tqarg( i ), ircColors[i] ); + conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).tqarg( 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/kstextview.cpp b/ksirc/kstextview.cpp index bd43d82c..ff198c02 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -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; @@ -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 ) @@ -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" ]; @@ -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 ); diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 6b3813a8..4499f370 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -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; 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..62a4bca4 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -73,7 +73,7 @@ void KSircView::clear() TQString KSircView::makeTimeStamp() { TQTime now = TQTime::currentTime(); - TQString timeStamp = TQString::tqfromLatin1( "[%1:%2:%3] " ) + TQString timeStamp = TQString::fromLatin1( "[%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' ) ); @@ -112,9 +112,9 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const richText = richText.tqarg( color.name() ); if ( !pixmap.isEmpty() ) - richText.prepend( TQString::tqfromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); + richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); - TQString timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) .tqarg( ksopts->textColor.name() ) .tqarg( makeTimeStamp() ); m_timeStamps.append(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); @@ -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,7 +224,7 @@ void KSircView::addRichText(const TQString &_text) timeStamp = re.cap(1); } else { - timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) .tqarg( ksopts->textColor.name() ) .tqarg( makeTimeStamp() ); if ( m_timestamps ) @@ -303,7 +303,7 @@ 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 ) 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/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/controller.cpp b/ksirc/puke/controller.cpp index 20c020c7..5a646973 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -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..410437e7 100644 --- a/ksirc/puke/dcc_status.pm +++ b/ksirc/puke/dcc_status.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/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/pwidget.cpp b/ksirc/puke/pwidget.cpp index cf3ac667..af041c19 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -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/servercontroller.cpp b/ksirc/servercontroller.cpp index 9ad1b913..4ae34f1e 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -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() @@ -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..91754dd8 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -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( tqalignment() | WordBreak ); } void KSircTopic::setText( const TQString &_text) @@ -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 ); @@ -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/toplevel.cpp b/ksirc/toplevel.cpp index fa53cded..44bca8a3 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -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").tqarg(m_channelInfo.channel()).tqarg(mode); else - command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); sirc_write(command); linee->setFocus(); } @@ -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" ).tqarg( ksopts->publicAway ? '1' : '0' ); emit outputUnicodeLine( awayEvalCommand ); } @@ -985,7 +985,7 @@ void KSircTopLevel::sirc_write(const TQString &str) if(!isSpecialWindow()) { // channel or private chat if(plain[0].latin1() != '/'){ - command.prepend(TQString::tqfromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); + command.prepend(TQString::fromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); } else if(plain.startsWith("/me ")) { command.remove(0, 3); @@ -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" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); sirc_write( command ); linee->setFocus(); } @@ -1739,14 +1739,14 @@ 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"), + TQString::fromLatin1("ChannelPersonal"), i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel())); } else { - int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::tqfromLatin1("ChannelChanged"), + TQString::fromLatin1("ChannelChanged"), i18n("Channel %1 changed").tqarg(m_channelInfo.channel())); } lastBeep = ctime; |