Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
089118c185
100 changed files with 755 additions and 755 deletions
  1. 5
    5
      dcoprss/cache.cpp
  2. 7
    7
      dcoprss/document.cpp
  3. 1
    1
      dcoprss/query.cpp
  4. 1
    1
      dcoprss/service.h
  5. 2
    2
      filesharing/advanced/kcm_sambaconf/expertuserdlg.ui
  6. 3
    3
      filesharing/advanced/kcm_sambaconf/filemodedlg.ui
  7. 2
    2
      filesharing/advanced/kcm_sambaconf/groupselectdlg.ui
  8. 2
    2
      filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
  9. 60
    60
      filesharing/advanced/kcm_sambaconf/kcminterface.ui
  10. 8
    8
      filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui
  11. 1
    1
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
  12. 2
    2
      filesharing/advanced/kcm_sambaconf/konqinterface.ui
  13. 1
    1
      filesharing/advanced/kcm_sambaconf/sambafile.cpp
  14. 33
    33
      filesharing/advanced/kcm_sambaconf/share.ui
  15. 1
    1
      filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
  16. 1
    1
      filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui
  17. 2
    2
      filesharing/advanced/kcm_sambaconf/userselectdlg.ui
  18. 1
    1
      filesharing/advanced/kcm_sambaconf/usertab.ui
  19. 4
    4
      filesharing/advanced/nfs/hostprops.ui
  20. 1
    1
      filesharing/advanced/nfs/nfsdialoggui.ui
  21. 1
    1
      filesharing/advanced/nfs/nfsentry.h
  22. 5
    5
      filesharing/advanced/propsdlgplugin/propertiespagegui.ui
  23. 5
    5
      filesharing/simple/controlcenter.ui
  24. 4
    4
      filesharing/simple/fileshare.cpp
  25. 2
    2
      filesharing/simple/groupconfiggui.ui
  26. 5
    5
      filesharing/simple/krichtextlabel.cpp
  27. 2
    2
      filesharing/simple/krichtextlabel.h
  28. 5
    5
      kdict/actions.cpp
  29. 6
    6
      kdict/applet/kdictapplet.cpp
  30. 6
    6
      kdict/matchview.cpp
  31. 6
    6
      kdict/sets.cpp
  32. 7
    7
      kget/dlgIndividual.cpp
  33. 2
    2
      kget/dlgadvancedbase.ui
  34. 3
    3
      kget/dlgautomationbase.ui
  35. 5
    5
      kget/dlgconnectionbase.ui
  36. 1
    1
      kget/dlgdirectoriesbase.ui
  37. 3
    3
      kget/dlglimitsbase.ui
  38. 2
    2
      kget/dlgsystembase.ui
  39. 3
    3
      kget/docking.cpp
  40. 1
    1
      kget/docking.h
  41. 1
    1
      kget/droptarget.cpp
  42. 17
    17
      kget/kmainwidget.cpp
  43. 1
    1
      kget/settings.cpp
  44. 11
    11
      kget/transfer.cpp
  45. 6
    6
      kget/transfer.h
  46. 2
    2
      kget/transferlist.cpp
  47. 1
    1
      kget/transferlist.h
  48. 209
    209
      knewsticker/common/configaccess.cpp
  49. 3
    3
      knewsticker/common/configaccess.h
  50. 1
    1
      knewsticker/common/newsengine.cpp
  51. 1
    1
      knewsticker/common/newsengine.h
  52. 4
    4
      knewsticker/common/newsiconmgr.cpp
  53. 9
    9
      knewsticker/common/xmlnewsaccess.cpp
  54. 17
    17
      knewsticker/knewsticker.cpp
  55. 6
    6
      knewsticker/knewstickerconfig.cpp
  56. 6
    6
      knewsticker/knewstickerconfigwidget.ui
  57. 1
    1
      knewsticker/knewstickerstub/knewstickerstub.cpp
  58. 5
    5
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
  59. 2
    2
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h
  60. 2
    2
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
  61. 6
    6
      knewsticker/newsscroller.cpp
  62. 1
    1
      knewsticker/newsscroller.h
  63. 11
    11
      knewsticker/newssourcedlgimpl.cpp
  64. 1
    1
      kopete/KABC_INTEG_NOTES
  65. 3
    3
      kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
  66. 2
    2
      kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
  67. 2
    2
      kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
  68. 1
    1
      kopete/kopete/addcontactwizard/addcontactwizard.cpp
  69. 7
    7
      kopete/kopete/addcontactwizard/addcontactwizard_base.ui
  70. 1
    1
      kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp
  71. 3
    3
      kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
  72. 7
    7
      kopete/kopete/chatwindow/chatmemberslistwidget.cpp
  73. 1
    1
      kopete/kopete/chatwindow/chatmemberslistwidget.h
  74. 10
    10
      kopete/kopete/chatwindow/chatmessagepart.cpp
  75. 7
    7
      kopete/kopete/chatwindow/chattexteditpart.cpp
  76. 48
    48
      kopete/kopete/chatwindow/chatview.cpp
  77. 1
    1
      kopete/kopete/chatwindow/chatview.h
  78. 2
    2
      kopete/kopete/chatwindow/emoticonselector.cpp
  79. 39
    39
      kopete/kopete/chatwindow/kopetechatwindow.cpp
  80. 1
    1
      kopete/kopete/chatwindow/kopetechatwindow.h
  81. 1
    1
      kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
  82. 3
    3
      kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
  83. 18
    18
      kopete/kopete/chatwindow/kopeteemailwindow.cpp
  84. 4
    4
      kopete/kopete/chatwindow/krichtexteditpart.cpp
  85. 2
    2
      kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
  86. 12
    12
      kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
  87. 6
    6
      kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
  88. 4
    4
      kopete/kopete/config/appearance/appearanceconfig.cpp
  89. 2
    2
      kopete/kopete/config/appearance/appearanceconfig_colors.ui
  90. 5
    5
      kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
  91. 2
    2
      kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
  92. 4
    4
      kopete/kopete/config/appearance/emoticonseditdialog.cpp
  93. 1
    1
      kopete/kopete/config/appearance/emoticonseditwidget.ui
  94. 2
    2
      kopete/kopete/config/appearance/tooltipeditwidget.ui
  95. 3
    3
      kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
  96. 4
    4
      kopete/kopete/config/behavior/behaviorconfig_chat.ui
  97. 5
    5
      kopete/kopete/config/behavior/behaviorconfig_events.ui
  98. 1
    1
      kopete/kopete/config/behavior/behaviorconfig_general.ui
  99. 5
    5
      kopete/kopete/config/behavior/kopeteawayconfigbase.ui
  100. 0
    0
      kopete/kopete/config/identity/kopeteidentityconfigbase.ui

+ 5
- 5
dcoprss/cache.cpp View File

@@ -35,7 +35,7 @@ bool CacheEntry::isValid() const
35 35
 {
36 36
 	// Cache entries get invalid after on hour. One shouldn't hardcode this
37 37
 	// but for now it'll do.
38
-	return m_timeStamp.secsTo( TQDateTime::tqcurrentDateTime() ) < 3600;
38
+	return m_timeStamp.secsTo( TQDateTime::currentDateTime() ) < 3600;
39 39
 }
40 40
 
41 41
 Cache *Cache::m_instance = 0;
@@ -51,8 +51,8 @@ TQString Cache::getCacheKey( const TQString &server, const TQString &method,
51 51
                             const TQValueList<TQVariant> &args )
52 52
 {
53 53
 	TQString key;
54
-	key = server + TQString::tqfromLatin1( "__" );
55
-	key += method + TQString::tqfromLatin1( "__" );
54
+	key = server + TQString::fromLatin1( "__" );
55
+	key += method + TQString::fromLatin1( "__" );
56 56
 	TQValueList<TQVariant>::ConstIterator it = args.begin();
57 57
 	TQValueList<TQVariant>::ConstIterator end = args.end();
58 58
 	for ( ; it != end; ++it )
@@ -111,13 +111,13 @@ void Cache::touch( const TQString &key )
111 111
 	CacheEntry *entry = find( key );
112 112
 	if ( !entry )
113 113
 		return;
114
-	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
114
+	entry->m_timeStamp = TQDateTime::currentDateTime();
115 115
 }
116 116
 
117 117
 void Cache::insert( const TQString &key, const KXMLRPC::Query::Result &result )
118 118
 {
119 119
 	CacheEntry *entry = new CacheEntry;
120
-	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
120
+	entry->m_timeStamp = TQDateTime::currentDateTime();
121 121
 	entry->m_result = result;
122 122
 	TQDict<CacheEntry>::insert( key, entry );
123 123
 }

+ 7
- 7
dcoprss/document.cpp View File

@@ -29,7 +29,7 @@ RSSDocument::RSSDocument(const TQString& url) :
29 29
 	m_pix = TQPixmap();
30 30
 	m_isLoading = false;
31 31
 	m_maxAge = 60;
32
-	m_Timeout = TQDateTime::tqcurrentDateTime();
32
+	m_Timeout = TQDateTime::currentDateTime();
33 33
 	m_state.clear();
34 34
 }
35 35
 
@@ -40,7 +40,7 @@ RSSDocument::~RSSDocument()
40 40
 	delete m_Doc;
41 41
 }
42 42
 
43
-void RSSDocument::loadingComplete(Loader *ldr, Document doc, tqStatus stat)
43
+void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat)
44 44
 {
45 45
 
46 46
 
@@ -129,7 +129,7 @@ TQDateTime RSSDocument::lastBuildDate()
129 129
 	if( m_Doc != 0L)
130 130
 		return m_Doc->lastBuildDate();
131 131
 	else
132
-		return TQDateTime::tqcurrentDateTime();
132
+		return TQDateTime::currentDateTime();
133 133
 }
134 134
 
135 135
 TQDateTime RSSDocument::pubDate()
@@ -137,7 +137,7 @@ TQDateTime RSSDocument::pubDate()
137 137
 	if( m_Doc != 0L)
138 138
 		return m_Doc->pubDate();
139 139
 	else
140
-		return TQDateTime::tqcurrentDateTime();
140
+		return TQDateTime::currentDateTime();
141 141
 }
142 142
 
143 143
 TQString RSSDocument::copyright()
@@ -243,14 +243,14 @@ bool RSSDocument::pixmapValid()
243 243
 void RSSDocument::refresh()
244 244
 {
245 245
 	kdDebug() << "Mod time " << m_Timeout.toString() << endl;
246
-	kdDebug() << "Current time " << TQDateTime::tqcurrentDateTime().toString() << endl;
246
+	kdDebug() << "Current time " << TQDateTime::currentDateTime().toString() << endl;
247 247
 
248
-	if(!m_isLoading  && (TQDateTime::tqcurrentDateTime() >= m_Timeout))
248
+	if(!m_isLoading  && (TQDateTime::currentDateTime() >= m_Timeout))
249 249
 	{
250 250
 		kdDebug() << "Document going to refresh" << endl;
251 251
 		m_isLoading = true;
252 252
 		Loader *loader = Loader::create(this,
253
-			TQT_SLOT(loadingComplete(Loader *, Document, tqStatus)));
253
+			TQT_SLOT(loadingComplete(Loader *, Document, Status)));
254 254
 		loader->loadFrom(KURL( m_Url ),  new FileRetriever());
255 255
 		documentUpdating(DCOPRef(this));
256 256
 	}

+ 1
- 1
dcoprss/query.cpp View File

@@ -113,7 +113,7 @@ void QueryService::getCategories( const TQString &category )
113 113
 	kdDebug() << "QueryService::getCategories()" << endl;
114 114
 
115 115
 	if ( category == "Top" ) {
116
-		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::tqfromLatin1( "DMOZ" ) ),
116
+		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ),
117 117
 		            TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
118 118
 	} else {
119 119
 		TQStringList args;

+ 1
- 1
dcoprss/service.h View File

@@ -124,7 +124,7 @@ class RSSDocument :  public TQObject, public DCOPObject
124 124
 
125 125
 	private slots:
126 126
 		void pixmapLoaded(const TQPixmap&);
127
-		void loadingComplete(Loader *, Document, tqStatus);
127
+		void loadingComplete(Loader *, Document, Status);
128 128
 
129 129
 	public:
130 130
 		RSSDocument(const TQString& url);

+ 2
- 2
filesharing/advanced/kcm_sambaconf/expertuserdlg.ui View File

@@ -129,7 +129,7 @@
129 129
                     <property name="sizeType">
130 130
                         <enum>Expanding</enum>
131 131
                     </property>
132
-                    <property name="tqsizeHint">
132
+                    <property name="sizeHint">
133 133
                         <size>
134 134
                             <width>20</width>
135 135
                             <height>20</height>
@@ -179,7 +179,7 @@
179 179
             <property name="sizeType">
180 180
                 <enum>Expanding</enum>
181 181
             </property>
182
-            <property name="tqsizeHint">
182
+            <property name="sizeHint">
183 183
                 <size>
184 184
                     <width>20</width>
185 185
                     <height>40</height>

+ 3
- 3
filesharing/advanced/kcm_sambaconf/filemodedlg.ui View File

@@ -67,7 +67,7 @@
67 67
                     <property name="sizeType">
68 68
                         <enum>Expanding</enum>
69 69
                     </property>
70
-                    <property name="tqsizeHint">
70
+                    <property name="sizeHint">
71 71
                         <size>
72 72
                             <width>20</width>
73 73
                             <height>43</height>
@@ -84,7 +84,7 @@
84 84
                     <property name="sizeType">
85 85
                         <enum>Expanding</enum>
86 86
                     </property>
87
-                    <property name="tqsizeHint">
87
+                    <property name="sizeHint">
88 88
                         <size>
89 89
                             <width>70</width>
90 90
                             <height>20</height>
@@ -359,7 +359,7 @@
359 359
                     <property name="sizeType">
360 360
                         <enum>Expanding</enum>
361 361
                     </property>
362
-                    <property name="tqsizeHint">
362
+                    <property name="sizeHint">
363 363
                         <size>
364 364
                             <width>20</width>
365 365
                             <height>20</height>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/groupselectdlg.ui View File

@@ -52,7 +52,7 @@
52 52
                     <property name="sizeType">
53 53
                         <enum>Expanding</enum>
54 54
                     </property>
55
-                    <property name="tqsizeHint">
55
+                    <property name="sizeHint">
56 56
                         <size>
57 57
                             <width>285</width>
58 58
                             <height>20</height>
@@ -113,7 +113,7 @@
113 113
             <property name="sizeType">
114 114
                 <enum>Expanding</enum>
115 115
             </property>
116
-            <property name="tqsizeHint">
116
+            <property name="sizeHint">
117 117
                 <size>
118 118
                     <width>20</width>
119 119
                     <height>20</height>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/joindomaindlg.ui View File

@@ -46,7 +46,7 @@
46 46
                     <property name="sizeType">
47 47
                         <enum>Expanding</enum>
48 48
                     </property>
49
-                    <property name="tqsizeHint">
49
+                    <property name="sizeHint">
50 50
                         <size>
51 51
                             <width>20</width>
52 52
                             <height>20</height>
@@ -190,7 +190,7 @@
190 190
             <property name="sizeType">
191 191
                 <enum>Expanding</enum>
192 192
             </property>
193
-            <property name="tqsizeHint">
193
+            <property name="sizeHint">
194 194
                 <size>
195 195
                     <width>20</width>
196 196
                     <height>40</height>

+ 60
- 60
filesharing/advanced/kcm_sambaconf/kcminterface.ui View File

@@ -521,7 +521,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
521 521
                                         <property name="sizeType">
522 522
                                             <enum>Expanding</enum>
523 523
                                         </property>
524
-                                        <property name="tqsizeHint">
524
+                                        <property name="sizeHint">
525 525
                                             <size>
526 526
                                                 <width>40</width>
527 527
                                                 <height>20</height>
@@ -614,7 +614,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
614 614
                                 <property name="sizeType">
615 615
                                     <enum>Expanding</enum>
616 616
                                 </property>
617
-                                <property name="tqsizeHint">
617
+                                <property name="sizeHint">
618 618
                                     <size>
619 619
                                         <width>30</width>
620 620
                                         <height>0</height>
@@ -633,7 +633,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
633 633
                         <property name="sizeType">
634 634
                             <enum>Expanding</enum>
635 635
                         </property>
636
-                        <property name="tqsizeHint">
636
+                        <property name="sizeHint">
637 637
                             <size>
638 638
                                 <width>20</width>
639 639
                                 <height>40</height>
@@ -752,7 +752,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
752 752
                                 <property name="sizeType">
753 753
                                     <enum>Expanding</enum>
754 754
                                 </property>
755
-                                <property name="tqsizeHint">
755
+                                <property name="sizeHint">
756 756
                                     <size>
757 757
                                         <width>20</width>
758 758
                                         <height>0</height>
@@ -900,7 +900,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
900 900
                                 <property name="sizeType">
901 901
                                     <enum>Expanding</enum>
902 902
                                 </property>
903
-                                <property name="tqsizeHint">
903
+                                <property name="sizeHint">
904 904
                                     <size>
905 905
                                         <width>20</width>
906 906
                                         <height>0</height>
@@ -1066,7 +1066,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
1066 1066
                                         <property name="sizeType">
1067 1067
                                             <enum>Expanding</enum>
1068 1068
                                         </property>
1069
-                                        <property name="tqsizeHint">
1069
+                                        <property name="sizeHint">
1070 1070
                                             <size>
1071 1071
                                                 <width>20</width>
1072 1072
                                                 <height>30</height>
@@ -1102,7 +1102,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
1102 1102
                                         <property name="sizeType">
1103 1103
                                             <enum>Expanding</enum>
1104 1104
                                         </property>
1105
-                                        <property name="tqsizeHint">
1105
+                                        <property name="sizeHint">
1106 1106
                                             <size>
1107 1107
                                                 <width>20</width>
1108 1108
                                                 <height>30</height>
@@ -1135,7 +1135,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
1135 1135
                                         <property name="sizeType">
1136 1136
                                             <enum>Expanding</enum>
1137 1137
                                         </property>
1138
-                                        <property name="tqsizeHint">
1138
+                                        <property name="sizeHint">
1139 1139
                                             <size>
1140 1140
                                                 <width>20</width>
1141 1141
                                                 <height>30</height>
@@ -1243,7 +1243,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
1243 1243
                                 <property name="sizeType">
1244 1244
                                     <enum>Expanding</enum>
1245 1245
                                 </property>
1246
-                                <property name="tqsizeHint">
1246
+                                <property name="sizeHint">
1247 1247
                                     <size>
1248 1248
                                         <width>240</width>
1249 1249
                                         <height>20</height>
@@ -1413,7 +1413,7 @@ Only change something if you know what you are doing.</string>
1413 1413
                                                 <property name="sizeType">
1414 1414
                                                     <enum>Expanding</enum>
1415 1415
                                                 </property>
1416
-                                                <property name="tqsizeHint">
1416
+                                                <property name="sizeHint">
1417 1417
                                                     <size>
1418 1418
                                                         <width>20</width>
1419 1419
                                                         <height>40</height>
@@ -1673,7 +1673,7 @@ Only change something if you know what you are doing.</string>
1673 1673
                                                         <property name="sizeType">
1674 1674
                                                             <enum>Expanding</enum>
1675 1675
                                                         </property>
1676
-                                                        <property name="tqsizeHint">
1676
+                                                        <property name="sizeHint">
1677 1677
                                                             <size>
1678 1678
                                                                 <width>180</width>
1679 1679
                                                                 <height>20</height>
@@ -1717,7 +1717,7 @@ Only change something if you know what you are doing.</string>
1717 1717
                                                         <property name="sizeType">
1718 1718
                                                             <enum>Expanding</enum>
1719 1719
                                                         </property>
1720
-                                                        <property name="tqsizeHint">
1720
+                                                        <property name="sizeHint">
1721 1721
                                                             <size>
1722 1722
                                                                 <width>117</width>
1723 1723
                                                                 <height>20</height>
@@ -1789,7 +1789,7 @@ Only change something if you know what you are doing.</string>
1789 1789
                                                 <property name="sizeType">
1790 1790
                                                     <enum>Expanding</enum>
1791 1791
                                                 </property>
1792
-                                                <property name="tqsizeHint">
1792
+                                                <property name="sizeHint">
1793 1793
                                                     <size>
1794 1794
                                                         <width>20</width>
1795 1795
                                                         <height>40</height>
@@ -2065,7 +2065,7 @@ Only change something if you know what you are doing.</string>
2065 2065
                                                         <property name="sizeType">
2066 2066
                                                             <enum>Expanding</enum>
2067 2067
                                                         </property>
2068
-                                                        <property name="tqsizeHint">
2068
+                                                        <property name="sizeHint">
2069 2069
                                                             <size>
2070 2070
                                                                 <width>20</width>
2071 2071
                                                                 <height>20</height>
@@ -2242,7 +2242,7 @@ Only change something if you know what you are doing.</string>
2242 2242
                                                 <property name="sizeType">
2243 2243
                                                     <enum>Expanding</enum>
2244 2244
                                                 </property>
2245
-                                                <property name="tqsizeHint">
2245
+                                                <property name="sizeHint">
2246 2246
                                                     <size>
2247 2247
                                                         <width>40</width>
2248 2248
                                                         <height>20</height>
@@ -2295,7 +2295,7 @@ Only change something if you know what you are doing.</string>
2295 2295
                                                 <property name="sizeType">
2296 2296
                                                     <enum>Expanding</enum>
2297 2297
                                                 </property>
2298
-                                                <property name="tqsizeHint">
2298
+                                                <property name="sizeHint">
2299 2299
                                                     <size>
2300 2300
                                                         <width>20</width>
2301 2301
                                                         <height>170</height>
@@ -2458,7 +2458,7 @@ Only change something if you know what you are doing.</string>
2458 2458
                                                         <property name="sizeType">
2459 2459
                                                             <enum>Expanding</enum>
2460 2460
                                                         </property>
2461
-                                                        <property name="tqsizeHint">
2461
+                                                        <property name="sizeHint">
2462 2462
                                                             <size>
2463 2463
                                                                 <width>16</width>
2464 2464
                                                                 <height>20</height>
@@ -2592,7 +2592,7 @@ Only change something if you know what you are doing.</string>
2592 2592
                                                         <property name="sizeType">
2593 2593
                                                             <enum>Expanding</enum>
2594 2594
                                                         </property>
2595
-                                                        <property name="tqsizeHint">
2595
+                                                        <property name="sizeHint">
2596 2596
                                                             <size>
2597 2597
                                                                 <width>120</width>
2598 2598
                                                                 <height>20</height>
@@ -2611,7 +2611,7 @@ Only change something if you know what you are doing.</string>
2611 2611
                                                 <property name="sizeType">
2612 2612
                                                     <enum>Expanding</enum>
2613 2613
                                                 </property>
2614
-                                                <property name="tqsizeHint">
2614
+                                                <property name="sizeHint">
2615 2615
                                                     <size>
2616 2616
                                                         <width>20</width>
2617 2617
                                                         <height>20</height>
@@ -2730,7 +2730,7 @@ Only change something if you know what you are doing.</string>
2730 2730
                                                     <property name="sizeType">
2731 2731
                                                         <enum>Expanding</enum>
2732 2732
                                                     </property>
2733
-                                                    <property name="tqsizeHint">
2733
+                                                    <property name="sizeHint">
2734 2734
                                                         <size>
2735 2735
                                                             <width>40</width>
2736 2736
                                                             <height>20</height>
@@ -2768,7 +2768,7 @@ Only change something if you know what you are doing.</string>
2768 2768
                                                             <verstretch>0</verstretch>
2769 2769
                                                         </sizepolicy>
2770 2770
                                                     </property>
2771
-                                                    <property name="tqminimumSize">
2771
+                                                    <property name="minimumSize">
2772 2772
                                                         <size>
2773 2773
                                                             <width>76</width>
2774 2774
                                                             <height>0</height>
@@ -2834,7 +2834,7 @@ Only change something if you know what you are doing.</string>
2834 2834
                                                         <cstring>statusChk</cstring>
2835 2835
                                                     </property>
2836 2836
                                                     <property name="text">
2837
-                                                        <string>tqStatus</string>
2837
+                                                        <string>Status</string>
2838 2838
                                                     </property>
2839 2839
                                                     <property name="checked">
2840 2840
                                                         <bool>true</bool>
@@ -2906,7 +2906,7 @@ Only change something if you know what you are doing.</string>
2906 2906
                                             <property name="sizeType">
2907 2907
                                                 <enum>Expanding</enum>
2908 2908
                                             </property>
2909
-                                            <property name="tqsizeHint">
2909
+                                            <property name="sizeHint">
2910 2910
                                                 <size>
2911 2911
                                                     <width>20</width>
2912 2912
                                                     <height>60</height>
@@ -3034,7 +3034,7 @@ Only change something if you know what you are doing.</string>
3034 3034
                                             <property name="sizeType">
3035 3035
                                                 <enum>Expanding</enum>
3036 3036
                                             </property>
3037
-                                            <property name="tqsizeHint">
3037
+                                            <property name="sizeHint">
3038 3038
                                                 <size>
3039 3039
                                                     <width>40</width>
3040 3040
                                                     <height>20</height>
@@ -3053,7 +3053,7 @@ Only change something if you know what you are doing.</string>
3053 3053
                                     <property name="sizeType">
3054 3054
                                         <enum>Expanding</enum>
3055 3055
                                     </property>
3056
-                                    <property name="tqsizeHint">
3056
+                                    <property name="sizeHint">
3057 3057
                                         <size>
3058 3058
                                             <width>20</width>
3059 3059
                                             <height>50</height>
@@ -3144,7 +3144,7 @@ Only change something if you know what you are doing.</string>
3144 3144
                                             <property name="sizeType">
3145 3145
                                                 <enum>Expanding</enum>
3146 3146
                                             </property>
3147
-                                            <property name="tqsizeHint">
3147
+                                            <property name="sizeHint">
3148 3148
                                                 <size>
3149 3149
                                                     <width>16</width>
3150 3150
                                                     <height>20</height>
@@ -3493,7 +3493,7 @@ Only change something if you know what you are doing.</string>
3493 3493
                                             <property name="sizeType">
3494 3494
                                                 <enum>Expanding</enum>
3495 3495
                                             </property>
3496
-                                            <property name="tqsizeHint">
3496
+                                            <property name="sizeHint">
3497 3497
                                                 <size>
3498 3498
                                                     <width>20</width>
3499 3499
                                                     <height>16</height>
@@ -3694,7 +3694,7 @@ Only change something if you know what you are doing.</string>
3694 3694
                                     <property name="sizeType">
3695 3695
                                         <enum>Expanding</enum>
3696 3696
                                     </property>
3697
-                                    <property name="tqsizeHint">
3697
+                                    <property name="sizeHint">
3698 3698
                                         <size>
3699 3699
                                             <width>20</width>
3700 3700
                                             <height>40</height>
@@ -3730,7 +3730,7 @@ Only change something if you know what you are doing.</string>
3730 3730
                                     <property name="sizeType">
3731 3731
                                         <enum>Expanding</enum>
3732 3732
                                     </property>
3733
-                                    <property name="tqsizeHint">
3733
+                                    <property name="sizeHint">
3734 3734
                                         <size>
3735 3735
                                             <width>20</width>
3736 3736
                                             <height>100</height>
@@ -3811,7 +3811,7 @@ Only change something if you know what you are doing.</string>
3811 3811
                                     <property name="sizeType">
3812 3812
                                         <enum>Preferred</enum>
3813 3813
                                     </property>
3814
-                                    <property name="tqsizeHint">
3814
+                                    <property name="sizeHint">
3815 3815
                                         <size>
3816 3816
                                             <width>323</width>
3817 3817
                                             <height>20</height>
@@ -4060,7 +4060,7 @@ Only change something if you know what you are doing.</string>
4060 4060
                                             <property name="sizeType">
4061 4061
                                                 <enum>Expanding</enum>
4062 4062
                                             </property>
4063
-                                            <property name="tqsizeHint">
4063
+                                            <property name="sizeHint">
4064 4064
                                                 <size>
4065 4065
                                                     <width>40</width>
4066 4066
                                                     <height>20</height>
@@ -4202,7 +4202,7 @@ Only change something if you know what you are doing.</string>
4202 4202
                                     <property name="sizeType">
4203 4203
                                         <enum>Expanding</enum>
4204 4204
                                     </property>
4205
-                                    <property name="tqsizeHint">
4205
+                                    <property name="sizeHint">
4206 4206
                                         <size>
4207 4207
                                             <width>20</width>
4208 4208
                                             <height>120</height>
@@ -4347,7 +4347,7 @@ Only change something if you know what you are doing.</string>
4347 4347
                                             <property name="sizeType">
4348 4348
                                                 <enum>Expanding</enum>
4349 4349
                                             </property>
4350
-                                            <property name="tqsizeHint">
4350
+                                            <property name="sizeHint">
4351 4351
                                                 <size>
4352 4352
                                                     <width>40</width>
4353 4353
                                                     <height>20</height>
@@ -4393,7 +4393,7 @@ Only change something if you know what you are doing.</string>
4393 4393
                                     <property name="sizeType">
4394 4394
                                         <enum>Expanding</enum>
4395 4395
                                     </property>
4396
-                                    <property name="tqsizeHint">
4396
+                                    <property name="sizeHint">
4397 4397
                                         <size>
4398 4398
                                             <width>20</width>
4399 4399
                                             <height>280</height>
@@ -4570,7 +4570,7 @@ Only change something if you know what you are doing.</string>
4570 4570
                                             <property name="sizeType">
4571 4571
                                                 <enum>Expanding</enum>
4572 4572
                                             </property>
4573
-                                            <property name="tqsizeHint">
4573
+                                            <property name="sizeHint">
4574 4574
                                                 <size>
4575 4575
                                                     <width>30</width>
4576 4576
                                                     <height>20</height>
@@ -4640,7 +4640,7 @@ Only change something if you know what you are doing.</string>
4640 4640
                                             <property name="sizeType">
4641 4641
                                                 <enum>Expanding</enum>
4642 4642
                                             </property>
4643
-                                            <property name="tqsizeHint">
4643
+                                            <property name="sizeHint">
4644 4644
                                                 <size>
4645 4645
                                                     <width>50</width>
4646 4646
                                                     <height>20</height>
@@ -4659,7 +4659,7 @@ Only change something if you know what you are doing.</string>
4659 4659
                                     <property name="sizeType">
4660 4660
                                         <enum>Expanding</enum>
4661 4661
                                     </property>
4662
-                                    <property name="tqsizeHint">
4662
+                                    <property name="sizeHint">
4663 4663
                                         <size>
4664 4664
                                             <width>20</width>
4665 4665
                                             <height>120</height>
@@ -4917,7 +4917,7 @@ Only change something if you know what you are doing.</string>
4917 4917
                                     <property name="sizeType">
4918 4918
                                         <enum>Expanding</enum>
4919 4919
                                     </property>
4920
-                                    <property name="tqsizeHint">
4920
+                                    <property name="sizeHint">
4921 4921
                                         <size>
4922 4922
                                             <width>20</width>
4923 4923
                                             <height>80</height>
@@ -5036,7 +5036,7 @@ Only change something if you know what you are doing.</string>
5036 5036
                                     <property name="sizeType">
5037 5037
                                         <enum>Expanding</enum>
5038 5038
                                     </property>
5039
-                                    <property name="tqsizeHint">
5039
+                                    <property name="sizeHint">
5040 5040
                                         <size>
5041 5041
                                             <width>20</width>
5042 5042
                                             <height>20</height>
@@ -5481,7 +5481,7 @@ Only change something if you know what you are doing.</string>
5481 5481
                                             <property name="sizeType">
5482 5482
                                                 <enum>Expanding</enum>
5483 5483
                                             </property>
5484
-                                            <property name="tqsizeHint">
5484
+                                            <property name="sizeHint">
5485 5485
                                                 <size>
5486 5486
                                                     <width>80</width>
5487 5487
                                                     <height>0</height>
@@ -5500,7 +5500,7 @@ Only change something if you know what you are doing.</string>
5500 5500
                                     <property name="sizeType">
5501 5501
                                         <enum>Expanding</enum>
5502 5502
                                     </property>
5503
-                                    <property name="tqsizeHint">
5503
+                                    <property name="sizeHint">
5504 5504
                                         <size>
5505 5505
                                             <width>0</width>
5506 5506
                                             <height>70</height>
@@ -5729,7 +5729,7 @@ This is only available if the SSL libraries have been compiled on your system an
5729 5729
                                                             <property name="sizeType">
5730 5730
                                                                 <enum>Expanding</enum>
5731 5731
                                                             </property>
5732
-                                                            <property name="tqsizeHint">
5732
+                                                            <property name="sizeHint">
5733 5733
                                                                 <size>
5734 5734
                                                                     <width>140</width>
5735 5735
                                                                     <height>0</height>
@@ -5913,7 +5913,7 @@ This is only available if the SSL libraries have been compiled on your system an
5913 5913
                                     <property name="sizeType">
5914 5914
                                         <enum>Expanding</enum>
5915 5915
                                     </property>
5916
-                                    <property name="tqsizeHint">
5916
+                                    <property name="sizeHint">
5917 5917
                                         <size>
5918 5918
                                             <width>0</width>
5919 5919
                                             <height>30</height>
@@ -5949,7 +5949,7 @@ This is only available if the SSL libraries have been compiled on your system an
5949 5949
                                     <property name="sizeType">
5950 5950
                                         <enum>Expanding</enum>
5951 5951
                                     </property>
5952
-                                    <property name="tqsizeHint">
5952
+                                    <property name="sizeHint">
5953 5953
                                         <size>
5954 5954
                                             <width>20</width>
5955 5955
                                             <height>50</height>
@@ -6035,7 +6035,7 @@ This is only available if the SSL libraries have been compiled on your system an
6035 6035
                                             <property name="sizeType">
6036 6036
                                                 <enum>Expanding</enum>
6037 6037
                                             </property>
6038
-                                            <property name="tqsizeHint">
6038
+                                            <property name="sizeHint">
6039 6039
                                                 <size>
6040 6040
                                                     <width>330</width>
6041 6041
                                                     <height>20</height>
@@ -6193,7 +6193,7 @@ This is only available if the SSL libraries have been compiled on your system an
6193 6193
                                             <property name="sizeType">
6194 6194
                                                 <enum>Expanding</enum>
6195 6195
                                             </property>
6196
-                                            <property name="tqsizeHint">
6196
+                                            <property name="sizeHint">
6197 6197
                                                 <size>
6198 6198
                                                     <width>40</width>
6199 6199
                                                     <height>20</height>
@@ -6405,7 +6405,7 @@ This is only available if the SSL libraries have been compiled on your system an
6405 6405
                                                     <verstretch>0</verstretch>
6406 6406
                                                 </sizepolicy>
6407 6407
                                             </property>
6408
-                                            <property name="tqminimumSize">
6408
+                                            <property name="minimumSize">
6409 6409
                                                 <size>
6410 6410
                                                     <width>150</width>
6411 6411
                                                     <height>0</height>
@@ -6468,7 +6468,7 @@ This is only available if the SSL libraries have been compiled on your system an
6468 6468
                                     <property name="sizeType">
6469 6469
                                         <enum>Expanding</enum>
6470 6470
                                     </property>
6471
-                                    <property name="tqsizeHint">
6471
+                                    <property name="sizeHint">
6472 6472
                                         <size>
6473 6473
                                             <width>340</width>
6474 6474
                                             <height>20</height>
@@ -6553,7 +6553,7 @@ This is only available if the SSL libraries have been compiled on your system an
6553 6553
                                     <property name="sizeType">
6554 6554
                                         <enum>Expanding</enum>
6555 6555
                                     </property>
6556
-                                    <property name="tqsizeHint">
6556
+                                    <property name="sizeHint">
6557 6557
                                         <size>
6558 6558
                                             <width>20</width>
6559 6559
                                             <height>300</height>
@@ -6728,7 +6728,7 @@ This is only available if the SSL libraries have been compiled on your system an
6728 6728
                                     <property name="sizeType">
6729 6729
                                         <enum>Expanding</enum>
6730 6730
                                     </property>
6731
-                                    <property name="tqsizeHint">
6731
+                                    <property name="sizeHint">
6732 6732
                                         <size>
6733 6733
                                             <width>370</width>
6734 6734
                                             <height>20</height>
@@ -6824,7 +6824,7 @@ This is only available if the SSL libraries have been compiled on your system an
6824 6824
                                     <property name="sizeType">
6825 6825
                                         <enum>Expanding</enum>
6826 6826
                                     </property>
6827
-                                    <property name="tqsizeHint">
6827
+                                    <property name="sizeHint">
6828 6828
                                         <size>
6829 6829
                                             <width>20</width>
6830 6830
                                             <height>100</height>
@@ -6860,7 +6860,7 @@ This is only available if the SSL libraries have been compiled on your system an
6860 6860
                                     <property name="sizeType">
6861 6861
                                         <enum>Expanding</enum>
6862 6862
                                     </property>
6863
-                                    <property name="tqsizeHint">
6863
+                                    <property name="sizeHint">
6864 6864
                                         <size>
6865 6865
                                             <width>20</width>
6866 6866
                                             <height>280</height>
@@ -6946,7 +6946,7 @@ This is only available if the SSL libraries have been compiled on your system an
6946 6946
                                             <verstretch>0</verstretch>
6947 6947
                                         </sizepolicy>
6948 6948
                                     </property>
6949
-                                    <property name="tqminimumSize">
6949
+                                    <property name="minimumSize">
6950 6950
                                         <size>
6951 6951
                                             <width>150</width>
6952 6952
                                             <height>0</height>
@@ -6993,7 +6993,7 @@ This is only available if the SSL libraries have been compiled on your system an
6993 6993
                                     <property name="sizeType">
6994 6994
                                         <enum>Expanding</enum>
6995 6995
                                     </property>
6996
-                                    <property name="tqsizeHint">
6996
+                                    <property name="sizeHint">
6997 6997
                                         <size>
6998 6998
                                             <width>0</width>
6999 6999
                                             <height>30</height>
@@ -7134,7 +7134,7 @@ This is only available if the SSL libraries have been compiled on your system an
7134 7134
                                     <property name="sizeType">
7135 7135
                                         <enum>Expanding</enum>
7136 7136
                                     </property>
7137
-                                    <property name="tqsizeHint">
7137
+                                    <property name="sizeHint">
7138 7138
                                         <size>
7139 7139
                                             <width>20</width>
7140 7140
                                             <height>130</height>
@@ -7339,7 +7339,7 @@ This is only available if the SSL libraries have been compiled on your system an
7339 7339
                                     <property name="sizeType">
7340 7340
                                         <enum>Expanding</enum>
7341 7341
                                     </property>
7342
-                                    <property name="tqsizeHint">
7342
+                                    <property name="sizeHint">
7343 7343
                                         <size>
7344 7344
                                             <width>330</width>
7345 7345
                                             <height>20</height>
@@ -7452,7 +7452,7 @@ This is only available if the SSL libraries have been compiled on your system an
7452 7452
                                     <property name="sizeType">
7453 7453
                                         <enum>Expanding</enum>
7454 7454
                                     </property>
7455
-                                    <property name="tqsizeHint">
7455
+                                    <property name="sizeHint">
7456 7456
                                         <size>
7457 7457
                                             <width>20</width>
7458 7458
                                             <height>230</height>
@@ -7643,7 +7643,7 @@ This is only available if the SSL libraries have been compiled on your system an
7643 7643
                                             <property name="sizeType">
7644 7644
                                                 <enum>Expanding</enum>
7645 7645
                                             </property>
7646
-                                            <property name="tqsizeHint">
7646
+                                            <property name="sizeHint">
7647 7647
                                                 <size>
7648 7648
                                                     <width>40</width>
7649 7649
                                                     <height>20</height>
@@ -7764,7 +7764,7 @@ This is only available if the SSL libraries have been compiled on your system an
7764 7764
                                     <property name="sizeType">
7765 7765
                                         <enum>Expanding</enum>
7766 7766
                                     </property>
7767
-                                    <property name="tqsizeHint">
7767
+                                    <property name="sizeHint">
7768 7768
                                         <size>
7769 7769
                                             <width>20</width>
7770 7770
                                             <height>40</height>
@@ -7838,7 +7838,7 @@ This is only available if the SSL libraries have been compiled on your system an
7838 7838
                                     <property name="sizeType">
7839 7839
                                         <enum>Expanding</enum>
7840 7840
                                     </property>
7841
-                                    <property name="tqsizeHint">
7841
+                                    <property name="sizeHint">
7842 7842
                                         <size>
7843 7843
                                             <width>20</width>
7844 7844
                                             <height>320</height>

+ 8
- 8
filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui View File

@@ -319,7 +319,7 @@
319 319
               <property name='sizeType'>
320 320
                 <enum>Expanding</enum>
321 321
               </property>
322
-              <property name='tqsizeHint'>
322
+              <property name='sizeHint'>
323 323
                 <size>
324 324
                   <width>20</width>
325 325
                   <height>20</height>
@@ -349,7 +349,7 @@
349 349
               <property name='sizeType'>
350 350
                 <enum>Expanding</enum>
351 351
               </property>
352
-              <property name='tqsizeHint'>
352
+              <property name='sizeHint'>
353 353
                 <size>
354 354
                   <width>20</width>
355 355
                   <height>50</height>
@@ -535,7 +535,7 @@
535 535
               <property name='sizeType'>
536 536
                 <enum>Expanding</enum>
537 537
               </property>
538
-              <property name='tqsizeHint'>
538
+              <property name='sizeHint'>
539 539
                 <size>
540 540
                   <width>200</width>
541 541
                   <height>20</height>
@@ -633,7 +633,7 @@
633 633
               <property name='sizeType'>
634 634
                 <enum>Expanding</enum>
635 635
               </property>
636
-              <property name='tqsizeHint'>
636
+              <property name='sizeHint'>
637 637
                 <size>
638 638
                   <width>20</width>
639 639
                   <height>20</height>
@@ -683,7 +683,7 @@
683 683
               <property name='sizeType'>
684 684
                 <enum>Expanding</enum>
685 685
               </property>
686
-              <property name='tqsizeHint'>
686
+              <property name='sizeHint'>
687 687
                 <size>
688 688
                   <width>263</width>
689 689
                   <height>20</height>
@@ -831,7 +831,7 @@
831 831
               <property name='sizeType'>
832 832
                 <enum>Expanding</enum>
833 833
               </property>
834
-              <property name='tqsizeHint'>
834
+              <property name='sizeHint'>
835 835
                 <size>
836 836
                   <width>20</width>
837 837
                   <height>20</height>
@@ -944,7 +944,7 @@
944 944
               <property name='sizeType'>
945 945
                 <enum>Expanding</enum>
946 946
               </property>
947
-              <property name='tqsizeHint'>
947
+              <property name='sizeHint'>
948 948
                 <size>
949 949
                   <width>20</width>
950 950
                   <height>20</height>
@@ -1079,7 +1079,7 @@
1079 1079
             <property name='sizeType'>
1080 1080
               <enum>Expanding</enum>
1081 1081
             </property>
1082
-            <property name='tqsizeHint'>
1082
+            <property name='sizeHint'>
1083 1083
               <size>
1084 1084
                 <width>20</width>
1085 1085
                 <height>20</height>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp View File

@@ -1267,7 +1267,7 @@ void KcmSambaConf::save() {
1267 1267
   // Base settings
1268 1268
 
1269 1269
   _smbconf = _interface->configUrlRq->url();
1270
-  KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false);
1270
+  KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false);
1271 1271
   config.writeEntry("SMBCONF",_smbconf);
1272 1272
   config.sync();
1273 1273
 

+ 2
- 2
filesharing/advanced/kcm_sambaconf/konqinterface.ui View File

@@ -420,7 +420,7 @@
420 420
                     <property name="sizeType">
421 421
                         <enum>Expanding</enum>
422 422
                     </property>
423
-                    <property name="tqsizeHint">
423
+                    <property name="sizeHint">
424 424
                         <size>
425 425
                             <width>20</width>
426 426
                             <height>0</height>
@@ -447,7 +447,7 @@
447 447
             <property name="sizeType">
448 448
                 <enum>Expanding</enum>
449 449
             </property>
450
-            <property name="tqsizeHint">
450
+            <property name="sizeHint">
451 451
                 <size>
452 452
                     <width>0</width>
453 453
                     <height>20</height>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/sambafile.cpp View File

@@ -394,7 +394,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
394 394
 
395 395
 void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen)
396 396
 {
397
-  _parmOutput+=TQString::tqfromLatin1(buffer,buflen);
397
+  _parmOutput+=TQString::fromLatin1(buffer,buflen);
398 398
 }
399 399
 
400 400
 void SambaFile::parseParmStdOutput()

+ 33
- 33
filesharing/advanced/kcm_sambaconf/share.ui View File

@@ -304,7 +304,7 @@
304 304
                         <property name="sizeType">
305 305
                             <enum>Expanding</enum>
306 306
                         </property>
307
-                        <property name="tqsizeHint">
307
+                        <property name="sizeHint">
308 308
                             <size>
309 309
                                 <width>20</width>
310 310
                                 <height>90</height>
@@ -362,7 +362,7 @@
362 362
                                 <property name="sizeType">
363 363
                                     <enum>Expanding</enum>
364 364
                                 </property>
365
-                                <property name="tqsizeHint">
365
+                                <property name="sizeHint">
366 366
                                     <size>
367 367
                                         <width>50</width>
368 368
                                         <height>20</height>
@@ -540,7 +540,7 @@
540 540
                         <property name="sizeType">
541 541
                             <enum>Expanding</enum>
542 542
                         </property>
543
-                        <property name="tqsizeHint">
543
+                        <property name="sizeHint">
544 544
                             <size>
545 545
                                 <width>20</width>
546 546
                                 <height>20</height>
@@ -1050,7 +1050,7 @@ Only change something if you know what you are doing.</string>
1050 1050
                                                     <verstretch>0</verstretch>
1051 1051
                                                 </sizepolicy>
1052 1052
                                             </property>
1053
-                                            <property name="tqminimumSize">
1053
+                                            <property name="minimumSize">
1054 1054
                                                 <size>
1055 1055
                                                     <width>20</width>
1056 1056
                                                     <height>0</height>
@@ -1072,7 +1072,7 @@ Only change something if you know what you are doing.</string>
1072 1072
                                                     <verstretch>0</verstretch>
1073 1073
                                                 </sizepolicy>
1074 1074
                                             </property>
1075
-                                            <property name="tqminimumSize">
1075
+                                            <property name="minimumSize">
1076 1076
                                                 <size>
1077 1077
                                                     <width>20</width>
1078 1078
                                                     <height>0</height>
@@ -1086,7 +1086,7 @@ Only change something if you know what you are doing.</string>
1086 1086
                                             <property name="name">
1087 1087
                                                 <cstring>forceCreateModeEdit</cstring>
1088 1088
                                             </property>
1089
-                                            <property name="tqminimumSize">
1089
+                                            <property name="minimumSize">
1090 1090
                                                 <size>
1091 1091
                                                     <width>40</width>
1092 1092
                                                     <height>0</height>
@@ -1100,7 +1100,7 @@ Only change something if you know what you are doing.</string>
1100 1100
                                             <property name="name">
1101 1101
                                                 <cstring>forceSecurityModeEdit</cstring>
1102 1102
                                             </property>
1103
-                                            <property name="tqminimumSize">
1103
+                                            <property name="minimumSize">
1104 1104
                                                 <size>
1105 1105
                                                     <width>40</width>
1106 1106
                                                     <height>0</height>
@@ -1114,7 +1114,7 @@ Only change something if you know what you are doing.</string>
1114 1114
                                             <property name="name">
1115 1115
                                                 <cstring>forceDirectoryModeEdit</cstring>
1116 1116
                                             </property>
1117
-                                            <property name="tqminimumSize">
1117
+                                            <property name="minimumSize">
1118 1118
                                                 <size>
1119 1119
                                                     <width>40</width>
1120 1120
                                                     <height>0</height>
@@ -1128,7 +1128,7 @@ Only change something if you know what you are doing.</string>
1128 1128
                                             <property name="name">
1129 1129
                                                 <cstring>forceDirectorySecurityModeEdit</cstring>
1130 1130
                                             </property>
1131
-                                            <property name="tqminimumSize">
1131
+                                            <property name="minimumSize">
1132 1132
                                                 <size>
1133 1133
                                                     <width>40</width>
1134 1134
                                                     <height>0</height>
@@ -1150,7 +1150,7 @@ Only change something if you know what you are doing.</string>
1150 1150
                                                     <verstretch>0</verstretch>
1151 1151
                                                 </sizepolicy>
1152 1152
                                             </property>
1153
-                                            <property name="tqminimumSize">
1153
+                                            <property name="minimumSize">
1154 1154
                                                 <size>
1155 1155
                                                     <width>20</width>
1156 1156
                                                     <height>0</height>
@@ -1172,7 +1172,7 @@ Only change something if you know what you are doing.</string>
1172 1172
                                                     <verstretch>0</verstretch>
1173 1173
                                                 </sizepolicy>
1174 1174
                                             </property>
1175
-                                            <property name="tqminimumSize">
1175
+                                            <property name="minimumSize">
1176 1176
                                                 <size>
1177 1177
                                                     <width>20</width>
1178 1178
                                                     <height>0</height>
@@ -1194,7 +1194,7 @@ Only change something if you know what you are doing.</string>
1194 1194
                                     <property name="sizeType">
1195 1195
                                         <enum>Expanding</enum>
1196 1196
                                     </property>
1197
-                                    <property name="tqsizeHint">
1197
+                                    <property name="sizeHint">
1198 1198
                                         <size>
1199 1199
                                             <width>20</width>
1200 1200
                                             <height>16</height>
@@ -1272,7 +1272,7 @@ Only change something if you know what you are doing.</string>
1272 1272
                                                     <verstretch>0</verstretch>
1273 1273
                                                 </sizepolicy>
1274 1274
                                             </property>
1275
-                                            <property name="tqminimumSize">
1275
+                                            <property name="minimumSize">
1276 1276
                                                 <size>
1277 1277
                                                     <width>20</width>
1278 1278
                                                     <height>0</height>
@@ -1294,7 +1294,7 @@ Only change something if you know what you are doing.</string>
1294 1294
                                                     <verstretch>0</verstretch>
1295 1295
                                                 </sizepolicy>
1296 1296
                                             </property>
1297
-                                            <property name="tqminimumSize">
1297
+                                            <property name="minimumSize">
1298 1298
                                                 <size>
1299 1299
                                                     <width>20</width>
1300 1300
                                                     <height>0</height>
@@ -1316,7 +1316,7 @@ Only change something if you know what you are doing.</string>
1316 1316
                                                     <verstretch>0</verstretch>
1317 1317
                                                 </sizepolicy>
1318 1318
                                             </property>
1319
-                                            <property name="tqminimumSize">
1319
+                                            <property name="minimumSize">
1320 1320
                                                 <size>
1321 1321
                                                     <width>20</width>
1322 1322
                                                     <height>0</height>
@@ -1330,7 +1330,7 @@ Only change something if you know what you are doing.</string>
1330 1330
                                             <property name="name">
1331 1331
                                                 <cstring>securityMaskEdit</cstring>
1332 1332
                                             </property>
1333
-                                            <property name="tqminimumSize">
1333
+                                            <property name="minimumSize">
1334 1334
                                                 <size>
1335 1335
                                                     <width>40</width>
1336 1336
                                                     <height>0</height>
@@ -1344,7 +1344,7 @@ Only change something if you know what you are doing.</string>
1344 1344
                                             <property name="name">
1345 1345
                                                 <cstring>directoryMaskEdit</cstring>
1346 1346
                                             </property>
1347
-                                            <property name="tqminimumSize">
1347
+                                            <property name="minimumSize">
1348 1348
                                                 <size>
1349 1349
                                                     <width>40</width>
1350 1350
                                                     <height>0</height>
@@ -1358,7 +1358,7 @@ Only change something if you know what you are doing.</string>
1358 1358
                                             <property name="name">
1359 1359
                                                 <cstring>directorySecurityMaskEdit</cstring>
1360 1360
                                             </property>
1361
-                                            <property name="tqminimumSize">
1361
+                                            <property name="minimumSize">
1362 1362
                                                 <size>
1363 1363
                                                     <width>40</width>
1364 1364
                                                     <height>0</height>
@@ -1386,7 +1386,7 @@ Only change something if you know what you are doing.</string>
1386 1386
                                             <property name="name">
1387 1387
                                                 <cstring>createMaskEdit</cstring>
1388 1388
                                             </property>
1389
-                                            <property name="tqminimumSize">
1389
+                                            <property name="minimumSize">
1390 1390
                                                 <size>
1391 1391
                                                     <width>40</width>
1392 1392
                                                     <height>0</height>
@@ -1408,7 +1408,7 @@ Only change something if you know what you are doing.</string>
1408 1408
                                                     <verstretch>0</verstretch>
1409 1409
                                                 </sizepolicy>
1410 1410
                                             </property>
1411
-                                            <property name="tqminimumSize">
1411
+                                            <property name="minimumSize">
1412 1412
                                                 <size>
1413 1413
                                                     <width>20</width>
1414 1414
                                                     <height>0</height>
@@ -1490,7 +1490,7 @@ Only change something if you know what you are doing.</string>
1490 1490
                                             <property name="name">
1491 1491
                                                 <cstring>forceUnknownAclUserEdit</cstring>
1492 1492
                                             </property>
1493
-                                            <property name="tqminimumSize">
1493
+                                            <property name="minimumSize">
1494 1494
                                                 <size>
1495 1495
                                                     <width>40</width>
1496 1496
                                                     <height>0</height>
@@ -1676,7 +1676,7 @@ Only change something if you know what you are doing.</string>
1676 1676
                                     <property name="sizeType">
1677 1677
                                         <enum>Expanding</enum>
1678 1678
                                     </property>
1679
-                                    <property name="tqsizeHint">
1679
+                                    <property name="sizeHint">
1680 1680
                                         <size>
1681 1681
                                             <width>20</width>
1682 1682
                                             <height>120</height>
@@ -1759,7 +1759,7 @@ Only change something if you know what you are doing.</string>
1759 1759
                                     <property name="sizeType">
1760 1760
                                         <enum>Expanding</enum>
1761 1761
                                     </property>
1762
-                                    <property name="tqsizeHint">
1762
+                                    <property name="sizeHint">
1763 1763
                                         <size>
1764 1764
                                             <width>143</width>
1765 1765
                                             <height>16</height>
@@ -1933,7 +1933,7 @@ Only change something if you know what you are doing.</string>
1933 1933
                                 <property name="sizeType">
1934 1934
                                     <enum>Expanding</enum>
1935 1935
                                 </property>
1936
-                                <property name="tqsizeHint">
1936
+                                <property name="sizeHint">
1937 1937
                                     <size>
1938 1938
                                         <width>20</width>
1939 1939
                                         <height>30</height>
@@ -2024,7 +2024,7 @@ Only change something if you know what you are doing.</string>
2024 2024
                                             <property name="name">
2025 2025
                                                 <cstring>manglingCharEdit</cstring>
2026 2026
                                             </property>
2027
-                                            <property name="tqmaximumSize">
2027
+                                            <property name="maximumSize">
2028 2028
                                                 <size>
2029 2029
                                                     <width>40</width>
2030 2030
                                                     <height>32767</height>
@@ -2041,7 +2041,7 @@ Only change something if you know what you are doing.</string>
2041 2041
                                             <property name="sizeType">
2042 2042
                                                 <enum>Expanding</enum>
2043 2043
                                             </property>
2044
-                                            <property name="tqsizeHint">
2044
+                                            <property name="sizeHint">
2045 2045
                                                 <size>
2046 2046
                                                     <width>20</width>
2047 2047
                                                     <height>0</height>
@@ -2322,7 +2322,7 @@ Only change something if you know what you are doing.</string>
2322 2322
                                     <property name="sizeType">
2323 2323
                                         <enum>Expanding</enum>
2324 2324
                                     </property>
2325
-                                    <property name="tqsizeHint">
2325
+                                    <property name="sizeHint">
2326 2326
                                         <size>
2327 2327
                                             <width>20</width>
2328 2328
                                             <height>20</height>
@@ -2392,7 +2392,7 @@ Only change something if you know what you are doing.</string>
2392 2392
                                                     <property name="sizeType">
2393 2393
                                                         <enum>Expanding</enum>
2394 2394
                                                     </property>
2395
-                                                    <property name="tqsizeHint">
2395
+                                                    <property name="sizeHint">
2396 2396
                                                         <size>
2397 2397
                                                             <width>299</width>
2398 2398
                                                             <height>20</height>
@@ -2508,7 +2508,7 @@ Only change something if you know what you are doing.</string>
2508 2508
                                                     <property name="sizeType">
2509 2509
                                                         <enum>Expanding</enum>
2510 2510
                                                     </property>
2511
-                                                    <property name="tqsizeHint">
2511
+                                                    <property name="sizeHint">
2512 2512
                                                         <size>
2513 2513
                                                             <width>40</width>
2514 2514
                                                             <height>20</height>
@@ -2564,7 +2564,7 @@ Only change something if you know what you are doing.</string>
2564 2564
                                     <property name="sizeType">
2565 2565
                                         <enum>Expanding</enum>
2566 2566
                                     </property>
2567
-                                    <property name="tqsizeHint">
2567
+                                    <property name="sizeHint">
2568 2568
                                         <size>
2569 2569
                                             <width>20</width>
2570 2570
                                             <height>260</height>
@@ -2648,7 +2648,7 @@ Only change something if you know what you are doing.</string>
2648 2648
                                     <property name="sizeType">
2649 2649
                                         <enum>Expanding</enum>
2650 2650
                                     </property>
2651
-                                    <property name="tqsizeHint">
2651
+                                    <property name="sizeHint">
2652 2652
                                         <size>
2653 2653
                                             <width>16</width>
2654 2654
                                             <height>284</height>
@@ -2745,7 +2745,7 @@ Only change something if you know what you are doing.</string>
2745 2745
                                     <property name="sizeType">
2746 2746
                                         <enum>Expanding</enum>
2747 2747
                                     </property>
2748
-                                    <property name="tqsizeHint">
2748
+                                    <property name="sizeHint">
2749 2749
                                         <size>
2750 2750
                                             <width>20</width>
2751 2751
                                             <height>50</height>
@@ -2916,7 +2916,7 @@ Only change something if you know what you are doing.</string>
2916 2916
                     <property name="sizeType">
2917 2917
                         <enum>Expanding</enum>
2918 2918
                     </property>
2919
-                    <property name="tqsizeHint">
2919
+                    <property name="sizeHint">
2920 2920
                         <size>
2921 2921
                             <width>20</width>
2922 2922
                             <height>0</height>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp View File

@@ -175,7 +175,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP
175 175
 
176 176
 void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen)
177 177
 {
178
-  _smbpasswdOutput+=TQString::tqfromLatin1(buffer,buflen);
178
+  _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen);
179 179
 }
180 180
 
181 181
 

+ 1
- 1
filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui View File

@@ -238,7 +238,7 @@
238 238
                     <property name="sizeType">
239 239
                         <enum>Expanding</enum>
240 240
                     </property>
241
-                    <property name="tqsizeHint">
241
+                    <property name="sizeHint">
242 242
                         <size>
243 243
                             <width>20</width>
244 244
                             <height>20</height>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/userselectdlg.ui View File

@@ -183,7 +183,7 @@
183 183
             <property name="sizeType">
184 184
                 <enum>Expanding</enum>
185 185
             </property>
186
-            <property name="tqsizeHint">
186
+            <property name="sizeHint">
187 187
                 <size>
188 188
                     <width>20</width>
189 189
                     <height>50</height>
@@ -225,7 +225,7 @@
225 225
                     <property name="sizeType">
226 226
                         <enum>Expanding</enum>
227 227
                     </property>
228
-                    <property name="tqsizeHint">
228
+                    <property name="sizeHint">
229 229
                         <size>
230 230
                             <width>285</width>
231 231
                             <height>20</height>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/usertab.ui View File

@@ -159,7 +159,7 @@
159 159
                     <property name="sizeType">
160 160
                         <enum>Expanding</enum>
161 161
                     </property>
162
-                    <property name="tqsizeHint">
162
+                    <property name="sizeHint">
163 163
                         <size>
164 164
                             <width>20</width>
165 165
                             <height>100</height>

+ 4
- 4
filesharing/advanced/nfs/hostprops.ui View File

@@ -34,7 +34,7 @@
34 34
                     <verstretch>0</verstretch>
35 35
                 </sizepolicy>
36 36
             </property>
37
-            <property name="tqminimumSize">
37
+            <property name="minimumSize">
38 38
                 <size>
39 39
                     <width>180</width>
40 40
                     <height>0</height>
@@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
380 380
                                     <verstretch>0</verstretch>
381 381
                                 </sizepolicy>
382 382
                             </property>
383
-                            <property name="tqminimumSize">
383
+                            <property name="minimumSize">
384 384
                                 <size>
385 385
                                     <width>50</width>
386 386
                                     <height>0</height>
@@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
426 426
                                     <verstretch>0</verstretch>
427 427
                                 </sizepolicy>
428 428
                             </property>
429
-                            <property name="tqminimumSize">
429
+                            <property name="minimumSize">
430 430
                                 <size>
431 431
                                     <width>50</width>
432 432
                                     <height>0</height>
@@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
450 450
             <property name="sizeType">
451 451
                 <enum>Expanding</enum>
452 452
             </property>
453
-            <property name="tqsizeHint">
453
+            <property name="sizeHint">
454 454
                 <size>
455 455
                     <width>20</width>
456 456
                     <height>16</height>

+ 1
- 1
filesharing/advanced/nfs/nfsdialoggui.ui View File

@@ -89,7 +89,7 @@ The first column shows the name or address of the host, the second column shows
89 89
                     <property name="sizeType">
90 90
                         <enum>Expanding</enum>
91 91
                     </property>
92
-                    <property name="tqsizeHint">
92
+                    <property name="sizeHint">
93 93
                         <size>
94 94
                             <width>20</width>
95 95
                             <height>40</height>

+ 1
- 1
filesharing/advanced/nfs/nfsentry.h View File

@@ -74,7 +74,7 @@ typedef TQPtrListIterator<NFSLine> NFSLineIterator;
74 74
 
75 75
 class NFSEmptyLine : public NFSLine {
76 76
 public:
77
-  virtual TQString toString() const { return TQString::tqfromLatin1("\n"); }
77
+  virtual TQString toString() const { return TQString::fromLatin1("\n"); }
78 78
   virtual ~NFSEmptyLine() {};
79 79
 };
80 80
 

+ 5
- 5
filesharing/advanced/propsdlgplugin/propertiespagegui.ui View File

@@ -146,7 +146,7 @@
146 146
                                     <property name="sizeType">
147 147
                                         <enum>Expanding</enum>
148 148
                                     </property>
149
-                                    <property name="tqsizeHint">
149
+                                    <property name="sizeHint">
150 150
                                         <size>
151 151
                                             <width>40</width>
152 152
                                             <height>20</height>
@@ -181,7 +181,7 @@
181 181
                                     <property name="sizeType">
182 182
                                         <enum>Expanding</enum>
183 183
                                     </property>
184
-                                    <property name="tqsizeHint">
184
+                                    <property name="sizeHint">
185 185
                                         <size>
186 186
                                             <width>156</width>
187 187
                                             <height>20</height>
@@ -277,7 +277,7 @@
277 277
                                     <property name="sizeType">
278 278
                                         <enum>Expanding</enum>
279 279
                                     </property>
280
-                                    <property name="tqsizeHint">
280
+                                    <property name="sizeHint">
281 281
                                         <size>
282 282
                                             <width>40</width>
283 283
                                             <height>20</height>
@@ -312,7 +312,7 @@
312 312
                                     <property name="sizeType">
313 313
                                         <enum>Expanding</enum>
314 314
                                     </property>
315
-                                    <property name="tqsizeHint">
315
+                                    <property name="sizeHint">
316 316
                                         <size>
317 317
                                             <width>40</width>
318 318
                                             <height>20</height>
@@ -335,7 +335,7 @@
335 335
             <property name="sizeType">
336 336
                 <enum>Expanding</enum>
337 337
             </property>
338
-            <property name="tqsizeHint">
338
+            <property name="sizeHint">
339 339
                 <size>
340 340
                     <width>20</width>
341 341
                     <height>1</height>

+ 5
- 5
filesharing/simple/controlcenter.ui View File

@@ -84,7 +84,7 @@
84 84
                                     <verstretch>0</verstretch>
85 85
                                 </sizepolicy>
86 86
                             </property>
87
-                            <property name="tqminimumSize">
87
+                            <property name="minimumSize">
88 88
                                 <size>
89 89
                                     <width>11</width>
90 90
                                     <height>0</height>
@@ -149,7 +149,7 @@
149 149
                                     <verstretch>0</verstretch>
150 150
                                 </sizepolicy>
151 151
                             </property>
152
-                            <property name="tqminimumSize">
152
+                            <property name="minimumSize">
153 153
                                 <size>
154 154
                                     <width>11</width>
155 155
                                     <height>0</height>
@@ -203,7 +203,7 @@
203 203
                                     <verstretch>0</verstretch>
204 204
                                 </sizepolicy>
205 205
                             </property>
206
-                            <property name="tqminimumSize">
206
+                            <property name="minimumSize">
207 207
                                 <size>
208 208
                                     <width>11</width>
209 209
                                     <height>0</height>
@@ -275,7 +275,7 @@
275 275
                             <property name="sizeType">
276 276
                                 <enum>Expanding</enum>
277 277
                             </property>
278
-                            <property name="tqsizeHint">
278
+                            <property name="sizeHint">
279 279
                                 <size>
280 280
                                     <width>40</width>
281 281
                                     <height>20</height>
@@ -398,7 +398,7 @@
398 398
                             <property name="sizeType">
399 399
                                 <enum>Expanding</enum>
400 400
                             </property>
401
-                            <property name="tqsizeHint">
401
+                            <property name="sizeHint">
402 402
                                 <size>
403 403
                                     <width>20</width>
404 404
                                     <height>20</height>

+ 4
- 4
filesharing/simple/fileshare.cpp View File

@@ -81,9 +81,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
81 81
            this, TQT_SLOT(allowedUsersBtnClicked()));
82 82
 
83 83
   TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) );
84
-  path += TQString::tqfromLatin1(":/usr/sbin");
85
-  TQString sambaExec = KStandardDirs::findExe( TQString::tqfromLatin1("smbd"), path );
86
-  TQString nfsExec = KStandardDirs::findExe( TQString::tqfromLatin1("rpc.nfsd"), path );
84
+  path += TQString::fromLatin1(":/usr/sbin");
85
+  TQString sambaExec = KStandardDirs::findExe( TQString::fromLatin1("smbd"), path );
86
+  TQString nfsExec = KStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path );
87 87
 
88 88
   if ( nfsExec.isEmpty() && sambaExec.isEmpty())
89 89
   {
@@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() {
196 196
 
197 197
 void KFileShareConfig::load()
198 198
 {
199
-    KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
199
+    KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
200 200
 
201 201
     m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" );
202 202
     

+ 2
- 2
filesharing/simple/groupconfiggui.ui View File

@@ -86,7 +86,7 @@
86 86
                     <property name="sizeType">
87 87
                         <enum>Expanding</enum>
88 88
                     </property>
89
-                    <property name="tqsizeHint">
89
+                    <property name="sizeHint">
90 90
                         <size>
91 91
                             <width>20</width>
92 92
                             <height>20</height>
@@ -140,7 +140,7 @@
140 140
                     <property name="sizeType">
141 141
                         <enum>Expanding</enum>
142 142
                     </property>
143
-                    <property name="tqsizeHint">
143
+                    <property name="sizeHint">
144 144
                         <size>
145 145
                             <width>180</width>
146 146
                             <height>20</height>

+ 5
- 5
filesharing/simple/krichtextlabel.cpp View File

@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
41 41
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
42 42
  : TQLabel ( parent, name ) {
43 43
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
44
-  tqsetAlignment( TQt::WordBreak );
44
+  setAlignment( TQt::WordBreak );
45 45
   setText(text);
46 46
 }
47 47
 
48 48
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
49 49
  : TQLabel ( parent, name ) {
50 50
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
51
-  tqsetAlignment( TQt::WordBreak );
51
+  setAlignment( TQt::WordBreak );
52 52
 }
53 53
 
54 54
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
62 62
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
63 63
 }
64 64
 
65
-TQSize KRichTextLabel::tqminimumSizeHint() const
65
+TQSize KRichTextLabel::minimumSizeHint() const
66 66
 {
67 67
   TQString qt_text = qrichtextify( text() );
68 68
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
97 97
   return TQSize(pref_width, rt.height());
98 98
 }
99 99
 
100
-TQSize KRichTextLabel::tqsizeHint() const
100
+TQSize KRichTextLabel::sizeHint() const
101 101
 {
102
-  return tqminimumSizeHint();
102
+  return minimumSizeHint();
103 103
 }
104 104
 
105 105
 void KRichTextLabel::setText( const TQString &text ) {

+ 2
- 2
filesharing/simple/krichtextlabel.h View File

@@ -46,8 +46,8 @@ public:
46 46
   int defaultWidth() const { return m_defaultWidth; }
47 47
   void setDefaultWidth(int defaultWidth);
48 48
 
49
-  virtual TQSize tqminimumSizeHint() const;
50
-  virtual TQSize tqsizeHint() const;
49
+  virtual TQSize minimumSizeHint() const;
50
+  virtual TQSize sizeHint() const;
51 51
   TQSizePolicy sizePolicy() const;
52 52
 
53 53
 public slots:

+ 5
- 5
kdict/actions.cpp View File

@@ -46,7 +46,7 @@ int DictComboAction::plug( TQWidget *widget, int index )
46 46
     m_combo = new KComboBox(m_editable,bar);
47 47
     m_combo->setCompletionMode(m_compMode);
48 48
 
49
-    bar->insertWidget( id_, m_combo->tqsizeHint().width(), m_combo, index );
49
+    bar->insertWidget( id_, m_combo->sizeHint().width(), m_combo, index );
50 50
     bar->setItemAutoSized(id_,m_autoSized);
51 51
 
52 52
     if ( m_combo ) {
@@ -155,7 +155,7 @@ void DictComboAction::setList(TQStringList items)
155 155
     if (m_editable && m_combo->completionObject())
156 156
       m_combo->completionObject()->setItems(items);
157 157
     if (!m_autoSized)
158
-      m_combo->setFixedWidth(m_combo->tqsizeHint().width());
158
+      m_combo->setFixedWidth(m_combo->sizeHint().width());
159 159
   }
160 160
 }
161 161
 
@@ -213,9 +213,9 @@ int DictLabelAction::plug( TQWidget *widget, int index )
213 213
     int id = KAction::getToolButtonID();
214 214
 
215 215
     TQLabel *label = new TQLabel( text(), widget,  "kde toolbar widget" );
216
-    label->setMinimumWidth(label->tqsizeHint().width());
216
+    label->setMinimumWidth(label->sizeHint().width());
217 217
     label->setBackgroundMode( TQt::PaletteButton );
218
-    label->tqsetAlignment(AlignCenter | AlignVCenter);
218
+    label->setAlignment(AlignCenter | AlignVCenter);
219 219
     label->adjustSize();
220 220
 
221 221
     tb->insertWidget( id, label->width(), label, index );
@@ -320,7 +320,7 @@ void DictButtonAction::unplug( TQWidget *widget )
320 320
 int DictButtonAction::widthHint()
321 321
 {
322 322
   if (m_button)
323
-    return m_button->tqsizeHint().width();
323
+    return m_button->sizeHint().width();
324 324
   else
325 325
     return 0;
326 326
 }

+ 6
- 6
kdict/applet/kdictapplet.cpp View File

@@ -102,7 +102,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
102 102
   TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true);
103 103
   iconLabel->setPixmap(pm);
104 104
   baseLay->addWidget(iconLabel,1,0);
105
-  iconLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter);
105
+  iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter);
106 106
   iconLabel->setFixedWidth(pm.width()+4);
107 107
   TQToolTip::add(iconLabel,i18n("Look up a word or phrase with Kdict"));
108 108
 
@@ -160,7 +160,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
160 160
   externalCombo = new KHistoryCombo(popupBox);
161 161
   externalCombo->setCompletionObject(completionObject);  
162 162
   connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&)));
163
-  externalCombo->setFixedSize(160, externalCombo->tqsizeHint().height());
163
+  externalCombo->setFixedSize(160, externalCombo->sizeHint().height());
164 164
   
165 165
   connect(internalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
166 166
           this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion)));
@@ -205,9 +205,9 @@ DictApplet::~DictApplet()
205 205
 int DictApplet::widthForHeight(int height) const
206 206
 {
207 207
   if (height >= 38)
208
-    return textLabel->tqsizeHint().width()+55;
208
+    return textLabel->sizeHint().width()+55;
209 209
   else
210
-    return textLabel->tqsizeHint().width()+25;
210
+    return textLabel->sizeHint().width()+25;
211 211
 }
212 212
 
213 213
 
@@ -224,10 +224,10 @@ void DictApplet::resizeEvent(TQResizeEvent*)
224 224
     baseWidget->show();
225 225
     baseWidget->setFixedSize(width(),height());
226 226
 
227
-    if (height() < internalCombo->tqsizeHint().height())
227
+    if (height() < internalCombo->sizeHint().height())
228 228
       internalCombo->setFixedHeight(height());
229 229
     else
230
-      internalCombo->setFixedHeight(internalCombo->tqsizeHint().height());
230
+      internalCombo->setFixedHeight(internalCombo->sizeHint().height());
231 231
 
232 232
     if (height() >= 38) {
233 233
       textLabel->show();

+ 6
- 6
kdict/matchview.cpp View File

@@ -119,7 +119,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
119 119
 
120 120
   boxLayout->addSpacing(1);
121 121
   w_strat = new TQComboBox(false,this);
122
-  w_strat->setFixedHeight(w_strat->tqsizeHint().height());
122
+  w_strat->setFixedHeight(w_strat->sizeHint().height());
123 123
   connect(w_strat,TQT_SIGNAL(activated(int)),this,TQT_SLOT(strategySelected(int)));
124 124
   boxLayout->addWidget(w_strat,0);
125 125
   boxLayout->addSpacing(1);
@@ -133,7 +133,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
133 133
   w_list->setSelectionMode(TQListView::Extended);
134 134
   w_list->setTreeStepSize(18);
135 135
   w_list->setSorting(-1);                                 // disable sorting
136
-  w_list->setMinimumHeight(w_strat->tqsizeHint().height());
136
+  w_list->setMinimumHeight(w_strat->sizeHint().height());
137 137
   connect(w_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(enableGetButton()));
138 138
   connect(w_list,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_SLOT(returnPressed(TQListViewItem *)));
139 139
   connect(w_list,TQT_SIGNAL(doubleClicked(TQListViewItem *)),TQT_SLOT(getOneItem(TQListViewItem *)));
@@ -144,15 +144,15 @@ MatchView::MatchView(TQWidget *parent, const char *name)
144 144
 
145 145
   boxLayout->addSpacing(1);
146 146
   w_get = new TQPushButton(i18n("&Get Selected"),this);
147
-  w_get->setFixedHeight(w_get->tqsizeHint().height()-3);
148
-  w_get->setMinimumWidth(w_get->tqsizeHint().width()-20);
147
+  w_get->setFixedHeight(w_get->sizeHint().height()-3);
148
+  w_get->setMinimumWidth(w_get->sizeHint().width()-20);
149 149
   w_get->setEnabled(false);
150 150
   connect(w_get, TQT_SIGNAL(clicked()), this, TQT_SLOT(getSelected()));
151 151
   boxLayout->addWidget(w_get,0);
152 152
 
153 153
   w_getAll = new TQPushButton(i18n("Get &All"),this);
154
-  w_getAll->setFixedHeight(w_getAll->tqsizeHint().height()-3);
155
-  w_getAll->setMinimumWidth(w_getAll->tqsizeHint().width()-20);
154
+  w_getAll->setFixedHeight(w_getAll->sizeHint().height()-3);
155
+  w_getAll->setMinimumWidth(w_getAll->sizeHint().width()-20);
156 156
   w_getAll->setEnabled(false);
157 157
   connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll()));
158 158
   boxLayout->addWidget(w_getAll,0);

+ 6
- 6
kdict/sets.cpp View File

@@ -44,12 +44,12 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
44 44
   topLayout->addLayout(subLayout1,0);
45 45
 
46 46
   w_set = new TQComboBox(true,page);
47
-  w_set->setFixedHeight(w_set->tqsizeHint().height());
47
+  w_set->setFixedHeight(w_set->sizeHint().height());
48 48
   w_set->setInsertionPolicy (TQComboBox::NoInsertion);
49 49
   w_set->insertStringList(sets);
50 50
   connect(w_set, TQT_SIGNAL(activated(int)),this, TQT_SLOT(activateSet(int)));
51 51
   TQLabel *l = new TQLabel(w_set, i18n("&Set:"),page);
52
-  l->setMinimumSize(l->tqsizeHint());
52
+  l->setMinimumSize(l->sizeHint());
53 53
   subLayout1->addWidget(l,0);
54 54
   subLayout1->addWidget(w_set,1);
55 55
 
@@ -60,12 +60,12 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
60 60
   subLayout1->addWidget(w_save,0);
61 61
 
62 62
   TQPushButton *btn = new TQPushButton(i18n("&New"),page);
63
-  btn->setMinimumSize(btn->tqsizeHint());
63
+  btn->setMinimumSize(btn->sizeHint());
64 64
   connect(btn, TQT_SIGNAL(clicked()),this, TQT_SLOT(newPressed()));
65 65
   subLayout1->addWidget(btn,0);
66 66
 
67 67
   w_delete = new TQPushButton(i18n("&Delete"),page);
68
-  w_delete->setMinimumSize(w_delete->tqsizeHint());
68
+  w_delete->setMinimumSize(w_delete->sizeHint());
69 69
   connect(w_delete, TQT_SIGNAL(clicked()),this, TQT_SLOT(deletePressed()));
70 70
   subLayout1->addWidget(w_delete,0);
71 71
 
@@ -83,7 +83,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
83 83
   connect(w_leftBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(leftSelected(int)));
84 84
   connect(w_leftBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(leftHighlighted(int)));
85 85
   TQLabel *leftLabel = new TQLabel(w_leftBox, i18n("S&elected databases:"),page);
86
-  leftLabel->setMinimumSize(leftLabel->tqsizeHint());
86
+  leftLabel->setMinimumSize(leftLabel->sizeHint());
87 87
   subLayout2->addWidget(leftLabel,0,0);
88 88
   subLayout2->addMultiCellWidget(w_leftBox,1,6,0,0);
89 89
 
@@ -111,7 +111,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
111 111
   connect(w_rightBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(rightSelected(int)));
112 112
   connect(w_rightBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(rightHighlighted(int)));
113 113
   TQLabel *rightLabel = new TQLabel(w_rightBox, i18n("A&vailable databases:"),page);
114
-  rightLabel->setMinimumSize(rightLabel->tqsizeHint());
114
+  rightLabel->setMinimumSize(rightLabel->sizeHint());
115 115
   subLayout2->addWidget(rightLabel,0,2);
116 116
   subLayout2->addMultiCellWidget(w_rightBox,1,6,2,2);
117 117
 

+ 7
- 7
kget/dlgIndividual.cpp View File

@@ -162,9 +162,9 @@ DlgIndividual::DlgIndividual(Transfer * _item)
162 162
     // otherwise set it to the current time
163 163
     TQDateTime dt;
164 164
 
165
-    if (item->getStartTime() < TQDateTime::tqcurrentDateTime() && item->getMode() != Transfer::MD_SCHEDULED)
165
+    if (item->getStartTime() < TQDateTime::currentDateTime() && item->getMode() != Transfer::MD_SCHEDULED)
166 166
     {
167
-        dt = TQDateTime::tqcurrentDateTime();
167
+        dt = TQDateTime::currentDateTime();
168 168
     }
169 169
     else
170 170
     {
@@ -182,14 +182,14 @@ DlgIndividual::DlgIndividual(Transfer * _item)
182 182
     ml_log = new TQTextEdit(panelAdvanced);
183 183
     ml_log->setTextFormat(LogText);
184 184
     ml_log->setReadOnly(true);
185
-    // ml_log->setFixedSize(tqsizeHint());
185
+    // ml_log->setFixedSize(sizeHint());
186 186
     ml_log->setVScrollBarMode(TQScrollView::Auto);
187 187
     ml_log->setWordWrap(TQTextEdit::NoWrap);
188 188
 
189
-    // ml_log->tqsetSizePolicy(policy);
189
+    // ml_log->setSizePolicy(policy);
190 190
 
191 191
     panelAdvanced->addTab(ml_log, i18n("Log"));
192
-    // panelAdvanced->setFixedSize(tqsizeHint());
192
+    // panelAdvanced->setFixedSize(sizeHint());
193 193
 
194 194
 
195 195
 
@@ -197,7 +197,7 @@ DlgIndividual::DlgIndividual(Transfer * _item)
197 197
     advanced = ksettings.b_advancedIndividual;
198 198
     slotToggleAdvanced();
199 199
 
200
-    resize( tqminimumSizeHint() );
200
+    resize( minimumSizeHint() );
201 201
     setMaximumHeight( height() );
202 202
 
203 203
     //bool keepOpenChecked = false;
@@ -315,7 +315,7 @@ void DlgIndividual::slotKeepOpenToggled(bool bToggled)
315 315
 
316 316
     bKeepDlgOpen=bToggled;
317 317
 
318
-    if (!bKeepDlgOpen && item->gettqStatus()==Transfer::ST_FINISHED)
318
+    if (!bKeepDlgOpen && item->getStatus()==Transfer::ST_FINISHED)
319 319
     {
320 320
         hide();
321 321
         m_pDockIndividual->hide();

+ 2
- 2
kget/dlgadvancedbase.ui View File

@@ -48,7 +48,7 @@
48 48
                     <property name="sizeType">
49 49
                         <enum>Preferred</enum>
50 50
                     </property>
51
-                    <property name="tqsizeHint">
51
+                    <property name="sizeHint">
52 52
                         <size>
53 53
                             <width>40</width>
54 54
                             <height>20</height>
@@ -178,7 +178,7 @@
178 178
                     <property name="sizeType">
179 179
                         <enum>Expanding</enum>
180 180
                     </property>
181
-                    <property name="tqsizeHint">
181
+                    <property name="sizeHint">
182 182
                         <size>
183 183
                             <width>35</width>
184 184
                             <height>20</height>

+ 3
- 3
kget/dlgautomationbase.ui View File

@@ -112,7 +112,7 @@
112 112
                     <property name="sizeType">
113 113
                         <enum>Preferred</enum>
114 114
                     </property>
115
-                    <property name="tqsizeHint">
115
+                    <property name="sizeHint">
116 116
                         <size>
117 117
                             <width>40</width>
118 118
                             <height>20</height>
@@ -129,7 +129,7 @@
129 129
                     <property name="sizeType">
130 130
                         <enum>Preferred</enum>
131 131
                     </property>
132
-                    <property name="tqsizeHint">
132
+                    <property name="sizeHint">
133 133
                         <size>
134 134
                             <width>50</width>
135 135
                             <height>20</height>
@@ -146,7 +146,7 @@
146 146
                     <property name="sizeType">
147 147
                         <enum>Preferred</enum>
148 148
                     </property>
149
-                    <property name="tqsizeHint">
149
+                    <property name="sizeHint">
150 150
                         <size>
151 151
                             <width>50</width>
152 152
                             <height>20</height>

+ 5
- 5
kget/dlgconnectionbase.ui View File

@@ -94,7 +94,7 @@
94 94
                     <property name="sizeType">
95 95
                         <enum>Expanding</enum>
96 96
                     </property>
97
-                    <property name="tqsizeHint">
97
+                    <property name="sizeHint">
98 98
                         <size>
99 99
                             <width>40</width>
100 100
                             <height>20</height>
@@ -111,7 +111,7 @@
111 111
                     <property name="sizeType">
112 112
                         <enum>Expanding</enum>
113 113
                     </property>
114
-                    <property name="tqsizeHint">
114
+                    <property name="sizeHint">
115 115
                         <size>
116 116
                             <width>40</width>
117 117
                             <height>20</height>
@@ -141,7 +141,7 @@
141 141
                     <property name="sizeType">
142 142
                         <enum>Expanding</enum>
143 143
                     </property>
144
-                    <property name="tqsizeHint">
144
+                    <property name="sizeHint">
145 145
                         <size>
146 146
                             <width>40</width>
147 147
                             <height>20</height>
@@ -174,7 +174,7 @@
174 174
                     <property name="sizeType">
175 175
                         <enum>Expanding</enum>
176 176
                     </property>
177
-                    <property name="tqsizeHint">
177
+                    <property name="sizeHint">
178 178
                         <size>
179 179
                             <width>40</width>
180 180
                             <height>20</height>
@@ -283,7 +283,7 @@
283 283
                     <property name="sizeType">
284 284
                         <enum>Expanding</enum>
285 285
                     </property>
286
-                    <property name="tqsizeHint">
286
+                    <property name="sizeHint">
287 287
                         <size>
288 288
                             <width>20</width>
289 289
                             <height>20</height>

+ 1
- 1
kget/dlgdirectoriesbase.ui View File

@@ -51,7 +51,7 @@
51 51
                     <property name="sizeType">
52 52
                         <enum>Expanding</enum>
53 53
                     </property>
54
-                    <property name="tqsizeHint">
54
+                    <property name="sizeHint">
55 55
                         <size>
56 56
                             <width>20</width>
57 57
                             <height>40</height>

+ 3
- 3
kget/dlglimitsbase.ui View File

@@ -106,7 +106,7 @@
106 106
                     <property name="sizeType">
107 107
                         <enum>Expanding</enum>
108 108
                     </property>
109
-                    <property name="tqsizeHint">
109
+                    <property name="sizeHint">
110 110
                         <size>
111 111
                             <width>40</width>
112 112
                             <height>20</height>
@@ -123,7 +123,7 @@
123 123
                     <property name="sizeType">
124 124
                         <enum>Expanding</enum>
125 125
                     </property>
126
-                    <property name="tqsizeHint">
126
+                    <property name="sizeHint">
127 127
                         <size>
128 128
                             <width>40</width>
129 129
                             <height>20</height>
@@ -140,7 +140,7 @@
140 140
                     <property name="sizeType">
141 141
                         <enum>Expanding</enum>
142 142
                     </property>
143
-                    <property name="tqsizeHint">
143
+                    <property name="sizeHint">
144 144
                         <size>
145 145
                             <width>40</width>
146 146
                             <height>20</height>

+ 2
- 2
kget/dlgsystembase.ui View File

@@ -107,7 +107,7 @@
107 107
             <property name="sizeType">
108 108
                 <enum>Expanding</enum>
109 109
             </property>
110
-            <property name="tqsizeHint">
110
+            <property name="sizeHint">
111 111
                 <size>
112 112
                     <width>40</width>
113 113
                     <height>20</height>
@@ -124,7 +124,7 @@
124 124
             <property name="sizeType">
125 125
                 <enum>Expanding</enum>
126 126
             </property>
127
-            <property name="tqsizeHint">
127
+            <property name="sizeHint">
128 128
                 <size>
129 129
                     <width>40</width>
130 130
                     <height>10</height>

+ 3
- 3
kget/docking.cpp View File

@@ -56,7 +56,7 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent)
56 56
     setAcceptDrops(true);
57 57
    
58 58
     dtip = new DynamicTip( this );
59
-    dtip->settqStatus( kapp->aboutData()->shortDescription() );
59
+    dtip->setStatus( kapp->aboutData()->shortDescription() );
60 60
 
61 61
 }
62 62
 
@@ -100,7 +100,7 @@ void DockWidget::mousePressEvent(TQMouseEvent * e)
100 100
 
101 101
 void DockWidget::updateToolTip( const TQString& _status )
102 102
 {
103
-   dtip->settqStatus( _status );
103
+   dtip->setStatus( _status );
104 104
 }
105 105
 
106 106
 
@@ -117,7 +117,7 @@ DynamicTip::DynamicTip( TQWidget * parent )
117 117
 }
118 118
 
119 119
 
120
-void DynamicTip::settqStatus( const TQString & _status )
120
+void DynamicTip::setStatus( const TQString & _status )
121 121
 {
122 122
    status = _status;
123 123
 }

+ 1
- 1
kget/docking.h View File

@@ -43,7 +43,7 @@ class DynamicTip : public TQToolTip
43 43
    public:
44 44
        DynamicTip( TQWidget * parent );
45 45
        virtual ~DynamicTip() {}//TODO workaround for qt-bug, can be removed after 4.0 
46
-       void settqStatus( const TQString & _status );
46
+       void setStatus( const TQString & _status );
47 47
 
48 48
    protected:
49 49
        void maybeTip( const TQPoint & );

+ 1
- 1
kget/droptarget.cpp View File

@@ -45,7 +45,7 @@
45 45
 #include <X11/Xos.h>
46 46
 #include <X11/extensions/shape.h>
47 47
 #undef Bool
48
-#undef tqStatus
48
+#undef Status
49 49
 #endif
50 50
 #include "settings.h"
51 51
 #include "droptarget.h"

+ 17
- 17
kget/kmainwidget.cpp View File

@@ -142,8 +142,8 @@ KMainWidget::KMainWidget(bool bStartDocked)
142 142
     kmain = this;
143 143
 
144 144
     // Set log time, needed for the name of log file
145
-    TQDate date = TQDateTime::tqcurrentDateTime().date();
146
-    TQTime time = TQDateTime::tqcurrentDateTime().time();
145
+    TQDate date = TQDateTime::currentDateTime().date();
146
+    TQTime time = TQDateTime::currentDateTime().time();
147 147
     TQString tmp;
148 148
 
149 149
     tmp.sprintf("log%d:%d:%d-%d:%d:%d", date.day(), date.month(), date.year(), time.hour(), time.minute(), time.second());
@@ -708,7 +708,7 @@ void KMainWidget::slotQuit()
708 708
 
709 709
     for (; it.current(); ++it) {
710 710
         item = it.current();
711
-        if (item->gettqStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) {
711
+        if (item->getStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) {
712 712
             if (KMessageBox::warningContinueCancel(this, i18n("Some transfers are still running.\nAre you sure you want to quit KGet?"), i18n("Warning"), KStdGuiItem::quit()) != KMessageBox::Continue) {
713 713
 #ifdef _DEBUG
714 714
                 sDebugOut << endl;
@@ -876,10 +876,10 @@ void KMainWidget::stopAll()
876 876
     log(i18n("Stopping all jobs"), false);
877 877
 
878 878
     TransferIterator it(myTransferList);
879
-    Transfer::TransfertqStatus tqStatus;
879
+    Transfer::TransferStatus Status;
880 880
     for (; it.current(); ++it) {
881
-        tqStatus = it.current()->gettqStatus();
882
-        if (tqStatus == Transfer::ST_TRYING || tqStatus == Transfer::ST_RUNNING)
881
+        Status = it.current()->getStatus();
882
+        if (Status == Transfer::ST_TRYING || Status == Transfer::ST_RUNNING)
883 883
             it.current()->slotStop();
884 884
     }
885 885
     slotUpdateActions();
@@ -1360,7 +1360,7 @@ void KMainWidget::checkQueue()
1360 1360
 
1361 1361
         // count running transfers
1362 1362
         for (; it.current(); ++it) {
1363
-            status = it.current()->gettqStatus();
1363
+            status = it.current()->getStatus();
1364 1364
             if (status == Transfer::ST_RUNNING || status == Transfer::ST_TRYING)
1365 1365
                 numRun++;
1366 1366
         }
@@ -1370,7 +1370,7 @@ void KMainWidget::checkQueue()
1370 1370
         bool isQuequed;
1371 1371
         for (; it.current() && numRun < ksettings.maxSimultaneousConnections; ++it) {
1372 1372
             item = it.current();
1373
-            isRunning = (item->gettqStatus() == Transfer::ST_RUNNING) || ((item->gettqStatus() == Transfer::ST_TRYING));
1373
+            isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING));
1374 1374
 
1375 1375
             isQuequed = (item->getMode() == Transfer::MD_TQUEUED || item->getMode() == Transfer::MD_NEW);
1376 1376
 
@@ -1394,7 +1394,7 @@ void KMainWidget::checkQueue()
1394 1394
     for (; it.current(); ++it)
1395 1395
     {
1396 1396
         item = it.current();
1397
-        if (item->getMode() == Transfer::MD_NEW && item->gettqStatus() == Transfer::ST_STOPPED)
1397
+        if (item->getMode() == Transfer::MD_NEW && item->getStatus() == Transfer::ST_STOPPED)
1398 1398
         {
1399 1399
             item->checkCache();
1400 1400
         }
@@ -1420,7 +1420,7 @@ void KMainWidget::slotAnimTimeout()
1420 1420
         animCounter = 0;
1421 1421
     }
1422 1422
     // update status of all items of transferList
1423
-    isTransfer = myTransferList->updatetqStatus(animCounter);
1423
+    isTransfer = myTransferList->updateStatus(animCounter);
1424 1424
 
1425 1425
     //if (this->isVisible()) {
1426 1426
         updateStatusBar();
@@ -1445,7 +1445,7 @@ void KMainWidget::slotTransferTimeout()
1445 1445
 
1446 1446
     for (; it.current(); ++it) {
1447 1447
         item = it.current();
1448
-        if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::tqcurrentDateTime()) {
1448
+        if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) {
1449 1449
             item->setMode(Transfer::MD_TQUEUED);
1450 1450
             flag = true;
1451 1451
         }
@@ -1455,7 +1455,7 @@ void KMainWidget::slotTransferTimeout()
1455 1455
         checkQueue();
1456 1456
     }
1457 1457
 
1458
-    if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::tqcurrentDate()) {
1458
+    if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::currentDate()) {
1459 1459
         onlineDisconnect();
1460 1460
     }
1461 1461
 
@@ -2040,7 +2040,7 @@ void KMainWidget::slotUpdateActions()
2040 2040
             sDebug << "-->ONLINE= " << ksettings.b_offline << endl;
2041 2041
 #endif
2042 2042
             if (item == first_item && !ksettings.b_offline) {
2043
-                switch (item->gettqStatus()) {
2043
+                switch (item->getStatus()) {
2044 2044
                 case Transfer::ST_TRYING:
2045 2045
                 case Transfer::ST_RUNNING:
2046 2046
                     m_paResume->setEnabled(false);
@@ -2052,7 +2052,7 @@ void KMainWidget::slotUpdateActions()
2052 2052
                     m_paPause->setEnabled(false);
2053 2053
                     m_paRestart->setEnabled(false);
2054 2054
 #ifdef _DEBUG
2055
-                    sDebug << "STATUS IS  stopped" << item->gettqStatus() << endl;
2055
+                    sDebug << "STATUS IS  stopped" << item->getStatus() << endl;
2056 2056
 #endif
2057 2057
                     break;
2058 2058
                 case Transfer::ST_FINISHED:
@@ -2064,7 +2064,7 @@ void KMainWidget::slotUpdateActions()
2064 2064
 
2065 2065
                 }               //end switch
2066 2066
 
2067
-            } else if (item->gettqStatus() != first_item->gettqStatus()) {
2067
+            } else if (item->getStatus() != first_item->getStatus()) {
2068 2068
                 // disable all when all selected items don't have the same status
2069 2069
                 m_paResume->setEnabled(false);
2070 2070
                 m_paPause->setEnabled(false);
@@ -2076,7 +2076,7 @@ void KMainWidget::slotUpdateActions()
2076 2076
                 m_paDelete->setEnabled(true);
2077 2077
                 m_paCopy->setEnabled(true);
2078 2078
                 m_paIndividual->setEnabled(true);
2079
-                if (item->gettqStatus() != Transfer::ST_FINISHED) {
2079
+                if (item->getStatus() != Transfer::ST_FINISHED) {
2080 2080
                     m_paQueue->setEnabled(true);
2081 2081
                     m_paTimer->setEnabled(true);
2082 2082
                     m_paDelay->setEnabled(true);
@@ -2469,7 +2469,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url )
2469 2469
     Transfer *transfer = myTransferList->find( url );
2470 2470
     if ( transfer )
2471 2471
     {
2472
-        if ( transfer->gettqStatus() != Transfer::ST_FINISHED )
2472
+        if ( transfer->getStatus() != Transfer::ST_FINISHED )
2473 2473
         {
2474 2474
             if ( !ksettings.b_expertMode )
2475 2475
             {

+ 1
- 1
kget/settings.cpp View File

@@ -91,7 +91,7 @@ Settings::load()
91 91
     b_timedDisconnect = config->readBoolEntry("TimedDisconnect", DEF_TimedDisconnect);
92 92
     disconnectTime.setHMS(config->readNumEntry("DisconnectTimeHour"), config->readNumEntry("DisconnectTimeMinute"), 0);
93 93
 
94
-    disconnectDate = TQDate::tqcurrentDate();      // doesn't make sense to save it
94
+    disconnectDate = TQDate::currentDate();      // doesn't make sense to save it
95 95
 
96 96
     b_autoShutdown = config->readBoolEntry("AutoShutdown", DEF_AutoShutdown);
97 97
     b_autoPaste = config->readBoolEntry("AutoPaste", DEF_AutoPaste);

+ 11
- 11
kget/transfer.cpp View File

@@ -109,7 +109,7 @@ Transfer::init(const uint _id)
109 109
     id = _id;
110 110
     m_pSlave = new Slave(this, src, dest);
111 111
     canResume = false;
112
-    startTime = TQDateTime::tqcurrentDateTime();
112
+    startTime = TQDateTime::currentDateTime();
113 113
     speed = 0;
114 114
     // retryCount = ksettings.reconnectRetries-1;
115 115
     retryCount = 0;
@@ -270,7 +270,7 @@ void Transfer::updateAll()
270 270
 {
271 271
     sDebugIn << endl;
272 272
 
273
-    updatetqStatus(status);       // first phase of animation
273
+    updateStatus(status);       // first phase of animation
274 274
 
275 275
     logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL()));
276 276
     logMessage(i18n("To: %1").tqarg(dest.prettyURL()));
@@ -303,7 +303,7 @@ void Transfer::updateAll()
303 303
 }
304 304
 
305 305
 
306
-bool Transfer::updatetqStatus(int counter)
306
+bool Transfer::updateStatus(int counter)
307 307
 {
308 308
     //sDebug<< ">>>>Entering"<<endl;
309 309
 
@@ -337,18 +337,18 @@ bool Transfer::updatetqStatus(int counter)
337 337
     setPixmap(view->lv_pixmap, *pix);
338 338
     view->setUpdatesEnabled(true);
339 339
 
340
-    if(prevtqStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
340
+    if(prevStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
341 341
         {
342 342
         TQRect rect = view->header()->sectionRect(view->lv_pixmap);
343 343
 
344 344
         int x = rect.x();
345
-        int y = view->tqitemRect(this).y();
345
+        int y = view->itemRect(this).y();
346 346
         int w = rect.width();
347 347
         int h = rect.height();
348 348
 
349 349
         view->TQScrollView::updateContents(x,y,w,h);
350 350
 
351
-        prevtqStatus = status;
351
+        prevStatus = status;
352 352
        prevMode = mode;
353 353
     }
354 354
 
@@ -510,8 +510,8 @@ void Transfer::slotRequestSchedule()
510 510
 
511 511
     // if the time was already set somewhere in the future, keep it
512 512
     // otherwise set it to the current time + 60 seconds
513
-    if (startTime < TQDateTime::tqcurrentDateTime()) {
514
-        TQDateTime dt = TQDateTime::tqcurrentDateTime();
513
+    if (startTime < TQDateTime::currentDateTime()) {
514
+        TQDateTime dt = TQDateTime::currentDateTime();
515 515
         startTime = dt.addSecs(60);
516 516
     }
517 517
     if (status == ST_RUNNING) {
@@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
787 787
     }
788 788
 
789 789
     mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED);
790
-    status = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING);
790
+    status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING);
791 791
     startTime = config->readDateTimeEntry("ScheduledTime");
792 792
     canResume = config->readBoolEntry("CanResume", true);
793 793
     totalSize = config->readUnsignedNum64Entry("TotalSize", 0);
@@ -851,7 +851,7 @@ void Transfer::slotExecError()
851 851
 
852 852
     status = ST_STOPPED;
853 853
     mode = MD_SCHEDULED;
854
-    startTime=TQDateTime::tqcurrentDateTime().addSecs(ksettings.reconnectTime * 60);
854
+    startTime=TQDateTime::currentDateTime().addSecs(ksettings.reconnectTime * 60);
855 855
     emit statusChanged(this, OP_SCHEDULED);
856 856
 
857 857
     sDebugOut << endl;
@@ -982,7 +982,7 @@ bool Transfer::keepDialogOpen() const
982 982
 
983 983
 void Transfer::maybeShow()
984 984
 {
985
-    if ( ksettings.b_showIndividual && gettqStatus() != Transfer::ST_FINISHED )
985
+    if ( ksettings.b_showIndividual && getStatus() != Transfer::ST_FINISHED )
986 986
     {
987 987
         if(dlgIndividual)
988 988
             dlgIndividual->show();

+ 6
- 6
kget/transfer.h View File

@@ -57,7 +57,7 @@ class Transfer:public TQObject, public KListViewItem
57 57
 public:
58 58
     enum TransferMode { MD_TQUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW };
59 59
 
60
-    enum TransfertqStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED };
60
+    enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED };
61 61
 
62 62
     enum TransferOperation {
63 63
         OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED,
@@ -114,7 +114,7 @@ public:
114 114
     {
115 115
         return speed;
116 116
     }
117
-    TransfertqStatus gettqStatus()const
117
+    TransferStatus getStatus()const
118 118
     {
119 119
         return status;
120 120
     }
@@ -127,7 +127,7 @@ public:
127 127
     {
128 128
         mode = _mode;
129 129
     }
130
-    void settqStatus(TransfertqStatus _status)
130
+    void setStatus(TransferStatus _status)
131 131
     {
132 132
         status = _status;
133 133
     };
@@ -139,7 +139,7 @@ public:
139 139
 
140 140
     // update methods
141 141
     void updateAll();
142
-    bool updatetqStatus(int counter);
142
+    bool updateStatus(int counter);
143 143
 
144 144
     void showIndividual();
145 145
     void UpdateRetry();
@@ -220,10 +220,10 @@ private:
220 220
     unsigned int remainingTimeSec;
221 221
     TQString remainingTime;
222 222
 
223
-    TransfertqStatus status;
223
+    TransferStatus status;
224 224
     TransferMode mode;
225 225
 
226
-   TransfertqStatus prevtqStatus;
226
+   TransferStatus prevStatus;
227 227
    TransferMode prevMode;
228 228
 
229 229
     // how many times have we retried already

+ 2
- 2
kget/transferlist.cpp View File

@@ -182,14 +182,14 @@ void TransferList::moveToEnd(Transfer * item)
182 182
 }
183 183
 
184 184
 
185
-bool TransferList::updatetqStatus(int counter)
185
+bool TransferList::updateStatus(int counter)
186 186
 {
187 187
     bool isTransfer = false;
188 188
 
189 189
     TransferIterator it(this);
190 190
 
191 191
     for (; it.current(); ++it) {
192
-        isTransfer |= it.current()->updatetqStatus(counter);
192
+        isTransfer |= it.current()->updateStatus(counter);
193 193
     }
194 194
 
195 195
     return isTransfer;

+ 1
- 1
kget/transferlist.h View File

@@ -76,7 +76,7 @@ public:
76 76
     {
77 77
         return phasesNum;
78 78
     }
79
-    bool updatetqStatus(int counter);
79
+    bool updateStatus(int counter);
80 80
     Transfer * find(const KURL& _src);
81 81
     bool areTransfersQueuedOrScheduled();
82 82
 

+ 209
- 209
knewsticker/common/configaccess.cpp View File

@@ -20,343 +20,343 @@
20 20
 static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
21 21
 	// Arts ---------------
22 22
 		NewsSourceBase::Data(
23
-		TQString::tqfromLatin1("Bureau 42"),
24
-		TQString::tqfromLatin1("http://www.bureau42.com/rdf/"),
25
-		TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"),
23
+		TQString::fromLatin1("Bureau 42"),
24
+		TQString::fromLatin1("http://www.bureau42.com/rdf/"),
25
+		TQString::fromLatin1("http://www.bureau42.com/favicon.ico"),
26 26
 		NewsSourceBase::Arts, 5, false, false),
27 27
 		NewsSourceBase::Data(
28
-		TQString::tqfromLatin1("eFilmCritic"),
29
-		TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"),
30
-		TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"),
28
+		TQString::fromLatin1("eFilmCritic"),
29
+		TQString::fromLatin1("http://efilmcritic.com/fo.rdf"),
30
+		TQString::fromLatin1("http://efilmcritic.com/favicon.ico"),
31 31
 		NewsSourceBase::Arts, 3, false, false),
32