summaryrefslogtreecommitdiffstats
path: root/kmilo/kmilod
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
commita2277b6bc715464e83882b90c2a058139b8a6b54 (patch)
treeab09b14014f59b4d8e2ddd12226aa0b22e4dfc5d /kmilo/kmilod
parentd3f79e04b34bd1f70a458b81b28fc8799498c8dc (diff)
downloadtdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.tar.gz
tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.zip
TQt4 port kdeutils
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmilo/kmilod')
-rw-r--r--kmilo/kmilod/defaultskin.cpp10
-rw-r--r--kmilo/kmilod/defaultskin.h1
-rw-r--r--kmilo/kmilod/defaultwidget.ui20
-rw-r--r--kmilo/kmilod/kmilod.h1
-rw-r--r--kmilo/kmilod/kmilointerface.h1
-rw-r--r--kmilo/kmilod/monitor.cpp6
-rw-r--r--kmilo/kmilod/monitor.h2
7 files changed, 22 insertions, 19 deletions
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 6667a88..f8275a8 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -41,8 +41,8 @@
DefaultSkin::DefaultSkin() {
connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
- _widget = new DefaultWidget(0, "Screen Indicator", Qt::WX11BypassWM);
- _widget->setFocusPolicy(TQWidget::NoFocus);
+ _widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM);
+ _widget->setFocusPolicy(TQ_NoFocus);
KWin::setOnAllDesktops(_widget->winId(), true);
KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky
@@ -100,10 +100,10 @@ void DefaultSkin::show() {
#if KDE_IS_VERSION(3,1,90)
TQRect r = KGlobalSettings::splashScreenDesktopGeometry();
#else
- TQRect r = TQApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->tqgeometry();
#endif
- // _label->resize(_label->minimumSizeHint());
- // _widget->resize(_label->minimumSizeHint());
+ // _label->resize(_label->tqminimumSizeHint());
+ // _widget->resize(_label->tqminimumSizeHint());
_widget->move(r.center() -
TQPoint(_widget->width()/2, _widget->height()/2));
_widget->show();
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 62bea16..82a3184 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -32,6 +32,7 @@ class DefaultWidget;
class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
Q_OBJECT
+ TQ_OBJECT
public:
DefaultSkin();
virtual ~DefaultSkin();
diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui
index 65c19d8..41ad25f 100644
--- a/kmilo/kmilod/defaultwidget.ui
+++ b/kmilo/kmilod/defaultwidget.ui
@@ -3,7 +3,7 @@
<comment>Default widget for the default display for kmilod
Released under the terms of the GNU GPL.</comment>
<author>George Staikos &lt;staikos@kde.org</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DefaultWidget</cstring>
</property>
@@ -11,11 +11,11 @@ Released under the terms of the GNU GPL.</comment>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QWidgetStack" row="0" column="0">
+ <widget class="TQWidgetStack" row="0" column="0">
<property name="name">
<cstring>_widgetStack</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -26,20 +26,20 @@ Released under the terms of the GNU GPL.</comment>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>_textOnly</cstring>
</property>
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -50,18 +50,18 @@ Released under the terms of the GNU GPL.</comment>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>_progressText</cstring>
</property>
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QProgressBar" row="0" column="1" colspan="2">
+ <widget class="TQProgressBar" row="0" column="1" colspan="2">
<property name="name">
<cstring>_progress</cstring>
</property>
@@ -82,5 +82,5 @@ Released under the terms of the GNU GPL.</comment>
</widget>
</grid>
</widget>
-<layoutdefaults spacing="2" margin="2"/>
+<tqlayoutdefaults spacing="2" margin="2"/>
</UI>
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index 6fdfb52..24f7fd8 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -36,6 +36,7 @@ class KMiloInterface;
class KMiloD : public KDEDModule {
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
KMiloD(const TQCString &name);
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index 16e1567..1b22ff0 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -32,6 +32,7 @@ namespace KMilo {
// FIXME: make put the methods into .cpp file when the header is installed.
class KMiloInterface : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
virtual ~KMiloInterface() {}
diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp
index 84f0e03..955fccd 100644
--- a/kmilo/kmilod/monitor.cpp
+++ b/kmilo/kmilod/monitor.cpp
@@ -22,8 +22,8 @@
#include "monitor.h"
-KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&)
-: TQObject(parent, name) {
+KMilo::Monitor::Monitor(TQObject *tqparent, const char *name, const TQStringList&)
+: TQObject(tqparent, name) {
_poll = true;
}
@@ -38,7 +38,7 @@ KMilo::Monitor::DisplayType KMilo::Monitor::poll() { return None; }
int KMilo::Monitor::progress() const { return 42; }
-TQString KMilo::Monitor::message() const { return TQString::null; }
+TQString KMilo::Monitor::message() const { return TQString(); }
TQPixmap KMilo::Monitor::customPixmap() const { return TQPixmap(); }
bool KMilo::Monitor::init() { return true; }
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index d50045b..7053752 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -37,7 +37,7 @@ class KMiloInterface;
class KDE_EXPORT Monitor : public TQObject {
public:
- Monitor(TQObject *parent, const char *name, const TQStringList&);
+ Monitor(TQObject *tqparent, const char *name, const TQStringList&);
virtual ~Monitor();
/**