[rkward/work/frameworks-Mac] rkward: Rename rinterface.h in order to avoid include file clash.
Thomas Friedrichsmeier
null at kde.org
Thu Jun 1 14:07:38 UTC 2017
Git commit 262581dc845db95b793951bf1f8cd50e3eaf2840 by Thomas Friedrichsmeier.
Committed on 01/06/2017 at 14:03.
Pushed by tfry into branch 'work/frameworks-Mac'.
Rename rinterface.h in order to avoid include file clash.
Sigh. clang considers Mac to be case-insensitive, and so will consider
rinterface.h the same as Rinterface.h.
Further clang and cmake (don't know which is to blame) think it's fun to look
for <include.h> in the local dirs, first, then in the system path. Thus,
would include our rinterface.h, instead of the R header.
M +1 -1 rkward/agents/CMakeLists.txt
M +1 -1 rkward/agents/rkeditobjectagent.cpp
M +1 -1 rkward/agents/rkloadagent.cpp
M +1 -1 rkward/agents/rkquitagent.cpp
M +1 -1 rkward/agents/rksaveagent.cpp
M +1 -1 rkward/agents/showedittextfileagent.cpp
M +1 -1 rkward/core/rcontainerobject.cpp
M +1 -1 rkward/core/renvironmentobject.cpp
M +1 -1 rkward/core/rkrownames.cpp
M +1 -1 rkward/core/rkvariable.cpp
M +1 -1 rkward/core/robject.cpp
M +1 -1 rkward/core/robjectlist.cpp
M +1 -1 rkward/dataeditor/rkeditordataframe.cpp
M +1 -1 rkward/dataeditor/rkvareditmodel.cpp
M +1 -1 rkward/dialogs/rkerrordialog.cpp
M +1 -1 rkward/dialogs/rkloadlibsdialog.cpp
M +1 -1 rkward/misc/rkdummypart.rc
M +1 -1 rkward/misc/rkprogresscontrol.cpp
M +1 -1 rkward/plugin/rkpreviewbox.cpp
M +1 -1 rkward/plugin/rkstandardcomponentgui.cpp
M +1 -1 rkward/rbackend/CMakeLists.txt
M +1 -1 rkward/rbackend/rcommand.cpp
M +1 -1 rkward/rbackend/rcommandreceiver.cpp
M +1 -1 rkward/rbackend/rcommandstack.cpp
M +1 -1 rkward/rbackend/rkrbackendprotocol_frontend.cpp
R +3 -3 rkward/rbackend/rkrinterface.cpp [from: rkward/rbackend/rinterface.cpp - 099% similarity]
R +4 -4 rkward/rbackend/rkrinterface.h [from: rkward/rbackend/rinterface.h - 099% similarity]
M +1 -1 rkward/rbackend/rksessionvars.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
M +1 -1 rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
M +1 -1 rkward/rkconsole.cpp
M +1 -1 rkward/rkconsolepart.rc
M +1 -1 rkward/rkward.cpp
M +1 -1 rkward/robjectviewer.cpp
M +1 -1 rkward/scriptbackends/rkcomponentscripting.cpp
M +1 -1 rkward/settings/rksettingsmodulegraphics.cpp
M +1 -1 rkward/settings/rksettingsmoduleoutput.cpp
M +1 -1 rkward/settings/rksettingsmoduler.cpp
M +1 -1 rkward/windows/rcontrolwindow.cpp
M +1 -1 rkward/windows/rkcatchedx11windowpart.rc
M +1 -1 rkward/windows/rkcommandeditorwindow.cpp
M +1 -1 rkward/windows/rkcommandeditorwindowpart.rc
M +1 -1 rkward/windows/rkcommandlog.cpp
M +1 -1 rkward/windows/rkhelpsearchwindow.cpp
M +1 -1 rkward/windows/rkhtmlwindow.cpp
M +1 -1 rkward/windows/rkstandardactions.rc
M +1 -1 rkward/windows/rktoplevelwindowgui.cpp
M +1 -1 rkward/windows/rkwindowcatcher.cpp
M +1 -1 rkward/windows/rkworkplace.cpp
M +1 -1 rkward/windows/robjectbrowser.cpp
https://commits.kde.org/rkward/262581dc845db95b793951bf1f8cd50e3eaf2840
diff --git a/rkward/agents/CMakeLists.txt b/rkward/agents/CMakeLists.txt
index 2c37fde4..15fdce5f 100644
--- a/rkward/agents/CMakeLists.txt
+++ b/rkward/agents/CMakeLists.txt
@@ -14,4 +14,4 @@ SET(agents_STAT_SRCS
)
ADD_LIBRARY(agents STATIC ${agents_STAT_SRCS})
-TARGET_LINK_LIBRARIES(agents Qt5::Widgets KF5::TextEditor)
\ No newline at end of file
+TARGET_LINK_LIBRARIES(agents Qt5::Widgets KF5::TextEditor)
diff --git a/rkward/agents/rkeditobjectagent.cpp b/rkward/agents/rkeditobjectagent.cpp
index e93b83c9..a037849a 100644
--- a/rkward/agents/rkeditobjectagent.cpp
+++ b/rkward/agents/rkeditobjectagent.cpp
@@ -21,7 +21,7 @@
#include "../rkglobals.h"
#include "../core/robjectlist.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../windows/rkworkplace.h"
diff --git a/rkward/agents/rkloadagent.cpp b/rkward/agents/rkloadagent.cpp
index c2db749d..34d383af 100644
--- a/rkward/agents/rkloadagent.cpp
+++ b/rkward/agents/rkloadagent.cpp
@@ -27,7 +27,7 @@
#include "../rkglobals.h"
#include "../core/robjectlist.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../windows/rkworkplace.h"
#include "../settings/rksettingsmodulegeneral.h"
diff --git a/rkward/agents/rkquitagent.cpp b/rkward/agents/rkquitagent.cpp
index 47361fd9..22585d95 100644
--- a/rkward/agents/rkquitagent.cpp
+++ b/rkward/agents/rkquitagent.cpp
@@ -22,7 +22,7 @@
#include <qtimer.h>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../misc/rkprogresscontrol.h"
diff --git a/rkward/agents/rksaveagent.cpp b/rkward/agents/rksaveagent.cpp
index 9050d580..1b066534 100644
--- a/rkward/agents/rksaveagent.cpp
+++ b/rkward/agents/rksaveagent.cpp
@@ -22,7 +22,7 @@
#include <qapplication.h>
#include <QFileDialog>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../core/robjectlist.h"
#include "../rkglobals.h"
#include "../rkward.h"
diff --git a/rkward/agents/showedittextfileagent.cpp b/rkward/agents/showedittextfileagent.cpp
index ca453fd9..5e3c84dc 100644
--- a/rkward/agents/showedittextfileagent.cpp
+++ b/rkward/agents/showedittextfileagent.cpp
@@ -21,7 +21,7 @@
#include <KMessageWidget>
#include "../windows/rkcommandeditorwindow.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkrbackendprotocol_frontend.h"
#include "../windows/rkworkplace.h"
#include "../rkglobals.h"
diff --git a/rkward/core/rcontainerobject.cpp b/rkward/core/rcontainerobject.cpp
index 6f378f8a..22652733 100644
--- a/rkward/core/rcontainerobject.cpp
+++ b/rkward/core/rcontainerobject.cpp
@@ -18,7 +18,7 @@
#include <qregexp.h>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "robjectlist.h"
#include "rkpseudoobjects.h"
#include "rkvariable.h"
diff --git a/rkward/core/renvironmentobject.cpp b/rkward/core/renvironmentobject.cpp
index 9e6857e9..0e41bd4c 100644
--- a/rkward/core/renvironmentobject.cpp
+++ b/rkward/core/renvironmentobject.cpp
@@ -22,7 +22,7 @@
#include "robjectlist.h"
#include "rkpseudoobjects.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../settings/rksettingsmoduleobjectbrowser.h"
#include "rkmodificationtracker.h"
#include "../rkglobals.h"
diff --git a/rkward/core/rkrownames.cpp b/rkward/core/rkrownames.cpp
index 33e22d08..7aa532d7 100644
--- a/rkward/core/rkrownames.cpp
+++ b/rkward/core/rkrownames.cpp
@@ -23,7 +23,7 @@
#include "rcontainerobject.h"
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "rkmodificationtracker.h"
#include "../debug.h"
diff --git a/rkward/core/rkvariable.cpp b/rkward/core/rkvariable.cpp
index 47d39891..b8d6d9a6 100644
--- a/rkward/core/rkvariable.cpp
+++ b/rkward/core/rkvariable.cpp
@@ -23,7 +23,7 @@
#include "rcontainerobject.h"
#include "robjectlist.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkglobals.h"
#include "rkmodificationtracker.h"
diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index b2843da5..c5cc0bb0 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -21,7 +21,7 @@
#include <qregexp.h>
#include <KLocalizedString>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkrbackendprotocol_shared.h"
#include "../rkglobals.h"
#include "robjectlist.h"
diff --git a/rkward/core/robjectlist.cpp b/rkward/core/robjectlist.cpp
index e2f10ca5..deb95b84 100644
--- a/rkward/core/robjectlist.cpp
+++ b/rkward/core/robjectlist.cpp
@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include "renvironmentobject.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "rkmodificationtracker.h"
#include "../misc/rkprogresscontrol.h"
#include "../settings/rksettingsmoduler.h"
diff --git a/rkward/dataeditor/rkeditordataframe.cpp b/rkward/dataeditor/rkeditordataframe.cpp
index d900f612..a57530e0 100644
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@ -19,7 +19,7 @@
#include <kmessagebox.h>
#include <KLocalizedString>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkglobals.h"
#include "twintable.h"
#include "twintablemember.h"
diff --git a/rkward/dataeditor/rkvareditmodel.cpp b/rkward/dataeditor/rkvareditmodel.cpp
index a9acfbe6..6dbd7807 100644
--- a/rkward/dataeditor/rkvareditmodel.cpp
+++ b/rkward/dataeditor/rkvareditmodel.cpp
@@ -26,7 +26,7 @@
#include "../core/rcontainerobject.h"
#include "../core/rkmodificationtracker.h"
#include "../core/rkrownames.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/dialogs/rkerrordialog.cpp b/rkward/dialogs/rkerrordialog.cpp
index 69a6b8af..1cdbb237 100644
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@ -31,7 +31,7 @@
#include <QDialog>
#include <QVBoxLayout>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rksessionvars.h"
#include "../misc/rkprogresscontrol.h"
#include "../misc/rkdialogbuttonbox.h"
diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlibsdialog.cpp
index 9b013a40..bfebe5be 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -37,7 +37,7 @@
#include <kuser.h>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../settings/rksettingsmodulegeneral.h"
#include "../settings/rksettings.h"
#include "../core/robjectlist.h"
diff --git a/rkward/misc/rkdummypart.rc b/rkward/misc/rkdummypart.rc
index ac3bca21..b7f699cf 100644
--- a/rkward/misc/rkdummypart.rc
+++ b/rkward/misc/rkdummypart.rc
@@ -1,4 +1,4 @@
<!DOCTYPE kpartgui>
<kpartgui name="rkward_dummypart" version="54">
<!-- Just an empty file to silence warnings -->
-</kpartgui>
\ No newline at end of file
+</kpartgui>
diff --git a/rkward/misc/rkprogresscontrol.cpp b/rkward/misc/rkprogresscontrol.cpp
index aa837d12..f6932b1b 100644
--- a/rkward/misc/rkprogresscontrol.cpp
+++ b/rkward/misc/rkprogresscontrol.cpp
@@ -28,7 +28,7 @@
#include <KLocalizedString>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../settings/rksettingsmoduler.h"
#include "../debug.h"
diff --git a/rkward/plugin/rkpreviewbox.cpp b/rkward/plugin/rkpreviewbox.cpp
index ce3db6bc..bf9428f0 100644
--- a/rkward/plugin/rkpreviewbox.cpp
+++ b/rkward/plugin/rkpreviewbox.cpp
@@ -25,7 +25,7 @@
#include <KLocalizedString>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../misc/xmlhelper.h"
#include "../misc/rkxmlguipreviewarea.h"
#include "../windows/rkwindowcatcher.h"
diff --git a/rkward/plugin/rkstandardcomponentgui.cpp b/rkward/plugin/rkstandardcomponentgui.cpp
index f6ad9ccc..d6db9be7 100644
--- a/rkward/plugin/rkstandardcomponentgui.cpp
+++ b/rkward/plugin/rkstandardcomponentgui.cpp
@@ -39,7 +39,7 @@
#include "../misc/rkxmlguipreviewarea.h"
#include "../windows/rkworkplace.h"
#include "../windows/rkcommandeditorwindow.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkward.h"
#include "../settings/rksettingsmoduleplugins.h"
#include "../rkglobals.h"
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 6cd8e05d..4598be0a 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -27,7 +27,7 @@ SET (
SET (
rbackend_frontend_SRCS
- rinterface.cpp
+ rkrinterface.cpp
rcommand.cpp
rcommandreceiver.cpp
rcommandstack.cpp
diff --git a/rkward/rbackend/rcommand.cpp b/rkward/rbackend/rcommand.cpp
index e80bd5f6..0f95d043 100644
--- a/rkward/rbackend/rcommand.cpp
+++ b/rkward/rbackend/rcommand.cpp
@@ -17,7 +17,7 @@
#include "rcommand.h"
#include "rcommandreceiver.h"
-#include "rinterface.h"
+#include "rkrinterface.h"
#include "../windows/rkcommandlog.h"
#include "rkrbackendprotocol_shared.h"
#include "../core/robject.h"
diff --git a/rkward/rbackend/rcommandreceiver.cpp b/rkward/rbackend/rcommandreceiver.cpp
index 44920f8e..2ae0ef3d 100644
--- a/rkward/rbackend/rcommandreceiver.cpp
+++ b/rkward/rbackend/rcommandreceiver.cpp
@@ -17,7 +17,7 @@
#include "rcommandreceiver.h"
#include "../rkglobals.h"
-#include "rinterface.h"
+#include "rkrinterface.h"
#include "../debug.h"
diff --git a/rkward/rbackend/rcommandstack.cpp b/rkward/rbackend/rcommandstack.cpp
index 92bb3def..c72b0f3a 100644
--- a/rkward/rbackend/rcommandstack.cpp
+++ b/rkward/rbackend/rcommandstack.cpp
@@ -21,7 +21,7 @@
#include <QTimer>
#include <QTime>
-#include "rinterface.h"
+#include "rkrinterface.h"
#include "../debug.h"
diff --git a/rkward/rbackend/rkrbackendprotocol_frontend.cpp b/rkward/rbackend/rkrbackendprotocol_frontend.cpp
index 8bd2d8c8..6f3dd439 100644
--- a/rkward/rbackend/rkrbackendprotocol_frontend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_frontend.cpp
@@ -17,7 +17,7 @@
#include "rkrbackendprotocol_frontend.h"
-#include "rinterface.h"
+#include "rkrinterface.h"
#include <QThread>
diff --git a/rkward/rbackend/rinterface.cpp b/rkward/rbackend/rkrinterface.cpp
similarity index 99%
rename from rkward/rbackend/rinterface.cpp
rename to rkward/rbackend/rkrinterface.cpp
index f21078c9..7df0a10f 100644
--- a/rkward/rbackend/rinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -1,8 +1,8 @@
/***************************************************************************
- rinterface.cpp - description
+ rkrinterface.cpp - description
-------------------
begin : Fri Nov 1 2002
- copyright : (C) 2002-2016 by Thomas Friedrichsmeier
+ copyright : (C) 2002-2017 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include "rinterface.h"
+#include "rkrinterface.h"
#include "rcommandstack.h"
#include "rkrbackendprotocol_frontend.h"
diff --git a/rkward/rbackend/rinterface.h b/rkward/rbackend/rkrinterface.h
similarity index 99%
rename from rkward/rbackend/rinterface.h
rename to rkward/rbackend/rkrinterface.h
index 086b3995..fa286286 100644
--- a/rkward/rbackend/rinterface.h
+++ b/rkward/rbackend/rkrinterface.h
@@ -1,8 +1,8 @@
/***************************************************************************
- rinterface.h - description
+ rkrinterface.h - description
-------------------
begin : Fri Nov 1 2002
- copyright : (C) 2002 - 2013 by Thomas Friedrichsmeier
+ copyright : (C) 2002 - 2017 by Thomas Friedrichsmeier
email : thomas.friedrichsmeier at kdemail.net
***************************************************************************/
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#ifndef RINTERFACE_H
-#define RINTERFACE_H
+#ifndef RKRINTERFACE_H
+#define RKRINTERFACE_H
#include <qobject.h>
#include <QFile>
diff --git a/rkward/rbackend/rksessionvars.cpp b/rkward/rbackend/rksessionvars.cpp
index 90368eb8..6dbbcd26 100644
--- a/rkward/rbackend/rksessionvars.cpp
+++ b/rkward/rbackend/rksessionvars.cpp
@@ -17,7 +17,7 @@
#include "rksessionvars.h"
-#include "rinterface.h"
+#include "rkrinterface.h"
#include "../settings/rksettingsmoduledebug.h"
#include "../settings/rksettingsmodulegeneral.h"
#include "../version.h"
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
index 5503de64..f5c4e3cc 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
@@ -28,7 +28,7 @@
#include <sys/stat.h>
#include "rkgraphicsdevice_protocol_shared.h"
-#include "../rinterface.h"
+#include "../rkrinterface.h"
#include "../../rkglobals.h"
#include "../../misc/rkdialogbuttonbox.h"
diff --git a/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R b/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
index a73ffb15..873964ce 100644
--- a/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
+++ b/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
@@ -64,4 +64,4 @@ rktest.makeplugintests <- function(testsuites="testsuite.R", testroot=getwd(), o
cat (paste ("\n\nThese output are saved in: ", paste (getwd(), outfile, sep=.Platform$file.sep), ".\nIf needed, send them to rkward-devel at kde.org\n", sep=""))
cat (paste("\nThe full test results have been saved to this temporary directory:\n", rktest.getTempDir(),"\n"))
-}
\ No newline at end of file
+}
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index 5d0d6b7f..ac56b2f1 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -53,7 +53,7 @@
#include "rkglobals.h"
#include "rkward.h"
#include "windows/rkhelpsearchwindow.h"
-#include "rbackend/rinterface.h"
+#include "rbackend/rkrinterface.h"
#include "rbackend/rcommand.h"
#include "settings/rksettings.h"
#include "settings/rksettingsmoduleconsole.h"
diff --git a/rkward/rkconsolepart.rc b/rkward/rkconsolepart.rc
index 88eb83b7..51961ed7 100644
--- a/rkward/rkconsolepart.rc
+++ b/rkward/rkconsolepart.rc
@@ -53,4 +53,4 @@ but avoids the total derangement of the edit menu over time.
<Separator/>
<Action name="rkconsole_clear"/>
</Menu>
-</kpartgui>
\ No newline at end of file
+</kpartgui>
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index 6e510412..5907ebf1 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -52,7 +52,7 @@
#include "settings/rksettingsmodulegeneral.h"
#include "settings/rksettingsmoduleoutput.h"
#include "settings/rksettingsmodulecommandeditor.h"
-#include "rbackend/rinterface.h"
+#include "rbackend/rkrinterface.h"
#include "core/robjectlist.h"
#include "core/renvironmentobject.h"
#include "misc/rkstandardicons.h"
diff --git a/rkward/robjectviewer.cpp b/rkward/robjectviewer.cpp
index 956156ed..9deeb631 100644
--- a/rkward/robjectviewer.cpp
+++ b/rkward/robjectviewer.cpp
@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include <QFontDatabase>
-#include "rbackend/rinterface.h"
+#include "rbackend/rkrinterface.h"
#include "rkglobals.h"
#include "core/robject.h"
#include "misc/rkdummypart.h"
diff --git a/rkward/scriptbackends/rkcomponentscripting.cpp b/rkward/scriptbackends/rkcomponentscripting.cpp
index a0cc518b..726c13a2 100644
--- a/rkward/scriptbackends/rkcomponentscripting.cpp
+++ b/rkward/scriptbackends/rkcomponentscripting.cpp
@@ -26,7 +26,7 @@
#include "../misc/rkcommonfunctions.h"
#include "../misc/xmlhelper.h"
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "qtscriptbackend.h"
#include "qtscripti18n.h"
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index ef50777e..5c240810 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -31,7 +31,7 @@
#include <QSpinBox>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../misc/rkspinbox.h"
#include "../misc/rkcommonfunctions.h"
#include "../debug.h"
diff --git a/rkward/settings/rksettingsmoduleoutput.cpp b/rkward/settings/rksettingsmoduleoutput.cpp
index c4813e92..3486247f 100644
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@ -31,7 +31,7 @@
#include "../rkglobals.h"
#include "../misc/getfilenamewidget.h"
#include "../misc/rkcommonfunctions.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../debug.h"
// static members
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index 0daf4df5..aa279878 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -37,7 +37,7 @@
#include "../misc/multistringselector.h"
#include "../misc/rkprogresscontrol.h"
#include "../misc/rkcommonfunctions.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rksessionvars.h"
#include "../rkglobals.h"
#include "../debug.h"
diff --git a/rkward/windows/rcontrolwindow.cpp b/rkward/windows/rcontrolwindow.cpp
index b3b89cf2..d9e5e8e8 100644
--- a/rkward/windows/rcontrolwindow.cpp
+++ b/rkward/windows/rcontrolwindow.cpp
@@ -27,7 +27,7 @@
#include "../settings/rksettings.h"
#include "../misc/rkdummypart.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rcommand.h"
#include "../rbackend/rcommandstack.h"
#include "../rkglobals.h"
diff --git a/rkward/windows/rkcatchedx11windowpart.rc b/rkward/windows/rkcatchedx11windowpart.rc
index a191c4ae..90501554 100644
--- a/rkward/windows/rkcatchedx11windowpart.rc
+++ b/rkward/windows/rkcatchedx11windowpart.rc
@@ -49,4 +49,4 @@
<Separator/>
<Action name="stop_interaction"/>
</ToolBar>
-</kpartgui>
\ No newline at end of file
+</kpartgui>
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 82230635..5794f8ed 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -52,7 +52,7 @@
#include "../misc/rkxmlguisyncer.h"
#include "../misc/rkjobsequence.h"
#include "../core/robjectlist.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../settings/rksettings.h"
#include "../settings/rksettingsmodulecommandeditor.h"
#include "../rkconsole.h"
diff --git a/rkward/windows/rkcommandeditorwindowpart.rc b/rkward/windows/rkcommandeditorwindowpart.rc
index 43576932..f85f6244 100644
--- a/rkward/windows/rkcommandeditorwindowpart.rc
+++ b/rkward/windows/rkcommandeditorwindowpart.rc
@@ -37,4 +37,4 @@
<Separator/>
<DefineGroup name="ktexteditor_popup_merge2"/>
</Menu>
-</kpartgui>
\ No newline at end of file
+</kpartgui>
diff --git a/rkward/windows/rkcommandlog.cpp b/rkward/windows/rkcommandlog.cpp
index 8a2c7f16..e96e1fad 100644
--- a/rkward/windows/rkcommandlog.cpp
+++ b/rkward/windows/rkcommandlog.cpp
@@ -17,7 +17,7 @@
#include "rkcommandlog.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkglobals.h"
#include "../rkconsole.h"
#include "../settings/rksettingsmodulewatch.h"
diff --git a/rkward/windows/rkhelpsearchwindow.cpp b/rkward/windows/rkhelpsearchwindow.cpp
index 9a525756..43bbdc17 100644
--- a/rkward/windows/rkhelpsearchwindow.cpp
+++ b/rkward/windows/rkhelpsearchwindow.cpp
@@ -33,7 +33,7 @@
#include <QVBoxLayout>
#include <QSortFilterProxyModel>
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rcommandreceiver.h"
#include "../rbackend/rksessionvars.h"
#include "../debug.h"
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index b6514b48..5ead99fe 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -45,7 +45,7 @@
#include <QMimeDatabase>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "rkhelpsearchwindow.h"
#include "../rkward.h"
#include "../rkconsole.h"
diff --git a/rkward/windows/rkstandardactions.rc b/rkward/windows/rkstandardactions.rc
index accdaccb..0ac9cedd 100644
--- a/rkward/windows/rkstandardactions.rc
+++ b/rkward/windows/rkstandardactions.rc
@@ -56,4 +56,4 @@
<Menu name="rkcommandlog_context_menu">
<Action name="run_current" group="rkcommandlog_context_merge1"/>
</Menu>
-</kpartgui>
\ No newline at end of file
+</kpartgui>
diff --git a/rkward/windows/rktoplevelwindowgui.cpp b/rkward/windows/rktoplevelwindowgui.cpp
index 7b9f1a55..cd36ce5b 100644
--- a/rkward/windows/rktoplevelwindowgui.cpp
+++ b/rkward/windows/rktoplevelwindowgui.cpp
@@ -42,7 +42,7 @@
#include "../misc/rkcommonfunctions.h"
#include "../plugin/rkcomponentmap.h"
#include "../dialogs/rkerrordialog.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rkglobals.h"
#include "../rkward.h"
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowcatcher.cpp
index 9920016d..7e305d01 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -223,7 +223,7 @@ void RKWindowCatcher::killDevice (int device_number) {
#include <kactioncollection.h>
#include "../rkglobals.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../rbackend/rkwarddevice/rkgraphicsdevice.h"
#include "../core/robject.h"
#include "../misc/rkprogresscontrol.h"
diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index 09b60b7a..38ba99e7 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -46,7 +46,7 @@
#include "../robjectviewer.h"
#include "../settings/rksettingsmodulegeneral.h"
#include "../settings/rksettingsmodulecommandeditor.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../windows/rkwindowcatcher.h"
#include "../rbackend/rcommand.h"
#include "../misc/rkcommonfunctions.h"
diff --git a/rkward/windows/robjectbrowser.cpp b/rkward/windows/robjectbrowser.cpp
index 314a24ad..4949da44 100644
--- a/rkward/windows/robjectbrowser.cpp
+++ b/rkward/windows/robjectbrowser.cpp
@@ -32,7 +32,7 @@
#include "../core/robjectlist.h"
#include "../core/renvironmentobject.h"
#include "../core/rkmodificationtracker.h"
-#include "../rbackend/rinterface.h"
+#include "../rbackend/rkrinterface.h"
#include "../misc/rkobjectlistview.h"
#include "../misc/rkdummypart.h"
#include "../misc/rkstandardicons.h"
More information about the rkward-tracker
mailing list