[rkward-cvs] SF.net SVN: rkward: [2057] branches/KDE4_port/rkward/agents

[tfry at users.sourceforge.net]

Revision: 2057
          http://rkward.svn.sourceforge.net/rkward/?rev=2057&view=rev
Author:   tfry
Date:     2007-10-14 09:21:38 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
subdir agents compiles (if only all porting was this easy)

Modified Paths:
--------------
    branches/KDE4_port/rkward/agents/rkloadagent.cpp
    branches/KDE4_port/rkward/agents/rksaveagent.h
    branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
    branches/KDE4_port/rkward/agents/showedittextfileagent.h

Modified: branches/KDE4_port/rkward/agents/rkloadagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/rkloadagent.cpp	2007-10-14 16:13:19 UTC (rev 2056)
+++ branches/KDE4_port/rkward/agents/rkloadagent.cpp	2007-10-14 16:21:38 UTC (rev 2057)
@@ -75,7 +75,7 @@
 		if (!tmpfile.isEmpty ()) KIO::NetAccess::removeTempFile (tmpfile);
 		if (command->failed ()) {
 			KMessageBox::error (0, i18n ("There has been an error opening file '%1':\n%2").arg (RObjectList::getObjectList ()->getWorkspaceURL ().path ()).arg (command->error ()), i18n ("Error loading workspace"));
-			RObjectList::getObjectList ()->setWorkspaceURL (QString::null);
+			RObjectList::getObjectList ()->setWorkspaceURL (KUrl());
 		} else {
 			RKWorkplace::mainWorkplace ()->restoreWorkplace ();
 			RKWorkplace::mainWorkplace ()->clearWorkplaceDescription ();

Modified: branches/KDE4_port/rkward/agents/rksaveagent.h
===================================================================
--- branches/KDE4_port/rkward/agents/rksaveagent.h	2007-10-14 16:13:19 UTC (rev 2056)
+++ branches/KDE4_port/rkward/agents/rksaveagent.h	2007-10-14 16:21:38 UTC (rev 2057)
@@ -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=KUrl());
 	
 	~RKSaveAgent ();
 protected:

Modified: branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/showedittextfileagent.cpp	2007-10-14 16:13:19 UTC (rev 2056)
+++ branches/KDE4_port/rkward/agents/showedittextfileagent.cpp	2007-10-14 16:21:38 UTC (rev 2057)
@@ -17,7 +17,6 @@
 
 #include "showedittextfileagent.h"
 
-#include <kdialogbase.h>
 #include <klocale.h>
 
 #include <qlabel.h>
@@ -126,7 +125,13 @@
 ///################# END ShowEditTextFileAgent ##################
 ///################# BEGIN ShowEditTextFileDialog #################
 
-ShowEditTextFileDialog::ShowEditTextFileDialog (const QString &text, const QString &caption) : KDialogBase ((QWidget*) 0, 0, false, caption, KDialogBase::Ok, KDialogBase::Ok) {
+ShowEditTextFileDialog::ShowEditTextFileDialog (const QString &text, const QString &caption) : KDialog ((QWidget*) 0) {
+	RK_TRACE (APP);
+
+	setCaption (caption);
+	setButtons (KDialog::Ok);
+	setModal (false);
+
 	QWidget *page = new QWidget (this);
 	setMainWidget (page);
 	Q3VBoxLayout *layout = new Q3VBoxLayout (page, 0, spacingHint ());
@@ -134,10 +139,11 @@
 	label->setAlignment (Qt::WordBreak | Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs);
 	layout->addWidget (label);
 
-	setButtonOK (KGuiItem (i18n ("Done")));
+	setButtonText (KDialog::Ok, i18n ("Done"));
 }
 
 ShowEditTextFileDialog::~ShowEditTextFileDialog () {
+	RK_TRACE (APP);
 }
 
 #include "showedittextfileagent.moc"

Modified: branches/KDE4_port/rkward/agents/showedittextfileagent.h
===================================================================
--- branches/KDE4_port/rkward/agents/showedittextfileagent.h	2007-10-14 16:13:19 UTC (rev 2056)
+++ branches/KDE4_port/rkward/agents/showedittextfileagent.h	2007-10-14 16:21:38 UTC (rev 2057)
@@ -53,13 +53,13 @@
 	ShowEditTextFileDialog *dialog;
 };
 
-#include <kdialogbase.h>
+#include <kdialog.h>
 
 /** Mini helper class of ShowEditTextFileAgent. Do not use outside of ShowEditTextFileAgent. 
 
 TODO: might be renamed / reused as a more generic non-modal information dialog */
 
-class ShowEditTextFileDialog : public KDialogBase {
+class ShowEditTextFileDialog : public KDialog {
 	public:
 /** constructor
 @param text: Text to display in the dialog */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.