[rkward-cvs] rkward/rkward/settings rksettings.cpp,1.8,1.9 rksettingsmodulegeneral.cpp,1.1,1.2 rksettingsmodulegeneral.h,1.1,1.2

[Thomas Friedrichsmeier]

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

Modified Files:
	rksettings.cpp rksettingsmodulegeneral.cpp 
	rksettingsmodulegeneral.h 
Log Message:
Compile fixes after renaming RKSettingsModuleLogfiles

Index: rksettingsmodulegeneral.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulegeneral.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rksettingsmodulegeneral.cpp	20 Oct 2005 19:28:20 -0000	1.1
--- rksettingsmodulegeneral.cpp	20 Oct 2005 19:45:54 -0000	1.2
***************
*** 31,36 ****
  
  // static members
! QString RKSettingsModuleLogfiles::files_path;
! QString RKSettingsModuleLogfiles::new_files_path;
  
  RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
--- 31,36 ----
  
  // static members
! QString RKSettingsModuleGeneral::files_path;
! QString RKSettingsModuleGeneral::new_files_path;
  
  RKSettingsModuleGeneral::RKSettingsModuleGeneral (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
***************
*** 92,94 ****
  }
  
! #include "rksettingsmodulelogfiles.moc"
--- 92,94 ----
  }
  
! #include "rksettingsmodulegeneral.moc"

Index: rksettingsmodulegeneral.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulegeneral.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rksettingsmodulegeneral.h	20 Oct 2005 19:28:20 -0000	1.1
--- rksettingsmodulegeneral.h	20 Oct 2005 19:45:54 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  
  #include "rksettingsmodule.h"
+ #include "../dialogs/startupdialog.h"
  
  class GetFileNameWidget;
***************
*** 43,51 ****
  /// returns the directory-name where the logfiles should reside
  	static QString &filesPath () { return files_path; };
  public slots:
  	void pathChanged ();
  private:
  	GetFileNameWidget *files_choser;
! 	
  	static QString files_path;
  /** since changing the files_path can not easily be done while in an active session, the setting should only take effect on the next start. This string stores a changed setting, while keeping the old one intact as long as RKWard is running */
--- 44,54 ----
  /// returns the directory-name where the logfiles should reside
  	static QString &filesPath () { return files_path; };
+ 	static StartupDialog::Result startupAction () { return startup_action; };
  public slots:
  	void pathChanged ();
  private:
  	GetFileNameWidget *files_choser;
! 
! 	static StartupDialog::Result startup_action;
  	static QString files_path;
  /** since changing the files_path can not easily be done while in an active session, the setting should only take effect on the next start. This string stores a changed setting, while keeping the old one intact as long as RKWard is running */

Index: rksettings.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettings.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rksettings.cpp	16 Oct 2005 18:48:34 -0000	1.8
--- rksettings.cpp	20 Oct 2005 19:45:54 -0000	1.9
***************
*** 26,30 ****
  #include "rksettingsmoduler.h"
  #include "rksettingsmodulephp.h"
! #include "rksettingsmodulelogfiles.h"
  #include "rksettingsmoduleoutput.h"
  #include "rksettingsmodulewatch.h"
--- 26,30 ----
  #include "rksettingsmoduler.h"
  #include "rksettingsmodulephp.h"
! #include "rksettingsmodulegeneral.h"
  #include "rksettingsmoduleoutput.h"
  #include "rksettingsmodulewatch.h"
***************
*** 84,88 ****
  	modules.append (new RKSettingsModuleR (this, this));
  	modules.append (new RKSettingsModulePHP (this, this));
! 	modules.append (new RKSettingsModuleLogfiles (this, this));
  	modules.append (new RKSettingsModuleOutput (this, this));
  	modules.append (new RKSettingsModuleWatch (this, this));
--- 84,88 ----
  	modules.append (new RKSettingsModuleR (this, this));
  	modules.append (new RKSettingsModulePHP (this, this));
! 	modules.append (new RKSettingsModuleGeneral (this, this));
  	modules.append (new RKSettingsModuleOutput (this, this));
  	modules.append (new RKSettingsModuleWatch (this, this));
***************
*** 147,151 ****
  	RKSettingsModuleR::loadSettings(config);
  	RKSettingsModulePHP::loadSettings(config);
! 	RKSettingsModuleLogfiles::loadSettings(config);
  	RKSettingsModuleOutput::loadSettings(config);
  	RKSettingsModuleWatch::loadSettings(config);
--- 147,151 ----
  	RKSettingsModuleR::loadSettings(config);
  	RKSettingsModulePHP::loadSettings(config);
! 	RKSettingsModuleGeneral::loadSettings(config);
  	RKSettingsModuleOutput::loadSettings(config);
  	RKSettingsModuleWatch::loadSettings(config);
***************
*** 160,164 ****
  	RKSettingsModuleR::saveSettings(config);
  	RKSettingsModulePHP::saveSettings(config);
! 	RKSettingsModuleLogfiles::saveSettings(config);
  	RKSettingsModuleOutput::saveSettings(config);
  	RKSettingsModuleWatch::saveSettings(config);
--- 160,164 ----
  	RKSettingsModuleR::saveSettings(config);
  	RKSettingsModulePHP::saveSettings(config);
! 	RKSettingsModuleGeneral::saveSettings(config);
  	RKSettingsModuleOutput::saveSettings(config);
  	RKSettingsModuleWatch::saveSettings(config);