Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
ba2a3ce341
100 changed files with 547 additions and 547 deletions
  1. 5
    5
      NewsLog.txt
  2. 2
    2
      akregator/src/addfeedwidgetbase.ui
  3. 1
    1
      akregator/src/akregator_view.cpp
  4. 2
    2
      akregator/src/articleviewer.cpp
  5. 5
    5
      akregator/src/listtabwidget.cpp
  6. 7
    7
      akregator/src/mk4storage/metakit/CHANGES
  7. 1
    1
      akregator/src/mk4storage/metakit/tests/regress.cpp
  8. 3
    3
      akregator/src/mk4storage/mk4confwidgetbase.ui
  9. 3
    3
      akregator/src/propertieswidgetbase.ui
  10. 1
    1
      akregator/src/settings_archive.ui
  11. 1
    1
      akregator/src/settings_browser.ui
  12. 2
    2
      akregator/src/simplenodeselector.cpp
  13. 5
    5
      akregator/src/tabwidget.cpp
  14. 1
    1
      akregator/src/tag.h
  15. 2
    2
      akregator/src/tagpropertieswidgetbase.ui
  16. 1
    1
      akregator/src/trayicon.cpp
  17. 1
    1
      akregator/src/treenodeitem.cpp
  18. 2
    2
      akregator/src/viewer.cpp
  19. 1
    1
      certmanager/conf/appearanceconfigwidgetbase.ui
  20. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  21. 1
    1
      certmanager/lib/kleo/dn.cpp
  22. 1
    1
      certmanager/lib/ui/cryptoconfigmodule.cpp
  23. 9
    9
      certmanager/lib/ui/cryptoconfigmodule_p.h
  24. 3
    3
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  25. 5
    5
      certmanager/lib/ui/kdhorizontalline.cpp
  26. 1
    1
      doc/api/doxygen.css
  27. 2
    2
      indexlib/boost-compat/config/abi/borland_prefix.hpp
  28. 1
    1
      kaddressbook/TODO
  29. 7
    7
      kaddressbook/addresseditwidget.cpp
  30. 2
    2
      kaddressbook/addresseeeditordialog.cpp
  31. 2
    2
      kaddressbook/addresseeeditorextension.cpp
  32. 64
    64
      kaddressbook/addresseeeditorwidget.cpp
  33. 8
    8
      kaddressbook/addviewdialog.cpp
  34. 2
    2
      kaddressbook/advancedcustomfields.cpp
  35. 1
    1
      kaddressbook/contacteditorwidgetmanager.h
  36. 14
    14
      kaddressbook/customfieldswidget.cpp
  37. 4
    4
      kaddressbook/distributionlisteditor.cpp
  38. 4
    4
      kaddressbook/distributionlistpicker.cpp
  39. 2
    2
      kaddressbook/extensionmanager.cpp
  40. 4
    4
      kaddressbook/features/distributionlistngwidget.cpp
  41. 1
    1
      kaddressbook/filtereditdialog.cpp
  42. 3
    3
      kaddressbook/freebusywidget.cpp
  43. 1
    1
      kaddressbook/geowidget.cpp
  44. 5
    5
      kaddressbook/imagewidget.cpp
  45. 6
    6
      kaddressbook/incsearchwidget.cpp
  46. 7
    7
      kaddressbook/jumpbuttonbar.cpp
  47. 6
    6
      kaddressbook/kabcore.cpp
  48. 3
    3
      kaddressbook/kaddressbookview.cpp
  49. 2
    2
      kaddressbook/kcmconfigs/addhostdialog.cpp
  50. 10
    10
      kaddressbook/kcmconfigs/addresseewidget.cpp
  51. 2
    2
      kaddressbook/kcmconfigs/extensionconfigdialog.cpp
  52. 7
    7
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  53. 2
    2
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  54. 2
    2
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  55. 4
    4
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  56. 6
    6
      kaddressbook/keywidget.cpp
  57. 1
    1
      kaddressbook/ldapsearchdialog.cpp
  58. 17
    17
      kaddressbook/nameeditdialog.cpp
  59. 12
    12
      kaddressbook/phoneeditwidget.cpp
  60. 2
    2
      kaddressbook/printing/detailledstyle.cpp
  61. 1
    1
      kaddressbook/printing/kabentrypainter.cpp
  62. 3
    3
      kaddressbook/printing/selectionpage.cpp
  63. 2
    2
      kaddressbook/printing/stylepage.cpp
  64. 2
    2
      kaddressbook/secrecywidget.cpp
  65. 2
    2
      kaddressbook/undocmds.cpp
  66. 2
    2
      kaddressbook/viewmanager.cpp
  67. 3
    3
      kaddressbook/views/cardview.cpp
  68. 3
    3
      kaddressbook/views/cardview.h
  69. 2
    2
      kaddressbook/views/configurecardviewdialog.cpp
  70. 5
    5
      kaddressbook/views/configuretableviewdialog.cpp
  71. 2
    2
      kaddressbook/views/kaddressbookcardview.cpp
  72. 2
    2
      kaddressbook/views/kaddressbookiconview.cpp
  73. 1
    1
      kaddressbook/views/kaddressbooktableview.cpp
  74. 15
    15
      kaddressbook/xxport/csvimportdialog.cpp
  75. 9
    9
      kaddressbook/xxport/vcard_xxport.cpp
  76. 4
    4
      kaddressbook/xxportselectdialog.cpp
  77. 2
    2
      kalarm/Changelog
  78. 1
    1
      kalarm/alarmlistview.cpp
  79. 5
    5
      kalarm/alarmtimewidget.cpp
  80. 9
    9
      kalarm/birthdaydlg.cpp
  81. 3
    3
      kalarm/deferdlg.cpp
  82. 33
    33
      kalarm/editdlg.cpp
  83. 2
    2
      kalarm/find.cpp
  84. 9
    9
      kalarm/fontcolour.cpp
  85. 6
    6
      kalarm/fontcolourbutton.cpp
  86. 1
    1
      kalarm/functions.cpp
  87. 8
    8
      kalarm/latecancel.cpp
  88. 1
    1
      kalarm/latecancel.h
  89. 9
    9
      kalarm/lib/spinbox2.cpp
  90. 1
    1
      kalarm/lib/spinbox2.h
  91. 15
    15
      kalarm/messagewin.cpp
  92. 25
    25
      kalarm/prefdlg.cpp
  93. 47
    47
      kalarm/recurrenceedit.cpp
  94. 1
    1
      kalarm/recurrenceeditprivate.h
  95. 4
    4
      kalarm/reminder.cpp
  96. 9
    9
      kalarm/repetition.cpp
  97. 4
    4
      kalarm/sounddlg.cpp
  98. 3
    3
      kalarm/specialactions.cpp
  99. 7
    7
      kalarm/templatedlg.cpp
  100. 0
    0
      kalarm/timeselector.cpp

+ 5
- 5
NewsLog.txt View File

@@ -66,7 +66,7 @@ Problems addressed
66 66
 ------------------
67 67
 
68 68
 * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
69
-* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
69
+* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
70 70
 * kolab/issue4455: calendar activate/deactivate handling broken
71 71
 * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
72 72
                    dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
269 269
 * kolab/issue3902: Delete a folder while syncing leads to crash
270 270
 * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
271 271
 * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
272
-* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
272
+* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
273 273
 * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
274 274
 
275 275
 
@@ -551,7 +551,7 @@ Problems addressed
551 551
 
552 552
 * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
553 553
 * kolab/issue3930: time on the Marcus Bains line doesn't change
554
-* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
554
+* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
555 555
 * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
556 556
 * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
557 557
 * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
565 565
 * kolab/issue3065: Crash in KOAgendaItem::paintEvent
566 566
 * kolab/issue3902: Delete a folder while syncing leads to crash
567 567
 * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
568
-* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
568
+* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
569 569
 * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
570 570
 * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
571 571
 * kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
1474 1474
 Problems addressed
1475 1475
 -------------------
1476 1476
 
1477
-* Prevent crash after changing the tqlayout and replying then. (778728)
1477
+* Prevent crash after changing the layout and replying then. (778728)
1478 1478
 * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
1479 1479
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
1480 1480
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)

+ 2
- 2
akregator/src/addfeedwidgetbase.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout16</cstring>
27
+                <cstring>layout16</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -65,7 +65,7 @@
65 65
                 </spacer>
66 66
                 <widget class="TQLayoutWidget">
67 67
                     <property name="name">
68
-                        <cstring>tqlayout15</cstring>
68
+                        <cstring>layout15</cstring>
69 69
                     </property>
70 70
                     <grid>
71 71
                         <property name="name">

+ 1
- 1
akregator/src/akregator_view.cpp View File

@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
1266 1266
             link = article.link().url();
1267 1267
         else
1268 1268
             link = article.guid();
1269
-        TQClipboard *cb = TQApplication::tqclipboard();
1269
+        TQClipboard *cb = TQApplication::clipboard();
1270 1270
         cb->setText(link, TQClipboard::Clipboard);
1271 1271
         cb->setText(link, TQClipboard::Selection);
1272 1272
     }

+ 2
- 2
akregator/src/articleviewer.cpp View File

@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
188 188
 
189 189
 void ArticleViewer::generateNormalModeCSS()
190 190
 {
191
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
191
+    const TQColorGroup & cg = TQApplication::palette().active();
192 192
     
193 193
     // from kmail::headerstyle.cpp
194 194
     m_normalModeCSS = TQString(
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
267 267
 
268 268
 void ArticleViewer::generateCombinedModeCSS()
269 269
 {
270
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
270
+    const TQColorGroup & cg = TQApplication::palette().active();
271 271
     
272 272
     // from kmail::headerstyle.cpp
273 273
     m_combinedModeCSS = TQString (

+ 5
- 5
akregator/src/listtabwidget.cpp View File

@@ -52,7 +52,7 @@ public:
52 52
     int currentID;
53 53
     TQValueList<NodeListView*> views;
54 54
     TQMap<int, NodeListView*> idToView;
55
-    TQHBoxLayout* tqlayout;
55
+    TQHBoxLayout* layout;
56 56
     ViewMode viewMode;
57 57
     TQMap<TQWidget*, TQString> captions;
58 58
 };
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
158 158
     d->current = 0;
159 159
     d->currentID = -1;
160 160
     d->viewMode = verticalTabs;
161
-    d->tqlayout = new TQHBoxLayout(this);
162
-    //d->tqlayout = new TQGridLayout(this, 1, 2);
161
+    d->layout = new TQHBoxLayout(this);
162
+    //d->layout = new TQGridLayout(this, 1, 2);
163 163
     d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); 
164 164
     d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
165 165
     //d->tabBar->setStyle(KMultiTabBar::KDEV3);
166 166
     d->tabBar->showActiveTabTexts(true);
167 167
     d->tabBar->setPosition(KMultiTabBar::Left);
168
-    d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
168
+    d->layout->addWidget(d->tabBar/*, 0, 0*/);
169 169
 
170 170
     d->stack = new TQWidgetStack(this);
171
-    d->tqlayout->addWidget(d->stack/*, 0, 1*/);
171
+    d->layout->addWidget(d->stack/*, 0, 1*/);
172 172
     
173 173
 //    connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
174 174
 }

+ 7
- 7
akregator/src/mk4storage/metakit/CHANGES View File

@@ -211,9 +211,9 @@
211 211
    One was in SCXX, PWONumber.h - ouch and apologies (jcw).  Changed
212 212
    comparison logic in mk4too.cpp (64-bit ints, new code).
213 213
 
214
-2003-02-28    Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
214
+2003-02-28    Fixed relaxed layout in Mk4tcl, several Mk4py fixes
215 215
 
216
-   Use list operators to convert a Tcl tqlayout to MK format.  This used
216
+   Use list operators to convert a Tcl layout to MK format.  This used
217 217
    to crash, Tcl test 6.7 added to verify the fix.  Changed test 3.1 to
218 218
    use a different notation for nested defs (^).
219 219
 
@@ -605,13 +605,13 @@
605 605
    c4_Storage::SaveTo function, memo's would sometimes not be written,
606 606
    leading to a *damaged* datafile (and incorrect free-space tracking).
607 607
 
608
-2002-03-15    Better configure logic, "mk::view tqlayout" fix
608
+2002-03-15    Better configure logic, "mk::view layout" fix
609 609
 
610 610
    Many tweaks to configures, makes, and libtool setup.  Get rid of the
611 611
    library version numbers and the special Mk4*.so targets.  Instead of
612 612
    Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
613 613
 
614
-   Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
614
+   Fixed "mk::view layout", it was broken by the 10-2-2002 change.
615 615
 
616 616
 2002-03-13    Extend partial access 'B' usage
617 617
 
@@ -658,9 +658,9 @@
658 658
    causing it to detach empty top-level views, even when in use.  Fixed,
659 659
    added s39 to test for this case.
660 660
 
661
-2002-02-10    Improve Mk4tcl's "mk::view tqlayout"
661
+2002-02-10    Improve Mk4tcl's "mk::view layout"
662 662
 
663
-   Avoid crash when asking for the tqlayout of a non-existent view.  Now
663
+   Avoid crash when asking for the layout of a non-existent view.  Now
664 664
    returns an error instead.
665 665
 
666 666
 2002-02-07    Fast commit with many empty subviews
@@ -1614,7 +1614,7 @@
1614 1614
     new version in c4_Sequence allocate the c4_Bytes object lazily.
1615 1615
     Faster, and decreases sequence object size (for lots of subviews).
1616 1616
 
1617
-    Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
1617
+    Mk4tcl, mk::layout now returns the proper layout even if the views
1618 1618
     are empty.  Solved by adding extra arg to c4_Storage::Description,
1619 1619
     to return structure of a single top-level view.  Fixes "mk8basic.1",
1620 1620
     and the returned string now has one bogus list layer stripped off.

+ 1
- 1
akregator/src/mk4storage/metakit/tests/regress.cpp View File

@@ -100,7 +100,7 @@ main()
100 100
 }
101 101
 
102 102
 // Recursively display the entire view contents. The results shown do not
103
-// depend on file tqlayout (free space, file positions, flat vs. on-demand).
103
+// depend on file layout (free space, file positions, flat vs. on-demand).
104 104
 
105 105
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
106 106
 {

+ 3
- 3
akregator/src/mk4storage/mk4confwidgetbase.ui View File

@@ -27,7 +27,7 @@
27 27
         </property>
28 28
         <widget class="TQLayoutWidget" row="0" column="0">
29 29
             <property name="name">
30
-                <cstring>tqlayout4</cstring>
30
+                <cstring>layout4</cstring>
31 31
             </property>
32 32
             <vbox>
33 33
                 <property name="name">
@@ -46,7 +46,7 @@
46 46
                 </widget>
47 47
                 <widget class="TQLayoutWidget">
48 48
                     <property name="name">
49
-                        <cstring>tqlayout3</cstring>
49
+                        <cstring>layout3</cstring>
50 50
                     </property>
51 51
                     <hbox>
52 52
                         <property name="name">
@@ -74,7 +74,7 @@
74 74
         </widget>
75 75
         <widget class="TQLayoutWidget" row="1" column="0">
76 76
             <property name="name">
77
-                <cstring>tqlayout4</cstring>
77
+                <cstring>layout4</cstring>
78 78
             </property>
79 79
             <hbox>
80 80
                 <property name="name">

+ 3
- 3
akregator/src/propertieswidgetbase.ui View File

@@ -39,7 +39,7 @@
39 39
                     </property>
40 40
                     <widget class="TQLayoutWidget" row="0" column="0">
41 41
                         <property name="name">
42
-                            <cstring>tqlayout8</cstring>
42
+                            <cstring>layout8</cstring>
43 43
                         </property>
44 44
                         <grid>
45 45
                             <property name="name">
@@ -100,7 +100,7 @@
100 100
                     </widget>
101 101
                     <widget class="TQLayoutWidget" row="2" column="0">
102 102
                         <property name="name">
103
-                            <cstring>tqlayout9</cstring>
103
+                            <cstring>layout9</cstring>
104 104
                         </property>
105 105
                         <hbox>
106 106
                             <property name="name">
@@ -362,7 +362,7 @@
362 362
                     </property>
363 363
                     <widget class="TQLayoutWidget" row="0" column="0">
364 364
                         <property name="name">
365
-                            <cstring>tqlayout4</cstring>
365
+                            <cstring>layout4</cstring>
366 366
                         </property>
367 367
                         <vbox>
368 368
                             <property name="name">

+ 1
- 1
akregator/src/settings_archive.ui View File

@@ -25,7 +25,7 @@
25 25
         </property>
26 26
         <widget class="TQLayoutWidget" row="0" column="0">
27 27
             <property name="name">
28
-                <cstring>tqlayout1</cstring>
28
+                <cstring>layout1</cstring>
29 29
             </property>
30 30
             <vbox>
31 31
                 <property name="name">

+ 1
- 1
akregator/src/settings_browser.ui View File

@@ -96,7 +96,7 @@
96 96
         </spacer>
97 97
         <widget class="TQLayoutWidget" row="0" column="0">
98 98
             <property name="name">
99
-                <cstring>tqlayout2</cstring>
99
+                <cstring>layout2</cstring>
100 100
             </property>
101 101
             <grid>
102 102
                 <property name="name">

+ 2
- 2
akregator/src/simplenodeselector.cpp View File

@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
142 142
     
143 143
     connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
144 144
 
145
-    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
146
-    tqlayout->addWidget(d->view, 0, 0);
145
+    TQGridLayout* layout = new TQGridLayout(this, 1, 1);
146
+    layout->addWidget(d->view, 0, 0);
147 147
 
148 148
     d->visitor = new NodeVisitor(this);
149 149
 

+ 5
- 5
akregator/src/tabwidget.cpp View File

@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
166 166
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
167 167
 {
168 168
     int hframe, overlap;
169
-    hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
170
-    overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
169
+    hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
170
+    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
171 171
 
172 172
     TQFontMetrics fm = tabBar()->fontMetrics();
173 173
     int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
183 183
         if ( tab->iconSet() )
184 184
             iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
185 185
 
186
-        x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
186
+        x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
187 187
     }
188 188
     return x;
189 189
 }
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
288 288
 
289 289
     url = view->part()->url();
290 290
     
291
-    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
292
-    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
291
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
292
+    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
293 293
 }
294 294
 
295 295
 void TabWidget::slotCloseTab()

+ 1
- 1
akregator/src/tag.h View File

@@ -81,7 +81,7 @@ class Tag
81 81
 
82 82
     bool isNull() const;
83 83
     
84
-    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
84
+    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
85 85
     TQString id() const;
86 86
 
87 87
     /** user-visible name of the tag */

+ 2
- 2
akregator/src/tagpropertieswidgetbase.ui View File

@@ -22,7 +22,7 @@
22 22
         </property>
23 23
         <widget class="TQLayoutWidget" row="0" column="0">
24 24
             <property name="name">
25
-                <cstring>tqlayout1</cstring>
25
+                <cstring>layout1</cstring>
26 26
             </property>
27 27
             <hbox>
28 28
                 <property name="name">
@@ -62,7 +62,7 @@
62 62
         </spacer>
63 63
         <widget class="TQLayoutWidget" row="1" column="0">
64 64
             <property name="name">
65
-                <cstring>tqlayout9</cstring>
65
+                <cstring>layout9</cstring>
66 66
             </property>
67 67
             <hbox>
68 68
                 <property name="name">

+ 1
- 1
akregator/src/trayicon.cpp View File

@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
116 116
     // Paint the border
117 117
     const int BORDER = 1;
118 118
     TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
119
-    finalShot.fill(KApplication::tqpalette().active().foreground());
119
+    finalShot.fill(KApplication::palette().active().foreground());
120 120
     painter.begin(&finalShot);
121 121
     painter.drawPixmap(BORDER, BORDER, shot);
122 122
     painter.end();

+ 1
- 1
akregator/src/treenodeitem.cpp View File

@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
105 105
 } 
106 106
     
107 107
 
108
-// TODO: reverse for reverse tqlayout
108
+// TODO: reverse for reverse layout
109 109
 void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
110 110
                                int column, int width, int align )
111 111
 

+ 2
- 2
akregator/src/viewer.cpp View File

@@ -203,7 +203,7 @@ void Viewer::slotCopy()
203 203
 {
204 204
     TQString text = selectedText();
205 205
     text.replace( TQChar( 0xa0 ), ' ' );
206
-    TQClipboard *cb = TQApplication::tqclipboard();
206
+    TQClipboard *cb = TQApplication::clipboard();
207 207
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
208 208
     cb->setText(text);
209 209
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
212 212
 void Viewer::slotCopyLinkAddress()
213 213
 {
214 214
    if(m_url.isEmpty()) return;
215
-   TQClipboard *cb = TQApplication::tqclipboard();
215
+   TQClipboard *cb = TQApplication::clipboard();
216 216
    cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
217 217
    cb->setText(m_url.prettyURL(), TQClipboard::Selection);
218 218
 }

+ 1
- 1
certmanager/conf/appearanceconfigwidgetbase.ui View File

@@ -37,7 +37,7 @@
37 37
         </widget>
38 38
         <widget class="TQLayoutWidget">
39 39
             <property name="name">
40
-                <cstring>tqlayout2</cstring>
40
+                <cstring>layout2</cstring>
41 41
             </property>
42 42
             <vbox>
43 43
                 <property name="name">

+ 2
- 2
certmanager/kwatchgnupg/kwatchgnupgconfig.cpp View File

@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
80 80
   TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
81 81
 
82 82
   group = new TQVGroupBox( i18n("WatchGnuPG"), top );
83
-  group->tqlayout()->setSpacing( spacingHint() );
83
+  group->layout()->setSpacing( spacingHint() );
84 84
 
85 85
   w = new TQWidget( group );
86 86
 
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
116 116
 
117 117
   /******************* Log Window group *******************/
118 118
   group = new TQVGroupBox( i18n("Log Window"), top );
119
-  group->tqlayout()->setSpacing( spacingHint() );
119
+  group->layout()->setSpacing( spacingHint() );
120 120
 
121 121
   w = new TQWidget( group );
122 122
 

+ 1
- 1
certmanager/lib/kleo/dn.cpp View File

@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
272 272
     TQString result;
273 273
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
274 274
         const TQChar ch = s[i];
275
-        switch ( ch.tqunicode() ) {
275
+        switch ( ch.unicode() ) {
276 276
         case ',':
277 277
         case '+':
278 278
         case '"':

+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.cpp View File

@@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
124 124
       dialogHeight = 400;
125 125
     TQSize sz = scrollView->sizeHint();
126 126
     scrollView->setMinimumSize( sz.width()
127
-                                + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
127
+                                + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent),
128 128
                                 TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
129 129
   }
130 130
   if ( mComponentGUIs.empty() ) {

+ 9
- 9
certmanager/lib/ui/cryptoconfigmodule_p.h View File

@@ -82,7 +82,7 @@ namespace Kleo {
82 82
 
83 83
   public:
84 84
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
85
-                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
85
+                          TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
86 86
 
87 87
     bool save();
88 88
     void load();
@@ -102,7 +102,7 @@ namespace Kleo {
102 102
     static CryptoConfigEntryGUI* createEntryGUI(
103 103
       CryptoConfigModule* module,
104 104
       Kleo::CryptoConfigEntry* entry, const TQString& entryName,
105
-      TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
105
+      TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
106 106
   };
107 107
 
108 108
   /**
@@ -154,7 +154,7 @@ namespace Kleo {
154 154
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
155 155
                                Kleo::CryptoConfigEntry* entry,
156 156
                                const TQString& entryName,
157
-                               TQGridLayout * tqlayout,
157
+                               TQGridLayout * layout,
158 158
                                TQWidget* parent, const char* name = 0 );
159 159
 
160 160
     virtual void doSave();
@@ -174,7 +174,7 @@ namespace Kleo {
174 174
     CryptoConfigEntryPath( CryptoConfigModule* module,
175 175
                            Kleo::CryptoConfigEntry* entry,
176 176
                            const TQString& entryName,
177
-                           TQGridLayout * tqlayout,
177
+                           TQGridLayout * layout,
178 178
                            TQWidget* parent, const char* name = 0 );
179 179
 
180 180
     virtual void doSave();
@@ -194,7 +194,7 @@ namespace Kleo {
194 194
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
195 195
                               Kleo::CryptoConfigEntry* entry,
196 196
                               const TQString& entryName,
197
-                              TQGridLayout * tqlayout,
197
+                              TQGridLayout * layout,
198 198
                               TQWidget* parent, const char* name = 0 );
199 199
 
200 200
     virtual void doSave();
@@ -214,7 +214,7 @@ namespace Kleo {
214 214
     CryptoConfigEntryURL( CryptoConfigModule* module,
215 215
                           Kleo::CryptoConfigEntry* entry,
216 216
                           const TQString& entryName,
217
-                          TQGridLayout * tqlayout,
217
+                          TQGridLayout * layout,
218 218
                           TQWidget* parent, const char* name = 0 );
219 219
 
220 220
     virtual void doSave();
@@ -234,7 +234,7 @@ namespace Kleo {
234 234
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
235 235
                               Kleo::CryptoConfigEntry* entry,
236 236
                               const TQString& entryName,
237
-                              TQGridLayout * tqlayout,
237
+                              TQGridLayout * layout,
238 238
                               TQWidget* parent, const char* name = 0 );
239 239
     virtual void doSave();
240 240
     virtual void doLoad();
@@ -254,7 +254,7 @@ namespace Kleo {
254 254
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
255 255
                                Kleo::CryptoConfigEntry* entry,
256 256
                                const TQString& entryName,
257
-                               TQGridLayout * tqlayout,
257
+                               TQGridLayout * layout,
258 258
                                TQWidget* parent, const char* name = 0 );
259 259
     virtual void doSave();
260 260
     virtual void doLoad();
@@ -273,7 +273,7 @@ namespace Kleo {
273 273
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
274 274
                               Kleo::CryptoConfigEntry* entry,
275 275
                               const TQString& entryName,
276
-                              TQGridLayout * tqlayout,
276
+                              TQGridLayout * layout,
277 277
                               TQWidget* parent, const char* name = 0 );
278 278
     virtual void doSave();
279 279
     virtual void doLoad();

+ 3
- 3
certmanager/lib/ui/directoryserviceswidgetbase.ui View File

@@ -44,7 +44,7 @@
44 44
         </widget>
45 45
         <widget class="TQLayoutWidget">
46 46
             <property name="name">
47
-                <cstring>tqlayout2</cstring>
47
+                <cstring>layout2</cstring>
48 48
             </property>
49 49
             <hbox>
50 50
                 <property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
126 126
                 </widget>
127 127
                 <widget class="TQLayoutWidget">
128 128
                     <property name="name">
129
-                        <cstring>tqlayout1</cstring>
129
+                        <cstring>layout1</cstring>
130 130
                     </property>
131 131
                     <vbox>
132 132
                         <property name="name">
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
171 171
         </widget>
172 172
         <widget class="TQLayoutWidget">
173 173
             <property name="name">
174
-                <cstring>tqlayout3</cstring>
174
+                <cstring>layout3</cstring>
175 175
             </property>
176 176
             <hbox>
177 177
                 <property name="name">

+ 5
- 5
certmanager/lib/ui/kdhorizontalline.cpp View File

@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
97 97
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
98 98
     if ( mLenVisible ) { // but do we also have a visible label?
99 99
       TQRect r = rect();
100
-      const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
100
+      const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
101 101
       if( va & AlignVCenter )
102 102
         r.setTop( fm.height() / 2 );		// frame rect should be
103 103
       else if( va & AlignTop )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
147 147
         x = 0;
148 148
     }
149 149
     TQRect r( x, 0, tw, h );
150
-    int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
150
+    int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
151 151
     if ( va & AlignTop )
152 152
       r.moveBy( 0, fm.descent() );
153
-    const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
154
-    if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
153
+    const TQColor pen( (TQRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
154
+    if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
155 155
       va |= NoAccel;
156
-    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
156
+    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
157 157
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
158 158
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
159 159
   }

+ 1
- 1
doc/api/doxygen.css View File

@@ -362,7 +362,7 @@ display: none;
362 362
 @media aural { .doNotDisplay {
363 363
 display: inline;
364 364
 }}
365
-/* Stylesheet that handles PIM-specific classes and tqlayout */
365
+/* Stylesheet that handles PIM-specific classes and layout */
366 366
 
367 367
 #content h1
368 368
 {

+ 2
- 2
indexlib/boost-compat/config/abi/borland_prefix.hpp View File

@@ -10,9 +10,9 @@
10 10
 //  -Ve (on or off - empty base classes)
11 11
 //  -aX (alignment - 5 options).
12 12
 //  -pX (Calling convention - 4 options)
13
-//  -VmX (member pointer size and tqlayout - 5 options)
13
+//  -VmX (member pointer size and layout - 5 options)
14 14
 //  -VC (on or off, changes name mangling)
15
-//  -Vl (on or off, changes struct tqlayout).
15
+//  -Vl (on or off, changes struct layout).
16 16
 
17 17
 //  In addition the following warnings are sufficiently annoying (and
18 18
 //  unfixable) to have them turned off by default:

+ 1
- 1
kaddressbook/TODO View File

@@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten)
22 22
     file to get a list of views) - DONE
23 23
 - Redo and move the DCOP interface - 50%
24 24
 - Cleanup the tableview more - DONE
25
-- Retqlayout the edit contact dialog - DONE
25
+- Relayout the edit contact dialog - DONE
26 26
 - Remove ContactEntry*. Impelement supporting classes required
27 27
     for this. - DONE
28 28
 - Update the way the ConfigureView dialog gets the view config page - DONE

+ 7
- 7
kaddressbook/addresseditwidget.cpp View File

@@ -82,25 +82,25 @@ class TabPressEater : public TQObject
82 82
 AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
83 83
   : TQWidget( parent, name )
84 84
 {
85
-  TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
86
-  tqlayout->setSpacing( KDialog::spacingHint() );
85
+  TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
86
+  layout->setSpacing( KDialog::spacingHint() );
87 87
 
88 88
   mTypeCombo = new AddressTypeCombo( mAddressList, this );
89 89
   connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
90 90
            TQT_SLOT( updateAddressEdit() ) );
91
-  tqlayout->addWidget( mTypeCombo );
91
+  layout->addWidget( mTypeCombo );
92 92
 
93 93
   mAddressField = new KActiveLabel( this );
94 94
   mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
95 95
   mAddressField->setMinimumHeight( 20 );
96 96
   mAddressField->setAlignment( TQt::AlignTop );
97 97
   mAddressField->setTextFormat( TQt::PlainText );
98
-  tqlayout->addWidget( mAddressField );
98
+  layout->addWidget( mAddressField );
99 99
 
100 100
   mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
101 101
   connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
102 102
 
103
-  tqlayout->addWidget( mEditButton );
103
+  layout->addWidget( mEditButton );
104 104
 }
105 105
 
106 106
 AddressEditWidget::~AddressEditWidget()
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
604 604
                  parent, "AddressTypeDialog" )
605 605
 {
606 606
   TQWidget *page = plainPage();
607
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
607
+  TQVBoxLayout *layout = new TQVBoxLayout( page );
608 608
 
609 609
   mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
610
-  tqlayout->addWidget( mGroup );
610
+  layout->addWidget( mGroup );
611 611
 
612 612
   mTypeList = KABC::Address::typeList();
613 613
   mTypeList.remove( KABC::Address::Pref );

+ 2
- 2
kaddressbook/addresseeeditordialog.cpp View File

@@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
48 48
 
49 49
   TQWidget *page = plainPage();
50 50
 
51
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
51
+  TQVBoxLayout *layout = new TQVBoxLayout( page );
52 52
 
53 53
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) {
54 54
     mEditorWidget = new SimpleAddresseeEditor( page );
@@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
56 56
     mEditorWidget = new AddresseeEditorWidget( page );
57 57
   }
58 58
   connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
59
-  tqlayout->addWidget( mEditorWidget );
59
+  layout->addWidget( mEditorWidget );
60 60
 
61 61
   enableButton( KDialogBase::Apply, false );
62 62
 

+ 2
- 2
kaddressbook/addresseeeditorextension.cpp View File

@@ -36,14 +36,14 @@
36 36
 AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
37 37
   : KAB::ExtensionWidget( core, parent, name )
38 38
 {
39
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
39
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
40 40
 
41 41
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor )
42 42
     mAddresseeEditor = new SimpleAddresseeEditor( this );
43 43
   else
44 44
     mAddresseeEditor = new AddresseeEditorWidget( this );
45 45
 
46
-  tqlayout->addWidget( mAddresseeEditor );
46
+  layout->addWidget( mAddresseeEditor );
47 47
 }
48 48
 
49 49
 AddresseeEditorExtension::~AddresseeEditorExtension()

+ 64
- 64
kaddressbook/addresseeeditorwidget.cpp View File

@@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& )
125 125
 
126 126
 void AddresseeEditorWidget::initGUI()
127 127
 {
128
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
128
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
129 129
 
130 130
   mTabWidget = new TQTabWidget( this );
131
-  tqlayout->addWidget( mTabWidget );
131
+  layout->addWidget( mTabWidget );
132 132
 
133 133
   setupTab1();
134 134
   setupTab2();
@@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1()
144 144
   // This is the General tab
145 145
   TQWidget *tab1 = new TQWidget( mTabWidget );
146 146
 
147
-  TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 );
148
-  tqlayout->setMargin( KDialogBase::marginHint() );
149
-  tqlayout->setSpacing( KDialogBase::spacingHint() );
147
+  TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 );
148
+  layout->setMargin( KDialogBase::marginHint() );
149
+  layout->setSpacing( KDialogBase::spacingHint() );
150 150
 
151 151
   TQLabel *label;
152 152
   KSeparator* bar;
@@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1()
159 159
   label = new TQLabel( tab1 );
160 160
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
161 161
                                                       KIcon::SizeMedium ) );
162
-  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
162
+  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
163 163
 
164 164
   // First name
165 165
   button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
@@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1()
178 178
     mNameLabel->show();
179 179
   }
180 180
 
181
-  tqlayout->addWidget( button, 0, 1 );
182
-  tqlayout->addWidget( mNameEdit, 0, 2 );
183
-  tqlayout->addWidget( mNameLabel, 0, 2 );
181
+  layout->addWidget( button, 0, 1 );
182
+  layout->addWidget( mNameEdit, 0, 2 );
183
+  layout->addWidget( mNameLabel, 0, 2 );
184 184
   label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
185 185
   mRoleEdit = new KLineEdit( tab1 );
186 186
   connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
187 187
            TQT_SLOT( textChanged( const TQString& ) ) );
188 188
   label->setBuddy( mRoleEdit );
189
-  tqlayout->addWidget( label, 1, 1 );
190
-  tqlayout->addWidget( mRoleEdit, 1, 2 );
189
+  layout->addWidget( label, 1, 1 );
190
+  layout->addWidget( mRoleEdit, 1, 2 );
191 191
 
192 192
   // Organization
193 193
   label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
@@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1()
195 195
   label->setBuddy( mOrgEdit );
196 196
   connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
197 197
            TQT_SLOT( organizationTextChanged( const TQString& ) ) );
198
-  tqlayout->addWidget( label, 2, 1 );
199
-  tqlayout->addWidget( mOrgEdit, 2, 2 );
198
+  layout->addWidget( label, 2, 1 );
199
+  layout->addWidget( mOrgEdit, 2, 2 );
200 200
 
201 201
   // File as (formatted name)
202 202
   label = new TQLabel( i18n( "Formatted name:" ), tab1 );
203 203
   mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
204
-  tqlayout->addWidget( label, 3, 1 );
205
-  tqlayout->addWidget( mFormattedNameLabel, 3, 2 );
204
+  layout->addWidget( label, 3, 1 );
205
+  layout->addWidget( mFormattedNameLabel, 3, 2 );
206 206
 
207 207
   // Left hand separator. This separator doesn't go all the way
208 208
   // across so the dialog still flows from top to bottom
209 209
   bar = new KSeparator( KSeparator::HLine, tab1 );
210
-  tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 );
210
+  layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
211 211
 
212 212
   //////////////////////////////////////
213 213
   // Phone numbers (upper right)
214 214
   label = new TQLabel( tab1 );
215 215
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook",
216 216
                     KIcon::Desktop, KIcon::SizeMedium ) );
217
-  tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 );
217
+  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
218 218
 
219 219
   mPhoneEditWidget = new PhoneEditWidget( tab1 );
220 220
   connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
221
-  tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
221
+  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
222 222
 
223 223
   bar = new KSeparator( KSeparator::HLine, tab1 );
224
-  tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 );
224
+  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
225 225
 
226 226
   //////////////////////////////////////
227 227
   // Addresses (lower left)
228 228
   label = new TQLabel( tab1 );
229 229
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
230 230
                                                      KIcon::SizeMedium ) );
231
-  tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 );
231
+  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
232 232
 
233 233
   mAddressEditWidget = new AddressEditWidget( tab1 );
234 234
   connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
235
-  tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
235
+  layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
236 236
 
237 237
   //////////////////////////////////////
238 238
   // Email / Web (lower right)
239 239
   label = new TQLabel( tab1 );
240 240
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
241 241
                                                      KIcon::SizeMedium ) );
242
-  tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 );
242
+  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
243 243
 
244 244
   mEmailWidget = new EmailEditWidget( tab1 );
245 245
   connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
246
-  tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
246
+  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
247 247
 
248 248
   // add the separator
249 249
   bar = new KSeparator( KSeparator::HLine, tab1 );
250
-  tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 );
250
+  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
251 251
 
252 252
   TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );
253 253
 
@@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1()
263 263
   label->setBuddy( mURLEdit );
264 264
   homePageLayout->addWidget( label );
265 265
   homePageLayout->addWidget( mURLEdit );
266
-  tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
266
+  layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
267 267
 
268 268
   TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 );
269 269
   label = new TQLabel( i18n("Blog feed:"), tab1 );
@@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1()
273 273
   connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
274 274
            TQT_SLOT( textChanged( const TQString & ) ) );
275 275
   label->setBuddy( mBlogEdit );
276
-  tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
276
+  layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
277 277
 
278 278
   mIMWidget = new IMEditWidget( tab1, mAddressee );
279 279
   connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
280
-  tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
280
+  layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
281 281
 
282
-  tqlayout->addColSpacing( 6, 50 );
282
+  layout->addColSpacing( 6, 50 );
283 283
 
284 284
   bar = new KSeparator( KSeparator::HLine, tab1 );
285
-  tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 );
285
+  layout->addMultiCellWidget( bar, 11, 11, 0, 6 );
286 286
 
287 287
   ///////////////////////////////////////
288 288
   TQHBox *categoryBox = new TQHBox( tab1 );
@@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1()
300 300
   mSecrecyWidget = new SecrecyWidget( categoryBox );
301 301
   connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
302 302
 
303
-  tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
303
+  layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
304 304
 
305
-  // Build the tqlayout and add to the tab widget
306
-  tqlayout->activate(); // required
305
+  // Build the layout and add to the tab widget
306
+  layout->activate(); // required
307 307
 
308 308
   mTabWidget->addTab( tab1, i18n( "&General" ) );
309 309
 }
@@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2()
313 313
   // This is the Details tab
314 314
   TQWidget *tab2 = new TQWidget( mTabWidget );
315 315
 
316
-  TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 );
317
-  tqlayout->setMargin( KDialogBase::marginHint() );
318
-  tqlayout->setSpacing( KDialogBase::spacingHint() );
316
+  TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 );
317
+  layout->setMargin( KDialogBase::marginHint() );
318
+  layout->setSpacing( KDialogBase::spacingHint() );
319 319
 
320 320
   TQLabel *label;
321 321
   KSeparator* bar;
@@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2()
327 327
   label = new TQLabel( tab2 );
328 328
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
329 329
                                                      KIcon::SizeMedium ) );
330
-  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
330
+  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
331 331
 
332 332
   label = new TQLabel( i18n( "Department:" ), tab2 );
333
-  tqlayout->addWidget( label, 0, 1 );
333
+  layout->addWidget( label, 0, 1 );
334 334
   mDepartmentEdit = new KLineEdit( tab2 );
335 335
   connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
336 336
            TQT_SLOT( textChanged( const TQString& ) ) );
337 337
   label->setBuddy( mDepartmentEdit );
338
-  tqlayout->addWidget( mDepartmentEdit, 0, 2 );
338
+  layout->addWidget( mDepartmentEdit, 0, 2 );
339 339
 
340 340
   label = new TQLabel( i18n( "Office:" ), tab2 );
341
-  tqlayout->addWidget( label, 1, 1 );
341
+  layout->addWidget( label, 1, 1 );
342 342
   mOfficeEdit = new KLineEdit( tab2 );
343 343
   connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
344 344
            TQT_SLOT( textChanged( const TQString& ) ) );
345 345
   label->setBuddy( mOfficeEdit );
346
-  tqlayout->addWidget( mOfficeEdit, 1, 2 );
346
+  layout->addWidget( mOfficeEdit, 1, 2 );
347 347
 
348 348
   label = new TQLabel( i18n( "Profession:" ), tab2 );
349
-  tqlayout->addWidget( label, 2, 1 );
349
+  layout->addWidget( label, 2, 1 );
350 350
   mProfessionEdit = new KLineEdit( tab2 );
351 351
   connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
352 352
            TQT_SLOT( textChanged( const TQString& ) ) );
353 353
   label->setBuddy( mProfessionEdit );
354
-  tqlayout->addWidget( mProfessionEdit, 2, 2 );
354
+  layout->addWidget( mProfessionEdit, 2, 2 );
355 355
 
356 356
   label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
357
-  tqlayout->addWidget( label, 0, 3 );
357
+  layout->addWidget( label, 0, 3 );
358 358
   mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
359 359
   connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
360 360
            TQT_SLOT( textChanged( const TQString& ) ) );
361 361
   label->setBuddy( mManagerEdit );
362
-  tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
362
+  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
363 363
 
364 364
   label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
365
-  tqlayout->addWidget( label, 1, 3 );
365
+  layout->addWidget( label, 1, 3 );
366 366
   mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
367 367
   connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
368 368
            TQT_SLOT( textChanged( const TQString& ) ) );
369 369
   label->setBuddy( mAssistantEdit );
370
-  tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
370
+  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
371 371
 
372 372
   label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
373
-  tqlayout->addWidget( label, 2, 3 );
373
+  layout->addWidget( label, 2, 3 );
374 374
   mTitleEdit = new KLineEdit( tab2 );
375 375
   connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
376 376
            TQT_SLOT( textChanged( const TQString& ) ) );
377 377
   label->setBuddy( mTitleEdit );
378
-  tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
378
+  layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
379 379
 
380 380
   bar = new KSeparator( KSeparator::HLine, tab2 );
381
-  tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 );
381
+  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
382 382
 
383 383
   /////////////////////////////////////////////////
384 384
   // Personal info
@@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2()
386 386
   label = new TQLabel( tab2 );
387 387
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
388 388
                                                      KIcon::SizeMedium ) );
389
-  tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 );
389
+  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
390 390
 
391 391
   label = new TQLabel( i18n( "Nickname:" ), tab2 );
392
-  tqlayout->addWidget( label, 4, 1 );
392
+  layout->addWidget( label, 4, 1 );
393 393
   mNicknameEdit = new KLineEdit( tab2 );
394 394
   connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
395 395
            TQT_SLOT( textChanged( const TQString& ) ) );
396 396
   label->setBuddy( mNicknameEdit );
397
-  tqlayout->addWidget( mNicknameEdit, 4, 2 );
397
+  layout->addWidget( mNicknameEdit, 4, 2 );
398 398
 
399 399
   label = new TQLabel( i18n( "Partner's name:" ), tab2 );
400
-  tqlayout->addWidget( label, 5, 1 );
400
+  layout->addWidget( label, 5, 1 );
401 401
   mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
402 402
   connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
403 403
            TQT_SLOT( textChanged( const TQString& ) ) );
404 404
   label->setBuddy( mSpouseEdit );
405
-  tqlayout->addWidget( mSpouseEdit, 5, 2 );
405
+  layout->addWidget( mSpouseEdit, 5, 2 );
406 406
 
407 407
   label = new TQLabel( i18n( "Birthdate:" ), tab2 );
408
-  tqlayout->addWidget( label, 4, 3 );
408
+  layout->addWidget( label, 4, 3 );
409 409
   mBirthdayPicker = new KDateEdit( tab2 );
410 410
   connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
411 411
            TQT_SLOT( dateChanged( const TQDate& ) ) );
412 412
   connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
413 413
            TQT_SLOT( emitModified() ) );
414 414
   label->setBuddy( mBirthdayPicker );
415
-  tqlayout->addWidget( mBirthdayPicker, 4, 4 );
415
+  layout->addWidget( mBirthdayPicker, 4, 4 );
416 416
 
417 417
   label = new TQLabel( i18n( "Anniversary:" ), tab2 );
418
-  tqlayout->addWidget( label, 5, 3 );
418
+  layout->addWidget( label, 5, 3 );
419 419
   mAnniversaryPicker = new KDateEdit( tab2 );
420 420
   connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
421 421
            TQT_SLOT( dateChanged( const TQDate& ) ) );
422 422
   connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
423 423
            TQT_SLOT( emitModified() ) );
424 424
   label->setBuddy( mAnniversaryPicker );
425
-  tqlayout->addWidget( mAnniversaryPicker, 5, 4 );
425
+  layout->addWidget( mAnniversaryPicker, 5, 4 );
426 426
 
427 427
   bar = new KSeparator( KSeparator::HLine, tab2 );
428
-  tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 );
428
+  layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
429 429
 
430 430
    //////////////////////////////////////
431 431
   // Notes
432 432
   label = new TQLabel( i18n( "Note:" ), tab2 );
433 433
   label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
434
-  tqlayout->addWidget( label, 7, 0 );
434
+  layout->addWidget( label, 7, 0 );
435 435
   mNoteEdit = new TQTextEdit( tab2 );
436 436
   mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
437 437
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
438 438
   connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
439 439
   label->setBuddy( mNoteEdit );
440
-  tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
440
+  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
441 441
 
442
-   // Build the tqlayout and add to the tab widget
443
-  tqlayout->activate(); // required
442
+   // Build the layout and add to the tab widget
443
+  layout->activate(); // required
444 444
 
445 445
   mTabWidget->addTab( tab2, i18n( "&Details" ) );
446 446
 }
@@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
474 474
       page->addWidget( widget );
475 475
   }
476 476
 
477
-  // query the tqlayout update
477
+  // query the layout update
478 478
   TQDictIterator<ContactEditorTabPage> it( mTabPages );
479 479
   for ( ; it.current(); ++it )
480 480
     it.current()->updateLayout();

+ 8
- 8
kaddressbook/addviewdialog.cpp View File

@@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
44 44
 
45 45
   TQWidget *page = plainPage();
46 46
 
47
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 );
48
-  tqlayout->setSpacing( spacingHint() );
49
-  tqlayout->setRowStretch( 1, 1 );
50
-  tqlayout->setColStretch( 1, 1 );
47
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2 );
48
+  layout->setSpacing( spacingHint() );
49
+  layout->setRowStretch( 1, 1 );
50
+  layout->setColStretch( 1, 1 );
51 51
 
52 52
   TQLabel *label = new TQLabel( i18n( "View name:" ), page );
53
-  tqlayout->addWidget( label, 0, 0 );
53
+  layout->addWidget( label, 0, 0 );
54 54
 
55 55
   mViewNameEdit = new TQLineEdit( page );
56 56
   connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
57 57
            TQT_SLOT( textChanged( const TQString& ) ) );
58
-  tqlayout->addWidget( mViewNameEdit, 0, 1 );
58
+  layout->addWidget( mViewNameEdit, 0, 1 );
59 59
 
60 60
   mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
61 61
   connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
62
-  tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
63
-  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
62
+  layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
63
+  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
64 64
   groupLayout->setSpacing( spacingHint() );
65 65
 
66 66
   int row = 0;

+ 2
- 2
kaddressbook/advancedcustomfields.cpp View File

@@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly )
126 126
 
127 127
 void AdvancedCustomFields::initGUI( const TQString &uiFile )
128 128
 {
129
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
129
+  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
130 130
                                          KDialog::spacingHint() );
131 131
 
132 132
   mFields = new KPIM::DesignerFields( uiFile, this );
133
-  tqlayout->addWidget( mFields );
133
+  layout->addWidget( mFields );
134 134
 
135 135
   connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
136 136
 }

+ 1
- 1
kaddressbook/contacteditorwidgetmanager.h View File

@@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget
96 96
     void setReadOnly( bool readOnly );
97 97
 
98 98
     /**
99
-      Calculates the tqlayout of the widgets and moves them to the
99
+      Calculates the layout of the widgets and moves them to the
100 100
       correct position.
101 101
      */
102 102
     void updateLayout();

+ 14
- 14
kaddressbook/customfieldswidget.cpp View File

@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
48 48
 {
49 49
   TQWidget *page = plainPage();
50 50
 
51
-  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
51
+  TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
52 52
 
53 53
   TQLabel *label = new TQLabel( i18n( "Title:" ), page );
54
-  tqlayout->addWidget( label, 0, 0 );
54
+  layout->addWidget( label, 0, 0 );
55 55
 
56 56
   mTitle = new KLineEdit( page );
57 57
   mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
58 58
   label->setBuddy( mTitle );
59
-  tqlayout->addWidget( mTitle, 0, 1 );
59
+  layout->addWidget( mTitle, 0, 1 );
60 60
 
61 61
   label = new TQLabel( i18n( "Type:" ), page );
62
-  tqlayout->addWidget( label, 1, 0 );
62
+  layout->addWidget( label, 1, 0 );
63 63
 
64 64
   mType = new KComboBox( page );
65 65
   label->setBuddy( mType );
66
-  tqlayout->addWidget( mType, 1, 1 );
66
+  layout->addWidget( mType, 1, 1 );
67 67
 
68 68
   mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
69 69
   mGlobal->setChecked( true );
70
-  tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
70
+  layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
71 71
 
72 72
   connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
73 73
            this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -124,18 +124,18 @@ void AddFieldDialog::nameChanged( const TQString &name )
124 124
 FieldWidget::FieldWidget( TQWidget *parent, const char *name )
125 125
   : TQWidget( parent, name )
126 126
 {
127
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
127
+  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
128 128
                                          KDialog::spacingHint() );
129 129
 
130
-  mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
130
+  mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
131 131
   mGlobalLayout->setAlignment( TQt::AlignTop );
132 132
 
133 133
   mSeparator = new TQFrame( this );
134 134
   mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
135 135
   mSeparator->hide();
136
-  tqlayout->addWidget( mSeparator );
136
+  layout->addWidget( mSeparator );
137 137
 
138
-  mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
138
+  mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
139 139
   mLocalLayout->setAlignment( TQt::AlignTop );
140 140
 }
141 141
 
@@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField()
485 485
 
486 486
 void CustomFieldsWidget::initGUI()
487 487
 {
488
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
488
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
489 489
                                          KDialog::spacingHint() );
490 490
 
491 491
   mFieldWidget = new FieldWidget( this );
492
-  tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
492
+  layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
493 493
 
494 494
   mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
495
-  tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
495
+  layout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
496 496
 
497 497
   mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
498 498
   mRemoveButton->setEnabled( false );
499
-  tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
499
+  layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
500 500
 
501 501
   // load global fields
502 502
   TQStringList globalFields = KABPrefs::instance()->globalCustomFields();

+ 4
- 4
kaddressbook/distributionlisteditor.cpp View File

@@ -67,16 +67,16 @@ public:
67 67
 KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
68 68
 {
69 69
     Q_ASSERT( m_addressBook );
70
-    TQBoxLayout* tqlayout = new TQHBoxLayout( this );
71
-    tqlayout->setSpacing( KDialog::spacingHint() );
70
+    TQBoxLayout* layout = new TQHBoxLayout( this );
71
+    layout->setSpacing( KDialog::spacingHint() );
72 72
     m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
73 73
     connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
74 74
              this, TQT_SLOT( textChanged( const TQString& ) ) );
75
-    tqlayout->addWidget( m_lineEdit );
75
+    layout->addWidget( m_lineEdit );
76 76
     m_clearButton = new TQToolButton( this );
77 77
     m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
78 78
     m_clearButton->setEnabled( false );
79
-    tqlayout->addWidget( m_clearButton );
79
+    layout->addWidget( m_clearButton );
80 80
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
81 81
 }
82 82
 

+ 4
- 4
kaddressbook/distributionlistpicker.cpp View File

@@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
48 48
     enableButton( Ok, false );
49 49
     setButtonText( User1, i18n( "Add New Distribution List" ) );
50 50
     TQWidget* main = new TQWidget( this );
51
-    TQGridLayout* tqlayout = new TQGridLayout( main );
52
-    tqlayout->setSpacing( KDialog::spacingHint() );
51
+    TQGridLayout* layout = new TQGridLayout( main );
52
+    layout->setSpacing( KDialog::spacingHint() );
53 53
     m_label = new TQLabel( main );
54
-    tqlayout->addWidget( m_label, 0, 0 );
54
+    layout->addWidget( m_label, 0, 0 );
55 55
     m_listBox = new KListBox( main );
56
-    tqlayout->addWidget( m_listBox, 1, 0 );
56
+    layout->addWidget( m_listBox, 1, 0 );
57 57
     connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
58 58
              this, TQT_SLOT( entrySelected( const TQString& ) ) ); 
59 59
     connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),

+ 2
- 2
kaddressbook/extensionmanager.cpp View File

@@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
50 50
       mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
51 51
 {
52 52
   Q_ASSERT( mExtensionBar );
53
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
53
+  TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar );
54 54
   mSplitter = new TQSplitter( mExtensionBar );
55 55
   mSplitter->setOrientation( Qt::Vertical );
56
-  tqlayout->addWidget( mSplitter );
56
+  layout->addWidget( mSplitter );
57 57
 
58 58
   createExtensionWidgets();
59 59
 

+ 4
- 4
kaddressbook/features/distributionlistngwidget.cpp View File

@@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
117 117
 
118 118
 KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
119 119
 {
120
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
121
-    tqlayout->setSpacing( KDialog::spacingHint() );
120
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
121
+    layout->setSpacing( KDialog::spacingHint() );
122 122
 
123 123
     TQHBoxLayout *buttonLayout = new TQHBoxLayout();
124
-    tqlayout->addLayout( buttonLayout );
124
+    layout->addLayout( buttonLayout );
125 125
 
126 126
     TQLabel *label = new TQLabel( this );
127 127
     label->setText( i18n( "Distribution Lists" ) );
@@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
154 154
     connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
155 155
              this, TQT_SLOT( itemSelected( int ) ) );
156 156
     connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
157
-    tqlayout->addWidget( mListBox );
157
+    layout->addWidget( mListBox );
158 158
 
159 159
     connect( core, TQT_SIGNAL( contactsUpdated() ),
160 160
              this, TQT_SLOT( updateEntries() ) );

+ 1
- 1
kaddressbook/filtereditdialog.cpp View File

@@ -272,7 +272,7 @@ void FilterDialog::initGUI()
272 272
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
273 273
   mRemoveButton->setEnabled( false );
274 274
 
275
-  buttonBox->tqlayout();
275
+  buttonBox->layout();
276 276
   topLayout->addWidget( buttonBox, 0, 1 );
277 277
 }
278 278
 

+ 3
- 3
kaddressbook/freebusywidget.cpp View File

@@ -35,15 +35,15 @@
35 35
 FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
36 36
   : KAB::ContactEditorWidget( ab, parent, name )
37 37
 {
38
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
38
+  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
39 39
                                          KDialog::spacingHint() );
40 40
 
41 41
   TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this );
42
-  tqlayout->addWidget( label );
42
+  layout->addWidget( label );
43 43
 
44 44
   mURL = new KURLRequester( this );
45 45
   label->setBuddy( mURL );
46
-  tqlayout->addWidget( mURL );
46
+  layout->addWidget( mURL );
47 47
 
48 48
   connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
49 49
            this, TQT_SLOT( setModified() ) );

+ 1
- 1
kaddressbook/geowidget.cpp View File

@@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
175 175
   topLayout->addWidget( mCityCombo, 0, 1 );
176 176
 
177 177
   TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
178
-  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
178
+  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(),
179 179
                                                     2, 5, spacingHint() );
180 180
 
181 181
   TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup );

+ 5
- 5
kaddressbook/imagewidget.cpp View File

@@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
255 255
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
256 256
                                             KDialog::spacingHint() );
257 257
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
258
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
258
+  TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );
259 259
 
260 260
   mImageButton = new ImageButton( i18n( "Picture" ), box );
261 261
   mImageButton->setFixedSize( 100, 140 );
262 262
   mImageButton->setImageLoader( mImageLoader );
263
-  tqlayout->addWidget( mImageButton );
263
+  layout->addWidget( mImageButton );
264 264
 
265 265
   topLayout->addWidget( box );
266 266
 
@@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const
293 293
 ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
294 294
   : KAB::ContactEditorWidget( ab, parent, name )
295 295
 {
296
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
296
+  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
297 297
                                          KDialog::spacingHint() );
298 298
 
299 299
   mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
300
-  tqlayout->addWidget( mPhotoWidget );
300
+  layout->addWidget( mPhotoWidget );
301 301
 
302 302
   mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
303
-  tqlayout->addWidget( mLogoWidget );
303
+  layout->addWidget( mLogoWidget );
304 304
 
305 305
   connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
306 306
   connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );

+ 6
- 6
kaddressbook/incsearchwidget.cpp View File

@@ -40,7 +40,7 @@
40 40
 IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
41 41
     : TQWidget( parent, name )
42 42
 {
43
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
43
+  TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
44 44
 
45 45
   TQToolButton *button = new TQToolButton( this );
46 46
   button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
@@ -48,24 +48,24 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
48 48
   button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) );
49 49
   button->setAutoRaise( true );
50 50
   TQToolTip::add( button, i18n( "Reset" ) );
51
-  tqlayout->addWidget( button );
51
+  layout->addWidget( button );
52 52
 
53 53
   TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" );
54 54
   label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
55
-  tqlayout->addWidget( label );
55
+  layout->addWidget( label );
56 56
 
57 57
   mSearchText = new KLineEdit( this );
58 58
   mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
59 59
   TQWhatsThis::add( mSearchText, i18n( "The incremental search<p>Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) );
60 60
   label->setBuddy( mSearchText );
61
-  tqlayout->addWidget( mSearchText );
61
+  layout->addWidget( mSearchText );
62 62
 
63 63
   label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" );
64 64
   label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
65
-  tqlayout->addWidget( label );
65
+  layout->addWidget( label );
66 66
 
67 67
   mFieldCombo = new TQComboBox( false, this );
68
-  tqlayout->addWidget( mFieldCombo );
68
+  layout->addWidget( mFieldCombo );
69 69
   label->setBuddy(mFieldCombo);
70 70
 
71 71
   TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) );

+ 7
- 7
kaddressbook/jumpbuttonbar.cpp View File

@@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam
67 67
 {
68 68
   setMinimumSize( 1, 1 );
69 69
 
70
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 );
71
-  tqlayout->setAlignment( TQt::AlignTop );
72
-  tqlayout->setAutoAdd( true );
73
-  tqlayout->setResizeMode( TQLayout::FreeResize );
70
+  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 );
71
+  layout->setAlignment( TQt::AlignTop );
72
+  layout->setAutoAdd( true );
73
+  layout->setResizeMode( TQLayout::FreeResize );
74 74
 
75 75
   mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
76 76
   mGroupBox->setExclusive( true );
77
-  mGroupBox->tqlayout()->setSpacing( 0 );
78
-  mGroupBox->tqlayout()->setMargin( 0 );
77
+  mGroupBox->layout()->setSpacing( 0 );
78
+  mGroupBox->layout()->setMargin( 0 );
79 79
   mGroupBox->setFrameStyle( TQFrame::NoFrame );
80 80
 }
81 81
 
@@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons()
98 98
   TQFontMetrics fm = fontMetrics();
99 99
   TQPushButton *btn = new TQPushButton( "", this );
100 100
   btn->hide();
101
-  TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn,
101
+  TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn,
102 102
                      fm.size( ShowPrefix, "X - X") ).
103 103
                      expandedTo( TQApplication::globalStrut() );
104 104
   delete btn;

+ 6
- 6
kaddressbook/kabcore.cpp View File

@@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid )
430 430
   mActionMerge->setEnabled( ( list.size() == 2 ) && writable );
431 431
 
432 432
   if ( mReadWrite ) {
433
-    TQClipboard *cb = TQApplication::tqclipboard();
433
+    TQClipboard *cb = TQApplication::clipboard();
434 434
 #if defined(KABC_VCARD_ENCODING_FIX)
435 435
     const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
436 436
     list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
@@ -552,11 +552,11 @@ void KABCore::copyContacts()
552 552
 
553 553
 #if defined(KABC_VCARD_ENCODING_FIX)
554 554
   TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
555
-  TQClipboard *cb = TQApplication::tqclipboard();
555
+  TQClipboard *cb = TQApplication::clipboard();
556 556
   cb->setText( TQString::fromUtf8( clipText.data() ) );
557 557
 #else
558 558
   TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
559
-  TQClipboard *cb = TQApplication::tqclipboard();
559
+  TQClipboard *cb = TQApplication::clipboard();
560 560
   cb->setText( clipText );
561 561
 #endif
562 562
 }
@@ -575,7 +575,7 @@ void KABCore::cutContacts()
575 575
 
576 576
 void KABCore::pasteContacts()
577 577
 {
578
-  TQClipboard *cb = TQApplication::tqclipboard();
578
+  TQClipboard *cb = TQApplication::clipboard();
579 579
 #if defined(KABC_VCARD_ENCODING_FIX)
580 580
   const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
581 581
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
@@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar()
1311 1311
 
1312 1312
 void KABCore::initActions()
1313 1313
 {
1314
-  connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
1314
+  connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
1315 1315
            TQT_SLOT( clipboardDataChanged() ) );
1316 1316
 
1317 1317
   KAction *action;
@@ -1432,7 +1432,7 @@ void KABCore::initActions()
1432 1432
 void KABCore::clipboardDataChanged()
1433 1433
 {
1434 1434
   if ( mReadWrite )
1435
-    mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() );
1435
+    mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() );
1436 1436
 }
1437 1437
 
1438 1438
 void KABCore::updateIncSearchWidget()

+ 3
- 3
kaddressbook/kaddressbookview.cpp View File

@@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees()
121 121
 
122 122
 void KAddressBookView::initGUI()
123 123
 {
124
-  // Create the tqlayout
125
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
124
+  // Create the layout
125
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
126 126
 
127 127
   // Add the view widget
128 128
   mViewWidget = new TQWidget( this );
129
-  tqlayout->addWidget( mViewWidget );
129
+  layout->addWidget( mViewWidget );
130 130
 }
131 131
 
132 132
 KABC::Field::List KAddressBookView::fields() const

+ 2
- 2
kaddressbook/kcmconfigs/addhostdialog.cpp View File

@@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
39 39
   mServer = server;
40 40
 
41 41
   TQWidget *page = plainPage();
42
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() );
42
+  TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() );
43 43
 
44 44
   mCfg = new KABC::LdapConfigWidget(
45 45
        KABC::LdapConfigWidget::W_USER |
@@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
56 56
        KABC::LdapConfigWidget::W_AUTHBOX,
57 57
         page );
58 58
 
59
-  tqlayout->addWidget( mCfg );
59
+  layout->addWidget( mCfg );
60 60
   mCfg->setHost( mServer->host() );
61 61
   mCfg->setPort( mServer->port() );
62 62
   mCfg->setDn( mServer->baseDN() );

+ 10
- 10
kaddressbook/kcmconfigs/addresseewidget.cpp View File

@@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
44 44
                                 TQWidget *parent, const char *name )
45 45
   : TQWidget( parent, name ), mTitle( title ), mLabel( label )
46 46
 {
47
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
47
+  TQHBoxLayout *layout = new TQHBoxLayout( this );
48 48
 
49 49
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
50
-  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
50
+  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
51 51
                                               KDialog::spacingHint() );
52 52
 
53 53
   mBox = new TQListBox( group );
@@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
61 61
   mEditButton->setEnabled( false );
62 62
   mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this),  TQT_SLOT( remove() ) );
63 63
   mRemoveButton->setEnabled( false );
64
-  bbox->tqlayout();
64
+  bbox->layout();
65 65
   groupLayout->addWidget( bbox, 0, 1 );
66 66
 
67
-  tqlayout->addWidget( group );
67
+  layout->addWidget( group );
68 68
 }
69 69
 
70 70
 NamePartWidget::~NamePartWidget()
@@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
134 134
 AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
135 135
   : TQWidget( parent, name )
136 136
 {
137
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
137
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
138 138
                                          KDialog::spacingHint() );
139 139
 
140 140
   mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this );
141
-  tqlayout->addWidget( mPrefix, 0, 0 );
141
+  layout->addWidget( mPrefix, 0, 0 );
142 142
 
143 143
   mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this );
144
-  tqlayout->addWidget( mInclusion, 0, 1 );
144
+  layout->addWidget( mInclusion, 0, 1 );
145 145
 
146 146
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this );
147
-  tqlayout->addWidget( mSuffix, 0, 2 );
147
+  layout->addWidget( mSuffix, 0, 2 );
148 148
 
149 149
   TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this );
150
-  tqlayout->addWidget( label, 1, 0 );
150
+  layout->addWidget( label, 1, 0 );
151 151
 
152 152
   mFormattedNameCombo = new KComboBox( this );
153 153
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
155 155
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
156 156
   mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) );
157 157
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
158
-  tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
158
+  layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
159 159
 
160 160
   connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
161 161
   connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );

+ 2
- 2
kaddressbook/kcmconfigs/extensionconfigdialog.cpp View File

@@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC
35 35
                  name, true, true ), mWidget( 0 ), mConfig( config )
36 36
 {
37 37
   TQFrame *page = plainPage();
38
-  TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
38
+  TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
39 39
 
40 40
   mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
41
-  tqlayout->addWidget( mWidget, 0, 0 );
41
+  layout->addWidget( mWidget, 0, 0 );
42 42
 
43 43
   mWidget->restoreSettings( mConfig );
44 44
 }

+ 7
- 7
kaddressbook/kcmconfigs/kabconfigwidget.cpp View File

@@ -56,11 +56,11 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
56 56
 
57 57
   // General page
58 58
   TQWidget *generalPage = new TQWidget( this );
59
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
59
+  TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
60 60
                                             KDialog::spacingHint() );
61 61
 
62 62
   TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
63
-  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
63
+  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
64 64
   boxLayout->setAlignment( TQt::AlignTop );
65 65
 
66 66
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
@@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
94 94
   editorLayout->addStretch( 1 );
95 95
 
96 96
 
97
-  tqlayout->addWidget( groupBox );
97
+  layout->addWidget( groupBox );
98 98
 
99 99
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
100
-  TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
100
+  TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
101 101
                                        KDialog::spacingHint() );
102 102
   label = new TQLabel( i18n( "Phone:" ), groupBox );
103 103
   grid->addWidget( label, 0, 0 );
@@ -124,10 +124,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
124 124
 
125 125
   grid->setColStretch( 1, 1 );
126 126
 
127
-  tqlayout->addWidget( groupBox );
127
+  layout->addWidget( groupBox );
128 128
 
129 129
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
130
-  boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
130
+  boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
131 131
   boxLayout->setAlignment( TQt::AlignTop );
132 132
 
133 133
   mLocationMapURL = new TQComboBox( true, groupBox );
@@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
139 139
                                  "<li>%c: Country ISO Code</li> </ul>" ) );
140 140
   mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() );
141 141
   boxLayout->addWidget( mLocationMapURL );
142
-  tqlayout->addWidget( groupBox );
142
+  layout->addWidget( groupBox );
143 143
 
144 144
   connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
145 145
   connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );

+ 2
- 2
kaddressbook/kcmconfigs/kcmkabconfig.cpp View File

@@ -43,9 +43,9 @@ extern "C"
43 43
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
44 44
   : KCModule( parent, name )
45 45
 {
46
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
46
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
47 47
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
48
-  tqlayout->addWidget( mConfigWidget );
48
+  layout->addWidget( mConfigWidget );
49 49
 
50 50
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
51 51
 

+ 2
- 2
kaddressbook/kcmconfigs/kcmkabldapconfig.cpp View File

@@ -44,9 +44,9 @@ extern "C"
44 44
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
45 45
   : KCModule( parent, name )
46 46
 {
47
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
47
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
48 48
   mConfigWidget = new LDAPOptionsWidget( this );
49
-  tqlayout->addWidget( mConfigWidget );
49
+  layout->addWidget( mConfigWidget );
50 50
 
51 51
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
52 52
 

+ 4
- 4
kaddressbook/kcmconfigs/ldapoptionswidget.cpp View File

@@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults()
258 258
 
259 259
 void LDAPOptionsWidget::initGUI()
260 260
 {
261
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
261
+  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
262 262
 
263 263
   TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this );
264 264
   groupBox->setInsideSpacing( KDialog::spacingHint() );
@@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI()
285 285
   TQWidget* spacer = new TQWidget( upDownBox );
286 286
   upDownBox->setStretchFactor( spacer, 100 );
287 287
 
288
-  tqlayout->addWidget( groupBox );
288
+  layout->addWidget( groupBox );
289 289
 
290 290
   KButtonBox *buttons = new KButtonBox( this );
291 291
   buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
@@ -293,9 +293,9 @@ void LDAPOptionsWidget::initGUI()
293 293
   mEditButton->setEnabled( false );
294 294
   mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
295 295
   mRemoveButton->setEnabled( false );
296
-  buttons->tqlayout();
296
+  buttons->layout();
297 297
 
298
-  tqlayout->addWidget( buttons );
298
+  layout->addWidget( buttons );
299 299
 
300 300
   resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) );
301 301
 }

+ 6
- 6
kaddressbook/keywidget.cpp View File

@@ -41,25 +41,25 @@
41 41
 KeyWidget::KeyWidget( TQWidget *parent, const char *name )
42 42
   : TQWidget( parent, name )
43 43
 {
44
-  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
44
+  TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
45 45
                                          KDialog::spacingHint() );
46 46
 
47 47
   TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
48
-  tqlayout->addWidget( label, 0, 0 );
48
+  layout->addWidget( label, 0, 0 );
49 49
 
50 50
   mKeyCombo = new KComboBox( this );
51
-  tqlayout->addWidget( mKeyCombo, 0, 1 );
51
+  layout->addWidget( mKeyCombo, 0, 1 );
52 52
 
53 53
   mAddButton = new TQPushButton( i18n( "Add..." ), this );
54
-  tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
54
+  layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
55 55
 
56 56
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
57 57
   mRemoveButton->setEnabled( false );
58
-  tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
58
+  layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
59 59
 
60 60
   mExportButton = new TQPushButton( i18n( "Export..." ), this );
61 61
   mExportButton->setEnabled( false );
62
-  tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
62
+  layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
63 63
 
64 64
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
65 65
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );

+ 1
- 1
kaddressbook/ldapsearchdialog.cpp View File

@@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
153 153
   groupBox->setFrameShape( TQGroupBox::Box );
154 154
   groupBox->setFrameShadow( TQGroupBox::Sunken );
155 155
   groupBox->setColumnLayout( 0, Qt::Vertical );
156
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
156
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
157 157
                                             5, spacingHint() );
158 158
   boxLayout->setColStretch( 1, 1 );
159 159
 

+ 17
- 17
kaddressbook/nameeditdialog.cpp View File

@@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
51 51
                  Ok, parent, name, true ), mAddressee( addr )
52 52
 {
53 53
   TQWidget *page = plainPage();
54
-  TQGridLayout *tqlayout = new TQGridLayout( page );
55
-  tqlayout->setSpacing( spacingHint() );
56
-  tqlayout->addColSpacing( 2, 100 );
54
+  TQGridLayout *layout = new TQGridLayout( page );
55
+  layout->setSpacing( spacingHint() );
56
+  layout->addColSpacing( 2, 100 );
57 57
   TQLabel *label;
58 58
 
59 59
   label = new TQLabel( i18n( "Honorific prefixes:" ), page );
60
-  tqlayout->addWidget( label, 0, 0 );
60
+  layout->addWidget( label, 0, 0 );
61 61
   mPrefixCombo = new KComboBox( page );
62 62
   mPrefixCombo->setDuplicatesEnabled( false );
63 63
   mPrefixCombo->setEditable( true );
64 64
   mPrefixCombo->setEnabled( !readOnly );
65 65
   label->setBuddy( mPrefixCombo );
66
-  tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
66
+  layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
67 67
 
68 68
   TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) );
69 69
 
70 70
   label = new TQLabel( i18n( "Given name:" ), page );
71
-  tqlayout->addWidget( label, 1, 0 );
71
+  layout->addWidget( label, 1, 0 );
72 72
   mGivenNameEdit = new KLineEdit( page );
73 73
   mGivenNameEdit->setReadOnly( readOnly );
74 74
   label->setBuddy( mGivenNameEdit );
75
-  tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
75
+  layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
76 76
 
77 77
   label = new TQLabel( i18n( "Additional names:" ), page );
78
-  tqlayout->addWidget( label, 2, 0 );
78
+  layout->addWidget( label, 2, 0 );
79 79
   mAdditionalNameEdit = new KLineEdit( page );
80 80
   mAdditionalNameEdit->setReadOnly( readOnly );
81 81
   label->setBuddy( mAdditionalNameEdit );
82
-  tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
82
+  layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
83 83
 
84 84
   label = new TQLabel( i18n( "Family names:" ), page );
85
-  tqlayout->addWidget( label, 3, 0 );
85
+  layout->addWidget( label, 3, 0 );
86 86
   mFamilyNameEdit = new KLineEdit( page );
87 87
   mFamilyNameEdit->setReadOnly( readOnly );
88 88
   label->setBuddy( mFamilyNameEdit );
89
-  tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
89
+  layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
90 90
 
91 91
   label = new TQLabel( i18n( "Honorific suffixes:" ), page );
92
-  tqlayout->addWidget( label, 4, 0 );
92
+  layout->addWidget( label, 4, 0 );
93 93
   mSuffixCombo = new KComboBox( page );
94 94
   mSuffixCombo->setDuplicatesEnabled( false );
95 95
   mSuffixCombo->setEditable( true );
96 96
   mSuffixCombo->setEnabled( !readOnly );
97 97
   label->setBuddy( mSuffixCombo );
98
-  tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
98
+  layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
99 99
 
100 100
   TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) );
101 101
 
102 102
   label = new TQLabel( i18n( "Formatted name:" ), page );
103
-  tqlayout->addWidget( label, 5, 0 );
103
+  layout->addWidget( label, 5, 0 );
104 104
 
105 105
   mFormattedNameCombo = new KComboBox( page );
106 106
   mFormattedNameCombo->setEnabled( !readOnly );
107
-  tqlayout->addWidget( mFormattedNameCombo, 5, 1 );
107
+  layout->addWidget( mFormattedNameCombo, 5, 1 );
108 108
   connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );
109 109
 
110 110
   mFormattedNameEdit = new KLineEdit( page );
111 111
   mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
112
-  tqlayout->addWidget( mFormattedNameEdit, 5, 2 );
112
+  layout->addWidget( mFormattedNameEdit, 5, 2 );
113 113
 
114 114
   mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
115 115
   mParseBox->setEnabled( !readOnly );
116 116
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
117 117
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
118
-  tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
118
+  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
119 119
 
120 120
   // Fill in the values
121 121
   mFamilyNameEdit->setText( addr.familyName() );

+ 12
- 12
kaddressbook/phoneeditwidget.cpp View File

@@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected()
129 129
 PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
130 130
   : TQWidget( parent )
131 131
 {
132
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
132
+  TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 );
133 133
 
134 134
   mTypeCombo = new PhoneTypeCombo( this );
135 135
   mNumberEdit = new KLineEdit( this );
136 136
 
137
-  tqlayout->addWidget( mTypeCombo );
138
-  tqlayout->addWidget( mNumberEdit );
137
+  layout->addWidget( mTypeCombo );
138
+  layout->addWidget( mNumberEdit );
139 139
 
140 140
   connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
141 141
   connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
@@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
169 169
 PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
170 170
   : TQWidget( parent, name ), mReadOnly( false )
171 171
 {
172
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
173
-  tqlayout->setSpacing( KDialog::spacingHint() );
172
+  TQGridLayout *layout = new TQGridLayout( this, 2, 2 );
173
+  layout->setSpacing( KDialog::spacingHint() );
174 174
 
175
-  mWidgetLayout = new TQVBoxLayout( tqlayout );
176
-  tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
175
+  mWidgetLayout = new TQVBoxLayout( layout );
176
+  layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
177 177
 
178 178
   mAddButton = new TQPushButton( i18n( "Add" ), this );
179 179
   mAddButton->setMaximumSize( mAddButton->sizeHint() );
180
-  tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
180
+  layout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
181 181
 
182 182
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
183 183
   mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
184
-  tqlayout->addWidget( mRemoveButton, 1, 1 );
184
+  layout->addWidget( mRemoveButton, 1, 1 );
185 185
 
186 186
   mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
187 187
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
@@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
298 298
 {
299 299
   TQWidget *page = plainPage();
300 300
 
301
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() );
301
+  TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() );
302 302
 
303 303
   mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
304
-  tqlayout->addWidget( mPreferredBox );
304
+  layout->addWidget( mPreferredBox );
305 305
 
306 306
   mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
307
-  tqlayout->addWidget( mGroup );
307
+  layout->addWidget( mGroup );
308 308
 
309 309
   // fill widgets
310 310
   mTypeList = KABC::PhoneNumber::typeList();

+ 2
- 2
kaddressbook/printing/detailledstyle.cpp View File

@@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
112 112
   mPageAppearance->kcbHeaderTextColor->setColor(
113 113
       config->readColorEntry( ContactHeaderForeColor, &TQt::white ) );
114 114
 
115
-  mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
116
-  mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
115
+  mPageAppearance->layout()->setMargin( KDialog::marginHint() );
116
+  mPageAppearance->layout()->setSpacing( KDialog::spacingHint() );
117 117
 }
118 118
 
119 119
 DetailledPrintStyle::~DetailledPrintStyle()

+ 1
- 1
kaddressbook/printing/kabentrypainter.cpp View File

@@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
172 172
   KABC::Address address;
173 173
 
174 174
   // this is used to prepare some fields for printing and decide about
175
-  // the tqlayout later:
175
+  // the layout later:
176 176
   TQValueList<TQStringList> parts;
177 177
   TQValueList<TQRectList*> contents;
178 178
 

+ 3
- 3
kaddressbook/printing/selectionpage.cpp View File

@@ -52,10 +52,10 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
52 52
   mButtonGroup = new TQButtonGroup( this );
53 53
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
54 54
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
55
-  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
56
-  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
55
+  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
56
+  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
57 57
 
58
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
58
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
59 59
   groupLayout->setAlignment( TQt::AlignTop );
60 60
 
61 61
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );

+ 2
- 2
kaddressbook/printing/stylepage.cpp View File

@@ -122,7 +122,7 @@ void StylePage::initGUI()
122 122
 
123 123
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
124 124
   group->setColumnLayout( 0, Qt::Vertical );
125
-  TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
125
+  TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
126 126
                                              KDialog::spacingHint() );
127 127
   sortLayout->setAlignment( TQt::AlignTop );
128 128
 
@@ -142,7 +142,7 @@ void StylePage::initGUI()
142 142
 
143 143
   group = new TQButtonGroup( i18n( "Print Style" ), this );
144 144
   group->setColumnLayout( 0, Qt::Vertical );
145
-  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
145
+  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
146 146
                                               KDialog::spacingHint() );
147 147
 
148 148
   mStyleCombo = new KComboBox( false, group );

+ 2
- 2
kaddressbook/secrecywidget.cpp View File

@@ -32,10 +32,10 @@
32 32
 SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
33 33
   : TQWidget( parent, name )
34 34
 {
35
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
35
+  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
36 36
                                          KDialog::spacingHint() );
37 37
   mSecrecyCombo = new KComboBox( this );
38
-  tqlayout->addWidget( mSecrecyCombo );
38
+  layout->addWidget( mSecrecyCombo );
39 39
 
40 40
   const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
41 41
   KABC::Secrecy::TypeList::ConstIterator it;

+ 2
- 2
kaddressbook/undocmds.cpp View File

@@ -261,7 +261,7 @@ void CutCommand::unexecute()
261 261
 
262 262
   mAddresseeList.clear();
263 263
 
264
-  TQClipboard *cb = TQApplication::tqclipboard();
264
+  TQClipboard *cb = TQApplication::clipboard();
265 265
   kapp->processEvents();
266 266
   cb->setText( mOldText );
267 267
 }
@@ -289,7 +289,7 @@ void CutCommand::execute()
289 289
   // Convert to clipboard
290 290
   mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList );
291 291
 
292
-  TQClipboard *cb = TQApplication::tqclipboard();
292
+  TQClipboard *cb = TQApplication::clipboard();
293 293
   mOldText = cb->text();
294 294
   kapp->processEvents();
295 295
 #if defined(KABC_VCARD_ENCODING_FIX)

+ 2
- 2
kaddressbook/viewmanager.cpp View File

@@ -601,9 +601,9 @@ void ViewManager::initActions()
601 601
 
602 602
 void ViewManager::initGUI()
603 603
 {
604
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
604
+  TQHBoxLayout *layout = new TQHBoxLayout( this );
605 605
   mViewWidgetStack = new TQWidgetStack( this );
606
-  tqlayout->addWidget( mViewWidgetStack );
606
+  layout->addWidget( mViewWidgetStack );
607 607
 }
608 608
 
609 609
 #include "viewmanager.moc"

+ 3
- 3
kaddressbook/views/cardview.cpp View File

@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
316 316
 
317 317
   // if we are the current item and the view has focus, draw focus rect
318 318
   if ( mView->currentItem() == this && mView->hasFocus() ) {
319
-    mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
319
+    mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
320 320
         TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
321 321
         TQStyle::Style_FocusAtBorder,
322 322
         TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
843 843
    calcLayout();
844 844
 
845 845
   // allow setting costum colors in the viewport pale
846
-  TQColorGroup cg = viewport()->tqpalette().active();
846
+  TQColorGroup cg = viewport()->palette().active();
847 847
 
848 848
   TQRect clipRect( clipx, clipy, clipw, cliph );
849 849
   TQRect cardRect;
@@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event )
893 893
 
894 894
 void CardView::calcLayout()
895 895
 {
896
-  // Start in the upper left corner and tqlayout all the
896
+  // Start in the upper left corner and layout all the
897 897
   // cars using their height and width
898 898
   int maxWidth = 0;
899 899
   int maxHeight = 0;

+ 3
- 3
kaddressbook/views/cardview.h View File

@@ -516,7 +516,7 @@ class CardView : public TQScrollView
516 516
     void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph );
517 517
 
518 518
     /**
519
-      Sets the tqlayout to dirty and repaints.
519
+      Sets the layout to dirty and repaints.
520 520
      */
521 521
     void resizeEvent( TQResizeEvent* );
522 522
 
@@ -526,13 +526,13 @@ class CardView : public TQScrollView
526 526
     void contentsWheelEvent( TQWheelEvent* );
527 527
 
528 528
     /**
529
-      Sets the tqlayout to dirty and calls for a repaint.
529
+      Sets the layout to dirty and calls for a repaint.
530 530
      */
531 531
     void setLayoutDirty( bool dirty );
532 532
 
533 533
     /**
534 534
       Does the math based on the bounding rect of the cards to properly
535
-      lay the cards out on the screen. This is only done if the tqlayout is
535
+      lay the cards out on the screen. This is only done if the layout is
536 536
       marked as dirty.
537 537
      */
538 538
     void calcLayout();

+ 2
- 2
kaddressbook/views/configurecardviewdialog.cpp View File

@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
120 120
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
121 121
   enableFonts();
122 122
 
123
-  // tqlayout
123
+  // layout
124 124
   sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) );
125 125
   sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) );
126 126
   sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) );
@@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config )
152 152
     config->writeEntry( "TextFont", lTextFont->font() );
153 153
     config->writeEntry( "HeaderFont", lHeaderFont->font() );
154 154
   }
155
-  // tqlayout
155
+  // layout
156 156
   config->writeEntry( "ItemMargin", sbMargin->value() );
157 157
   config->writeEntry( "ItemSpacing", sbSpacing->value() );
158 158
   config->writeEntry( "SeparatorWidth", sbSepWidth->value() );

+ 5
- 5
kaddressbook/views/configuretableviewdialog.cpp View File

@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
111 111
 
112 112
 void LookAndFeelPage::initGUI()
113 113
 {
114
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
114
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
115 115
 
116 116
   TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
117 117
                                          i18n("Row Separator"), this);
118
-  tqlayout->addWidget(group);
118
+  layout->addWidget(group);
119 119
 
120 120
   mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
121 121
                                       group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
124 124
 
125 125
   // Background Checkbox/Selector
126 126
   TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
127
-  tqlayout->addLayout(backgroundLayout);
127
+  layout->addLayout(backgroundLayout);
128 128
 
129 129
   mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
130 130
                                  "mBackgroundBox");
@@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI()
141 141
   // ToolTip Checkbox
142 142
   mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this,
143 143
                               "mToolTipBox");
144
-  tqlayout->addWidget(mToolTipBox);
144
+  layout->addWidget(mToolTipBox);
145 145
 #if KDE_IS_VERSION(3,2,90)
146 146
   mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
147
-  tqlayout->addWidget( mIMPresenceBox );
147
+  layout->addWidget( mIMPresenceBox );
148 148
 #endif
149 149
 }
150 150
 

+ 2
- 2
kaddressbook/views/kaddressbookcardview.cpp View File

@@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
149 149
 {
150 150
   mShowEmptyFields = false;
151 151
 
152
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
152
+  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
153 153
 
154 154
   mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
155 155
   mCardView->setSelectionMode( CardView::Extended );
156
-  tqlayout->addWidget( mCardView );
156
+  layout->addWidget( mCardView );
157 157
 
158 158
   // Connect up the signals
159 159
   connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),

+ 2
- 2
kaddressbook/views/kaddressbookiconview.cpp View File

@@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
139 139
                                             TQWidget *parent, const char *name)
140 140
   : KAddressBookView( core, parent, name )
141 141
 {
142
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
142
+  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
143 143
 
144 144
   mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
145
-  tqlayout->addWidget( mIconView );
145
+  layout->addWidget( mIconView );
146 146
 
147 147
   // Connect up the signals
148 148
   connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),

+ 1
- 1
kaddressbook/views/kaddressbooktableview.cpp View File

@@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config )
210 210
   if ( config->readBoolEntry( "Background", false ) )
211 211
     mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) );
212 212
 
213
-  // Restore the tqlayout of the listview
213
+  // Restore the layout of the listview
214 214
   mListView->restoreLayout( config, config->group() );
215 215
 }
216 216
 

+ 15
- 15
kaddressbook/xxport/csvimportdialog.cpp View File

@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
367 367
 {
368 368
   mPage = plainPage();
369 369
 
370
-  TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(),
370
+  TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(),
371 371
                                          spacingHint() );
372 372
   TQHBoxLayout *hbox = new TQHBoxLayout();
373 373
   hbox->setSpacing( spacingHint() );
@@ -379,16 +379,16 @@ void CSVImportDialog::initGUI()
379 379
   mUrlRequester->setFilter( "*.csv" );
380 380
   hbox->addWidget( mUrlRequester );
381 381
 
382
-  tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
382
+  layout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
383 383
 
384 384
   // Delimiter: comma, semicolon, tab, space, other
385 385
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
386 386
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
387
-  mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
388
-  mDelimiterBox->tqlayout()->setMargin( marginHint() );
389
-  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
387
+  mDelimiterBox->layout()->setSpacing( spacingHint() );
388
+  mDelimiterBox->layout()->setMargin( marginHint() );
389
+  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
390 390
   delimiterLayout->setAlignment( TQt::AlignTop );
391
-  tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
391
+  layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
392 392
 
393 393
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
394 394
   mRadioComma->setChecked( true );
@@ -411,13 +411,13 @@ void CSVImportDialog::initGUI()
411 411
 
412 412
   mComboLine = new TQComboBox( false, mPage );
413 413
   mComboLine->insertItem( i18n( "1" ) );
414
-  tqlayout->addWidget( mComboLine, 2, 3 );
414
+  layout->addWidget( mComboLine, 2, 3 );
415 415
 
416 416
   mComboQuote = new TQComboBox( false, mPage );
417 417
   mComboQuote->insertItem( i18n( "\"" ), 0 );
418 418
   mComboQuote->insertItem( i18n( "'" ), 1 );
419 419
   mComboQuote->insertItem( i18n( "None" ), 2 );
420
-  tqlayout->addWidget( mComboQuote, 2, 2 );
420
+  layout->addWidget( mComboQuote, 2, 2 );
421 421
 
422 422
   mDatePatternEdit = new TQLineEdit( mPage );
423 423
   mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default
@@ -427,28 +427,28 @@ void CSVImportDialog::initGUI()
427 427
                                          "<li>M: month with 2 digits</li>"
428 428
                                          "<li>d: day with 1 or 2 digits</li>"
429 429
                                          "<li>D: day with 2 digits</li></ul>" ) );
430
-  tqlayout->addWidget( mDatePatternEdit, 2, 4 );
430
+  layout->addWidget( mDatePatternEdit, 2, 4 );
431 431
 
432 432
   label = new TQLabel( i18n( "Start at line:" ), mPage );
433
-  tqlayout->addWidget( label, 1, 3 );
433
+  layout->addWidget( label, 1, 3 );
434 434
 
435 435
   label = new TQLabel( i18n( "Textquote:" ), mPage );
436
-  tqlayout->addWidget( label, 1, 2 );
436
+  layout->addWidget( label, 1, 2 );
437 437
 
438 438
   label = new TQLabel( i18n( "Date format:" ), mPage );
439
-  tqlayout->addWidget( label, 1, 4 );
439
+  layout->addWidget( label, 1, 4 );
440 440
 
441 441
   mIgnoreDuplicates = new TQCheckBox( mPage );
442 442
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
443
-  tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
443
+  layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
444 444
 
445 445
   mCodecCombo = new TQComboBox( mPage );
446
-  tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
446
+  layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
447 447
 
448 448
   mTable = new TQTable( 0, 0, mPage );
449 449
   mTable->setSelectionMode( TQTable::NoSelection );
450 450
   mTable->horizontalHeader()->hide();
451
-  tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
451
+  layout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
452 452
 
453 453
   setButtonText( User1, i18n( "Apply Template..." ) );
454 454
   setButtonText( User2, i18n( "Save Template..." ) );

+ 9
- 9
kaddressbook/xxport/vcard_xxport.cpp View File

@@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
471 471
     mContacts( list )
472 472
 {
473 473
   TQFrame *page = plainPage();
474
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
474
+  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
475 475
 
476 476
   TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page );
477 477
   TQFont font = label->font();
478 478
   font.setBold( true );
479