summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--amor/amorbubble.cpp8
-rw-r--r--kmoon/kmoondlg.cpp8
-rw-r--r--kmoon/kmoondlg.h2
-rw-r--r--kweather/prefdialogdata.ui4
-rw-r--r--kweather/serviceconfigdata.ui4
-rw-r--r--kweather/sidebarwidgetbase.ui2
-rw-r--r--kworldwatch/about.ui2
-rw-r--r--kworldwatch/clock.ui2
8 files changed, 16 insertions, 16 deletions
diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp
index 314eba5..2860ccd 100644
--- a/amor/amorbubble.cpp
+++ b/amor/amorbubble.cpp
@@ -144,10 +144,10 @@ void AmorBubble::calcGeometry()
// create and apply the tqshape tqmask
mMask.resize(w, h);
mMask.fill(color0);
- TQPainter tqmaskPainter(&mMask);
- tqmaskPainter.setPen(color1);
- tqmaskPainter.setBrush(color1);
- drawBubble(tqmaskPainter);
+ TQPainter maskPainter(&mMask);
+ maskPainter.setPen(color1);
+ maskPainter.setBrush(color1);
+ drawBubble(maskPainter);
XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0,
mMask.handle(), ShapeSet );
}
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index a2204b3..acb789a 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -71,11 +71,11 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *tqparent, const char *name)
connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
- tqmasktoggle = new TQPushButton(hbox2);
- tqmasktoggle->setText(tqmask ? i18n("Switch Masking Off") :
+ masktoggle = new TQPushButton(hbox2);
+ masktoggle->setText(tqmask ? i18n("Switch Masking Off") :
i18n("Switch Masking On"));
- connect(tqmasktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
+ connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
topLayout->addWidget(vbox);
moon = new MoonWidget(page, "preview");
@@ -107,7 +107,7 @@ void KMoonDlg::toggleHemi() {
void KMoonDlg::toggleMask() {
moon->setMask(!moon->tqmask());
tqmask = moon->tqmask();
- tqmasktoggle->setText(tqmask ? i18n("Switch Masking Off") :
+ masktoggle->setText(tqmask ? i18n("Switch Masking Off") :
i18n("Switch Masking On"));
}
diff --git a/kmoon/kmoondlg.h b/kmoon/kmoondlg.h
index b0d4118..12a0a0d 100644
--- a/kmoon/kmoondlg.h
+++ b/kmoon/kmoondlg.h
@@ -44,7 +44,7 @@ class KMoonDlg : public KDialogBase {
bool north;
bool tqmask;
TQPushButton *hemitoggle;
- TQPushButton *tqmasktoggle;
+ TQPushButton *masktoggle;
private slots:
void help();
diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui
index 907629e..590a2c2 100644
--- a/kweather/prefdialogdata.ui
+++ b/kweather/prefdialogdata.ui
@@ -348,8 +348,8 @@
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index 248c04b..9aac188 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -249,8 +249,8 @@
<slot>addStation()</slot>
<slot>selectionChanged( TQListViewItem* )</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/kweather/sidebarwidgetbase.ui b/kweather/sidebarwidgetbase.ui
index 31e139b..46eb042 100644
--- a/kweather/sidebarwidgetbase.ui
+++ b/kweather/sidebarwidgetbase.ui
@@ -108,5 +108,5 @@
<pixmap>image0</pixmap>
</customwidget>
</customwidgets>
-<tqlayoutdefaults spacing="5" margin="5"/>
+<layoutdefaults spacing="5" margin="5"/>
</UI>
diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui
index 22c55dd..18ff889 100644
--- a/kworldwatch/about.ui
+++ b/kworldwatch/about.ui
@@ -213,5 +213,5 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
<slot>PushButton2_clicked()</slot>
<slot>accept()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kworldwatch/clock.ui b/kworldwatch/clock.ui
index 5869fe7..26fed16 100644
--- a/kworldwatch/clock.ui
+++ b/kworldwatch/clock.ui
@@ -255,5 +255,5 @@
<includes>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>