[rkward/frameworks] rkward: Some automatic replacements
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Thu Nov 26 19:57:26 UTC 2015
Git commit cf660281137b3f93f26748e169f3e4cef83a532e by Thomas Friedrichsmeier.
Committed on 26/11/2015 at 19:23.
Pushed by tfry into branch 'frameworks'.
Some automatic replacements
M +2 -2 rkward/dialogs/rkloadlibsdialog.cpp
M +2 -1 rkward/dialogs/rkreadlinedialog.cpp
M +1 -1 rkward/main.cpp
M +2 -2 rkward/misc/getfilenamewidget.cpp
M +1 -1 rkward/misc/getfilenamewidget.h
M +1 -1 rkward/misc/rkmessagecatalog.cpp
M +1 -1 rkward/qwinhost/qwinhost.h
M +2 -2 rkward/rbackend/rkfrontendtransmitter.cpp
M +1 -1 rkward/rbackend/rklocalesupport.cpp
M +11 -11 rkward/rbackend/rkrbackend.cpp
M +1 -1 rkward/rbackend/rkrbackend.h
M +1 -1 rkward/rbackend/rkrbackendprotocol_backend.cpp
M +1 -1 rkward/rbackend/rkrbackendprotocol_backend.h
M +2 -2 rkward/rbackend/rkreventloop.cpp
M +2 -2 rkward/rbackend/rkreventloop.h
M +2 -2 rkward/rbackend/rksessionvars.cpp
M +7 -7 rkward/rbackend/rksignalsupport.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
M +2 -2 rkward/rkconsole.cpp
M +4 -4 rkward/rkward.cpp
M +10 -10 rkward/rkward_startup_wrapper.cpp
M +2 -1 rkward/robjectviewer.cpp
M +1 -1 rkward/settings/rksettingsmodulegeneral.cpp
M +2 -2 rkward/settings/rksettingsmodulegraphics.cpp
M +12 -12 rkward/settings/rksettingsmoduler.cpp
M +1 -1 rkward/windows/detachedwindowcontainer.cpp
M +2 -2 rkward/windows/rkcommandeditorwindow.cpp
M +3 -1 rkward/windows/rkcommandlog.cpp
M +3 -2 rkward/windows/rkhtmlwindow.cpp
M +1 -1 rkward/windows/rktoolwindowlist.cpp
M +4 -4 rkward/windows/rkwindowcatcher.cpp
M +1 -1 rkward/windows/rkwindowcatcher.h
http://commits.kde.org/rkward/cf660281137b3f93f26748e169f3e4cef83a532e
diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlibsdialog.cpp
index 62fd1ca..e903d17 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -265,7 +265,7 @@ bool RKLoadLibsDialog::installPackages (const QStringList &packages, QString to_
QString mcaption = i18n ("Selected library location not writable");
QString message = i18n ("<p>The directory you have selected for installation (%1) is not writable with your current user permissions.</p>"
"<p>Would you like to install to %2, instead (you can also press \"Cancel\" and use the \"Configure Repositories\"-button to set up a different directory)?</p>", to_libloc, altlibloc);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
message.append (i18n ("<p>Alternatively, if you have access to an administrator account on this machine, you can use that to install the package(s), or "
"you could change the permissions of '%1'. Sorry, automatic switching to Administrator is not yet supported in RKWard on Windows.</p>", to_libloc));
int res = KMessageBox::warningContinueCancel (this, message, mcaption, KGuiItem (i18n ("Install to %1", altlibloc)));
@@ -330,7 +330,7 @@ void RKLoadLibsDialog::runInstallationCommand (const QString& command, bool as_r
QString R_binary (getenv ("R_BINARY"));
QString call;
QStringList params;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
RK_ASSERT (!as_root);
call = R_binary;
#else
diff --git a/rkward/dialogs/rkreadlinedialog.cpp b/rkward/dialogs/rkreadlinedialog.cpp
index 7376aef..690bc55 100644
--- a/rkward/dialogs/rkreadlinedialog.cpp
+++ b/rkward/dialogs/rkreadlinedialog.cpp
@@ -28,6 +28,7 @@
#include <klocale.h>
#include <kvbox.h>
#include <kglobalsettings.h>
+#include <QFontDatabase>
#include "../rbackend/rcommand.h"
@@ -57,7 +58,7 @@ RKReadLineDialog::RKReadLineDialog (QWidget *parent, const QString &caption, con
QTextEdit *output = new QTextEdit (page);
output->setUndoRedoEnabled (false);
output->setPlainText (QString ());
- output->setCurrentFont (KGlobalSettings::fixedFont ());
+ output->setCurrentFont (QFontDatabase::systemFont(QFontDatabase::FixedFont));
output->setLineWrapMode (QTextEdit::NoWrap);
output->insertPlainText (context);
output->setReadOnly (true);
diff --git a/rkward/main.cpp b/rkward/main.cpp
index f82e2ec..156df0f 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -73,7 +73,7 @@
#include "settings/rksettingsmoduledebug.h"
#include "windows/rkdebugmessagewindow.h"
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// these are needed for the exit hack.
# include <windows.h>
#endif
diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp
index 9ff790f..83cce92 100644
--- a/rkward/misc/getfilenamewidget.cpp
+++ b/rkward/misc/getfilenamewidget.cpp
@@ -43,7 +43,7 @@ GetFileNameWidget::GetFileNameWidget (QWidget *parent, FileType mode, bool only_
KFile::Modes mode_flags;
if (mode == ExistingDirectory) {
mode_flags = KFile::Directory | KFile::ExistingOnly;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// TODO: Hang on Windows when trying to select any dir (also in KFileDialog::getExistingDirectory ()). KDE 4.10
// this hack works around this, by using QFileDialog::getExistingDirectory ().
edit->button ()->disconnect (SIGNAL (clicked())); // Use old and new syntax, as we don't know, which way it was connected
@@ -81,7 +81,7 @@ void GetFileNameWidget::setLocation (const QString &new_location) {
if (edit->text () != new_location) edit->setUrl (QUrl::fromUserInput (new_location, QString (), QUrl::AssumeLocalFile));
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
void GetFileNameWidget::hackOverrideDirDialog () {
RK_TRACE (MISC);
diff --git a/rkward/misc/getfilenamewidget.h b/rkward/misc/getfilenamewidget.h
index 47a1e1e..64cf7d6 100644
--- a/rkward/misc/getfilenamewidget.h
+++ b/rkward/misc/getfilenamewidget.h
@@ -48,7 +48,7 @@ public slots:
void locationEditChanged (const QString &);
signals:
void locationChanged ();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
private slots:
void hackOverrideDirDialog ();
#endif
diff --git a/rkward/misc/rkmessagecatalog.cpp b/rkward/misc/rkmessagecatalog.cpp
index de6dc57..4f96c04 100644
--- a/rkward/misc/rkmessagecatalog.cpp
+++ b/rkward/misc/rkmessagecatalog.cpp
@@ -107,7 +107,7 @@ RKMessageCatalog* RKMessageCatalog::nullCatalog () {
return null_catalog;
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
extern "C" int __declspec(dllimport) _nl_msg_cat_cntr;
#endif
diff --git a/rkward/qwinhost/qwinhost.h b/rkward/qwinhost/qwinhost.h
index bc64ee6..f41ff30 100644
--- a/rkward/qwinhost/qwinhost.h
+++ b/rkward/qwinhost/qwinhost.h
@@ -54,7 +54,7 @@
#include <QtCore/QMap>
#include <qt_windows.h>
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
# if !defined(QT_QTWINMIGRATE_EXPORT) && !defined(QT_QTWINMIGRATE_IMPORT)
# define QT_QTWINMIGRATE_EXPORT
# elif defined(QT_QTWINMIGRATE_IMPORT)
diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index 346d636..b58a730 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -39,7 +39,7 @@
QString findBackendAtPath (const QString &path) {
QDir dir (path);
dir.makeAbsolute ();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QString ret = dir.filePath ("rkward.rbackend.exe");
#else
QString ret = dir.filePath ("rkward.rbackend");
@@ -93,7 +93,7 @@ void RKFrontendTransmitter::run () {
connect (backend, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &RKFrontendTransmitter::backendExit);
QString backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath ());
if (backend_executable.isEmpty ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "/rbackend"); // for running directly from the build-dir
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
if (backend_executable.isEmpty ()) backend_executable = findBackendAtPath (QCoreApplication::applicationDirPath () + "/../../../rbackend");
#endif
if (backend_executable.isEmpty ()) handleTransmissionError (i18n ("The backend executable could not be found. This is likely to be a problem with your installation."));
diff --git a/rkward/rbackend/rklocalesupport.cpp b/rkward/rbackend/rklocalesupport.cpp
index 8fa3023..49a6d26 100644
--- a/rkward/rbackend/rklocalesupport.cpp
+++ b/rkward/rbackend/rklocalesupport.cpp
@@ -20,7 +20,7 @@
#include <qtextcodec.h>
#include <QByteArray>
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// see http://sourceforge.net/p/rkward/patches/4/
// seems to be needed for GCC 4.3 as well.
# include <langinfo.h>
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index cac7bb9..6402813 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -17,7 +17,7 @@
#include "rkrbackend.h"
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# include <winsock2.h>
# include <windows.h>
# undef ERROR // clashes with R
@@ -77,7 +77,7 @@ extern "C" {
#include <R_ext/Parse.h>
#include <Rembedded.h>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# include <R_ext/RStartup.h>
# include <R_ext/Utils.h>
@@ -91,7 +91,7 @@ extern "C" {
# include <Rinterface.h>
#endif
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
# include <signal.h> // needed for pthread_kill
# include <pthread.h> // seems to be needed at least on FreeBSD
# include <unistd.h> // for non-blocking pipes
@@ -118,7 +118,7 @@ extern "C" {
void RK_scheduleIntr () {
RK_DEBUG (RBACKEND, DL_DEBUG, "interrupt scheduled");
RKRBackend::repl_status.interrupted = true;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
UserBreak = 1;
#else
RKSignalSupport::callOldSigIntHandler ();
@@ -134,7 +134,7 @@ void RKRBackend::scheduleInterrupt () {
if (RKRBackendProtocolBackend::inRThread ()) {
RK_scheduleIntr ();
} else {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
RK_scheduleIntr (); // Thread-safe on windows?!
#else
pthread_kill ((pthread_t) RKRBackendProtocolBackend::instance ()->r_thread_id, SIGUSR1); // NOTE: SIGUSR1 relays to SIGINT
@@ -420,7 +420,7 @@ int RReadConsole (const char* prompt, unsigned char* buf, int buflen, int hist)
return 1;
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
int RReadConsoleWin (const char* prompt, char* buf, int buflen, int hist) {
return RReadConsole (prompt, (unsigned char*) buf, buflen, hist);
}
@@ -759,7 +759,7 @@ RKRBackend::RKRBackend () : stdout_stderr_mutex (QMutex::Recursive) {
this_pointer = this;
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
void RKRBackend::setupCallbacks () {
RK_TRACE (RBACKEND);
@@ -969,7 +969,7 @@ bool RKRBackend::startR () {
char* argv[3] = { qstrdup ("--slave"), qstrdup ("--no-save"), qstrdup ("--no-restore") };
Rf_initialize_R (argc, argv);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
R_set_command_line_arguments(argc, argv);
FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
#endif
@@ -985,7 +985,7 @@ bool RKRBackend::startR () {
stdout_stderr_fd = pfd[0];
#endif
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// It is important to set this *early*, so R does not bail out, if there is an error in .Rprofile.
// On windows, set in connectCallbacks() for technical reasons, and that seems sufficient.
R_Interactive = (Rboolean) TRUE;
@@ -993,7 +993,7 @@ bool RKRBackend::startR () {
setup_Rmainloop ();
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// safety check: If we are beyond the stack boundaries already, we better disable stack checking
// this has to come *after* the first setup_Rmainloop ()!
Rboolean stack_ok = R_ToplevelExec (R_CheckStackWrapper, (void *) 0);
@@ -1006,7 +1006,7 @@ bool RKRBackend::startR () {
}
#endif
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// I am not sure, whether it is necessary to repeat this, here. It is not in R 3.0.0.
// But historically, it was placed here (after setup_Rmainloop(), and conceivably there
// was a reason to that (might have been reset in setup_Rmainloop() in earlier versions
diff --git a/rkward/rbackend/rkrbackend.h b/rkward/rbackend/rkrbackend.h
index 7d94b4e..42f75c7 100644
--- a/rkward/rbackend/rkrbackend.h
+++ b/rkward/rbackend/rkrbackend.h
@@ -30,7 +30,7 @@
#include "rcommandstack.h"
#include "rkrbackendprotocol_backend.h"
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
extern "C" {
void RK_scheduleIntr();
}
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.cpp b/rkward/rbackend/rkrbackendprotocol_backend.cpp
index 311954b..1dbc773 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_backend.cpp
@@ -125,7 +125,7 @@ RKRBackendProtocolBackend::RKRBackendProtocolBackend (const QString &storage_dir
_instance = this;
new RKRBackend ();
r_thread = QThread::currentThread (); // R thread == main thread
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
r_thread_id = QThread::currentThreadId ();
#endif
data_dir = storage_dir;
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.h b/rkward/rbackend/rkrbackendprotocol_backend.h
index 4deb224..60f8d73 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.h
+++ b/rkward/rbackend/rkrbackendprotocol_backend.h
@@ -44,7 +44,7 @@ private:
QString rkd_server_name;
static RKRBackendProtocolBackend* _instance;
QThread *r_thread;
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
friend void completeForkChild ();
Qt::HANDLE r_thread_id;
#endif
diff --git a/rkward/rbackend/rkreventloop.cpp b/rkward/rbackend/rkreventloop.cpp
index 58df030..cf81787 100644
--- a/rkward/rbackend/rkreventloop.cpp
+++ b/rkward/rbackend/rkreventloop.cpp
@@ -18,7 +18,7 @@
#include "rkreventloop.h"
#include "rkrbackend.h"
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# define Win32
# include <R.h>
#else
@@ -32,7 +32,7 @@ extern "C" void RK_doIntr ();
static void processX11EventsWorker (void *) {
// this basically copied from R's unix/sys-std.c (Rstd_ReadConsole)
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
for (;;) {
fd_set *what;
what = R_checkActivityEx(R_wait_usec > 0 ? R_wait_usec : 50, 1, RK_doIntr);
diff --git a/rkward/rbackend/rkreventloop.h b/rkward/rbackend/rkreventloop.h
index 65f8efd..f700f67 100644
--- a/rkward/rbackend/rkreventloop.h
+++ b/rkward/rbackend/rkreventloop.h
@@ -18,7 +18,7 @@
#ifndef RKREVENTLOOP_H
#define RKREVENTLOOP_H
-#include <qglobal.h> // For Q_WS_WIN
+#include <qglobal.h> // For Q_OS_WIN
namespace RKREventLoop {
/** This - somewhat misnamed - function takes care of processing R's events (not only X11).
@@ -38,7 +38,7 @@ namespace RKREventLoop {
/** Call this (potentially from a separate thread) to wake the handler set by setRKEventHandler() in the next iteration of
* R's event loop. */
void wakeRKEventHandler ();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
/** On Windows, Rp->Callback has to be set to this function during startup. */
void winRKEventHandlerWrapper (void);
#endif
diff --git a/rkward/rbackend/rksessionvars.cpp b/rkward/rbackend/rksessionvars.cpp
index 01f3b3f..6b1a2c6 100644
--- a/rkward/rbackend/rksessionvars.cpp
+++ b/rkward/rbackend/rksessionvars.cpp
@@ -124,9 +124,9 @@ QStringList RKSessionVars::frontendSessionInfo () {
lines.append ("KDE version (runtime): " + QString (KDE::versionString ()));
lines.append ("KDE version (compile time): " KDE_VERSION_STRING);
lines.append (QString ("Qt version (runtime): ") + qVersion ());
-#if defined Q_WS_WIN
+#if defined Q_OS_WIN
lines.append ("Windows runtime version (refer to QSysInfo documentation to translate code into human readable form): 0x" + QString::number (QSysInfo::windowsVersion (), 16));
-#elif defined Q_WS_MAC
+#elif defined Q_OS_MAC
lines.append ("MacOS runtime version (refer to QSysInfo documentation to translate code into human readable form): 0x" + QString::number (QSysInfo::MacintoshVersion, 16));
#endif
lines.append ("Local KDE directory: " + KGlobal::dirs ()->localkdedir ());
diff --git a/rkward/rbackend/rksignalsupport.cpp b/rkward/rbackend/rksignalsupport.cpp
index ffadca0..785e291 100644
--- a/rkward/rbackend/rksignalsupport.cpp
+++ b/rkward/rbackend/rksignalsupport.cpp
@@ -28,7 +28,7 @@
typedef void (*rk_sighandler_t) (int);
namespace RKSignalSupportPrivate {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
rk_sighandler_t r_sigsegv_handler = 0;
rk_sighandler_t default_sigsegv_handler = 0;
rk_sighandler_t r_sigill_handler = 0;
@@ -50,7 +50,7 @@ namespace RKSignalSupportPrivate {
signal (num, internal_sigint_handler);
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
void signal_proxy (int signum) {
rk_sighandler_t r_handler = r_sigsegv_handler;
rk_sighandler_t default_handler = default_sigsegv_handler;
@@ -73,7 +73,7 @@ namespace RKSignalSupportPrivate {
// if we are not in the R thread, handling the signal in R does more harm than good.
if (RKRBackendProtocolBackend::inRThread ()) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
if (r_handler) {
r_handler (signum);
return;
@@ -89,7 +89,7 @@ namespace RKSignalSupportPrivate {
#endif
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
if (default_handler) {
default_handler (signum);
return;
@@ -115,7 +115,7 @@ namespace RKSignalSupportPrivate {
void RKSignalSupport::saveDefaultSignalHandlers () {
RK_TRACE (RBACKEND);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
RKSignalSupportPrivate::default_sigsegv_handler = signal (SIGSEGV, SIG_DFL);
RKSignalSupportPrivate::default_sigill_handler = signal (SIGILL, SIG_DFL);
RKSignalSupportPrivate::default_sigabrt_handler = signal (SIGABRT, SIG_DFL);
@@ -129,7 +129,7 @@ void RKSignalSupport::saveDefaultSignalHandlers () {
void RKSignalSupport::installSignalProxies () {
RK_TRACE (RBACKEND);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
RKSignalSupportPrivate::r_sigsegv_handler = signal (SIGSEGV, &RKSignalSupportPrivate::signal_proxy);
RKSignalSupportPrivate::r_sigill_handler = signal (SIGILL, &RKSignalSupportPrivate::signal_proxy);
RKSignalSupportPrivate::r_sigabrt_handler = signal (SIGABRT, &RKSignalSupportPrivate::signal_proxy);
@@ -164,7 +164,7 @@ void RKSignalSupport::installSigIntAndUsrHandlers (void (*handler) (void)) {
RK_ASSERT (!RKSignalSupportPrivate::r_sigint_handler);
RKSignalSupportPrivate::new_sigint_handler = handler;
RKSignalSupportPrivate::r_sigint_handler = signal (SIGINT, &RKSignalSupportPrivate::internal_sigint_handler);
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// default action in R: save and quit. We use these as a proxy for SIGINT, instead.
signal (SIGUSR1, &RKSignalSupportPrivate::internal_sigint_handler);
signal (SIGUSR2, &RKSignalSupportPrivate::internal_sigint_handler);
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
index 7ed20c8..83f7f84 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.h
@@ -24,7 +24,7 @@
#include <QPainter>
#include <QLabel>
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// On Mac, drawing on a pixmap does not work correctly. Probably can only be done inside paint
// events. (MacOSX 10.6.8, Qt 4.8.4).
// On X11, similar problems seem to occur on some, but not all systems. Only on old versions?
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index 2406ce9..ed81b2e 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -73,7 +73,7 @@ RKConsole::RKConsole (QWidget *parent, bool tool_window, const char *name) : RKM
// I'd like to have this as a runtime version-check, but for that, I'd have to create a KTextEditor::Editor::instance(), first, and by
// that time the katepart has already enumerated its highlighting files, and the hack below would not work (for this session, at least).
- if (KTEXTEDITOR_VERSION < (5 << 16) | (16 << 8)) {
+ if (KTEXTEDITOR_VERSION < ((5 << 16) | (16 << 8))) {
// Older katepart5 (before 5.16.0) will not accept rkward.xml installed in its own directory (as that has an index.json where
// rkward.xml is not included). Thus, we try to sneak in rkward.xml as a local user syntax highlighting file.
QDir writable_path = QDir (QDir (QStandardPaths::writableLocation (QStandardPaths::GenericDataLocation)).absoluteFilePath ("katepart5/syntax"));
@@ -932,7 +932,7 @@ void RKConsole::showContextHelp () {
void RKConsole::initializeActions (KActionCollection *ac) {
RK_TRACE (APP);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
# define REAL_CTRL_KEY Qt::MetaModifier
# define REAL_CMD_KEY Qt::ControlModifier
#else
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index 9d7c1ed..fb3ab8b 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -207,7 +207,7 @@ void RKWardMainWindow::doPostInit () {
gui_rebuild_locked = false;
show ();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// detect and disable the buggy "native" file dialogs
KConfigGroup cg = KGlobal::config ().data ()->group ("KFileDialog Settings");
if (cg.readEntry ("Native", true)) {
@@ -440,7 +440,7 @@ void RKWardMainWindow::initActions() {
#if 0
// TODO: Fix import dialog and re-enable it: https://mail.kde.org/pipermail/rkward-devel/2015-June/004156.html
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// TODO: find the cause and fix it! http://sourceforge.net/p/rkward/bugs/54/
# ifdef __GNUC__
# warning TODO: import data dialog is disabled on windows due to bug in kdelibs
@@ -776,7 +776,7 @@ void RKWardMainWindow::askOpenWorkspace (const QUrl &url) {
slotSetStatusBarText(i18n("Opening workspace..."));
QUrl lurl = url;
if (lurl.isEmpty ()) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// getOpenUrl(QUrl("kfiledialog:///<rfiles>"), ...) causes a hang on windows (KDElibs 4.2.3).
# ifdef __GNUC__
# warning Track this bug down and/or report it
@@ -913,7 +913,7 @@ void RKWardMainWindow::slotOpenCommandEditor () {
RK_TRACE (APP);
KEncodingFileDialog::Result res;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// getOpenUrls(QUrl("kfiledialog:///<rfiles>"), ...) causes a hang on windows (KDElibs 4.2.3).
# ifdef __GNUC__
# warning Track this bug down and/or report it
diff --git a/rkward/rkward_startup_wrapper.cpp b/rkward/rkward_startup_wrapper.cpp
index 06fbba7..775e495 100644
--- a/rkward/rkward_startup_wrapper.cpp
+++ b/rkward/rkward_startup_wrapper.cpp
@@ -43,7 +43,7 @@ QString findExeAtPath (const QString appname, const QString &path) {
QDir dir (path);
dir.makeAbsolute ();
if (QFileInfo (dir.filePath (appname)).isExecutable ()) return dir.filePath (appname);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
if (QFileInfo (dir.filePath (appname + ".exe")).isExecutable ()) return dir.filePath (appname + ".exe");
if (QFileInfo (dir.filePath (appname + ".com")).isExecutable ()) return dir.filePath (appname + ".com");
if (QFileInfo (dir.filePath (appname + ".bat")).isExecutable ()) return dir.filePath (appname + ".bat");
@@ -55,11 +55,11 @@ QString findRKWardAtPath (const QString &path) {
return findExeAtPath ("rkward.frontend", path);
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
#include <windows.h>
#endif
QString quoteCommand (const QString &orig) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// Get short path name as a safe way to pass all sort of commands on the Windows shell
// credits to http://erasmusjam.wordpress.com/2012/10/01/get-8-3-windows-short-path-names-in-a-qt-application/
wchar_t input[orig.size()+1];
@@ -74,7 +74,7 @@ QString quoteCommand (const QString &orig) {
#endif
}
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// see http://blog.qt.digia.com/blog/2006/03/16/starting-interactive-processes-with-qprocess/
// Need an interactive process e.g. for running through gdb
# include <unistd.h>
@@ -161,7 +161,7 @@ int main (int argc, char *argv[]) {
}
// MacOS may need some path adjustments, first
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QString oldpath = qgetenv ("PATH");
if (!oldpath.contains (INSTALL_PATH)) {
//ensure that PATH is set to include what we deliver with the bundle
@@ -178,7 +178,7 @@ int main (int argc, char *argv[]) {
if (kf5_config_exe.isNull ()) kf5_config_exe = findExeAtPath ("kf5-config", app.applicationDirPath ());
if (kf5_config_exe.isNull ()) kf5_config_exe = findExeAtPath ("kf5-config", QDir (app.applicationDirPath ()).filePath ("KDE/bin"));
if (kf5_config_exe.isNull ()) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QStringList syspath = QString (qgetenv ("PATH")).split (';');
#else
QStringList syspath = QString (qgetenv ("PATH")).split (':');
@@ -197,7 +197,7 @@ int main (int argc, char *argv[]) {
QDir kde_dir (QFileInfo (kf5_config_exe).absolutePath ());
kde_dir.makeAbsolute ();
QString kde_dir_safe_path = quoteCommand (kde_dir.path ());
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QString kdeinit5_exe = findExeAtPath ("kdeinit5", kde_dir.path ());
qputenv ("PATH", QString (kde_dir_safe_path + ';' + qgetenv ("PATH")).toLocal8Bit ());
if (debug_level > 3) qDebug ("Adding %s to the system path", qPrintable (kde_dir_safe_path));
@@ -207,7 +207,7 @@ int main (int argc, char *argv[]) {
if (debug_level > 3) qDebug ("Setting environment variable RKWARD_ENSURE_PREFIX=%s", qPrintable (kde_dir_safe_path));
QString rkward_frontend_exe = findRKWardAtPath (app.applicationDirPath ()); // this is for running directly from a build tree
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
if (rkward_frontend_exe.isNull ()) rkward_frontend_exe = findRKWardAtPath (app.applicationDirPath () + "/rkward.frontend.app/Contents/MacOS"); // this is for running directly from a build tree
#endif
if (rkward_frontend_exe.isNull ()) rkward_frontend_exe = findRKWardAtPath (RKWARD_FRONTEND_LOCATION);
@@ -224,7 +224,7 @@ int main (int argc, char *argv[]) {
exit (1);
}
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// Explicit initialization of KDE, in case Windows 7 asks for admin privileges
if (kdeinit5_exe.isNull ()) {
kdeinit5_exe = findExeAtPath ("kdeinit5", QFileInfo (rkward_frontend_exe).absolutePath ());
@@ -286,7 +286,7 @@ int main (int argc, char *argv[]) {
if (debug_level > 2) qDebug ("Starting frontend: %s %s", qPrintable (r_exe), qPrintable (call_args.join (" ")));
InteractiveProcess proc;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
proc.setProcessChannelMode (debugger_args.isEmpty () ? QProcess::MergedChannels : QProcess::ForwardedChannels); // ForwardedChannels causes console window to pop up!
#else
proc.setProcessChannelMode (QProcess::ForwardedChannels);
diff --git a/rkward/robjectviewer.cpp b/rkward/robjectviewer.cpp
index 6ceee76..32380a3 100644
--- a/rkward/robjectviewer.cpp
+++ b/rkward/robjectviewer.cpp
@@ -26,6 +26,7 @@
#include <klocale.h>
#include <kglobalsettings.h>
+#include <QFontDatabase>
#include "rbackend/rinterface.h"
#include "rkglobals.h"
@@ -236,7 +237,7 @@ void RObjectViewerWidget::setText (const QString& text) {
RK_TRACE (APP);
area->setPlainText (QString ());
- QFont font = KGlobalSettings::fixedFont ();
+ QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont);
area->setCurrentFont (font);
area->insertPlainText (text);
diff --git a/rkward/settings/rksettingsmodulegeneral.cpp b/rkward/settings/rksettingsmodulegeneral.cpp
index 881499b..42ead79 100644
--- a/rkward/settings/rksettingsmodulegeneral.cpp
+++ b/rkward/settings/rksettingsmodulegeneral.cpp
@@ -245,7 +245,7 @@ void RKSettingsModuleGeneral::loadSettings (KConfig *config) {
startup_action = (StartupDialog::Result) cg.readEntry ("startup action", (int) StartupDialog::NoSavedSetting);
show_help_on_startup = cg.readEntry ("show help on startup", true);
initial_dir = (InitialDirectory) cg.readEntry ("initial dir mode",
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
(int) CurrentDirectory
#else
(int) RKWardDirectory
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index c6876c6..42477dc 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -90,7 +90,7 @@ RKSettingsModuleGraphics::RKSettingsModuleGraphics (RKSettings *gui, QWidget *pa
button = new QRadioButton (i18n ("Embed original device"), group);
replace_standard_devices_group->addButton (button, (int) EmbedDevice);
group_layout->addWidget (button);
-#if not (defined Q_WS_X11 || defined Q_WS_WIN)
+#if not (defined Q_WS_X11 || defined Q_OS_WIN)
button->setEnabled (false);
#endif
button = new QRadioButton (i18n ("No device integration"), group);
@@ -243,7 +243,7 @@ QStringList RKSettingsModuleGraphics::makeRRunTimeOptionCommands () {
if (default_device == RKDevice) command.append ("\"RK\"");
else if (default_device == OtherDevice) command.append (RObject::rQuote (default_device_other));
else {
-#if defined Q_WS_WIN
+#if defined Q_OS_WIN
command.append ("\"windows\"");
#elif defined Q_OS_MAC
command.append ("ifelse (capabilities(\"quartz\"), \"quartz\", \"X11\")");
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index 8ad15fb..e22ecf4 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -31,7 +31,7 @@
#include <QGridLayout>
#include <QPushButton>
#include <QTextEdit>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# include <QFileDialog>
#endif
@@ -181,7 +181,7 @@ RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSett
connect (pager_input, &QComboBox::editTextChanged, this, &RKSettingsModuleR::settingChanged);
grid->addWidget (pager_input, row, 1);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
grid->addWidget (label = new QLabel (i18n ("Use Internet Explorer functions for internet access"), this), ++row, 0);
internet2_input = new QCheckBox (this);
internet2_input->setChecked (options_internet2);
@@ -233,7 +233,7 @@ void RKSettingsModuleR::applyChanges () {
options_editor = editor_input->currentText ();
options_pager = pager_input->currentText ();
options_further = further_input->toPlainText ();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
options_internet2 = internet2_input->isChecked ();
#endif
@@ -268,7 +268,7 @@ QStringList RKSettingsModuleR::makeRRunTimeOptionCommands () {
if (options_pager == builtin_editor) list.append ("options (pager=rk.show.files)\n");
else list.append ("options (pager=\"" + options_pager + "\")\n");
if (!options_further.isEmpty ()) list.append (options_further + '\n');
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
list.append (QString ("setInternet2 (") + (options_internet2 ? "TRUE)\n" : "FALSE)\n"));
#endif
@@ -305,7 +305,7 @@ void RKSettingsModuleR::saveSettings (KConfig *config) {
cg.writeEntry ("editor", options_editor);
cg.writeEntry ("pager", options_pager);
cg.writeEntry ("further init commands", options_further);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
cg.writeEntry ("internet2", options_internet2);
#endif
}
@@ -327,7 +327,7 @@ void RKSettingsModuleR::loadSettings (KConfig *config) {
options_editor = cg.readEntry ("editor", builtin_editor);
options_pager = cg.readEntry ("pager", builtin_editor);
options_further = cg.readEntry ("further init commands", QString ());
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
options_internet2 = cg.readEntry ("internet2", false);
#endif
}
@@ -374,7 +374,7 @@ RKSettingsModuleRPackages::RKSettingsModuleRPackages (RKSettings *gui, QWidget *
connect (archive_packages_box, &QCheckBox::stateChanged, this, &RKSettingsModuleRPackages::settingChanged);
main_vbox->addWidget (archive_packages_box);
-#if defined Q_WS_WIN || defined Q_WS_MAC
+#if defined Q_OS_WIN || defined Q_OS_MAC
source_packages_box = new QCheckBox (i18n ("Build packages from source"), this);
source_packages_box->setChecked (source_packages);
#else
@@ -419,7 +419,7 @@ void RKSettingsModuleRPackages::settingChanged () {
void RKSettingsModuleRPackages::addLibLoc (QStringList *string_list) {
RK_TRACE (SETTINGS);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// TODO: Hang on Windows when trying to select any dir using (K|Q)FileDialog::getExistingDirectory (). KDE 4.10
QFileDialog dummy (this, i18n ("Add R Library Directory"));
dummy.setFileMode (QFileDialog::Directory);
@@ -492,10 +492,10 @@ QString RKSettingsModuleRPackages::libLocsCommand () {
//static
QString RKSettingsModuleRPackages::pkgTypeOption () {
QString ret;
-#if defined Q_WS_WIN || defined Q_WS_MAC
+#if defined Q_OS_WIN || defined Q_OS_MAC
ret.append ("options (pkgType=\"");
if (source_packages) ret.append ("source");
-# if defined Q_WS_WIN
+# if defined Q_OS_WIN
else ret.append ("win.binary");
# else
else if (RKSessionVars::compareRVersion ("3.0.0") > 0) {
@@ -522,7 +522,7 @@ QStringList RKSettingsModuleRPackages::makeRRunTimeOptionCommands () {
}
list.append (command + "))\n");
-#if defined Q_WS_WIN || defined Q_WS_MAC
+#if defined Q_OS_WIN || defined Q_OS_MAC
list.append (pkgTypeOption ());
#endif
@@ -585,7 +585,7 @@ void RKSettingsModuleRPackages::loadSettings (KConfig *config) {
liblocs = cg.readEntry ("LibraryLocations", QStringList ());
archive_packages = cg.readEntry ("archive packages", false);
-#if defined Q_WS_WIN || defined Q_WS_MAC
+#if defined Q_OS_WIN || defined Q_OS_MAC
# if defined USE_BINARY_PACKAGES
# define USE_SOURCE_PACKAGES false
# else
diff --git a/rkward/windows/detachedwindowcontainer.cpp b/rkward/windows/detachedwindowcontainer.cpp
index 97dcf3a..1e4e2ac 100644
--- a/rkward/windows/detachedwindowcontainer.cpp
+++ b/rkward/windows/detachedwindowcontainer.cpp
@@ -64,7 +64,7 @@ DetachedWindowContainer::DetachedWindowContainer (RKMDIWindow *widget_to_capture
// NOTE: If the window has not been shown, before, its geometry() is always 640*480, unconditionally.
setGeometry (widget_to_capture->frameGeometry ());
if (!widget_to_capture->isWindow ()) move (widget_to_capture->mapToGlobal (widget_to_capture->pos ()));
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// fix for detached tool windows positioned with the frame outside the screen
ensurePolished ();
QPoint adjust = pos ();
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 1436881..3ec41d9 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -1102,7 +1102,7 @@ KTextEditor::View* RKCommandHighlighter::getView () {
//////////
QString exportText(const QString& text, const KTextEditor::Attribute::Ptr& attrib, const KTextEditor::Attribute::Ptr& m_defaultAttribute) {
if ( !attrib || !attrib->hasAnyProperty() || attrib == m_defaultAttribute ) {
- return (Qt::escape(text));
+ return (text.toHtmlEscaped());
}
QString ret;
@@ -1124,7 +1124,7 @@ QString exportText(const QString& text, const KTextEditor::Attribute::Ptr& attri
.arg(writeBackground ? QString(QLatin1String("background:") + attrib->background().color().name() + QLatin1Char(';')) : QString()));
}
- ret.append (Qt::escape(text));
+ ret.append (text.toHtmlEscaped());
if ( writeBackground || writeForeground ) {
ret.append ("</span>");
diff --git a/rkward/windows/rkcommandlog.cpp b/rkward/windows/rkcommandlog.cpp
index b5b309c..6765176 100644
--- a/rkward/windows/rkcommandlog.cpp
+++ b/rkward/windows/rkcommandlog.cpp
@@ -30,6 +30,7 @@
#include <qsplitter.h>
#include <QMenu>
#include <QContextMenuEvent>
+#include <QFontDatabase>
#include <klocale.h>
#include <kactioncollection.h>
@@ -224,7 +225,7 @@ void RKCommandLog::clearLog () {
log_view->setPlainText (QString ());
// set a fixed width font
- QFont font = KGlobalSettings::fixedFont ();
+ QFont font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
log_view->setCurrentFont (font);
}
@@ -266,6 +267,7 @@ void RKCommandLogView::selectAll () {
#include <kxmlguifactory.h>
#include <QAction>
#include <QGuiApplication>
+#include <QFontDatabase>
RKCommandLogPart::RKCommandLogPart (RKCommandLog *for_log) : KParts::Part (0) {
RK_TRACE (APP);
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 96bf038..a16d4a1 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -43,6 +43,7 @@
#include <QPrintDialog>
#include <QMenu>
#include <QTextCodec>
+#include <QFontDatabase>
#include "../rkglobals.h"
#include "../rbackend/rinterface.h"
@@ -72,8 +73,8 @@ RKWebPage::RKWebPage (RKHTMLWindow* window): KWebPage (window, KPartsIntegration
RKWebPage::window = window;
new_window = false;
direct_load = false;
- settings ()->setFontFamily (QWebSettings::StandardFont, KGlobalSettings::generalFont ().family ());
- settings ()->setFontFamily (QWebSettings::FixedFont, KGlobalSettings::fixedFont ().family ());
+ settings ()->setFontFamily (QWebSettings::StandardFont, QFontDatabase::systemFont(QFontDatabase::GeneralFont).family ());
+ settings ()->setFontFamily (QWebSettings::FixedFont, QFontDatabase::systemFont(QFontDatabase::FixedFont).family ());
}
bool RKWebPage::acceptNavigationRequest (QWebFrame* frame, const QNetworkRequest& request, QWebPage::NavigationType type) {
diff --git a/rkward/windows/rktoolwindowlist.cpp b/rkward/windows/rktoolwindowlist.cpp
index 1280cfe..23a9bf3 100644
--- a/rkward/windows/rktoolwindowlist.cpp
+++ b/rkward/windows/rktoolwindowlist.cpp
@@ -35,7 +35,7 @@ void RKToolWindowList::registerToolWindow (RKMDIWindow *window, const QString &i
tr.window = window;
tr.id = id;
tr.default_placement = default_placement;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
// HACK: Workaround for shortcut conflict issue: https://mail.kde.org/pipermail/rkward-devel/2011-December/003153.html
if (default_shortcut & Qt::AltModifier) default_shortcut |= Qt::ControlModifier;
#endif
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowcatcher.cpp
index 05c1a32..f35f727 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -73,7 +73,7 @@ void RKWindowCatcher::stop (int new_cur_device) {
KWindowInfo wininfo = KWindowSystem::windowInfo (created_window, NET::WMName | NET::WMGeometry);
#endif
} else {
-#if defined Q_WS_MAC
+#if defined Q_OS_MAC
KMessageBox::information (0, i18n ("You have tried to embed a new R graphics device window in RKWard. However, this is not currently supported in this build of RKWard on Mac OS X. See http://rkward.kde.org/mac for more information."), i18n ("Could not embed R X11 window"), "embed_x11_device_not_supported");
#else
RKErrorDialog::reportableErrorMessage (0, i18n ("You have tried to embed a new R graphics device window in RKWard. However, either no window was created, or RKWard failed to detect the new window. If you think RKWard should have done better, consider reporting this as a bug. Alternatively, you may want to adjust Settings->Configure RKWard->Onscreen Graphics."), QString (), i18n ("Could not embed R X11 window"), "failure_to_detect_x11_device");
@@ -156,7 +156,7 @@ void RKWindowCatcher::killDevice (int device_number) {
#include <QScrollArea>
#include <qlabel.h>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# include "../qwinhost/qwinhost.h"
# include <windows.h>
#elif defined Q_WS_X11
@@ -191,7 +191,7 @@ RKCaughtX11Window::RKCaughtX11Window (WId window_to_embed, int device_number) :
commonInit (device_number);
embedded = window_to_embed;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// unfortunately, trying to get KWindowInfo as below hangs on windows (KDElibs 4.2.3)
WINDOWINFO wininfo;
wininfo.cbSize = sizeof (WINDOWINFO);
@@ -277,7 +277,7 @@ void RKCaughtX11Window::doEmbed () {
RK_TRACE (MISC);
if (embedded) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
capture = new QWinHost (xembed_container);
capture->setWindow (embedded);
capture->setFocusPolicy (Qt::ClickFocus);
diff --git a/rkward/windows/rkwindowcatcher.h b/rkward/windows/rkwindowcatcher.h
index 282156d..096ef51 100644
--- a/rkward/windows/rkwindowcatcher.h
+++ b/rkward/windows/rkwindowcatcher.h
@@ -193,7 +193,7 @@ private:
RKProgressControl *error_dialog;
static QHash<int, RKCaughtX11Window*> device_windows;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
QWinHost *capture;
#elif defined Q_WS_X11
QX11EmbedContainer *capture;
More information about the rkward-tracker
mailing list