[rkward-cvs] SF.net SVN: rkward: [2040] branches/KDE4_port/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 8 15:10:22 UTC 2007
Revision: 2040
http://rkward.svn.sourceforge.net/rkward/?rev=2040&view=rev
Author: tfry
Date: 2007-10-08 08:10:22 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
adapt-to-kde4-api.pl results
Modified Paths:
--------------
branches/KDE4_port/rkward/agents/rkloadagent.cpp
branches/KDE4_port/rkward/agents/rkloadagent.h
branches/KDE4_port/rkward/agents/rksaveagent.cpp
branches/KDE4_port/rkward/agents/rksaveagent.h
branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
branches/KDE4_port/rkward/core/robjectlist.h
branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
branches/KDE4_port/rkward/dataeditor/rkeditor.h
branches/KDE4_port/rkward/dataeditor/rkeditordataframepart.cpp
branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp
branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h
branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp
branches/KDE4_port/rkward/dialogs/startupdialog.cpp
branches/KDE4_port/rkward/dialogs/startupdialog.h
branches/KDE4_port/rkward/main.cpp
branches/KDE4_port/rkward/misc/getfilenamewidget.cpp
branches/KDE4_port/rkward/misc/getfilenamewidget.h
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
branches/KDE4_port/rkward/rkconsole.cpp
branches/KDE4_port/rkward/rkward.cpp
branches/KDE4_port/rkward/rkward.h
branches/KDE4_port/rkward/rkwardapplication.cpp
branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp
branches/KDE4_port/rkward/scriptbackends/phpbackend.h
branches/KDE4_port/rkward/settings/rksettings.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
branches/KDE4_port/rkward/windows/qxembedcopy.cpp
branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp
branches/KDE4_port/rkward/windows/rkcommandeditorwindow.h
branches/KDE4_port/rkward/windows/rkcommandlog.cpp
branches/KDE4_port/rkward/windows/rkcommandlog.h
branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
branches/KDE4_port/rkward/windows/rkfilebrowser.h
branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.h
branches/KDE4_port/rkward/windows/rkmdiwindow.h
branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp
branches/KDE4_port/rkward/windows/rkworkplace.cpp
branches/KDE4_port/rkward/windows/rkworkplace.h
Modified: branches/KDE4_port/rkward/agents/rkloadagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/rkloadagent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/agents/rkloadagent.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -33,7 +33,7 @@
#define WORKSPACE_LOAD_COMMAND 1
-RKLoadAgent::RKLoadAgent (const KURL &url, bool merge) {
+RKLoadAgent::RKLoadAgent (const KUrl &url, bool merge) {
RK_TRACE (APP);
RKWardMainWindow::getMain ()->slotSetStatusBarText (i18n ("Loading Workspace ..."));
Modified: branches/KDE4_port/rkward/agents/rkloadagent.h
===================================================================
--- branches/KDE4_port/rkward/agents/rkloadagent.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/agents/rkloadagent.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -30,7 +30,7 @@
class RKLoadAgent : public QObject, public RCommandReceiver {
Q_OBJECT
public:
- explicit RKLoadAgent (const KURL &url, bool merge=false);
+ explicit RKLoadAgent (const KUrl &url, bool merge=false);
~RKLoadAgent ();
protected:
Modified: branches/KDE4_port/rkward/agents/rksaveagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/rksaveagent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/agents/rksaveagent.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -30,7 +30,7 @@
#include "../debug.h"
-RKSaveAgent::RKSaveAgent (KURL url, bool save_file_as, DoneAction when_done, KURL load_url) {
+RKSaveAgent::RKSaveAgent (KUrl url, bool save_file_as, DoneAction when_done, KUrl load_url) {
RK_TRACE (APP);
save_url = url;
RKSaveAgent::when_done = when_done;
Modified: branches/KDE4_port/rkward/agents/rksaveagent.h
===================================================================
--- branches/KDE4_port/rkward/agents/rksaveagent.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/agents/rksaveagent.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -33,7 +33,7 @@
enum DoneAction { DoNothing=0, Load=1 };
/** creates a new RKSaveAgent. If when_done == Quit, the RKSaveAgent will quit the application as soon as saving was successful (or it asked to by the user). Similarly, if when_done==Load, it will load a new workspace after saving (specify the url in load_url). If url is given (not empty), and not save_file_as, the agent will try to save to the given url, else it will ask the user to specify a url. RKSaveAgent will self destruct when done. */
- explicit RKSaveAgent (KURL url, bool save_file_as=false, DoneAction when_done=DoNothing, KURL load_url=QString::null);
+ explicit RKSaveAgent (KUrl url, bool save_file_as=false, DoneAction when_done=DoNothing, KUrl load_url=QString::null);
~RKSaveAgent ();
protected:
@@ -42,8 +42,8 @@
bool askURL ();
void done ();
RCommandChain *save_chain;
- KURL save_url;
- KURL load_url;
+ KUrl save_url;
+ KUrl load_url;
DoneAction when_done;
};
Modified: branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -69,7 +69,7 @@
for (int n = 0; n < args->int_a; ++n) {
message.append (args->chars_a[n]).append (" (\"").append (args->chars_b[n]).append ("\")\n");
- bool ok = RKWorkplace::mainWorkplace ()->openScriptEditor (KURL (args->chars_a[n]), false, true, QString (*(args->chars_c)));
+ bool ok = RKWorkplace::mainWorkplace ()->openScriptEditor (KUrl (args->chars_a[n]), false, true, QString (*(args->chars_c)));
if (!ok) {
bad_files_list.append ("- ").append (args->chars_a[n]).append (" (\"").append (args->chars_b[n]).append ("\")\n");
@@ -82,7 +82,7 @@
for (int n = 0; n < args->int_a; ++n) {
message.append (args->chars_a[n]).append (" (\"").append (args->chars_b[n]).append ("\")\n");
- bool ok = RKWorkplace::mainWorkplace ()->openScriptEditor (KURL (args->chars_a[n]), true, false, QString (args->chars_b[n]));
+ bool ok = RKWorkplace::mainWorkplace ()->openScriptEditor (KUrl (args->chars_a[n]), true, false, QString (args->chars_b[n]));
if (!ok) {
bad_files_list.append ("- ").append (args->chars_a[n]).append (" (\"").append (args->chars_b[n]).append ("\")\n");
Modified: branches/KDE4_port/rkward/core/robjectlist.h
===================================================================
--- branches/KDE4_port/rkward/core/robjectlist.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/core/robjectlist.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -64,7 +64,7 @@
/** reimplemented from RContainerObject to validize the name in .GlobalEnv */
QString validizeName (const QString &child_name, bool unique=true);
- KURL getWorkspaceURL () { return current_url; };
+ KUrl getWorkspaceURL () { return current_url; };
static RObjectList *getObjectList () { return object_list; };
static REnvironmentObject *getGlobalEnv ();
@@ -89,7 +89,7 @@
private:
friend class RKLoadAgent;
friend class RKSaveAgent;
- void setWorkspaceURL (const KURL &url) { current_url = url; };
+ void setWorkspaceURL (const KUrl &url) { current_url = url; };
QTimer *update_timer;
RCommandChain *update_chain;
@@ -99,7 +99,7 @@
REnvironmentObject *createTopLevelEnvironment (const QString &name);
- KURL current_url;
+ KUrl current_url;
static RObjectList *object_list;
};
Modified: branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -56,9 +56,9 @@
setMinimumWidth (80);
KActionCollection *ac = new KActionCollection (this);
- KStdAction::cut (this, SLOT (cut ()), ac);
- KStdAction::copy (this, SLOT (copy ()), ac);
- KStdAction::paste (this, SLOT (paste ()), ac);
+ KStandardAction::cut (this, SLOT (cut ()), ac);
+ KStandardAction::copy (this, SLOT (copy ()), ac);
+ KStandardAction::paste (this, SLOT (paste ()), ac);
}
LevelsTable::~LevelsTable () {
Modified: branches/KDE4_port/rkward/dataeditor/rkeditor.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkeditor.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dataeditor/rkeditor.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -22,7 +22,7 @@
#include "../core/robject.h"
#include <kparts/part.h>
-#include <kmdichildview.h>
+#include <k3mdichildview.h>
#include "../windows/rkmdiwindow.h"
Modified: branches/KDE4_port/rkward/dataeditor/rkeditordataframepart.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkeditordataframepart.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dataeditor/rkeditordataframepart.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -46,9 +46,9 @@
}
void RKEditorDataFramePart::initializeActions () {
- editCut = KStdAction::cut(this, SLOT(slotEditCut()), actionCollection(), "cut");
- editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection(), "copy");
- editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection(), "paste");
+ editCut = KStandardAction::cut(this, SLOT(slotEditCut()), actionCollection(), "cut");
+ editCopy = KStandardAction::copy(this, SLOT(slotEditCopy()), actionCollection(), "copy");
+ editPaste = KStandardAction::paste(this, SLOT(slotEditPaste()), actionCollection(), "paste");
editPasteToTable = new KAction(i18n("Paste inside Table"), 0, 0, this, SLOT(slotEditPasteToTable()), actionCollection(), "paste_to_table");
editPasteToTable->setIcon("frame_spreadsheet");
editPasteToSelection = new KAction(i18n("Paste inside Selection"), 0, 0, this, SLOT(slotEditPasteToSelection()), actionCollection(), "paste_to_selection");
Modified: branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -33,7 +33,7 @@
#include <QCloseEvent>
#include <klocale.h>
-#include <kprocess.h>
+#include <k3process.h>
#include <kmessagebox.h>
#include "../rkglobals.h"
@@ -60,7 +60,7 @@
RK_TRACE (DIALOGS);
RKLoadLibsDialog::chain = chain;
- Q3Frame *page = addPage (i18n ("Local packages"));
+ QFrame *page = addPage (i18n ("Local packages"));
Q3VBoxLayout *layout = new Q3VBoxLayout (page, 0, KDialog::spacingHint ());
LoadUnloadWidget *luwidget = new LoadUnloadWidget (this, page);
connect (this, SIGNAL (installedPackagesChanged ()), luwidget, SLOT (updateInstalledPackages ()));
@@ -202,20 +202,20 @@
}
QString R_binary (getenv ("R_binary"));
- KProcess *proc = new KProcess;
+ K3Process *proc = new K3Process;
if (as_root) *proc << "kdesu" << "-t";
else *proc << "sh" << "-c";
*proc << R_binary + " CMD R --no-save < " + file.name ();
- connect (proc, SIGNAL (processExited (KProcess *)), this, SLOT (processExited (KProcess *)));
- connect (proc, SIGNAL (receivedStdout (KProcess *, char *, int)), this, SLOT (installationProcessOutput (KProcess *, char *, int)));
- connect (proc, SIGNAL (receivedStderr (KProcess *, char *, int)), this, SLOT (installationProcessError (KProcess *, char *, int)));
+ connect (proc, SIGNAL (processExited (K3Process *)), this, SLOT (processExited (K3Process *)));
+ connect (proc, SIGNAL (receivedStdout (K3Process *, char *, int)), this, SLOT (installationProcessOutput (K3Process *, char *, int)));
+ connect (proc, SIGNAL (receivedStderr (K3Process *, char *, int)), this, SLOT (installationProcessError (K3Process *, char *, int)));
RKProgressControl *installation_progress = new RKProgressControl (this, i18n ("Please stand by while installing selected packages"), i18n ("Installing packages"), RKProgressControl::CancellableProgress);
connect (this, SIGNAL (installationComplete ()), installation_progress, SLOT (done ()));
connect (this, SIGNAL (installationOutput (const QString &)), installation_progress, SLOT (newOutput (const QString &)));
connect (this, SIGNAL (installationError (const QString &)), installation_progress, SLOT (newError (const QString &)));
- proc->start (KProcess::NotifyOnExit, KProcess::AllOutput);
+ proc->start (K3Process::NotifyOnExit, K3Process::AllOutput);
if (!installation_progress->doModal (true)) proc->kill ();
@@ -226,17 +226,17 @@
return true;
}
-void RKLoadLibsDialog::installationProcessOutput (KProcess *, char *buffer, int buflen) {
+void RKLoadLibsDialog::installationProcessOutput (K3Process *, char *buffer, int buflen) {
RK_TRACE (DIALOGS);
emit (installationOutput (Q3CString (buffer, buflen)));
}
-void RKLoadLibsDialog::installationProcessError (KProcess *, char *buffer, int buflen) {
+void RKLoadLibsDialog::installationProcessError (K3Process *, char *buffer, int buflen) {
RK_TRACE (DIALOGS);
emit (installationError (Q3CString (buffer, buflen)));
}
-void RKLoadLibsDialog::processExited (KProcess *) {
+void RKLoadLibsDialog::processExited (K3Process *) {
RK_TRACE (DIALOGS);
emit (installationComplete ());
}
Modified: branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dialogs/rkloadlibsdialog.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -34,7 +34,7 @@
class QCloseEvent;
class RCommandChain;
class QCheckBox;
-class KProcess;
+class K3Process;
class PackageInstallParamsWidget;
class InstallPackagesWidget;
@@ -77,9 +77,9 @@
/** User1-button was clicked, i.e.: "Configure Repositories" */
void slotUser1 ();
void childDeleted ();
- void processExited (KProcess *);
- void installationProcessOutput (KProcess *proc, char *buffer, int buflen);
- void installationProcessError (KProcess *proc, char *buffer, int buflen);
+ void processExited (K3Process *);
+ void installationProcessOutput (K3Process *proc, char *buffer, int buflen);
+ void installationProcessError (K3Process *proc, char *buffer, int buflen);
void automatedInstall ();
private:
void tryDestruct ();
Modified: branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dialogs/rkreadlinedialog.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -36,7 +36,7 @@
RK_TRACE (DIALOGS);
RK_ASSERT (command);
- Q3VBox *page = makeVBoxMainWidget ();
+ KVBox *page = makeVBoxMainWidget ();
new QLabel (caption, page);
int screen_width = qApp->desktop ()->width () - 2*marginHint() - 2*spacingHint (); // TODO is this correct on xinerama?
Modified: branches/KDE4_port/rkward/dialogs/startupdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -114,7 +114,7 @@
result->result = ChoseFile;
} else {
result->result = OpenFile;
- result->open_url = KURL (item->text (0));
+ result->open_url = KUrl (item->text (0));
}
} else {
RK_ASSERT (false);
Modified: branches/KDE4_port/rkward/dialogs/startupdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -51,7 +51,7 @@
};
struct StartupDialogResult {
Result result;
- KURL open_url;
+ KUrl open_url;
};
StartupDialog (QWidget *parent, StartupDialogResult *result, KRecentFilesAction *recent_files);
Modified: branches/KDE4_port/rkward/main.cpp
===================================================================
--- branches/KDE4_port/rkward/main.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/main.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -114,15 +114,15 @@
}
RKWardStartupOptions *stoptions = new RKWardStartupOptions;
- KURL *open_url = 0;
+ KUrl *open_url = 0;
if (args->count ()) {
- open_url = new KURL (args->makeURL (args->arg (0)));
+ open_url = new KUrl (args->makeURL (args->arg (0)));
}
stoptions->initial_url = open_url;
stoptions->no_stack_check = args->isSet ("disable-stack-check");
RKWardApplication app;
- if (app.isRestored ()) {
+ if (app.isSessionRestored ()) {
RESTORE(RKWardMainWindow); // well, whatever this is supposed to do -> TODO
} else {
new RKWardMainWindow(stoptions);
Modified: branches/KDE4_port/rkward/misc/getfilenamewidget.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/getfilenamewidget.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/misc/getfilenamewidget.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -34,7 +34,7 @@
vbox->addWidget (new QLabel (label, this));
- edit = new KURLRequester (this);
+ edit = new KUrlRequester (this);
connect (edit, SIGNAL (textChanged (const QString &)), this, SLOT (locationEditChanged (const QString &)));
vbox->addWidget (edit);
Modified: branches/KDE4_port/rkward/misc/getfilenamewidget.h
===================================================================
--- branches/KDE4_port/rkward/misc/getfilenamewidget.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/misc/getfilenamewidget.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -20,10 +20,10 @@
#include <qwidget.h>
#include <qstring.h>
-class KURLRequester;
+class KUrlRequester;
/**
-Simple convenience class used to get a file/directoryname from the user. Basically provides a wrapper around KURLRequester.
+Simple convenience class used to get a file/directoryname from the user. Basically provides a wrapper around KUrlRequester.
@author Thomas Friedrichsmeier
*/
@@ -49,7 +49,7 @@
signals:
void locationChanged ();
private:
- KURLRequester *edit;
+ KUrlRequester *edit;
};
#endif
Modified: branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -63,7 +63,7 @@
if (!enslaved) {
KActionCollection *action_collection = new KActionCollection (this);
- KStdAction::copy (this, SLOT (copyCode ()), action_collection);
+ KStandardAction::copy (this, SLOT (copyCode ()), action_collection);
}
}
@@ -201,7 +201,7 @@
QString id = RKComponentMap::getComponentId (component->getHandle ());
QString path = QStringList::split ("::", id).join ("/");
- RKWorkplace::mainWorkplace ()->openHelpWindow (KURL ("rkward://component/" + path));
+ RKWorkplace::mainWorkplace ()->openHelpWindow (KUrl ("rkward://component/" + path));
}
void RKStandardComponentGUI::closeEvent (QCloseEvent *e) {
Modified: branches/KDE4_port/rkward/rkconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/rkconsole.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/rkconsole.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -393,7 +393,7 @@
if (quote_end < 0) quote_end = current_line.length ();
QString current_name = current_line.mid (quote_start + 1, quote_end - quote_start - 1);
- KURLCompletion comp (KURLCompletion::FileCompletion);
+ KUrlCompletion comp (KUrlCompletion::FileCompletion);
comp.setDir (QDir::currentPath ());
QString test = comp.makeCompletion (current_name);
@@ -793,8 +793,8 @@
copy_action = new KAction (i18n ("Copy selection cleaned"), 0, this, SLOT (copy ()), ac, "rkconsole_copy");
copy_literal_action = new KAction (i18n ("Copy selection literally"), 0, this, SLOT (literalCopy ()), ac, "rkconsole_copy_literal");
- KStdAction::clear (this, SLOT (clear ()), ac, "rkconsole_clear");
- paste_action = KStdAction::paste (this, SLOT (paste ()), ac, "rkconsole_paste");
+ KStandardAction::clear (this, SLOT (clear ()), ac, "rkconsole_clear");
+ paste_action = KStandardAction::paste (this, SLOT (paste ()), ac, "rkconsole_paste");
new KAction (i18n ("Configure"), 0, this, SLOT (configure ()), ac, "rkconsole_configure");
}
Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/rkward.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -28,7 +28,7 @@
#include <QCloseEvent>
// include files for KDE
-#include <kaboutapplication.h>
+#include <k3aboutapplication.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
@@ -38,9 +38,9 @@
#include <kconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>
-#include <kstdaction.h>
+#include <kstandardaction.h>
#include <kinputdialog.h>
-#include <kdockwidget.h>
+#include <k3dockwidget.h>
#include <kmultitabbar.h>
#include <ksqueezedtextlabel.h>
#include <dcopclient.h>
@@ -264,7 +264,7 @@
}
if (RKSettingsModuleGeneral::workplaceSaveMode () == RKSettingsModuleGeneral::SaveWorkplaceWithSession) {
- RKWorkplace::mainWorkplace ()->restoreWorkplace (RKSettingsModuleGeneral::getSavedWorkplace (kapp->config ()));
+ RKWorkplace::mainWorkplace ()->restoreWorkplace (RKSettingsModuleGeneral::getSavedWorkplace (KGlobal::config ()));
}
if (RKSettingsModuleGeneral::showHelpOnStartup ()) {
@@ -332,26 +332,26 @@
// TODO: is there a way to insert actions between standard actions without having to give all standard actions custom ids?
new_data_frame = new KAction (i18n ("Dataset"), 0, 0, this, SLOT (slotNewDataFrame ()), actionCollection (), "new_data_frame");
new_data_frame->setIcon("spreadsheet");
- new_command_editor = KStdAction::openNew(this, SLOT(slotNewCommandEditor()), actionCollection(), "new_command_editor");
+ new_command_editor = KStandardAction::openNew(this, SLOT(slotNewCommandEditor()), actionCollection(), "new_command_editor");
new_command_editor->setText (i18n ("Script File"));
new_command_editor->setIcon ("source");
- fileOpen = KStdAction::open(this, SLOT(slotOpenCommandEditor()), actionCollection(), "file_openy");
+ fileOpen = KStandardAction::open(this, SLOT(slotOpenCommandEditor()), actionCollection(), "file_openy");
fileOpen->setText (i18n ("Open R Script File"));
- fileOpenRecent = KStdAction::openRecent(this, SLOT(slotOpenCommandEditor (const KURL&)), actionCollection(), "file_open_recenty");
+ fileOpenRecent = KStandardAction::openRecent(this, SLOT(slotOpenCommandEditor (const KUrl&)), actionCollection(), "file_open_recenty");
KAction *import_data = new KAction (i18n ("Import Data"), 0, 0, this, SLOT (importData ()), actionCollection (), "import_data");
- fileOpenWorkspace = KStdAction::open(this, SLOT(slotFileOpenWorkspace()), actionCollection(), "file_openx");
+ fileOpenWorkspace = KStandardAction::open(this, SLOT(slotFileOpenWorkspace()), actionCollection(), "file_openx");
fileOpenWorkspace->setText (i18n ("Open Workspace"));
fileOpenWorkspace->setShortcut (KShortcut ("Ctrl+Shift+O"));
- fileOpenRecentWorkspace = KStdAction::openRecent(this, SLOT(slotFileOpenRecentWorkspace(const KURL&)), actionCollection(), "file_open_recentx");
- fileSaveWorkspace = KStdAction::save(this, SLOT(slotFileSaveWorkspace()), actionCollection(), "file_savex");
+ fileOpenRecentWorkspace = KStandardAction::openRecent(this, SLOT(slotFileOpenRecentWorkspace(const KUrl&)), actionCollection(), "file_open_recentx");
+ fileSaveWorkspace = KStandardAction::save(this, SLOT(slotFileSaveWorkspace()), actionCollection(), "file_savex");
fileSaveWorkspace->setText (i18n ("Save Workspace"));
fileSaveWorkspace->setShortcut (KShortcut ("Ctrl+Shift+S"));
- fileSaveWorkspaceAs = KStdAction::saveAs(this, SLOT(slotFileSaveWorkspaceAs()), actionCollection(), "file_save_asx");
+ fileSaveWorkspaceAs = KStandardAction::saveAs(this, SLOT(slotFileSaveWorkspaceAs()), actionCollection(), "file_save_asx");
fileSaveWorkspaceAs->setText (i18n ("Save Workspace As"));
- fileQuit = KStdAction::quit(this, SLOT(close ()), actionCollection(), "file_quitx");
+ fileQuit = KStandardAction::quit(this, SLOT(close ()), actionCollection(), "file_quitx");
file_load_libs = new KAction (i18n ("Configure Packages"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");
setStandardToolBarMenuEnabled (true);
@@ -425,17 +425,17 @@
connect (actionCollection (), SIGNAL (clearStatusText ()), this, SLOT (slotSetStatusReady ()));
}
-void RKWardMainWindow::openWorkspace (const KURL &url) {
+void RKWardMainWindow::openWorkspace (const KUrl &url) {
RK_TRACE (APP);
if (url.isEmpty ()) return;
new RKLoadAgent (url, false);
- fileOpenRecentWorkspace->addURL (url);
+ fileOpenRecentWorkspace->addUrl (url);
}
void RKWardMainWindow::saveOptions () {
RK_TRACE (APP);
- KConfig *config = kapp->config ();
+ KConfig *config = KGlobal::config ();
saveMainWindowSettings (config, "main window options");
@@ -453,12 +453,12 @@
void RKWardMainWindow::readOptions () {
RK_TRACE (APP);
- KConfig *config = kapp->config ();
+ KConfig *config = KGlobal::config ();
#if !KDE_IS_VERSION(3,3,0)
- applyMainWindowSettings (kapp->config (), "main window options");
+ applyMainWindowSettings (KGlobal::config (), "main window options");
#else
- applyMainWindowSettings (kapp->config (), "main window options", true);
+ applyMainWindowSettings (KGlobal::config (), "main window options", true);
#endif
// TODO: WORKAROUND: Actually applyMainWindowSettings could/should do this, but apparently this just does not work for maximized windows. Therefore we use our own version instead.
@@ -491,12 +491,12 @@
}
else */
{
- //KURL url=doc->URL();
+ //KUrl url=doc->URL();
//_cfg->writeEntry("filename", url.url());
//_cfg->writeEntry("modified", doc->isModified());
//QString tempname = kapp->tempSaveName(url.url());
- //QString tempurl= KURL::encode_string(tempname);
- //KURL _url(tempurl);
+ //QString tempurl= KUrl::encode_string(tempname);
+ //KUrl _url(tempurl);
//doc->saveDocument(_url);
}
}
@@ -506,13 +506,13 @@
{
RK_TRACE (APP);
/* QString filename = _cfg->readEntry("filename", "");
- KURL url(filename);
+ KUrl url(filename);
bool modified = _cfg->readBoolEntry("modified", false);
if(modified)
{
bool canRecover;
QString tempname = kapp->checkRecoverFile(filename, canRecover);
- KURL _url(tempname);
+ KUrl _url(tempname);
if(canRecover)
{
@@ -536,7 +536,7 @@
slotSetStatusBarText (i18n ("Exiting..."));
saveOptions ();
if (RKSettingsModuleGeneral::workplaceSaveMode () == RKSettingsModuleGeneral::SaveWorkplaceWithSession) {
- RKSettingsModuleGeneral::setSavedWorkplace (RKWorkplace::mainWorkplace ()->makeWorkplaceDescription ("\n", false), kapp->config ());
+ RKSettingsModuleGeneral::setSavedWorkplace (RKWorkplace::mainWorkplace ()->makeWorkplaceDescription ("\n", false), KGlobal::config ());
}
// if (!RObjectList::getGlobalEnv ()->isEmpty ()) {
@@ -577,15 +577,15 @@
}
-void RKWardMainWindow::fileOpenNoSave (const KURL &url) {
+void RKWardMainWindow::fileOpenNoSave (const KUrl &url) {
RK_TRACE (APP);
slotCloseAllEditors ();
slotSetStatusBarText(i18n("Opening workspace..."));
- KURL lurl = url;
+ KUrl lurl = url;
if (lurl.isEmpty ()) {
- lurl = KFileDialog::getOpenURL (":<rfiles>", i18n("*|All files"), this, i18n("Open File..."));
+ lurl = KFileDialog::getOpenUrl (":<rfiles>", i18n("*|All files"), this, i18n("Open File..."));
}
if (!lurl.isEmpty ()) {
openWorkspace (lurl);
@@ -593,7 +593,7 @@
slotSetStatusReady ();
}
-void RKWardMainWindow::fileOpenAskSave (const KURL &url) {
+void RKWardMainWindow::fileOpenAskSave (const KUrl &url) {
RK_TRACE (APP);
if (RObjectList::getObjectList ()->isEmpty ()) {
fileOpenNoSave (url);
@@ -615,7 +615,7 @@
fileOpenAskSave (QString::null);
}
-void RKWardMainWindow::slotFileOpenRecentWorkspace(const KURL& url)
+void RKWardMainWindow::slotFileOpenRecentWorkspace(const KUrl& url)
{
RK_TRACE (APP);
fileOpenAskSave (url);
@@ -704,23 +704,23 @@
void RKWardMainWindow::slotNewCommandEditor () {
RK_TRACE (APP);
- slotOpenCommandEditor (KURL ());
+ slotOpenCommandEditor (KUrl ());
}
-void RKWardMainWindow::slotOpenCommandEditor (const KURL &url) {
+void RKWardMainWindow::slotOpenCommandEditor (const KUrl &url) {
RK_TRACE (APP);
if (RKWorkplace::mainWorkplace ()->openScriptEditor (url)) {
- if (!url.isEmpty ()) fileOpenRecent->addURL (url);
+ if (!url.isEmpty ()) fileOpenRecent->addUrl (url);
}
};
void RKWardMainWindow::slotOpenCommandEditor () {
RK_TRACE (APP);
- KURL::List urls;
- KURL::List::const_iterator it;
+ KUrl::List urls;
+ KUrl::List::const_iterator it;
- urls = KFileDialog::getOpenURLs (":<rfiles>", "*.R *.r *.S *.s *.q|R Script Files (*.R *.r *.S *.s *.q)\n*.*|All Files (*.*)", this, i18n ("Open command file(s)"));
+ urls = KFileDialog::getOpenUrls (":<rfiles>", "*.R *.r *.S *.s *.q|R Script Files (*.R *.r *.S *.s *.q)\n*.*|All Files (*.*)", this, i18n ("Open command file(s)"));
for (it = urls.begin() ; it != urls.end() ; ++it) {
slotOpenCommandEditor (*it);
@@ -733,7 +733,7 @@
closeWindow (window);
}
-void RKWardMainWindow::openHTML (const KURL &url) {
+void RKWardMainWindow::openHTML (const KUrl &url) {
RK_TRACE (APP);
RKWorkplace::mainWorkplace ()->openHelpWindow (url);
@@ -748,7 +748,7 @@
RK_TRACE (APP);
QString wcaption = RObjectList::getObjectList ()->getWorkspaceURL ().fileName ();
- if (wcaption.isEmpty ()) wcaption = RObjectList::getObjectList ()->getWorkspaceURL ().prettyURL ();
+ if (wcaption.isEmpty ()) wcaption = RObjectList::getObjectList ()->getWorkspaceURL ().prettyUrl ();
if (wcaption.isEmpty ()) wcaption = i18n ("[Unnamed Workspace]");
RKMDIWindow *window = RKWorkplace::mainWorkplace ()->activeWindow (RKMDIWindow::Attached);
if (window) wcaption.append (" - " + window->fullCaption ());
Modified: branches/KDE4_port/rkward/rkward.h
===================================================================
--- branches/KDE4_port/rkward/rkward.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/rkward.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -40,8 +40,8 @@
// include files for Qt
// include files for KDE
-#include <kapp.h>
-#include <kmdimainfrm.h>
+#include <kapplication.h>
+#include <k3mdimainfrm.h>
#include <kaccel.h>
#include <kaction.h>
#include <kurl.h>
@@ -64,7 +64,7 @@
class RKTopLevelWindowGUI;
struct RKWardStartupOptions {
- KURL *initial_url; /**< The workspace file to load on startup. If 0, show a dialog asking what to do. **/
+ KUrl *initial_url; /**< The workspace file to load on startup. If 0, show a dialog asking what to do. **/
bool no_stack_check; /**< Disable R C stack checking */
};
@@ -84,13 +84,13 @@
void startR ();
/** open a workspace. Do not ask whether to save the old one. The old workspace is deleted! */
- void fileOpenNoSave (const KURL &url);
+ void fileOpenNoSave (const KUrl &url);
/** open a workspace. If the current workspace is not empty, ask wether to save first. */
- void fileOpenAskSave (const KURL &url);
+ void fileOpenAskSave (const KUrl &url);
/** opens the given url, assuming it is an HTML-help page. Like openHTML (), but with a QString parameter instead for DCOP. Generally you should use openHTML () instead. */
void openHTMLHelp (const QString &url);
/** opens the given url, assuming it is an HTML-help page. */
- void openHTML (const KURL &url);
+ void openHTML (const KUrl &url);
KParts::PartManager *partManager () { return part_manager; };
@@ -102,7 +102,7 @@
/** (try to) close all windows, and ask whether it is ok to quit */
bool doQueryQuit ();
protected:
- void openWorkspace (const KURL &url);
+ void openWorkspace (const KUrl &url);
/** save Options/Settings. Includes general Options like all bar positions and status as well as the geometry and the recent file list */
void saveOptions();
/** read general Options again and initialize all variables like the recent file list */
@@ -138,7 +138,7 @@
/** open a file and load it into the document*/
void slotFileOpenWorkspace();
/** opens a file from the recent files menu */
- void slotFileOpenRecentWorkspace(const KURL& url);
+ void slotFileOpenRecentWorkspace(const KUrl& url);
/** save a document */
void slotFileSaveWorkspace();
/** save a document by a new filename*/
@@ -167,7 +167,7 @@
/** open a new command editor (ask for file to open) */
void slotOpenCommandEditor ();
/** open a new command editor (load given url) */
- void slotOpenCommandEditor (const KURL &url);
+ void slotOpenCommandEditor (const KUrl &url);
/** a child window has received a close event. Check, whether data needs to be saved. Ask if necessary. Close only if safe. */
void slotChildWindowCloseRequest (KMdiChildView * window);
Modified: branches/KDE4_port/rkward/rkwardapplication.cpp
===================================================================
--- branches/KDE4_port/rkward/rkwardapplication.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/rkwardapplication.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -20,7 +20,7 @@
#include <X11/X.h>
#include <X11/Xlib.h>
-#include <kwin.h>
+#include <kwindowsystem.h>
#include <netwm_def.h>
#include "debug.h"
@@ -95,7 +95,7 @@
if (detect_x11_creations) {
if (e->type == CreateNotify) {
if (e->xcreatewindow.parent == qt_xrootwin ()) {
- KWin::WindowInfo info = KWin::windowInfo (e->xcreatewindow.window);
+ KWindowSystem::WindowInfo info = KWindowSystem::windowInfo (e->xcreatewindow.window);
if ((info.windowType (0xFFFF) != 0) && (!info.name ().isEmpty ())) {
RK_ASSERT (!created_window);
created_window = e->xcreatewindow.window;
@@ -110,7 +110,7 @@
if (e->type == PropertyNotify) {
if (e->xproperty.atom == wm_name_property) {
if (name_watchers_list.contains (e->xproperty.window)) {
- KWin::WindowInfo wininfo = KWin::windowInfo (e->xproperty.window);
+ KWindowSystem::WindowInfo wininfo = KWindowSystem::windowInfo (e->xproperty.window);
name_watchers_list[e->xproperty.window]->setCaption (wininfo.name ());
return true;
}
Modified: branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp
===================================================================
--- branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -64,18 +64,18 @@
return false;
}
- php_process = new KProcess ();
+ php_process = new K3Process ();
*php_process << RKSettingsModulePHP::phpBin();
*php_process << "-c" << php_ini; // set correct options
*php_process << common_php;
// we have to be connected at all times! Otherwise the connection will be gone for good.
- //connect (php_process, SIGNAL (receivedStderr (KProcess *, char*, int)), this, SLOT (gotError (KProcess *, char*, int)));
- connect (php_process, SIGNAL (wroteStdin (KProcess *)), this, SLOT (doneWriting (KProcess* )));
- connect (php_process, SIGNAL (receivedStdout (KProcess *, char*, int)), this, SLOT (gotOutput (KProcess *, char*, int)));
- connect (php_process, SIGNAL (processExited (KProcess *)), this, SLOT (processDied (KProcess*)));
+ //connect (php_process, SIGNAL (receivedStderr (K3Process *, char*, int)), this, SLOT (gotError (K3Process *, char*, int)));
+ connect (php_process, SIGNAL (wroteStdin (K3Process *)), this, SLOT (doneWriting (K3Process* )));
+ connect (php_process, SIGNAL (receivedStdout (K3Process *, char*, int)), this, SLOT (gotOutput (K3Process *, char*, int)));
+ connect (php_process, SIGNAL (processExited (K3Process *)), this, SLOT (processDied (K3Process*)));
- if (!php_process->start (KProcess::NotifyOnExit, KProcess::All)) {
+ if (!php_process->start (K3Process::NotifyOnExit, K3Process::All)) {
KMessageBox::error (0, i18n ("The PHP backend could not be started. Check whether you have correctly configured the location of the PHP-binary (Settings->Configure Settings->PHP backend)"), i18n ("PHP-Error"));
emit (haveError ());
return false;
@@ -151,7 +151,7 @@
}
}
-void PHPBackend::doneWriting (KProcess *) {
+void PHPBackend::doneWriting (K3Process *) {
RK_TRACE (PHP);
busy_writing = false;
@@ -160,7 +160,7 @@
tryNextFunction ();
}
-void PHPBackend::gotOutput (KProcess *, char* buf, int) {
+void PHPBackend::gotOutput (K3Process *, char* buf, int) {
RK_TRACE (PHP);
RK_DO (qDebug ("PHP transmission:\n%s", buf), PHP, DL_DEBUG);
@@ -234,7 +234,7 @@
}
}
-void PHPBackend::processDied (KProcess *) {
+void PHPBackend::processDied (K3Process *) {
RK_TRACE (PHP);
if (php_process) { // if the php_process is already 0, this means, we have caught an error message before the process died, have already shown a message, emitted haveError(), and called destroy()
Modified: branches/KDE4_port/rkward/scriptbackends/phpbackend.h
===================================================================
--- branches/KDE4_port/rkward/scriptbackends/phpbackend.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/scriptbackends/phpbackend.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -21,7 +21,7 @@
#include <qstring.h>
#include <qobject.h>
-#include <kprocess.h>
+#include <k3process.h>
#include <qstringlist.h>
#include <q3valuelist.h>
#include <ktempfile.h>
@@ -49,14 +49,14 @@
void preview (int flags) { callFunction ("getPreview ();", flags, Preview); };
void writeData (const QString &data);
public slots:
- void gotOutput (KProcess *proc, char* buf, int len);
- //void gotError (KProcess *proc, char* buf, int len);
- void processDied (KProcess *proc);
- void doneWriting (KProcess *proc);
+ void gotOutput (K3Process *proc, char* buf, int len);
+ //void gotError (K3Process *proc, char* buf, int len);
+ void processDied (K3Process *proc);
+ void doneWriting (K3Process *proc);
private:
void tryNextFunction ();
void tryWriteData ();
- KProcess *php_process;
+ K3Process *php_process;
/// The string singalling the end of transmission to/from PHP. TODO: make static
QString eot_string;
/// The string singalling the end of request from PHP. TODO: make static
Modified: branches/KDE4_port/rkward/settings/rksettings.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettings.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/settings/rksettings.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -23,6 +23,7 @@
#include <klocale.h>
#include <kapplication.h>
+#include <kglobal.h>
#include "../windows/rkworkplace.h"
@@ -151,7 +152,7 @@
for (it = modules.constBegin (); it != modules.constEnd (); ++it) {
if ((*it)->hasChanges ()) {
(*it)->applyChanges ();
- (*it)->save (kapp->config ());
+ (*it)->save (KGlobal::config ());
}
}
enableButtonApply (false);
Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleconsole.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -26,6 +26,7 @@
#include <qlabel.h>
//Added by qt3to4:
#include <Q3VBoxLayout>
+#include <kglobal.h>
#include "../rbackend/rcommand.h"
#include "../rkglobals.h"
@@ -134,7 +135,7 @@
QStringList RKSettingsModuleConsole::loadCommandHistory () {
RK_TRACE (SETTINGS);
- KConfig *config = kapp->config ();
+ KConfig *config = KGlobal::config ();
config->setGroup ("Console Settings");
return config->readListEntry ("history");
}
@@ -143,7 +144,7 @@
void RKSettingsModuleConsole::saveCommandHistory (const QStringList &list) {
RK_TRACE (SETTINGS);
- KConfig *config = kapp->config ();
+ KConfig *config = KGlobal::config ();
config->setGroup ("Console Settings");
if (save_history) {
config->writeEntry ("history", list);
Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -148,7 +148,7 @@
bool fix=false;
for (QStringList::const_iterator it = plugin_maps.constBegin (); it != plugin_maps.constEnd (); ++it) {
if ((*it).contains ("standard_plugins.pluginmap")) {
- fix = (KMessageBox::questionYesNo (0, i18n ("You appear to have an old configuration for the plugin-paths. The default configuration was changed between rkward 0.3.4 and rkward 0.3.5. Should the configuration be set to the new default (recommended)?"), i18n ("Configuration change"), KStdGuiItem::yes (), KStdGuiItem::no (), "pluginmap_upgrade") == KMessageBox::Yes);
+ fix = (KMessageBox::questionYesNo (0, i18n ("You appear to have an old configuration for the plugin-paths. The default configuration was changed between rkward 0.3.4 and rkward 0.3.5. Should the configuration be set to the new default (recommended)?"), i18n ("Configuration change"), KStandardGuiItem::yes (), KStandardGuiItem::no (), "pluginmap_upgrade") == KMessageBox::Yes);
}
}
if (fix) {
Modified: branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -18,7 +18,7 @@
#include "detachedwindowcontainer.h"
#include <klocale.h>
-#include <kstdaction.h>
+#include <kstandardaction.h>
#include <kstatusbar.h>
#include <qlayout.h>
@@ -39,7 +39,7 @@
setHelpMenuEnabled (false);
// create own GUI
setXMLFile ("detachedwindowcontainer.rc");
- KStdAction::close (this, SLOT (close ()), actionCollection (), "dwindow_close");
+ KStandardAction::close (this, SLOT (close ()), actionCollection (), "dwindow_close");
new KAction (i18n ("Attach to main window"), 0, this, SLOT (slotReattach ()), actionCollection (), "dwindow_attach");
RKTopLevelWindowGUI *toplevel_actions = new RKTopLevelWindowGUI (this);
insertChildClient (toplevel_actions);
Modified: branches/KDE4_port/rkward/windows/qxembedcopy.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -688,8 +688,8 @@
// However, QXEmbedCopy currently doesn't provide support for this detection,
// so for the time being, it's better to leave the window mapped as toplevel window.
// This will be ever more complicated with the systray windows, as the simple API
-// for them (KWin::setSystemTrayWindowFor()) doesn't make it possible to detect
-// themselves they have been released from systray, but KWin requires them
+// for them (KWindowSystem::setSystemTrayWindowFor()) doesn't make it possible to detect
+// themselves they have been released from systray, but KWindowSystem requires them
// to be visible to allow next Kicker instance to swallow them.
// See also below the L1022 comment.
// XUnmapWindow( qt_xdisplay(), window );
@@ -964,7 +964,7 @@
// See doc in qxembed.h.
void QXEmbedCopy::embed(WId w)
{
- kdDebug() << "*** Embed " << w << " into " << winId() << ". window=" << window << endl;
+ kDebug() << "*** Embed " << w << " into " << winId() << ". window=" << window << endl;
if (!w)
return;
// L1701: The has_window variable prevents embedding a same window twice.
@@ -998,11 +998,11 @@
Window parent = 0;
get_parent(w, &parent);
if (parent != qt_xrootwin()) { // this if added to original QXEmbed
- kdDebug() << QString(" failure to withdraw window") << endl;
+ kDebug() << QString(" failure to withdraw window") << endl;
window = 0;
return;
}
- kdDebug() << QString("> before reparent: parent=0x%1").arg(parent,0,16) << endl;
+ kDebug() << QString("> before reparent: parent=0x%1").arg(parent,0,16) << endl;
for (int i = 0; i < 50; i++) {
// this is done once more when finishing embedding, but it's done also here
// just in case we crash before reaching that place
@@ -1010,13 +1010,13 @@
XAddToSaveSet( qt_xdisplay(), w );
XReparentWindow(qt_xdisplay(), w, winId(), 0, 0);
if (get_parent(w, &parent) && parent == winId()) {
- kdDebug() << QString("> Loop %1: ").arg(i)
+ kDebug() << QString("> Loop %1: ").arg(i)
<< QString("> reparent of 0x%1").arg(w,0,16)
<< QString(" into 0x%1").arg(winId(),0,16)
<< QString(" successful") << endl;
break;
}
- kdDebug() << QString("> Loop %1: ").arg(i)
+ kDebug() << QString("> Loop %1: ").arg(i)
<< QString("> reparent of 0x%1").arg(w,0,16)
<< QString(" into 0x%1").arg(winId(),0,16)
<< QString(" failed") << endl;
Modified: branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -50,7 +50,7 @@
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kaction.h>
-#include <kstdaction.h>
+#include <kstandardaction.h>
#include <kaccel.h>
#include <klibloader.h>
#include <kiconloader.h>
@@ -189,7 +189,7 @@
m_doc->setReadWrite (!ro);
}
-bool RKCommandEditorWindow::openURL (const KURL &url, bool use_r_highlighting, bool read_only){
+bool RKCommandEditorWindow::openURL (const KUrl &url, bool use_r_highlighting, bool read_only){
RK_TRACE (COMMANDEDITOR);
if (m_doc->openURL (url)){
if (use_r_highlighting) setRHighlighting ();
@@ -202,7 +202,7 @@
return false;
}
-KURL RKCommandEditorWindow::url () {
+KUrl RKCommandEditorWindow::url () {
RK_TRACE (COMMANDEDITOR);
return (m_doc->url ());
@@ -227,7 +227,7 @@
void RKCommandEditorWindow::updateCaption () {
RK_TRACE (COMMANDEDITOR);
QString name = m_doc->url ().fileName ();
- if (name.isEmpty ()) name = m_doc->url ().prettyURL ();
+ if (name.isEmpty ()) name = m_doc->url ().prettyUrl ();
if (name.isEmpty ()) name = i18n ("Unnamed");
if (isModified ()) name.append (i18n (" [modified]"));
Modified: branches/KDE4_port/rkward/windows/rkcommandeditorwindow.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandeditorwindow.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkcommandeditorwindow.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -92,7 +92,7 @@
/** open given URL.
@param use_r_highlighting Initialize the view to use R syntax highlighting. Use, if you're going to edit an R syntax file
@param read_only Open the file in read-only mode */
- bool openURL (const KURL &url, bool use_r_highlighting=true, bool read_only=false);
+ bool openURL (const KUrl &url, bool use_r_highlighting=true, bool read_only=false);
/** returns, whether the document was modified since the last save */
bool isModified ();
/** insert the given text into the document at the current cursor position. Additionally, focuses the view */
@@ -110,7 +110,7 @@
void setReadOnly (bool ro);
/** Return current url */
- KURL url ();
+ KUrl url ();
bool provideContext (unsigned int line_rev, QString *context, int *cursor_position);
public slots:
Modified: branches/KDE4_port/rkward/windows/rkcommandlog.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandlog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkcommandlog.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -37,7 +37,7 @@
#include <QEvent>
#include <klocale.h>
-#include <kstdaction.h>
+#include <kstandardaction.h>
#include "../debug.h"
@@ -284,9 +284,9 @@
setXMLFile ("rkcommandlogpart.rc");
- copy = KStdAction::copy (log->getView (), SLOT (copy ()), actionCollection (), "log_copy");
- KStdAction::clear (log, SLOT (clearLog ()), actionCollection (), "log_clear");
- KStdAction::selectAll (log->getView (), SLOT (selectAll ()), actionCollection (), "log_select_all");
+ copy = KStandardAction::copy (log->getView (), SLOT (copy ()), actionCollection (), "log_copy");
+ KStandardAction::clear (log, SLOT (clearLog ()), actionCollection (), "log_clear");
+ KStandardAction::selectAll (log->getView (), SLOT (selectAll ()), actionCollection (), "log_select_all");
new KAction (i18n ("Configure"), 0, log, SLOT (configureLog ()), actionCollection (), "log_configure");
run_selection = new KAction (i18n ("Run selection"), QIcon (RKCommonFunctions::getRKWardDataDir () + "icons/run_selection.png"), KShortcut ("F8"), log, SLOT (runSelection ()), actionCollection (), "log_run_selection");
Modified: branches/KDE4_port/rkward/windows/rkcommandlog.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandlog.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkcommandlog.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -22,7 +22,7 @@
#include <q3textedit.h>
//Added by qt3to4:
#include <QEvent>
-#include <kmdichildview.h>
+#include <k3mdichildview.h>
#include "rkmdiwindow.h"
#include "../rbackend/rcommandreceiver.h"
Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -86,14 +86,14 @@
KToolBar *toolbar = new KToolBar (this);
toolbar->setIconSize (16);
- urlbox = new KURLComboBox (KURLComboBox::Directories, true, this);
- KURLCompletion* cmpl = new KURLCompletion (KURLCompletion::DirCompletion);
+ urlbox = new KUrlComboBox (KUrlComboBox::Directories, true, this);
+ KUrlCompletion* cmpl = new KUrlCompletion (KUrlCompletion::DirCompletion);
urlbox->setCompletionObject (cmpl);
urlbox->setAutoDeleteCompletionObject (true);
urlbox->setSizePolicy (QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed));
urlbox->listBox ()->installEventFilter (this);
- dir = new KDirOperator (KURL (), this);
+ dir = new KDirOperator (KUrl (), this);
dir->setView(KFile::Simple);
dir->setPreviewWidget (0);
@@ -104,9 +104,9 @@
dir->actionCollection ()->action ("short view")->plug (toolbar);
dir->actionCollection ()->action ("detailed view")->plug (toolbar);
- connect (dir, SIGNAL (urlEntered (const KURL &)), this, SLOT (urlChangedInView (const KURL &)));
+ connect (dir, SIGNAL (urlEntered (const KUrl &)), this, SLOT (urlChangedInView (const KUrl &)));
connect (urlbox, SIGNAL (returnPressed (const QString &)), this, SLOT (urlChangedInCombo (const QString &)));
- connect (urlbox, SIGNAL (urlActivated (const KURL&)), this, SLOT (urlChangedInCombo (const KURL&)));
+ connect (urlbox, SIGNAL (urlActivated (const KUrl&)), this, SLOT (urlChangedInCombo (const KUrl&)));
connect (dir, SIGNAL (fileSelected (const KFileItem*)), this, SLOT (fileActivated (const KFileItem*)));
@@ -124,7 +124,7 @@
dir->setURL (url, true);
}
-void RKFileBrowserWidget::urlChangedInView (const KURL &url) {
+void RKFileBrowserWidget::urlChangedInView (const KUrl &url) {
RK_TRACE (APP);
urlbox->setURL (url);
@@ -136,7 +136,7 @@
dir->setURL (url, true);
}
-void RKFileBrowserWidget::urlChangedInCombo (const KURL &url) {
+void RKFileBrowserWidget::urlChangedInCombo (const KUrl &url) {
RK_TRACE (APP);
dir->setURL (url, true);
Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -26,7 +26,7 @@
class KDirOperator;
class RKFileBrowserWidget;
-class KURLComboBox;
+class KUrlComboBox;
class KFileItem;
/** The file browser (tool) window. In order to save some startup time, the file browser is not really created until it is first shown. Hence, this is mostly just a wrapper around RKFileBrowserWidget */
@@ -60,13 +60,13 @@
bool eventFilter (QObject *watched, QEvent *e);
void setURL (const QString &url);
public slots:
- void urlChangedInView (const KURL &url);
+ void urlChangedInView (const KUrl &url);
void urlChangedInCombo (const QString &url);
- void urlChangedInCombo (const KURL &url);
+ void urlChangedInCombo (const KUrl &url);
void fileActivated (const KFileItem *item);
private:
KDirOperator *dir;
- KURLComboBox *urlbox;
+ KUrlComboBox *urlbox;
};
#endif
Modified: branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkhelpsearchwindow.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -197,7 +197,7 @@
void RKHelpSearchWindow::rCommandDone (RCommand *command) {
RK_TRACE (APP);
- KURL url;
+ KUrl url;
if (command->getFlags () == HELP_SEARCH) {
resultsList->clear ();
RK_ASSERT ((command->getDataLength () % 3) == 0);
Modified: branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -60,7 +60,7 @@
pLayout->addWidget (khtmlpart->widget ());
// We have to connect this in order to allow browsing.
- connect (khtmlpart->browserExtension (), SIGNAL (openURLRequestDelayed (const KURL &, const KParts::URLArgs &)), this, SLOT (slotOpenURLRequest (const KURL &, const KParts::URLArgs &)));
+ connect (khtmlpart->browserExtension (), SIGNAL (openURLRequestDelayed (const KUrl &, const KParts::URLArgs &)), this, SLOT (slotOpenURLRequest (const KUrl &, const KParts::URLArgs &)));
connect (khtmlpart, SIGNAL (completed ()), this, SLOT (loadDone ()));
url_history.setAutoDelete (true);
@@ -90,7 +90,7 @@
RK_TRACE (APP);
// enable copy
- KStdAction::copy (khtmlpart->browserExtension (), SLOT (copy ()), action_collection, "copy");
+ KStandardAction::copy (khtmlpart->browserExtension (), SLOT (copy ()), action_collection, "copy");
// run selection
run_selection = new KAction (i18n ("Run selection"), QIcon (RKCommonFunctions::getRKWardDataDir () + "icons/run_selection.png"), KShortcut ("F8"), this, SLOT (runSelection ()), action_collection, "run_selection");
@@ -162,12 +162,12 @@
url_change_is_from_history = false;
}
-bool RKHTMLWindow::openURL (const KURL &url) {
+bool RKHTMLWindow::openURL (const KUrl &url) {
RK_TRACE (APP);
// asyncrhonously dealing with non-local files would be quite a task. We chose the simple answer instead...
if (!url.isLocalFile ()) {
- if (KMessageBox::questionYesNo (this, i18n ("The url you are trying to open ('%1') is not a local file. Do you want to open the url in the default application?").arg (url.prettyURL ()), i18n ("Open in default application?")) != KMessageBox::Yes) {
+ if (KMessageBox::questionYesNo (this, i18n ("The url you are trying to open ('%1') is not a local file. Do you want to open the url in the default application?").arg (url.prettyUrl ()), i18n ("Open in default application?")) != KMessageBox::Yes) {
return false;
}
KRun *runner = new KRun (url); // according to KRun-documentation, KRun will self-destruct when done.
@@ -181,25 +181,25 @@
return true;
}
-KURL RKHTMLWindow::url () {
+KUrl RKHTMLWindow::url () {
if (khtmlpart) {
return khtmlpart->url ();
} else {
RK_ASSERT (false);
- return KURL ();
+ return KUrl ();
}
}
-void RKHTMLWindow::changeURL (const KURL &url) {
+void RKHTMLWindow::changeURL (const KUrl &url) {
updateCaption (url);
if (!url_change_is_from_history) {
if (back && forward) {
- KURL *current_url = url_history.current ();
+ KUrl *current_url = url_history.current ();
while (current_url != url_history.getLast ()) {
url_history.removeLast ();
}
- KURL *url_copy = new KURL (url);
+ KUrl *url_copy = new KUrl (url);
url_history.append (url_copy);
back->setEnabled (url_history.count () > 1);
forward->setEnabled (false);
@@ -207,12 +207,12 @@
}
}
-void RKHTMLWindow::updateCaption (const KURL &url) {
+void RKHTMLWindow::updateCaption (const KUrl &url) {
RK_TRACE (APP);
setCaption (url.filename ());
}
-void RKHTMLWindow::slotOpenURLRequest(const KURL &url, const KParts::URLArgs & ) {
+void RKHTMLWindow::slotOpenURLRequest(const KUrl &url, const KParts::URLArgs & ) {
RK_TRACE (APP);
openURL (url);
}
@@ -251,7 +251,7 @@
outputFlush = new KAction (i18n ("&Flush Output"), "editdelete", 0, this, SLOT (flushOutput ()), actionCollection (), "output_flush");
outputRefresh = new KAction (i18n ("&Refresh Output"), "reload", 0, this, SLOT (refreshOutput ()), actionCollection (), "output_refresh");
- print = KStdAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_output");
+ print = KStandardAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_output");
print->setText (i18n ("Print Output"));
addCommonActions (actionCollection ());
@@ -284,7 +284,7 @@
return ("output:" + output_url.url ());
}
-bool RKOutputWindow::openURL (const KURL &url) {
+bool RKOutputWindow::openURL (const KUrl &url) {
RK_TRACE (APP);
output_url = url;
@@ -300,7 +300,7 @@
return ok;
}
-void RKOutputWindow::updateCaption (const KURL &) {
+void RKOutputWindow::updateCaption (const KUrl &) {
}
void RKOutputWindow::refresh () {
@@ -339,7 +339,7 @@
if (!current_output) {
current_output = new RKOutputWindow (RKWorkplace::mainWorkplace ()->view ());
- KURL url (RKSettingsModuleGeneral::filesPath () + "/rk_out.html");
+ KUrl url (RKSettingsModuleGeneral::filesPath () + "/rk_out.html");
current_output->openURL (url);
}
@@ -387,11 +387,11 @@
// strip down the khtmlpart's GUI. remove some stuff we definitely don't need.
RKCommonFunctions::removeContainers (khtmlpart, QStringList::split (',', "tools,security,extraToolBar,saveBackground,saveDocument,saveFrame,printFrame,kget_menu"), true);
- back = KStdAction::back (this, SLOT (slotBack ()), actionCollection (), "help_back");
+ back = KStandardAction::back (this, SLOT (slotBack ()), actionCollection (), "help_back");
back->setEnabled (false);
- forward = KStdAction::forward (this, SLOT (slotForward ()), actionCollection (), "help_forward");
+ forward = KStandardAction::forward (this, SLOT (slotForward ()), actionCollection (), "help_forward");
forward->setEnabled (false);
- print = KStdAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_help");
+ print = KStandardAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_help");
print->setText (i18n ("Print Help"));
addCommonActions (actionCollection ());
@@ -411,7 +411,7 @@
khtmlpart = 0; // in case we try to redelete in a parent class
}
-bool RKHelpWindow::openURL (const KURL &url) {
+bool RKHelpWindow::openURL (const KUrl &url) {
RK_TRACE (APP);
bool ok = true;
@@ -439,7 +439,7 @@
}
}
-bool RKHelpWindow::renderRKHelp (const KURL &url) {
+bool RKHelpWindow::renderRKHelp (const KUrl &url) {
RK_TRACE (APP);
if (url.protocol () != "rkward") {
@@ -502,7 +502,7 @@
XMLChildList src_elements = help_xml->findElementsWithAttribute (help_doc_element, "src", QString (), true, DL_DEBUG);
for (XMLChildList::iterator it = src_elements.begin (); it != src_elements.end (); ++it) {
QString src = (*it).attribute ("src");
- if (KURL::isRelativeURL (src)) {
+ if (KUrl::isRelativeUrl (src)) {
src = "file://" + QDir::cleanPath (base_path.filePath (src));
(*it).setAttribute ("src", src);
}
@@ -574,7 +574,7 @@
}
// create a navigation bar
- KURL url_copy = url;
+ KUrl url_copy = url;
QString navigation;
QStringList::const_iterator names_it = anchornames.constBegin ();
for (QStringList::const_iterator it = anchors.constBegin (); it != anchors.constEnd (); ++it) {
@@ -640,7 +640,7 @@
link_element->setTagName ("a");
if (link_element->text ().isEmpty ()) {
QString text;
- KURL url = link_element->attribute ("href");
+ KUrl url = link_element->attribute ("href");
if (url.protocol () == "rkward") {
if (url.host () == "component") {
RKComponentHandle *chandle = componentPathToHandle (url.path ());
Modified: branches/KDE4_port/rkward/windows/rkhtmlwindow.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkhtmlwindow.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkhtmlwindow.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -20,7 +20,7 @@
#include <kurl.h>
#include <kparts/browserextension.h>
-#include <kmdichildview.h>
+#include <k3mdichildview.h>
#include <kxmlguiclient.h>
#include <q3ptrlist.h>
@@ -49,7 +49,7 @@
virtual ~RKHTMLWindow ();
public:
/** open given URL. Returns false, if the URL is not an existing local file. Loading a non-local URL may succeed, even if this returns false! */
- virtual bool openURL (const KURL &url);
+ virtual bool openURL (const KUrl &url);
/** Reload current page.*/
virtual void refresh ();
/** Add common actions to the given action collection (currently only "copy")
@@ -59,11 +59,11 @@
QString getDescription ();
bool isModified ();
/** Return current url */
- KURL url ();
+ KUrl url ();
void doGotoAnchor (const QString &anchor_name);
public slots:
/** this is used for browsing only. Use openURL instead, when calling from outside. */
- void slotOpenURLRequest (const KURL &url, const KParts::URLArgs &);
+ void slotOpenURLRequest (const KUrl &url, const KParts::URLArgs &);
void slotPrint ();
void slotForward ();
void slotBack ();
@@ -79,11 +79,11 @@
/** the KHTMLPart doing all the real work */
KHTMLPart * khtmlpart;
/** update caption according to given URL */
- virtual void updateCaption (const KURL &url);
+ virtual void updateCaption (const KUrl &url);
/** called from openURL. Takes care of updating caption, and updating back/forward actions, if available */
- void changeURL (const KURL &url);
+ void changeURL (const KUrl &url);
protected:
- Q3PtrList<KURL> url_history;
+ Q3PtrList<KUrl> url_history;
KAction *back;
KAction *forward;
KAction *print;
@@ -109,7 +109,7 @@
~RKOutputWindow ();
/** reimplemented to show "output is empty" message, if file could not be opened */
- bool openURL (const KURL &url);
+ bool openURL (const KUrl &url);
/** reimplemented to scroll to the bottom of the page */
void refresh ();
/** refresh output window.
@@ -130,7 +130,7 @@
void refreshOutput ();
protected:
/** reimplemented to never change the caption (it's always "Output") */
- void updateCaption (const KURL &url);
+ void updateCaption (const KUrl &url);
private:
/** print a message "Output is empty" to the output window. Used internally, if loading output fails*/
void showOutputEmptyMessage ();
@@ -140,7 +140,7 @@
static RKOutputWindow* current_output;
/** In case the output is empty (i.e. output file does not exist), we need to store, where the output *would* be, if it existed, so we can properly refresh the output */
- KURL output_url;
+ KUrl output_url;
static QDateTime last_refresh_time;
};
@@ -165,9 +165,9 @@
/** destructor */
~RKHelpWindow ();
/** reimplemented to handle our special protocols component://, rhelp://, and rkhelp:// in addition to the regular protocols */
- bool openURL (const KURL &url);
+ bool openURL (const KUrl &url);
private:
- bool renderRKHelp (const KURL &url);
+ bool renderRKHelp (const KUrl &url);
QString renderHelpFragment (QDomElement &fragment);
void prepareHelpLink (QDomElement *link_element);
RKComponentHandle *componentPathToHandle (QString path);
Modified: branches/KDE4_port/rkward/windows/rkmdiwindow.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkmdiwindow.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkmdiwindow.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -25,7 +25,7 @@
#include <QPaintEvent>
#include <kparts/part.h>
-#include <kmdimainfrm.h>
+#include <k3mdimainfrm.h>
class RKWorkplace;
Modified: branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -19,7 +19,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kaboutapplication.h>
+#include <k3aboutapplication.h>
#include "../rkconsole.h"
#include "../robjectbrowser.h"
@@ -47,12 +47,12 @@
// help menu
KAction *help_invoke_r_help = new KAction (i18n ("Help on R"), 0, 0, this, SLOT (invokeRHelp ()), actionCollection(), "invoke_r_help");
KAction *show_help_search = new KAction (i18n ("Search R Help"), 0, 0, this, SLOT (showHelpSearch ()), actionCollection(), "show_help_search");
- KAction *show_rkward_help = KStdAction::helpContents (this, SLOT (showRKWardHelp ()), actionCollection(), "rkward_help");
+ KAction *show_rkward_help = KStandardAction::helpContents (this, SLOT (showRKWardHelp ()), actionCollection(), "rkward_help");
show_rkward_help->setText (i18n ("Help on RKWard"));
- KStdAction::aboutApp (this, SLOT (showAboutApplication ()), actionCollection(), "about_app");
- KStdAction::whatsThis (for_window, SLOT (whatsThis ()), actionCollection(), "whats_this");
- KStdAction::reportBug (this, SLOT (reportRKWardBug ()), actionCollection(), "report_bug");
+ KStandardAction::aboutApp (this, SLOT (showAboutApplication ()), actionCollection(), "about_app");
+ KStandardAction::whatsThis (for_window, SLOT (whatsThis ()), actionCollection(), "whats_this");
+ KStandardAction::reportBug (this, SLOT (reportRKWardBug ()), actionCollection(), "report_bug");
help_invoke_r_help->setStatusText (i18n ("Shows the R help index"));
show_help_search->setStatusText (i18n ("Shows/raises the R Help Search window"));
@@ -94,7 +94,7 @@
void RKTopLevelWindowGUI::showAboutApplication () {
RK_TRACE (APP);
- KAboutApplication *about = new KAboutApplication ();
+ K3AboutApplication *about = new K3AboutApplication ();
about->exec ();
delete about;
}
@@ -169,7 +169,7 @@
void RKTopLevelWindowGUI::slotOutputShow () {
RK_TRACE (APP);
- RKWorkplace::mainWorkplace ()->openOutputWindow (KURL ());
+ RKWorkplace::mainWorkplace ()->openOutputWindow (KUrl ());
}
#include "rktoplevelwindowgui.moc"
Modified: branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkwindowcatcher.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -27,7 +27,7 @@
#include <kmessagebox.h>
#include <klocale.h>
-#include <kwin.h>
+#include <kwindowsystem.h>
#include "../rkwardapplication.h"
#include "rkworkplace.h"
@@ -113,7 +113,7 @@
capture->setProtocol (QXEmbedCopy::XPLAIN);
connect (capture, SIGNAL (embeddedWindowDestroyed ()), this, SLOT (deleteLater ()));
- KWin::WindowInfo wininfo = KWin::windowInfo (window_to_embed);
+ KWindowSystem::WindowInfo wininfo = KWindowSystem::windowInfo (window_to_embed);
setGeometry (wininfo.frameGeometry ());
setCaption (wininfo.name ());
setIcon (SmallIcon ("kcmx")); // looks like an X, here
@@ -194,7 +194,7 @@
// TODO: not very pretty, yet
KDialogBase *dialog = new KDialogBase (this, 0, true, i18n ("Specify fixed size"), KDialogBase::Ok|KDialogBase::Cancel);
- Q3VBox *page = dialog->makeVBoxMainWidget ();
+ KVBox *page = dialog->makeVBoxMainWidget ();
QLabel *label = new QLabel (i18n ("Width"), page);
KIntSpinBox *width = new KIntSpinBox (5, 32767, 1, xembed_container->width (), 10, page);
@@ -238,11 +238,11 @@
// TODO: not very pretty, yet
KDialogBase *dialog = new KDialogBase (this, 0, true, i18n ("Specify R object"), KDialogBase::Ok|KDialogBase::Cancel);
- Q3VBox *page = dialog->makeVBoxMainWidget ();
+ KVBox *page = dialog->makeVBoxMainWidget ();
RKSaveObjectChooser *chooser = new RKSaveObjectChooser (page, "my.plot", i18n ("Specify the R object name, you want to save the graph to"));
- connect (chooser, SIGNAL (okStatusChanged (bool)), dialog, SLOT (enableButtonOK (bool)));
- if (!chooser->isOk ()) dialog->enableButtonOK (false);
+ connect (chooser, SIGNAL (okStatusChanged (bool)), dialog, SLOT (enableButtonOk (bool)));
+ if (!chooser->isOk ()) dialog->enableButtonOk (false);
dialog->exec ();
Modified: branches/KDE4_port/rkward/windows/rkworkplace.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplace.cpp 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkworkplace.cpp 2007-10-08 15:10:22 UTC (rev 2040)
@@ -124,14 +124,14 @@
addWindow (window, true);
}
-bool RKWorkplace::openScriptEditor (const KURL &url, bool use_r_highlighting, bool read_only, const QString &force_caption) {
+bool RKWorkplace::openScriptEditor (const KUrl &url, bool use_r_highlighting, bool read_only, const QString &force_caption) {
RK_TRACE (APP);
// is this url already opened?
if (!url.isEmpty ()) {
for (RKWorkplaceObjectList::const_iterator it = windows.constBegin (); it != windows.constEnd (); ++it) {
if ((*it)->type == RKMDIWindow::CommandEditorWindow) {
- KURL ourl = static_cast<RKCommandEditorWindow *> (*it)->url ();
+ KUrl ourl = static_cast<RKCommandEditorWindow *> (*it)->url ();
if (url.equals (ourl, true)) {
(*it)->activate ();
return true;
@@ -145,7 +145,7 @@
if (!url.isEmpty ()) {
if (!editor->openURL (url, use_r_highlighting, read_only)) {
delete editor;
- KMessageBox::messageBox (view (), KMessageBox::Error, i18n ("Unable to open \"%1\"").arg (url.prettyURL ()), i18n ("Could not open command file"));
+ KMessageBox::messageBox (view (), KMessageBox::Error, i18n ("Unable to open \"%1\"").arg (url.prettyUrl ()), i18n ("Could not open command file"));
return false;
}
}
@@ -155,7 +155,7 @@
return true;
}
-void RKWorkplace::openHelpWindow (const KURL &url, bool only_once) {
+void RKWorkplace::openHelpWindow (const KUrl &url, bool only_once) {
RK_TRACE (APP);
if (url.isEmpty ()) {
@@ -178,7 +178,7 @@
addWindow (hw);
}
-void RKWorkplace::openOutputWindow (const KURL &url) {
+void RKWorkplace::openOutputWindow (const KUrl &url) {
RK_TRACE (APP);
RKOutputWindow::refreshOutput (true, true, false);
Modified: branches/KDE4_port/rkward/windows/rkworkplace.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplace.h 2007-10-08 15:08:03 UTC (rev 2039)
+++ branches/KDE4_port/rkward/windows/rkworkplace.h 2007-10-08 15:10:22 UTC (rev 2040)
@@ -93,14 +93,14 @@
@param read_only Open the document read only? Default is false, i.e. Read-write
@param force_caption Usually the caption is determined from the url of the file. If you specify a non-empty string here, that is used instead.
@returns false if a local url could not be opened, true for all remote urls, and on success */
- bool openScriptEditor (const KURL &url=KURL (), bool use_r_highlighting=true, bool read_only=false, const QString &force_caption = QString::null);
+ bool openScriptEditor (const KUrl &url=KUrl (), bool use_r_highlighting=true, bool read_only=false, const QString &force_caption = QString::null);
/** Opens a new help window, starting at the given url
@param url URL to open
@param only_once if true, checks whether any help window already shows this URL. If so, raise it, but do not open a new window. Else show the new window */
- void openHelpWindow (const KURL &url=KURL (), bool only_once=false);
+ void openHelpWindow (const KUrl &url=KUrl (), bool only_once=false);
/** Opens a new output window. Currently only a single output window will ever be created. Subsequent calls to the function will not create additional windows right now (but will raise / refresh the output window
@param url currently ignored! */
- void openOutputWindow (const KURL &url=KURL ());
+ void openOutputWindow (const KUrl &url=KUrl ());
/** signal there was new output, show/raise/refresh the output window as appropriate.
TODO: this should be obsoleted somehow */
void newOutput (bool only_if_modified);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list