Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
ba2a3ce341
100 changed files with 550 additions and 550 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. +3
    -3
      kalarm/timeselector.cpp

+ 5
- 5
NewsLog.txt View File

@@ -66,7 +66,7 @@ Problems addressed
------------------

* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)


@@ -551,7 +551,7 @@ Problems addressed

* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------

* Prevent crash after changing the tqlayout and replying then. (778728)
* Prevent crash after changing the layout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)

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

@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">

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

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

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

@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()

void ArticleViewer::generateNormalModeCSS()
{
const TQColorGroup & cg = TQApplication::tqpalette().active();
const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_normalModeCSS = TQString(
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()

void ArticleViewer::generateCombinedModeCSS()
{
const TQColorGroup & cg = TQApplication::tqpalette().active();
const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_combinedModeCSS = TQString (

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

@@ -52,7 +52,7 @@ public:
int currentID;
TQValueList<NodeListView*> views;
TQMap<int, NodeListView*> idToView;
TQHBoxLayout* tqlayout;
TQHBoxLayout* layout;
ViewMode viewMode;
TQMap<TQWidget*, TQString> captions;
};
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
d->current = 0;
d->currentID = -1;
d->viewMode = verticalTabs;
d->tqlayout = new TQHBoxLayout(this);
//d->tqlayout = new TQGridLayout(this, 1, 2);
d->layout = new TQHBoxLayout(this);
//d->layout = new TQGridLayout(this, 1, 2);
d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this);
d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
//d->tabBar->setStyle(KMultiTabBar::KDEV3);
d->tabBar->showActiveTabTexts(true);
d->tabBar->setPosition(KMultiTabBar::Left);
d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
d->layout->addWidget(d->tabBar/*, 0, 0*/);

d->stack = new TQWidgetStack(this);
d->tqlayout->addWidget(d->stack/*, 0, 1*/);
d->layout->addWidget(d->stack/*, 0, 1*/);
// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
}

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

@@ -211,9 +211,9 @@
One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed
comparison logic in mk4too.cpp (64-bit ints, new code).

2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes

Use list operators to convert a Tcl tqlayout to MK format. This used
Use list operators to convert a Tcl layout to MK format. This used
to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to
use a different notation for nested defs (^).

@@ -605,13 +605,13 @@
c4_Storage::SaveTo function, memo's would sometimes not be written,
leading to a *damaged* datafile (and incorrect free-space tracking).

2002-03-15 Better configure logic, "mk::view tqlayout" fix
2002-03-15 Better configure logic, "mk::view layout" fix

Many tweaks to configures, makes, and libtool setup. Get rid of the
library version numbers and the special Mk4*.so targets. Instead of
Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).

Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
Fixed "mk::view layout", it was broken by the 10-2-2002 change.

2002-03-13 Extend partial access 'B' usage

@@ -658,9 +658,9 @@
causing it to detach empty top-level views, even when in use. Fixed,
added s39 to test for this case.

2002-02-10 Improve Mk4tcl's "mk::view tqlayout"
2002-02-10 Improve Mk4tcl's "mk::view layout"

Avoid crash when asking for the tqlayout of a non-existent view. Now
Avoid crash when asking for the layout of a non-existent view. Now
returns an error instead.

2002-02-07 Fast commit with many empty subviews
@@ -1614,7 +1614,7 @@
new version in c4_Sequence allocate the c4_Bytes object lazily.
Faster, and decreases sequence object size (for lots of subviews).

Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
Mk4tcl, mk::layout now returns the proper layout even if the views
are empty. Solved by adding extra arg to c4_Storage::Description,
to return structure of a single top-level view. Fixes "mk8basic.1",
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()
}

// Recursively display the entire view contents. The results shown do not
// depend on file tqlayout (free space, file positions, flat vs. on-demand).
// depend on file layout (free space, file positions, flat vs. on-demand).

static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
{

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

@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

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

@@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -100,7 +100,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -362,7 +362,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">

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

@@ -25,7 +25,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<vbox>
<property name="name">

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

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

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

@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));

TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
tqlayout->addWidget(d->view, 0, 0);
TQGridLayout* layout = new TQGridLayout(this, 1, 1);
layout->addWidget(d->view, 0, 0);

d->visitor = new NodeVisitor(this);


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

@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );

TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;

x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
}
return x;
}
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()

url = view->part()->url();
kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
}

void TabWidget::slotCloseTab()

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

@@ -81,7 +81,7 @@ class Tag

bool isNull() const;
/** 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. */
/** 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. */
TQString id() const;

/** user-visible name of the tag */

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

@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">

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

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

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

@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
}

// TODO: reverse for reverse tqlayout
// TODO: reverse for reverse layout
void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
int column, int width, int align )


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

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

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

@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">

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

@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );

group = new TQVGroupBox( i18n("WatchGnuPG"), top );
group->tqlayout()->setSpacing( spacingHint() );
group->layout()->setSpacing( spacingHint() );

w = new TQWidget( group );

@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )

/******************* Log Window group *******************/
group = new TQVGroupBox( i18n("Log Window"), top );
group->tqlayout()->setSpacing( spacingHint() );
group->layout()->setSpacing( spacingHint() );

w = new TQWidget( group );


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

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

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

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

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

@@ -82,7 +82,7 @@ namespace Kleo {

public:
CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
TQGridLayout * layout, TQWidget* parent, const char* name = 0 );

bool save();
void load();
@@ -102,7 +102,7 @@ namespace Kleo {
static CryptoConfigEntryGUI* createEntryGUI(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const TQString& entryName,
TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
};

/**
@@ -154,7 +154,7 @@ namespace Kleo {
CryptoConfigEntryLineEdit( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );

virtual void doSave();
@@ -174,7 +174,7 @@ namespace Kleo {
CryptoConfigEntryPath( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );

virtual void doSave();
@@ -194,7 +194,7 @@ namespace Kleo {
CryptoConfigEntryDirPath( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );

virtual void doSave();
@@ -214,7 +214,7 @@ namespace Kleo {
CryptoConfigEntryURL( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );

virtual void doSave();
@@ -234,7 +234,7 @@ namespace Kleo {
CryptoConfigEntrySpinBox( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();
@@ -254,7 +254,7 @@ namespace Kleo {
CryptoConfigEntryCheckBox( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();
@@ -273,7 +273,7 @@ namespace Kleo {
CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
TQGridLayout * tqlayout,
TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();

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

@@ -44,7 +44,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

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

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

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

@@ -362,7 +362,7 @@ display: none;
@media aural { .doNotDisplay {
display: inline;
}}
/* Stylesheet that handles PIM-specific classes and tqlayout */
/* Stylesheet that handles PIM-specific classes and layout */

#content h1
{

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

@@ -10,9 +10,9 @@
// -Ve (on or off - empty base classes)
// -aX (alignment - 5 options).
// -pX (Calling convention - 4 options)
// -VmX (member pointer size and tqlayout - 5 options)
// -VmX (member pointer size and layout - 5 options)
// -VC (on or off, changes name mangling)
// -Vl (on or off, changes struct tqlayout).
// -Vl (on or off, changes struct layout).

// In addition the following warnings are sufficiently annoying (and
// 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)
file to get a list of views) - DONE
- Redo and move the DCOP interface - 50%
- Cleanup the tableview more - DONE
- Retqlayout the edit contact dialog - DONE
- Relayout the edit contact dialog - DONE
- Remove ContactEntry*. Impelement supporting classes required
for this. - DONE
- 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
AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
tqlayout->setSpacing( KDialog::spacingHint() );
TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
layout->setSpacing( KDialog::spacingHint() );

mTypeCombo = new AddressTypeCombo( mAddressList, this );
connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
TQT_SLOT( updateAddressEdit() ) );
tqlayout->addWidget( mTypeCombo );
layout->addWidget( mTypeCombo );

mAddressField = new KActiveLabel( this );
mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
mAddressField->setMinimumHeight( 20 );
mAddressField->setAlignment( TQt::AlignTop );
mAddressField->setTextFormat( TQt::PlainText );
tqlayout->addWidget( mAddressField );
layout->addWidget( mAddressField );

mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );

tqlayout->addWidget( mEditButton );
layout->addWidget( mEditButton );
}

AddressEditWidget::~AddressEditWidget()
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
parent, "AddressTypeDialog" )
{
TQWidget *page = plainPage();
TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
TQVBoxLayout *layout = new TQVBoxLayout( page );

mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
tqlayout->addWidget( mGroup );
layout->addWidget( mGroup );

mTypeList = KABC::Address::typeList();
mTypeList.remove( KABC::Address::Pref );

+ 2
- 2
kaddressbook/addresseeeditordialog.cpp View File

@@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,

TQWidget *page = plainPage();

TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
TQVBoxLayout *layout = new TQVBoxLayout( page );

if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) {
mEditorWidget = new SimpleAddresseeEditor( page );
@@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
mEditorWidget = new AddresseeEditorWidget( page );
}
connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
tqlayout->addWidget( mEditorWidget );
layout->addWidget( mEditorWidget );

enableButton( KDialogBase::Apply, false );


+ 2
- 2
kaddressbook/addresseeeditorextension.cpp View File

@@ -36,14 +36,14 @@
AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
: KAB::ExtensionWidget( core, parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );

if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor )
mAddresseeEditor = new SimpleAddresseeEditor( this );
else
mAddresseeEditor = new AddresseeEditorWidget( this );

tqlayout->addWidget( mAddresseeEditor );
layout->addWidget( mAddresseeEditor );
}

AddresseeEditorExtension::~AddresseeEditorExtension()

+ 64
- 64
kaddressbook/addresseeeditorwidget.cpp View File

@@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& )

void AddresseeEditorWidget::initGUI()
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );

mTabWidget = new TQTabWidget( this );
tqlayout->addWidget( mTabWidget );
layout->addWidget( mTabWidget );

setupTab1();
setupTab2();
@@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1()
// This is the General tab
TQWidget *tab1 = new TQWidget( mTabWidget );

TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 );
tqlayout->setMargin( KDialogBase::marginHint() );
tqlayout->setSpacing( KDialogBase::spacingHint() );
TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 );
layout->setMargin( KDialogBase::marginHint() );
layout->setSpacing( KDialogBase::spacingHint() );

TQLabel *label;
KSeparator* bar;
@@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1()
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
layout->addMultiCellWidget( label, 0, 1, 0, 0 );

// First name
button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
@@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1()
mNameLabel->show();
}

tqlayout->addWidget( button, 0, 1 );
tqlayout->addWidget( mNameEdit, 0, 2 );
tqlayout->addWidget( mNameLabel, 0, 2 );
layout->addWidget( button, 0, 1 );
layout->addWidget( mNameEdit, 0, 2 );
layout->addWidget( mNameLabel, 0, 2 );
label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
mRoleEdit = new KLineEdit( tab1 );
connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mRoleEdit );
tqlayout->addWidget( label, 1, 1 );
tqlayout->addWidget( mRoleEdit, 1, 2 );
layout->addWidget( label, 1, 1 );
layout->addWidget( mRoleEdit, 1, 2 );

// Organization
label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
@@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1()
label->setBuddy( mOrgEdit );
connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( organizationTextChanged( const TQString& ) ) );
tqlayout->addWidget( label, 2, 1 );
tqlayout->addWidget( mOrgEdit, 2, 2 );
layout->addWidget( label, 2, 1 );
layout->addWidget( mOrgEdit, 2, 2 );

// File as (formatted name)
label = new TQLabel( i18n( "Formatted name:" ), tab1 );
mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
tqlayout->addWidget( label, 3, 1 );
tqlayout->addWidget( mFormattedNameLabel, 3, 2 );
layout->addWidget( label, 3, 1 );
layout->addWidget( mFormattedNameLabel, 3, 2 );

// Left hand separator. This separator doesn't go all the way
// across so the dialog still flows from top to bottom
bar = new KSeparator( KSeparator::HLine, tab1 );
tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 );
layout->addMultiCellWidget( bar, 4, 4, 0, 2 );

//////////////////////////////////////
// Phone numbers (upper right)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook",
KIcon::Desktop, KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 );
layout->addMultiCellWidget( label, 0, 1, 3, 3 );

mPhoneEditWidget = new PhoneEditWidget( tab1 );
connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );

bar = new KSeparator( KSeparator::HLine, tab1 );
tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 );
layout->addMultiCellWidget( bar, 4, 4, 3, 6 );

//////////////////////////////////////
// Addresses (lower left)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 );
layout->addMultiCellWidget( label, 5, 6, 0, 0 );

mAddressEditWidget = new AddressEditWidget( tab1 );
connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );

//////////////////////////////////////
// Email / Web (lower right)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 );
layout->addMultiCellWidget( label, 5, 6, 3, 3 );

mEmailWidget = new EmailEditWidget( tab1 );
connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );

// add the separator
bar = new KSeparator( KSeparator::HLine, tab1 );
tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 );
layout->addMultiCellWidget( bar, 7, 7, 3, 6 );

TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );

@@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1()
label->setBuddy( mURLEdit );
homePageLayout->addWidget( label );
homePageLayout->addWidget( mURLEdit );
tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );

TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 );
label = new TQLabel( i18n("Blog feed:"), tab1 );
@@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1()
connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
TQT_SLOT( textChanged( const TQString & ) ) );
label->setBuddy( mBlogEdit );
tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );

mIMWidget = new IMEditWidget( tab1, mAddressee );
connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );

tqlayout->addColSpacing( 6, 50 );
layout->addColSpacing( 6, 50 );

bar = new KSeparator( KSeparator::HLine, tab1 );
tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 );
layout->addMultiCellWidget( bar, 11, 11, 0, 6 );

///////////////////////////////////////
TQHBox *categoryBox = new TQHBox( tab1 );
@@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1()
mSecrecyWidget = new SecrecyWidget( categoryBox );
connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );

tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );

// Build the tqlayout and add to the tab widget
tqlayout->activate(); // required
// Build the layout and add to the tab widget
layout->activate(); // required

mTabWidget->addTab( tab1, i18n( "&General" ) );
}
@@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2()
// This is the Details tab
TQWidget *tab2 = new TQWidget( mTabWidget );

TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 );
tqlayout->setMargin( KDialogBase::marginHint() );
tqlayout->setSpacing( KDialogBase::spacingHint() );
TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 );
layout->setMargin( KDialogBase::marginHint() );
layout->setSpacing( KDialogBase::spacingHint() );

TQLabel *label;
KSeparator* bar;
@@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( tab2 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
layout->addMultiCellWidget( label, 0, 1, 0, 0 );

label = new TQLabel( i18n( "Department:" ), tab2 );
tqlayout->addWidget( label, 0, 1 );
layout->addWidget( label, 0, 1 );
mDepartmentEdit = new KLineEdit( tab2 );
connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mDepartmentEdit );
tqlayout->addWidget( mDepartmentEdit, 0, 2 );
layout->addWidget( mDepartmentEdit, 0, 2 );

label = new TQLabel( i18n( "Office:" ), tab2 );
tqlayout->addWidget( label, 1, 1 );
layout->addWidget( label, 1, 1 );
mOfficeEdit = new KLineEdit( tab2 );
connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mOfficeEdit );
tqlayout->addWidget( mOfficeEdit, 1, 2 );
layout->addWidget( mOfficeEdit, 1, 2 );

label = new TQLabel( i18n( "Profession:" ), tab2 );
tqlayout->addWidget( label, 2, 1 );
layout->addWidget( label, 2, 1 );
mProfessionEdit = new KLineEdit( tab2 );
connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mProfessionEdit );
tqlayout->addWidget( mProfessionEdit, 2, 2 );
layout->addWidget( mProfessionEdit, 2, 2 );

label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
tqlayout->addWidget( label, 0, 3 );
layout->addWidget( label, 0, 3 );
mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mManagerEdit );
tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );

label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
tqlayout->addWidget( label, 1, 3 );
layout->addWidget( label, 1, 3 );
mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mAssistantEdit );
tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );

label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
tqlayout->addWidget( label, 2, 3 );
layout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mTitleEdit );
tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );

bar = new KSeparator( KSeparator::HLine, tab2 );
tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 );
layout->addMultiCellWidget( bar, 3, 3, 0, 5 );

/////////////////////////////////////////////////
// Personal info
@@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( tab2 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
KIcon::SizeMedium ) );
tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 );
layout->addMultiCellWidget( label, 4, 5, 0, 0 );

label = new TQLabel( i18n( "Nickname:" ), tab2 );
tqlayout->addWidget( label, 4, 1 );
layout->addWidget( label, 4, 1 );
mNicknameEdit = new KLineEdit( tab2 );
connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mNicknameEdit );
tqlayout->addWidget( mNicknameEdit, 4, 2 );
layout->addWidget( mNicknameEdit, 4, 2 );

label = new TQLabel( i18n( "Partner's name:" ), tab2 );
tqlayout->addWidget( label, 5, 1 );
layout->addWidget( label, 5, 1 );
mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mSpouseEdit );
tqlayout->addWidget( mSpouseEdit, 5, 2 );
layout->addWidget( mSpouseEdit, 5, 2 );

label = new TQLabel( i18n( "Birthdate:" ), tab2 );
tqlayout->addWidget( label, 4, 3 );
layout->addWidget( label, 4, 3 );
mBirthdayPicker = new KDateEdit( tab2 );
connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
TQT_SLOT( dateChanged( const TQDate& ) ) );
connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( emitModified() ) );
label->setBuddy( mBirthdayPicker );
tqlayout->addWidget( mBirthdayPicker, 4, 4 );
layout->addWidget( mBirthdayPicker, 4, 4 );

label = new TQLabel( i18n( "Anniversary:" ), tab2 );
tqlayout->addWidget( label, 5, 3 );
layout->addWidget( label, 5, 3 );
mAnniversaryPicker = new KDateEdit( tab2 );
connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
TQT_SLOT( dateChanged( const TQDate& ) ) );
connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( emitModified() ) );
label->setBuddy( mAnniversaryPicker );
tqlayout->addWidget( mAnniversaryPicker, 5, 4 );
layout->addWidget( mAnniversaryPicker, 5, 4 );

bar = new KSeparator( KSeparator::HLine, tab2 );
tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 );
layout->addMultiCellWidget( bar, 6, 6, 0, 5 );

//////////////////////////////////////
// Notes
label = new TQLabel( i18n( "Note:" ), tab2 );
label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
tqlayout->addWidget( label, 7, 0 );
layout->addWidget( label, 7, 0 );
mNoteEdit = new TQTextEdit( tab2 );
mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
label->setBuddy( mNoteEdit );
tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );

// Build the tqlayout and add to the tab widget
tqlayout->activate(); // required
// Build the layout and add to the tab widget
layout->activate(); // required

mTabWidget->addTab( tab2, i18n( "&Details" ) );
}
@@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
page->addWidget( widget );
}

// query the tqlayout update
// query the layout update
TQDictIterator<ContactEditorTabPage> it( mTabPages );
for ( ; it.current(); ++it )
it.current()->updateLayout();

+ 8
- 8
kaddressbook/addviewdialog.cpp View File

@@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,

TQWidget *page = plainPage();

TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 );
tqlayout->setSpacing( spacingHint() );
tqlayout->setRowStretch( 1, 1 );
tqlayout->setColStretch( 1, 1 );
TQGridLayout *layout = new TQGridLayout( page, 2, 2 );
layout->setSpacing( spacingHint() );
layout->setRowStretch( 1, 1 );
layout->setColStretch( 1, 1 );

TQLabel *label = new TQLabel( i18n( "View name:" ), page );
tqlayout->addWidget( label, 0, 0 );
layout->addWidget( label, 0, 0 );

mViewNameEdit = new TQLineEdit( page );
connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
tqlayout->addWidget( mViewNameEdit, 0, 1 );
layout->addWidget( mViewNameEdit, 0, 1 );

mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
groupLayout->setSpacing( spacingHint() );

int row = 0;

+ 2
- 2
kaddressbook/advancedcustomfields.cpp View File

@@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly )

void AdvancedCustomFields::initGUI( const TQString &uiFile )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );

mFields = new KPIM::DesignerFields( uiFile, this );
tqlayout->addWidget( mFields );
layout->addWidget( mFields );

connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
}

+ 1
- 1
kaddressbook/contacteditorwidgetmanager.h View File

@@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget
void setReadOnly( bool readOnly );

/**
Calculates the tqlayout of the widgets and moves them to the
Calculates the layout of the widgets and moves them to the
correct position.
*/
void updateLayout();

+ 14
- 14
kaddressbook/customfieldswidget.cpp View File

@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
{
TQWidget *page = plainPage();

TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );

TQLabel *label = new TQLabel( i18n( "Title:" ), page );
tqlayout->addWidget( label, 0, 0 );
layout->addWidget( label, 0, 0 );

mTitle = new KLineEdit( page );
mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
label->setBuddy( mTitle );
tqlayout->addWidget( mTitle, 0, 1 );
layout->addWidget( mTitle, 0, 1 );

label = new TQLabel( i18n( "Type:" ), page );
tqlayout->addWidget( label, 1, 0 );
layout->addWidget( label, 1, 0 );

mType = new KComboBox( page );
label->setBuddy( mType );
tqlayout->addWidget( mType, 1, 1 );
layout->addWidget( mType, 1, 1 );

mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
mGlobal->setChecked( true );
tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );

connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -124,18 +124,18 @@ void AddFieldDialog::nameChanged( const TQString &name )
FieldWidget::FieldWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );

mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
mGlobalLayout->setAlignment( TQt::AlignTop );

mSeparator = new TQFrame( this );
mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
mSeparator->hide();
tqlayout->addWidget( mSeparator );
layout->addWidget( mSeparator );

mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
mLocalLayout->setAlignment( TQt::AlignTop );
}

@@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField()

void CustomFieldsWidget::initGUI()
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
KDialog::spacingHint() );

mFieldWidget = new FieldWidget( this );
tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );

mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
layout->addWidget( mAddButton, 1, 1, TQt::AlignRight );

mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
mRemoveButton->setEnabled( false );
tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );

// load global fields
TQStringList globalFields = KABPrefs::instance()->globalCustomFields();

+ 4
- 4
kaddressbook/distributionlisteditor.cpp View File

@@ -67,16 +67,16 @@ public:
KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
{
Q_ASSERT( m_addressBook );
TQBoxLayout* tqlayout = new TQHBoxLayout( this );
tqlayout->setSpacing( KDialog::spacingHint() );
TQBoxLayout* layout = new TQHBoxLayout( this );
layout->setSpacing( KDialog::spacingHint() );
m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( textChanged( const TQString& ) ) );
tqlayout->addWidget( m_lineEdit );
layout->addWidget( m_lineEdit );
m_clearButton = new TQToolButton( this );
m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
m_clearButton->setEnabled( false );
tqlayout->addWidget( m_clearButton );
layout->addWidget( m_clearButton );
connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
}


+ 4
- 4
kaddressbook/distributionlistpicker.cpp View File

@@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
enableButton( Ok, false );
setButtonText( User1, i18n( "Add New Distribution List" ) );
TQWidget* main = new TQWidget( this );
TQGridLayout* tqlayout = new TQGridLayout( main );
tqlayout->setSpacing( KDialog::spacingHint() );
TQGridLayout* layout = new TQGridLayout( main );
layout->setSpacing( KDialog::spacingHint() );
m_label = new TQLabel( main );
tqlayout->addWidget( m_label, 0, 0 );
layout->addWidget( m_label, 0, 0 );
m_listBox = new KListBox( main );
tqlayout->addWidget( m_listBox, 1, 0 );
layout->addWidget( m_listBox, 1, 0 );
connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
this, TQT_SLOT( entrySelected( const TQString& ) ) );
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
mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
{
Q_ASSERT( mExtensionBar );
TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar );
mSplitter = new TQSplitter( mExtensionBar );
mSplitter->setOrientation( Qt::Vertical );
tqlayout->addWidget( mSplitter );
layout->addWidget( mSplitter );

createExtensionWidgets();


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

@@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const

KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
tqlayout->setSpacing( KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this );
layout->setSpacing( KDialog::spacingHint() );

TQHBoxLayout *buttonLayout = new TQHBoxLayout();
tqlayout->addLayout( buttonLayout );
layout->addLayout( buttonLayout );

TQLabel *label = new TQLabel( this );
label->setText( i18n( "Distribution Lists" ) );
@@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
this, TQT_SLOT( itemSelected( int ) ) );
connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
tqlayout->addWidget( mListBox );
layout->addWidget( mListBox );

connect( core, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( updateEntries() ) );

+ 1
- 1
kaddressbook/filtereditdialog.cpp View File

@@ -272,7 +272,7 @@ void FilterDialog::initGUI()
mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );

buttonBox->tqlayout();
buttonBox->layout();
topLayout->addWidget( buttonBox, 0, 1 );
}


+ 3
- 3
kaddressbook/freebusywidget.cpp View File

@@ -35,15 +35,15 @@
FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );

TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this );
tqlayout->addWidget( label );
layout->addWidget( label );

mURL = new KURLRequester( this );
label->setBuddy( mURL );
tqlayout->addWidget( mURL );
layout->addWidget( mURL );

connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( setModified() ) );

+ 1
- 1
kaddressbook/geowidget.cpp View File

@@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
topLayout->addWidget( mCityCombo, 0, 1 );

TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(),
2, 5, spacingHint() );

TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup );

+ 5
- 5
kaddressbook/imagewidget.cpp View File

@@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );

mImageButton = new ImageButton( i18n( "Picture" ), box );
mImageButton->setFixedSize( 100, 140 );
mImageButton->setImageLoader( mImageLoader );
tqlayout->addWidget( mImageButton );
layout->addWidget( mImageButton );

topLayout->addWidget( box );

@@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const
ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );

mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
tqlayout->addWidget( mPhotoWidget );
layout->addWidget( mPhotoWidget );

mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
tqlayout->addWidget( mLogoWidget );
layout->addWidget( mLogoWidget );

connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );

+ 6
- 6
kaddressbook/incsearchwidget.cpp View File

@@ -40,7 +40,7 @@
IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );

TQToolButton *button = new TQToolButton( this );
button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
@@ -48,24 +48,24 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) );
button->setAutoRaise( true );
TQToolTip::add( button, i18n( "Reset" ) );
tqlayout->addWidget( button );
layout->addWidget( button );

TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" );
label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
tqlayout->addWidget( label );
layout->addWidget( label );

mSearchText = new KLineEdit( this );
mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
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." ) );
label->setBuddy( mSearchText );
tqlayout->addWidget( mSearchText );
layout->addWidget( mSearchText );

label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" );
label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
tqlayout->addWidget( label );
layout->addWidget( label );

mFieldCombo = new TQComboBox( false, this );
tqlayout->addWidget( mFieldCombo );
layout->addWidget( mFieldCombo );
label->setBuddy(mFieldCombo);

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
{
setMinimumSize( 1, 1 );

TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 );
tqlayout->setAlignment( TQt::AlignTop );
tqlayout->setAutoAdd( true );
tqlayout->setResizeMode( TQLayout::FreeResize );
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 );
layout->setAlignment( TQt::AlignTop );
layout->setAutoAdd( true );
layout->setResizeMode( TQLayout::FreeResize );

mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
mGroupBox->setExclusive( true );
mGroupBox->tqlayout()->setSpacing( 0 );
mGroupBox->tqlayout()->setMargin( 0 );
mGroupBox->layout()->setSpacing( 0 );
mGroupBox->layout()->setMargin( 0 );
mGroupBox->setFrameStyle( TQFrame::NoFrame );
}

@@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons()
TQFontMetrics fm = fontMetrics();
TQPushButton *btn = new TQPushButton( "", this );
btn->hide();
TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn,
TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn,
fm.size( ShowPrefix, "X - X") ).
expandedTo( TQApplication::globalStrut() );
delete btn;

+ 6
- 6
kaddressbook/kabcore.cpp View File

@@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid )
mActionMerge->setEnabled( ( list.size() == 2 ) && writable );

if ( mReadWrite ) {
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
@@ -552,11 +552,11 @@ void KABCore::copyContacts()

#if defined(KABC_VCARD_ENCODING_FIX)
TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setText( TQString::fromUtf8( clipText.data() ) );
#else
TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setText( clipText );
#endif
}
@@ -575,7 +575,7 @@ void KABCore::cutContacts()

void KABCore::pasteContacts()
{
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
@@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar()

void KABCore::initActions()
{
connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( clipboardDataChanged() ) );

KAction *action;
@@ -1432,7 +1432,7 @@ void KABCore::initActions()
void KABCore::clipboardDataChanged()
{
if ( mReadWrite )
mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() );
mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() );
}

void KABCore::updateIncSearchWidget()

+ 3
- 3
kaddressbook/kaddressbookview.cpp View File

@@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees()

void KAddressBookView::initGUI()
{
// Create the tqlayout
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
// Create the layout
TQVBoxLayout *layout = new TQVBoxLayout( this );

// Add the view widget
mViewWidget = new TQWidget( this );
tqlayout->addWidget( mViewWidget );
layout->addWidget( mViewWidget );
}

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
mServer = server;

TQWidget *page = plainPage();
TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() );
TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() );

mCfg = new KABC::LdapConfigWidget(
KABC::LdapConfigWidget::W_USER |
@@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const
KABC::LdapConfigWidget::W_AUTHBOX,
page );

tqlayout->addWidget( mCfg );
layout->addWidget( mCfg );
mCfg->setHost( mServer->host() );
mCfg->setPort( mServer->port() );
mCfg->setDn( mServer->baseDN() );

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

@@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
TQWidget *parent, const char *name )
: TQWidget( parent, name ), mTitle( title ), mLabel( label )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
TQHBoxLayout *layout = new TQHBoxLayout( this );

TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
KDialog::spacingHint() );

mBox = new TQListBox( group );
@@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
mEditButton->setEnabled( false );
mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
bbox->tqlayout();
bbox->layout();
groupLayout->addWidget( bbox, 0, 1 );

tqlayout->addWidget( group );
layout->addWidget( group );
}

NamePartWidget::~NamePartWidget()
@@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
KDialog::spacingHint() );

mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this );
tqlayout->addWidget( mPrefix, 0, 0 );
layout->addWidget( mPrefix, 0, 0 );

mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this );
tqlayout->addWidget( mInclusion, 0, 1 );
layout->addWidget( mInclusion, 0, 1 );

mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this );
tqlayout->addWidget( mSuffix, 0, 2 );
layout->addWidget( mSuffix, 0, 2 );

TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this );
tqlayout->addWidget( label, 1, 0 );
layout->addWidget( label, 1, 0 );

mFormattedNameCombo = new KComboBox( this );
mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) );
mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );

connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
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
name, true, true ), mWidget( 0 ), mConfig( config )
{
TQFrame *page = plainPage();
TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );

mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
tqlayout->addWidget( mWidget, 0, 0 );
layout->addWidget( mWidget, 0, 0 );

mWidget->restoreSettings( mConfig );
}

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

@@ -56,11 +56,11 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )

// General page
TQWidget *generalPage = new TQWidget( this );
TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
KDialog::spacingHint() );

TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
boxLayout->setAlignment( TQt::AlignTop );

mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
@@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
editorLayout->addStretch( 1 );


tqlayout->addWidget( groupBox );
layout->addWidget( groupBox );

groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
KDialog::spacingHint() );
label = new TQLabel( i18n( "Phone:" ), groupBox );
grid->addWidget( label, 0, 0 );
@@ -124,10 +124,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )

grid->setColStretch( 1, 1 );

tqlayout->addWidget( groupBox );
layout->addWidget( groupBox );

groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
boxLayout->setAlignment( TQt::AlignTop );

mLocationMapURL = new TQComboBox( true, groupBox );
@@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
"<li>%c: Country ISO Code</li> </ul>" ) );
mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() );
boxLayout->addWidget( mLocationMapURL );
tqlayout->addWidget( groupBox );
layout->addWidget( groupBox );

connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );

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

@@ -43,9 +43,9 @@ extern "C"
KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
tqlayout->addWidget( mConfigWidget );
layout->addWidget( mConfigWidget );

connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );


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

@@ -44,9 +44,9 @@ extern "C"
KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new LDAPOptionsWidget( this );
tqlayout->addWidget( mConfigWidget );
layout->addWidget( mConfigWidget );

connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );


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

@@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults()

void LDAPOptionsWidget::initGUI()
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );

TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this );
groupBox->setInsideSpacing( KDialog::spacingHint() );
@@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI()
TQWidget* spacer = new TQWidget( upDownBox );
upDownBox->setStretchFactor( spacer, 100 );

tqlayout->addWidget( groupBox );
layout->addWidget( groupBox );

KButtonBox *buttons = new KButtonBox( this );
buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
@@ -293,9 +293,9 @@ void LDAPOptionsWidget::initGUI()
mEditButton->setEnabled( false );
mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
mRemoveButton->setEnabled( false );
buttons->tqlayout();
buttons->layout();

tqlayout->addWidget( buttons );
layout->addWidget( buttons );

resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) );
}

+ 6
- 6
kaddressbook/keywidget.cpp View File

@@ -41,25 +41,25 @@
KeyWidget::KeyWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
KDialog::spacingHint() );

TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
tqlayout->addWidget( label, 0, 0 );
layout->addWidget( label, 0, 0 );

mKeyCombo = new KComboBox( this );
tqlayout->addWidget( mKeyCombo, 0, 1 );
layout->addWidget( mKeyCombo, 0, 1 );

mAddButton = new TQPushButton( i18n( "Add..." ), this );
tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );

mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
mRemoveButton->setEnabled( false );
tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );

mExportButton = new TQPushButton( i18n( "Export..." ), this );
mExportButton->setEnabled( false );
tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );

connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
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,
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
groupBox->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );


+ 17
- 17
kaddressbook/nameeditdialog.cpp View File

@@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
Ok, parent, name, true ), mAddressee( addr )
{
TQWidget *page = plainPage();
TQGridLayout *tqlayout = new TQGridLayout( page );
tqlayout->setSpacing( spacingHint() );
tqlayout->addColSpacing( 2, 100 );
TQGridLayout *layout = new TQGridLayout( page );
layout->setSpacing( spacingHint() );
layout->addColSpacing( 2, 100 );
TQLabel *label;

label = new TQLabel( i18n( "Honorific prefixes:" ), page );
tqlayout->addWidget( label, 0, 0 );
layout->addWidget( label, 0, 0 );
mPrefixCombo = new KComboBox( page );
mPrefixCombo->setDuplicatesEnabled( false );
mPrefixCombo->setEditable( true );
mPrefixCombo->setEnabled( !readOnly );
label->setBuddy( mPrefixCombo );
tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );

TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) );

label = new TQLabel( i18n( "Given name:" ), page );
tqlayout->addWidget( label, 1, 0 );
layout->addWidget( label, 1, 0 );
mGivenNameEdit = new KLineEdit( page );
mGivenNameEdit->setReadOnly( readOnly );
label->setBuddy( mGivenNameEdit );
tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );

label = new TQLabel( i18n( "Additional names:" ), page );
tqlayout->addWidget( label, 2, 0 );
layout->addWidget( label, 2, 0 );
mAdditionalNameEdit = new KLineEdit( page );
mAdditionalNameEdit->setReadOnly( readOnly );
label->setBuddy( mAdditionalNameEdit );
tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );

label = new TQLabel( i18n( "Family names:" ), page );
tqlayout->addWidget( label, 3, 0 );
layout->addWidget( label, 3, 0 );
mFamilyNameEdit = new KLineEdit( page );
mFamilyNameEdit->setReadOnly( readOnly );
label->setBuddy( mFamilyNameEdit );
tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );

label = new TQLabel( i18n( "Honorific suffixes:" ), page );
tqlayout->addWidget( label, 4, 0 );
layout->addWidget( label, 4, 0 );
mSuffixCombo = new KComboBox( page );
mSuffixCombo->setDuplicatesEnabled( false );
mSuffixCombo->setEditable( true );
mSuffixCombo->setEnabled( !readOnly );
label->setBuddy( mSuffixCombo );
tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );

TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) );

label = new TQLabel( i18n( "Formatted name:" ), page );
tqlayout->addWidget( label, 5, 0 );
layout->addWidget( label, 5, 0 );

mFormattedNameCombo = new KComboBox( page );
mFormattedNameCombo->setEnabled( !readOnly );
tqlayout->addWidget( mFormattedNameCombo, 5, 1 );
layout->addWidget( mFormattedNameCombo, 5, 1 );
connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );

mFormattedNameEdit = new KLineEdit( page );
mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
tqlayout->addWidget( mFormattedNameEdit, 5, 2 );
layout->addWidget( mFormattedNameEdit, 5, 2 );

mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
mParseBox->setEnabled( !readOnly );
connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );

// Fill in the values
mFamilyNameEdit->setText( addr.familyName() );

+ 12
- 12
kaddressbook/phoneeditwidget.cpp View File

@@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected()
PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
: TQWidget( parent )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 );

mTypeCombo = new PhoneTypeCombo( this );
mNumberEdit = new KLineEdit( this );

tqlayout->addWidget( mTypeCombo );
tqlayout->addWidget( mNumberEdit );
layout->addWidget( mTypeCombo );
layout->addWidget( mNumberEdit );

connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
@@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name ), mReadOnly( false )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
tqlayout->setSpacing( KDialog::spacingHint() );
TQGridLayout *layout = new TQGridLayout( this, 2, 2 );
layout->setSpacing( KDialog::spacingHint() );

mWidgetLayout = new TQVBoxLayout( tqlayout );
tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
mWidgetLayout = new TQVBoxLayout( layout );
layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );

mAddButton = new TQPushButton( i18n( "Add" ), this );
mAddButton->setMaximumSize( mAddButton->sizeHint() );
tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
layout->addWidget( mAddButton, 1, 0, TQt::AlignRight );

mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
tqlayout->addWidget( mRemoveButton, 1, 1 );
layout->addWidget( mRemoveButton, 1, 1 );

mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
@@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
{
TQWidget *page = plainPage();

TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() );

mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
tqlayout->addWidget( mPreferredBox );
layout->addWidget( mPreferredBox );

mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
tqlayout->addWidget( mGroup );
layout->addWidget( mGroup );

// fill widgets
mTypeList = KABC::PhoneNumber::typeList();

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

@@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
mPageAppearance->kcbHeaderTextColor->setColor(
config->readColorEntry( ContactHeaderForeColor, &TQt::white ) );

mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
mPageAppearance->layout()->setMargin( KDialog::marginHint() );
mPageAppearance->layout()->setSpacing( KDialog::spacingHint() );
}

DetailledPrintStyle::~DetailledPrintStyle()

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

@@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
KABC::Address address;