[rkward-cvs] rkward/rkward/dialogs rkloadlibsdialog.cpp,1.16,1.17 startupdialog.h,1.1,1.2

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32612/dialogs

Modified Files:
	rkloadlibsdialog.cpp startupdialog.h 
Log Message:
Compile fixes after renaming RKSettingsModuleLogfiles

Index: rkloadlibsdialog.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/rkloadlibsdialog.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rkloadlibsdialog.cpp	18 Oct 2005 15:54:04 -0000	1.16
--- rkloadlibsdialog.cpp	20 Oct 2005 19:45:54 -0000	1.17
***************
*** 31,35 ****
  #include "../rkglobals.h"
  #include "../rbackend/rinterface.h"
! #include "../settings/rksettingsmodulelogfiles.h"
  #include "../settings/rksettings.h"
  #include "../misc/rkerrordialog.h"
--- 31,35 ----
  #include "../rkglobals.h"
  #include "../rbackend/rinterface.h"
! #include "../settings/rksettingsmodulegeneral.h"
  #include "../settings/rksettings.h"
  #include "../misc/rkerrordialog.h"
***************
*** 145,149 ****
  	RK_TRACE (DIALOGS);
  
! 	QString to_dir = QDir (RKSettingsModuleLogfiles::filesPath ()).filePath (".packagetemp");
  
  	if (packages.isEmpty ()) return false;
--- 145,149 ----
  	RK_TRACE (DIALOGS);
  
! 	QString to_dir = QDir (RKSettingsModuleGeneral::filesPath ()).filePath (".packagetemp");
  
  	if (packages.isEmpty ()) return false;
***************
*** 159,163 ****
  void RKLoadLibsDialog::installDownloadedPackages (bool become_root) {
  	RK_TRACE (DIALOGS);
! 	QDir tempdir = QDir (RKSettingsModuleLogfiles::filesPath ()).filePath (".packagetemp");
  
  	tempdir.setFilter (QDir::Files);
--- 159,163 ----
  void RKLoadLibsDialog::installDownloadedPackages (bool become_root) {
  	RK_TRACE (DIALOGS);
! 	QDir tempdir = QDir (RKSettingsModuleGeneral::filesPath ()).filePath (".packagetemp");
  
  	tempdir.setFilter (QDir::Files);
***************
*** 189,198 ****
  	if (RKSettingsModuleR::archivePackages ()) {
  		// step 1: create archive-dir, if neccessary
! 		QDir archivedir = QDir (RKSettingsModuleLogfiles::filesPath ()).filePath ("package_archive");
  		if (!archivedir.exists ()) {
  			// does not compile on some systems (October 2005).
  			//QDir (RKSettingsModuleLogfiles::filesPath ()).mkdir ("package_archive");
  			// Workaround (use this instead for a couple of months):
! 			QString dummy = RKSettingsModuleLogfiles::filesPath ();
  			QDir dir;
  			dir.setPath (dummy);
--- 189,198 ----
  	if (RKSettingsModuleR::archivePackages ()) {
  		// step 1: create archive-dir, if neccessary
! 		QDir archivedir = QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive");
  		if (!archivedir.exists ()) {
  			// does not compile on some systems (October 2005).
  			//QDir (RKSettingsModuleLogfiles::filesPath ()).mkdir ("package_archive");
  			// Workaround (use this instead for a couple of months):
! 			QString dummy = RKSettingsModuleGeneral::filesPath ();
  			QDir dir;
  			dir.setPath (dummy);

Index: startupdialog.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/startupdialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startupdialog.h	26 Aug 2004 13:06:28 -0000	1.1
--- startupdialog.h	20 Oct 2005 19:45:54 -0000	1.2
***************
*** 38,42 ****
  Q_OBJECT
  public:
! 	enum Result { EmptyWorkspace=0, EmptyTable=1, OpenFile=2, ChoseFile=3 };
  	struct StartupDialogResult {
  		Result result;
--- 38,49 ----
  Q_OBJECT
  public:
! 	/** enum to hold result of StartupDialog */
! 	enum Result {
! 		EmptyWorkspace=0,	/**< start with an empty workspace */
! 		EmptyTable=1,				/**< start with an empty table */
! 		OpenFile=2,					/**< open a recent file (already specified) */
! 		ChoseFile=3,				/**< chose file to open */
! 		NoSavedSetting=4		/**< not acutally returned as a result. Used in RKSettingsModuleGeneral. This is saved, if user wants to be asked on every startup */
! 	};
  	struct StartupDialogResult {
  		Result result;