summaryrefslogtreecommitdiffstats
path: root/kdialog
diff options
context:
space:
mode:
Diffstat (limited to 'kdialog')
-rw-r--r--kdialog/kdialog.cpp18
-rw-r--r--kdialog/progressdialog.h2
-rw-r--r--kdialog/tdelistboxdialog.h2
-rw-r--r--kdialog/widgets.cpp4
4 files changed, 13 insertions, 13 deletions
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index fa2512077..47320d0b0 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -48,7 +48,7 @@
#include <kicondialog.h>
#include <kdirselectdialog.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
#include <netwm.h>
#endif
@@ -56,9 +56,9 @@
using namespace std;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
static TDECmdLineOptions options[] =
{
@@ -125,10 +125,10 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::Show && o->isWidgetType()
&& o->inherits("KDialog"))
{
- TQWidget *w = TQT_TQWIDGET(o);
+ TQWidget *w = static_cast<TQWidget*>(o);
if (print)
cout << "winId: " << w->winId() << endl;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (id)
XSetTransientForHint(w->x11Display(), w->winId(), id);
#endif
@@ -301,11 +301,11 @@ static int directCommand(TDECmdLineArgs *args)
0, // name
duration );
TQTimer *timer = new TQTimer();
- TQObject::connect( timer, TQT_SIGNAL( timeout() ), kapp, TQT_SLOT( quit() ) );
- TQObject::connect( popup, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+ TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) );
+ TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
timer->start( duration, TRUE );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) {
int x, y;
int w, h;
@@ -525,7 +525,7 @@ static int directCommand(TDECmdLineArgs *args)
TQString startDir;
startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
TQString result;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
title, true, true);
#else
diff --git a/kdialog/progressdialog.h b/kdialog/progressdialog.h
index cdfca1ccb..1cf090081 100644
--- a/kdialog/progressdialog.h
+++ b/kdialog/progressdialog.h
@@ -24,7 +24,7 @@
class ProgressDialog : public KProgressDialog, virtual public ProgressDialogIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
ProgressDialog(TQWidget* parent = 0, const TQString& caption = TQString::null, const TQString& text = TQString::null, int totalSteps = 100);
diff --git a/kdialog/tdelistboxdialog.h b/kdialog/tdelistboxdialog.h
index a93e7d002..3ade107f0 100644
--- a/kdialog/tdelistboxdialog.h
+++ b/kdialog/tdelistboxdialog.h
@@ -25,7 +25,7 @@
class TDEListBoxDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index f68acfe4f..126eeec22 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -35,13 +35,13 @@
#include <tqvbox.h>
#include <tqfile.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
#include <netwm.h>
#endif
void Widgets::handleXGeometry(TQWidget * dlg)
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) {
int x, y;
int w, h;