summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kasyncio.h11
-rw-r--r--tdecore/kbufferedio.cpp10
-rw-r--r--tdecore/kbufferedio.h10
-rw-r--r--tdecore/kextsock.cpp10
-rw-r--r--tdecore/kextsock.h19
-rw-r--r--tdecore/kmanagerselection.h4
-rw-r--r--tdecore/kqiodevicegzip_p.cpp4
-rw-r--r--tdecore/kqiodevicegzip_p.h4
-rw-r--r--tdecore/ksock.h4
-rw-r--r--tdecore/kxmessages.h4
-rw-r--r--tdecore/libqt-mt.nmcheck2
-rw-r--r--tdecore/network/kbufferedsocket.cpp10
-rw-r--r--tdecore/network/kbufferedsocket.h17
-rw-r--r--tdecore/network/kclientsocketbase.cpp17
-rw-r--r--tdecore/network/kclientsocketbase.h16
-rw-r--r--tdecore/network/tdesocketbase.h9
-rw-r--r--tdecore/network/tdesocketdevice.cpp5
-rw-r--r--tdecore/network/tdesocketdevice.h5
-rw-r--r--tdecore/svgicons/ksvgiconengine.cpp4
-rw-r--r--tdecore/tdeapplication.cpp2
-rw-r--r--tdecore/tdeconfigbase.cpp48
-rw-r--r--tdecore/tdelocale.cpp10
-rw-r--r--tdecore/tdelocale.h10
-rw-r--r--tdecore/tdestartupinfo.h4
-rw-r--r--tdecore/twinmodule.h4
25 files changed, 5 insertions, 238 deletions
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index 46c51c10c..bd1ca41c2 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -25,10 +25,6 @@
#include <tqiodevice.h>
#include "tdelibs_export.h"
-#ifdef Q_MOC_RUN
-#define USE_QT4
-#endif // Q_MOC_RUN
-
class KAsyncIOPrivate;
/**
* Asynchronous I/O Support
@@ -39,12 +35,7 @@ class KAsyncIOPrivate;
* @author Thiago Macieira <thiago.macieira@kdemail.net>
* @short Asynchronous I/O support
*/
-class TDECORE_EXPORT KAsyncIO:
-#ifdef USE_QT4
-#else // USE_QT4
-public TQObject,
-#endif // USE_QT4
-public TQIODevice
+class TDECORE_EXPORT KAsyncIO: public TQObject, public TQIODevice
{
TQ_OBJECT
diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp
index 7a080ec68..d1ba6dcf2 100644
--- a/tdecore/kbufferedio.cpp
+++ b/tdecore/kbufferedio.cpp
@@ -111,22 +111,12 @@ bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
return true;
}
-#ifdef USE_QT3
int TDEBufferedIO::bytesAvailable() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 TDEBufferedIO::bytesAvailable() const
-#endif // USE_QT4
{
return readBufferSize();
}
-#ifdef USE_QT3
int TDEBufferedIO::bytesToWrite() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 TDEBufferedIO::bytesToWrite() const
-#endif // USE_QT4
{
return writeBufferSize();
}
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index 1b272eb0a..f51b46a60 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -118,12 +118,7 @@ public:
* Returns the number of bytes available for reading in the read buffer
* @return the number of bytes available for reading
*/
-#ifdef USE_QT3
virtual int bytesAvailable() const;
-#endif // USE_QT3
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const;
-#endif // USE_QT4
/**
* Waits for more data to be available and returns the amount of available data then.
@@ -137,12 +132,7 @@ public:
* Returns the number of bytes yet to write, still in the write buffer
* @return the number of unwritten bytes in the write buffer
*/
-#ifdef USE_QT3
virtual int bytesToWrite() const;
-#endif // USE_QT3
-#ifdef USE_QT4
- virtual qint64 bytesToWrite() const;
-#endif // USE_QT4
/**
* Checks whether there is enough data in the buffer to read a line
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index b9a6efb10..bb7449e7d 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -222,12 +222,7 @@ KExtendedSocket::~KExtendedSocket()
delete d;
}
-#ifdef USE_QT3
void KExtendedSocket::reset()
-#endif // USE_QT3
-#ifdef USE_QT4
-bool KExtendedSocket::reset()
-#endif // USE_QT4
{
closeNow();
release();
@@ -1557,12 +1552,7 @@ int KExtendedSocket::unreadBlock(const char *, uint)
return -1;
}
-#ifdef USE_QT3
int KExtendedSocket::bytesAvailable() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 KExtendedSocket::bytesAvailable() const
-#endif // USE_QT4
{
if (d->status < connected || d->flags & passiveSocket)
return -2;
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index f9edb033e..78068f03f 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -22,10 +22,6 @@
#include "tdelibs_export.h"
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
#ifdef Q_OS_UNIX
#include <sys/time.h>
@@ -211,12 +207,7 @@ public:
* freeing any related resources still being kept.
* @since 3.1
*/
-#ifdef USE_QT3
void reset();
-#endif // USE_QT3
-#ifdef USE_QT4
- bool reset();
-#endif // USE_QT4
/*
* --- status, flags and internal variables --- *
@@ -685,12 +676,7 @@ public:
* Returns length of this socket. This call is not supported on sockets.
* @return the length of this socket, or 0 if unsupported
*/
-#ifdef USE_QT3
virtual inline TQ_ULONG size() const
-#endif // USE_QT3
-#ifdef USE_QT4
- virtual inline qint64 size() const
-#endif // USE_QT4
{ return 0; }
/**
@@ -805,12 +791,7 @@ public:
* @return The number of available bytes, or -1 on error or -2 if this call is invalid
* in the current state.
*/
-#ifdef USE_QT3
virtual int bytesAvailable() const;
-#endif // USE_QT3
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const;
-#endif // USE_QT4
/**
* Waits @p msec milliseconds for more data to be available (use 0 to
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 31ea43ce9..b31a4efe0 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -28,10 +28,6 @@ DEALINGS IN THE SOFTWARE.
#include <tqobject.h>
#include <tdelibs_export.h>
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
#ifdef Q_WS_X11 // FIXME(E)
#include <X11/Xlib.h>
diff --git a/tdecore/kqiodevicegzip_p.cpp b/tdecore/kqiodevicegzip_p.cpp
index 0dcabed74..e63b9e8b4 100644
--- a/tdecore/kqiodevicegzip_p.cpp
+++ b/tdecore/kqiodevicegzip_p.cpp
@@ -78,11 +78,7 @@ void KQIODeviceGZip::flush(void)
}
}
-#ifdef USE_QT4
-qint64 KQIODeviceGZip::size(void) const
-#else // USE_QT4
TQIODevice::Offset KQIODeviceGZip::size(void) const
-#endif // USE_QT4
{
return 0; // You cannot determine size!
}
diff --git a/tdecore/kqiodevicegzip_p.h b/tdecore/kqiodevicegzip_p.h
index 0581602c1..22e4133b0 100644
--- a/tdecore/kqiodevicegzip_p.h
+++ b/tdecore/kqiodevicegzip_p.h
@@ -42,11 +42,7 @@ public:
void close(void);
void flush(void);
-#ifdef USE_QT4
- qint64 size(void) const;
-#else // USE_QT4
Offset size(void) const;
-#endif // USE_QT4
Offset at(void) const;
bool at(Offset pos);
bool atEnd(void) const;
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 8ec9eb2e8..e56b0efbb 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -22,10 +22,6 @@
#include "tdelibs_export.h"
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
#ifdef Q_OS_UNIX
#include <tqobject.h>
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index 97fdbe26f..469c99663 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -30,10 +30,6 @@ DEALINGS IN THE SOFTWARE.
#include <tqmap.h>
#include <tdelibs_export.h>
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
#ifdef Q_WS_X11
#include <X11/X.h>
diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck
index e18ee438f..d5962f37a 100644
--- a/tdecore/libqt-mt.nmcheck
+++ b/tdecore/libqt-mt.nmcheck
@@ -4,7 +4,7 @@
Q*::*
qt_*
-# these should preferably go in some namespace in Qt4
+# these should preferably go in some namespace
tqDebug
tqFatal
tqWarning
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index aaac54b03..ff2e11866 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -93,12 +93,7 @@ void TDEBufferedSocket::close()
}
}
-#ifdef USE_QT3
TQ_LONG TDEBufferedSocket::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 TDEBufferedSocket::bytesAvailable() const
-#endif
{
if (!d->input)
return KStreamSocket::bytesAvailable();
@@ -284,12 +279,7 @@ TDEIOBufferBase* TDEBufferedSocket::outputBuffer()
return d->output;
}
-#ifdef USE_QT3
TQ_ULONG TDEBufferedSocket::bytesToWrite() const
-#endif
-#ifdef USE_QT4
-qint64 TDEBufferedSocket::bytesToWrite() const
-#endif
{
if (!d->output)
return 0;
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 180314525..76c5dd057 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -99,12 +99,7 @@ public:
/**
* Make use of the buffers.
*/
-#ifdef USE_QT3
virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const;
-#endif
/**
* Make use of buffers.
@@ -183,12 +178,7 @@ public:
/**
* Returns the length of the output buffer.
*/
-#ifdef USE_QT3
virtual TQ_ULONG bytesToWrite() const;
-#endif
-#ifdef USE_QT4
- virtual qint64 bytesToWrite() const;
-#endif
/**
* Closes the socket and discards any output data that had been buffered
@@ -208,8 +198,6 @@ public:
*/
TQCString readLine();
- // KDE4: make virtual, add timeout to match the Qt4 signature
- // and move to another class up the hierarchy
/**
* Blocks until the connection is either established, or completely
* failed.
@@ -255,12 +243,7 @@ public:
* which required a call to reset() in order to be able to connect again
* using the same device. This is not necessary in TDEBufferedSocket any more.
*/
-#ifdef USE_QT3
inline void reset()
-#endif
-#ifdef USE_QT4
- inline bool reset()
-#endif
{ closeNow(); }
};
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index eaf669bb9..31df9a804 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -48,16 +48,8 @@ public:
};
KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name) :
-#ifdef USE_QT4
-#else // USE_QT4
- TQObject(parent, name),
-#endif // USE_QT4
- d(new KClientSocketBasePrivate)
-{
-#ifdef USE_QT4
- setParent(parent);
- setObjectName(name);
-#endif // USE_QT4
+ TQObject(parent, name), d(new KClientSocketBasePrivate)
+{
d->state = Idle;
d->enableRead = true;
d->enableWrite = false;
@@ -286,12 +278,7 @@ void KClientSocketBase::close()
}
// This function is unlike all the others because it is const
-#ifdef USE_QT3
TQ_LONG KClientSocketBase::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 KClientSocketBase::bytesAvailable() const
-#endif
{
return socketDevice()->bytesAvailable();
}
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 647a86c90..246987859 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -32,10 +32,6 @@
#include "kresolver.h"
#include <tdelibs_export.h>
-#ifdef Q_MOC_RUN
-#define USE_QT4
-#endif // Q_MOC_RUN
-
namespace KNetwork {
class KClientSocketBasePrivate;
@@ -50,12 +46,7 @@ class KClientSocketBasePrivate;
*
* @author Thiago Macieira <thiago.macieira@kdemail.net>
*/
-class TDECORE_EXPORT KClientSocketBase :
-#ifdef USE_QT4
-#else // USE_QT4
-public TQObject,
-#endif // USE_QT4
-public KActiveSocketBase
+class TDECORE_EXPORT KClientSocketBase : public TQObject, public KActiveSocketBase
{
TQ_OBJECT
@@ -302,12 +293,7 @@ public:
* Returns the number of bytes available on this socket.
* Reimplemented from TDESocketBase.
*/
-#ifdef USE_QT3
virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const;
-#endif
/**
* Waits for more data. Reimplemented from TDESocketBase.
diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h
index 706900117..e50f899dc 100644
--- a/tdecore/network/tdesocketbase.h
+++ b/tdecore/network/tdesocketbase.h
@@ -504,11 +504,7 @@ public:
* This call is not supported on sockets. Reimplemented from TQIODevice.
* This will always return 0.
*/
-#ifdef USE_QT4
- virtual qint64 size() const
-#else // USE_QT4
virtual Offset size() const
-#endif // USE_QT4
{ return 0; }
/**
@@ -536,12 +532,7 @@ public:
* Returns the number of bytes available for reading without
* blocking.
*/
-#ifdef USE_QT3
virtual TQ_LONG bytesAvailable() const = 0;
-#endif
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const = 0;
-#endif
/**
* Waits up to @p msecs for more data to be available on this socket.
diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index 6f3ec755b..3d683b405 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -364,12 +364,7 @@ bool TDESocketDevice::disconnect()
return true; // all is well
}
-#ifdef USE_QT3
TQ_LONG TDESocketDevice::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 TDESocketDevice::bytesAvailable() const
-#endif
{
if (m_sockfd == -1)
return -1; // there's nothing to read in a closed socket
diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h
index e5477c0c6..b01bfbc41 100644
--- a/tdecore/network/tdesocketdevice.h
+++ b/tdecore/network/tdesocketdevice.h
@@ -198,12 +198,7 @@ public:
/**
* Returns the number of bytes available for reading without blocking.
*/
-#ifdef USE_QT3
virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
- virtual qint64 bytesAvailable() const;
-#endif
/**
* Waits up to @p msecs for more data to be available on this socket.
diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp
index 3e68624c6..307261fa1 100644
--- a/tdecore/svgicons/ksvgiconengine.cpp
+++ b/tdecore/svgicons/ksvgiconengine.cpp
@@ -202,11 +202,7 @@ public:
TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
TQWMatrix *current = m_engine->painter()->worldMatrix();
-#ifdef USE_QT4
-printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n");
-#else // USE_QT4
*current = matrix * *current;
-#endif // USE_QT4
}
void parseCommonAttributes(TQDomNode &node)
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 99254a679..dbed066e3 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -752,7 +752,6 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
}
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
-// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps
TDEInstance( TDECmdLineArgs::about),
#ifdef Q_WS_X11
@@ -779,7 +778,6 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable
// FOR BINARY COMPATIBILITY ONLY
// REMOVE WHEN PRACTICAL!
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
-// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps
TDEInstance( TDECmdLineArgs::about),
#ifdef Q_WS_X11
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index f716d7bff..517024d4b 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -451,34 +451,10 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
case TQVariant::Cursor:
case TQVariant::SizePolicy:
case TQVariant::Time:
-#ifdef USE_QT3
case TQVariant::ByteArray:
-#endif // USE_QT3
case TQVariant::BitArray:
case TQVariant::KeySequence:
case TQVariant::Pen:
-#ifdef USE_QT4
- case TQVariant::Char:
- case TQVariant::Url:
- case TQVariant::Locale:
- case TQVariant::RectF:
- case TQVariant::SizeF:
- case TQVariant::Line:
- case TQVariant::LineF:
- case TQVariant::PointF:
- case TQVariant::RegExp:
- case TQVariant::Hash:
- case TQVariant::TextLength:
- case QVariant::TextFormat:
- case TQVariant::Matrix:
- case TQVariant::Transform:
- case TQVariant::Matrix4x4:
- case TQVariant::Vector2D:
- case TQVariant::Vector3D:
- case TQVariant::Vector4D:
- case TQVariant::Quaternion:
- case TQVariant::UserType:
-#endif // USE_QT4
{
break;
}
@@ -1378,34 +1354,10 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
case TQVariant::Cursor:
case TQVariant::SizePolicy:
case TQVariant::Time:
-#ifdef USE_QT3
case TQVariant::ByteArray:
-#endif // USE_QT3
case TQVariant::BitArray:
case TQVariant::KeySequence:
case TQVariant::Pen:
-#ifdef USE_QT4
- case TQVariant::Char:
- case TQVariant::Url:
- case TQVariant::Locale:
- case TQVariant::RectF:
- case TQVariant::SizeF:
- case TQVariant::Line:
- case TQVariant::LineF:
- case TQVariant::PointF:
- case TQVariant::RegExp:
- case TQVariant::Hash:
- case TQVariant::TextLength:
- case QVariant::TextFormat:
- case TQVariant::Matrix:
- case TQVariant::Transform:
- case TQVariant::Matrix4x4:
- case TQVariant::Vector2D:
- case TQVariant::Vector3D:
- case TQVariant::Vector4D:
- case TQVariant::Quaternion:
- case TQVariant::UserType:
-#endif // USE_QT4
{
break;
}
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 254d5f054..97a58fe20 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -2083,22 +2083,12 @@ void TDELocale::initFileNameEncoding(TDEConfig *)
// which, on Unix platforms, use the locale's codec.
}
-#ifdef USE_QT3
TQCString TDELocale::encodeFileNameUTF8( const TQString & fileName )
-#endif // USE_QT3
-#ifdef USE_QT4
-QByteArray TDELocale::encodeFileNameUTF8( const QString & fileName )
-#endif // USE_QT4
{
return TQString(fileName).utf8();
}
-#ifdef USE_QT3
TQString TDELocale::decodeFileNameUTF8( const TQCString & localFileName )
-#endif // USE_QT3
-#ifdef USE_QT4
-QString TDELocale::decodeFileNameUTF8( const QByteArray & localFileName )
-#endif // USE_QT4
{
return TQString::fromUtf8(localFileName);
}
diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h
index b52a32157..19525535c 100644
--- a/tdecore/tdelocale.h
+++ b/tdecore/tdelocale.h
@@ -1220,22 +1220,12 @@ private:
/**
* @internal A TQFile filename encoding function (TQFile::encodeFn).
*/
-#ifdef USE_QT3
static TQCString encodeFileNameUTF8( const TQString & fileName );
-#endif // USE_QT3
-#ifdef USE_QT4
- static QByteArray encodeFileNameUTF8( const QString & fileName );
-#endif // USE_QT4
/**
* @internal TQFile filename decoding function (TQFile::decodeFn).
*/
-#ifdef USE_QT3
static TQString decodeFileNameUTF8( const TQCString & localFileName );
-#endif // USE_QT3
-#ifdef USE_QT4
- static QString decodeFileNameUTF8( const QByteArray & localFileName );
-#endif // USE_QT4
/**
* @internal Changes the file name of the catalog to the correct
diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h
index 0d953b48d..248b4810b 100644
--- a/tdecore/tdestartupinfo.h
+++ b/tdecore/tdestartupinfo.h
@@ -28,10 +28,6 @@ DEALINGS IN THE SOFTWARE.
#include <sys/types.h>
#include <tqobject.h>
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
#ifdef Q_WS_X11 // FIXME(E): Redo in a less X11-specific way
#include <tqcstring.h>
diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h
index 52ea17c90..4fa9e07e4 100644
--- a/tdecore/twinmodule.h
+++ b/tdecore/twinmodule.h
@@ -27,10 +27,6 @@
#include <tqvaluelist.h>
#include "tdelibs_export.h"
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
#ifdef Q_OS_UNIX
class KWinModulePrivate;