TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Q_WS_* defines with TQ_WS_* equivalents

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/452/head
Michele Calgaro 3 months ago
parent 55dd5ae822
commit 2d7d2122cf
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
23 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
kcontrol/colors/colorscm.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#if defined Q_WS_X11 && !defined K_WS_QTONLY #if defined TQ_WS_X11 && !defined K_WS_QTONLY
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#endif #endif
@ -396,7 +396,7 @@ void KColorScheme::save()
flags |= KRdbExportColors; flags |= KRdbExportColors;
else else
{ {
#if defined Q_WS_X11 && !defined K_WS_QTONLY #if defined TQ_WS_X11 && !defined K_WS_QTONLY
// Undo the property xrdb has placed on the root window (if any), // Undo the property xrdb has placed on the root window (if any),
// i.e. remove all entries, including ours // i.e. remove all entries, including ours
XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER ); XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER );

4
kcontrol/filetypes/keditfiletype.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tdesycoca.h> #include <tdesycoca.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#endif #endif
@ -159,7 +159,7 @@ int main(int argc, char ** argv)
} }
FileTypeDialog dlg( mime, createType ); FileTypeDialog dlg( mime, createType );
#if defined Q_WS_X11 #if defined TQ_WS_X11
if( args->isSet( "parent" )) { if( args->isSet( "parent" )) {
bool ok; bool ok;
long id = args->getOption("parent").toLong(&ok); long id = args->getOption("parent").toLong(&ok);

2
kcontrol/konqhtml/appearance.cpp
Unescape View File

@ -18,7 +18,7 @@
#include <tdelocale.h> #include <tdelocale.h>
#include <knuminput.h> #include <knuminput.h>
#if defined Q_WS_X11 && !defined K_WS_QTONLY #if defined TQ_WS_X11 && !defined K_WS_QTONLY
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif

2
kcontrol/konqhtml/jsopts.cpp
Unescape View File

@ -19,7 +19,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#if defined Q_WS_X11 && !defined K_WS_QTONLY #if defined TQ_WS_X11 && !defined K_WS_QTONLY
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif

2
kdesktop/bgmanager.h
Unescape View File

@ -16,7 +16,7 @@
#include <tqdatetime.h> #include <tqdatetime.h>
#include <KBackgroundIface.h> #include <KBackgroundIface.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

2
kdesktop/kdesktopapp.h
Unescape View File

@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

2
kdesktop/lock/main.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <stdlib.h> #include <stdlib.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

2
kdesktop/lockeng.cpp
Unescape View File

@ -445,7 +445,7 @@ bool SaverEngine::isBlanked()
void SaverEngine::enableExports() void SaverEngine::enableExports()
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n"; kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient(); DCOPClient *client = kapp->dcopClient();
if (!client->isAttached()) { if (!client->isAttached()) {

2
kdesktop/main.cpp
Unescape View File

@ -43,7 +43,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

12
kdialog/kdialog.cpp
Unescape View File

@ -48,7 +48,7 @@
#include <kicondialog.h> #include <kicondialog.h>
#include <kdirselectdialog.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> #include <netwm.h>
#endif #endif
@ -56,9 +56,9 @@
using namespace std; using namespace std;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
#endif // Q_WS_X11 #endif // TQ_WS_X11
static TDECmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
@ -128,7 +128,7 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
TQWidget *w = static_cast<TQWidget*>(o); TQWidget *w = static_cast<TQWidget*>(o);
if (print) if (print)
cout << "winId: " << w->winId() << endl; cout << "winId: " << w->winId() << endl;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if (id) if (id)
XSetTransientForHint(w->x11Display(), w->winId(), id); XSetTransientForHint(w->x11Display(), w->winId(), id);
#endif #endif
@ -305,7 +305,7 @@ static int directCommand(TDECmdLineArgs *args)
TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
timer->start( duration, TRUE ); timer->start( duration, TRUE );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) { if ( ! kapp->geometryArgument().isEmpty()) {
int x, y; int x, y;
int w, h; int w, h;
@ -525,7 +525,7 @@ static int directCommand(TDECmdLineArgs *args)
TQString startDir; TQString startDir;
startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory")); startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
TQString result; TQString result;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory", result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
title, true, true); title, true, true);
#else #else

4
kdialog/widgets.cpp
Unescape View File

@ -35,13 +35,13 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqfile.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> #include <netwm.h>
#endif #endif
void Widgets::handleXGeometry(TQWidget * dlg) void Widgets::handleXGeometry(TQWidget * dlg)
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) { if ( ! kapp->geometryArgument().isEmpty()) {
int x, y; int x, y;
int w, h; int w, h;

4
kicker/taskbar/taskcontainer.cpp
Unescape View File

@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconloader.h> #include <kiconloader.h>
#include <kimageeffect.h> #include <kimageeffect.h>
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <netwm.h> #include <netwm.h>
#include <fixx11h.h> #include <fixx11h.h>
@ -1665,7 +1665,7 @@ void TaskContainer::updateFilteredTaskList()
(!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified())) (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
{ {
pid_t pid = 0; pid_t pid = 0;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
Atom type_ret; Atom type_ret;
int format_ret; int format_ret;
unsigned long nitems_ret = 0, unused = 0; unsigned long nitems_ret = 0, unused = 0;

4
klipper/main.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "toplevel.h" #include "toplevel.h"
#include "version.h" #include "version.h"
#if defined Q_WS_X11 #if defined TQ_WS_X11
#include <qxembed.h> // schroder #include <qxembed.h> // schroder
#endif #endif
@ -51,7 +51,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
// Make Klipper conform to freedesktop system tray standard, see // Make Klipper conform to freedesktop system tray standard, see
// http://bugs.kde.org/show_bug.cgi?id=69119 // http://bugs.kde.org/show_bug.cgi?id=69119
#if defined Q_WS_X11 && ! defined K_WS_QTONLY #if defined TQ_WS_X11 && ! defined K_WS_QTONLY
QXEmbed::initialize(); QXEmbed::initialize();
#endif #endif

2
konsole/konsole/main.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "konsole.h" #include "konsole.h"
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

14
krootbacking/krootbacking.cpp
Unescape View File

@ -45,7 +45,7 @@ class KRootBackingData
{ {
public: public:
TQWidget *toplevel; TQWidget *toplevel;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
KWinModule *twin; KWinModule *twin;
#endif #endif
}; };
@ -70,7 +70,7 @@ void KRootBacking::init()
connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint()));
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
d->twin = new KWinModule( this ); d->twin = new KWinModule( this );
@ -88,7 +88,7 @@ KRootBacking::~KRootBacking()
int KRootBacking::currentDesktop() const int KRootBacking::currentDesktop() const
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop ); NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop );
rinfo.activate(); rinfo.activate();
return rinfo.currentDesktop(); return rinfo.currentDesktop();
@ -153,7 +153,7 @@ void KRootBacking::repaint(bool force)
return; return;
m_Rect = TQRect(p1, p2); m_Rect = TQRect(p1, p2);
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
m_Desk = currentDesktop(); m_Desk = currentDesktop();
// TDESharedPixmap will correctly generate a tile for us. // TDESharedPixmap will correctly generate a tile for us.
@ -172,7 +172,7 @@ void KRootBacking::repaint(bool force)
bool KRootBacking::isAvailable() const bool KRootBacking::isAvailable() const
{ {
// #ifdef Q_WS_X11 // #ifdef TQ_WS_X11
// return m_pPixmap->isAvailable(pixmapName(m_Desk)); // return m_pPixmap->isAvailable(pixmapName(m_Desk));
// #else // #else
return m_pPixmap->isNull(); return m_pPixmap->isNull();
@ -181,7 +181,7 @@ bool KRootBacking::isAvailable() const
TQString KRootBacking::pixmapName(int desk) { TQString KRootBacking::pixmapName(int desk) {
TQString pattern = TQString("DESKTOP%1"); TQString pattern = TQString("DESKTOP%1");
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
int screen_number = DefaultScreen(tqt_xdisplay()); int screen_number = DefaultScreen(tqt_xdisplay());
if (screen_number) { if (screen_number) {
pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
@ -193,7 +193,7 @@ TQString KRootBacking::pixmapName(int desk) {
void KRootBacking::enableExports() void KRootBacking::enableExports()
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n"; kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient(); DCOPClient *client = kapp->dcopClient();
if (!client->isAttached()) if (!client->isAttached())

4
krootbacking/krootbacking.h
Unescape View File

@ -27,7 +27,7 @@
#include <tqcolor.h> #include <tqcolor.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
#ifndef Q_WS_QWS //FIXME #ifndef TQ_WS_QWS //FIXME
class TQRect; class TQRect;
class TQWidget; class TQWidget;
@ -174,6 +174,6 @@ private:
void init(); void init();
}; };
#endif // ! Q_WS_QWS #endif // ! TQ_WS_QWS
#endif // KROOTBACKING_H #endif // KROOTBACKING_H

2
ksmserver/shutdowndlg.cpp
Unescape View File

@ -577,7 +577,7 @@ void KSMShutdownIPFeedback::showNow()
void KSMShutdownIPFeedback::enableExports() void KSMShutdownIPFeedback::enableExports()
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n"; kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient(); DCOPClient *client = kapp->dcopClient();
if (!client->isAttached()) { if (!client->isAttached()) {

2
ktip/ktipwindow.cpp
Unescape View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips")))); KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips"))));
TQ_CHECK_PTR(tipDialog); TQ_CHECK_PTR(tipDialog);
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
KWin::setState(tipDialog->winId(), NET::StaysOnTop); KWin::setState(tipDialog->winId(), NET::StaysOnTop);
#endif #endif
tipDialog->setCaption(i18n("Useful Tips")); tipDialog->setCaption(i18n("Useful Tips"));

2
libkonq/libkonq_export.h
Unescape View File

@ -27,7 +27,7 @@
/* needed, because e.g. Q_OS_UNIX is so frequently used */ /* needed, because e.g. Q_OS_UNIX is so frequently used */
#include <tqglobal.h> #include <tqglobal.h>
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#else /* Q_OS_UNIX */ #else /* Q_OS_UNIX */

4
tdeioslave/sftp/tdeio_sftp.cpp
Unescape View File

@ -447,7 +447,7 @@ TQString sftpProtocol::canonicalizePath(const TQString &path) {
sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket) sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_sftp", pool_socket, app_socket), : SlaveBase("tdeio_sftp", pool_socket, app_socket),
mConnected(false), mPort(-1), mSession(NULL), mSftp(NULL) { mConnected(false), mPort(-1), mSession(NULL), mSftp(NULL) {
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl; kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl; kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl;
@ -470,7 +470,7 @@ sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_so
} }
sftpProtocol::~sftpProtocol() { sftpProtocol::~sftpProtocol() {
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl; kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
#endif #endif
closeConnection(); closeConnection();

4
tdmlib/dmctl.cpp
Unescape View File

@ -19,7 +19,7 @@
#include "dmctl.h" #include "dmctl.h"
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <tdelocale.h> #include <tdelocale.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -531,4 +531,4 @@ DM::type()
return DMType; return DMType;
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11

6
tdmlib/dmctl.h
Unescape View File

@ -32,7 +32,7 @@ struct SessEnt {
typedef TQValueList<SessEnt> SessList; typedef TQValueList<SessEnt> SessList;
class DM { class DM {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
public: public:
@ -77,7 +77,7 @@ private:
void GDMAuthenticate(); void GDMAuthenticate();
#else // Q_WS_X11 #else // TQ_WS_X11
public: public:
DM() {} DM() {}
@ -100,7 +100,7 @@ public:
int type() { return NoDM } int type() { return NoDM }
#endif // Q_WS_X11 #endif // TQ_WS_X11
}; // class DM }; // class DM

2
twin/lib/kdecoration.cpp
Unescape View File

@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqapplication.h> #include <tqapplication.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <assert.h> #include <assert.h>
#if defined Q_WS_X11 && ! defined K_WS_QTONLY #if defined TQ_WS_X11 && ! defined K_WS_QTONLY
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
#endif #endif

Write Preview
Loading…
Cancel
Save