# HG changeset patch
# User thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
# Date 1213707931 0
# Node ID 2f6b8f9236973725c858a2d0bfeda215d0af8f8b
# Parent  028b8e0c61393a87559855f1ee24710138e03407
Made the IndentHandler care itself about where to get the correct paths for the indenters, temp and so on from.

git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@735 59b1889a-e5ac-428c-b0c7-476e01d41282

diff -r 028b8e0c6139 -r 2f6b8f923697 src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp	Mon Jun 16 09:56:08 2008 +0000
+++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp	Tue Jun 17 13:05:31 2008 +0000
@@ -64,7 +64,7 @@
                 int argc = 1;
                 char *argv[] = {"setup", NULL};
                 static QApplication qapp(argc, argv);
-                indentHandler = new IndentHandler( SettingsPaths::getIndenterPath(), SettingsPaths::getSettingsPath(), SettingsPaths::getTempPath(), 0);
+                indentHandler = new IndentHandler(0);
                 indentHandler->setWindowModality( Qt::ApplicationModal );
                 indentHandler->setWindowTitle("UniversalIndentGUI");
                 indentHandler->setWindowIcon(QIcon(QString::fromUtf8(":/mainWindow/icon2.png")));
diff -r 028b8e0c6139 -r 2f6b8f923697 src/indenthandler.cpp
--- a/src/indenthandler.cpp	Mon Jun 16 09:56:08 2008 +0000
+++ b/src/indenthandler.cpp	Tue Jun 17 13:05:31 2008 +0000
@@ -40,7 +40,7 @@
     its \a indenterID, which is the number of found indenter ini files in alphabetic 
     order starting at index 0.
  */
-IndentHandler::IndentHandler(QString indenterDirPathStr, QString settingsDirPathStr, QString tempDirPathStr, int indenterID, QWidget *mainWindow, QWidget *parent)
+IndentHandler::IndentHandler(int indenterID, QWidget *mainWindow, QWidget *parent)
     : QWidget(parent)
 {
     Q_ASSERT_X( indenterID >= 0, "IndentHandler", "the selected indenterID is < 0" );
@@ -111,10 +111,10 @@
     indenterExecutableCallString = "";
     indenterExecutableSuffix = "";
 
-    indenterDirctoryStr = indenterDirPathStr;
-    tempDirctoryStr = tempDirPathStr;
-    settingsDirctoryStr = settingsDirPathStr;
-    QDir indenterDirctory = QDir(indenterDirPathStr);
+    indenterDirctoryStr = SettingsPaths::getIndenterPath();
+    tempDirctoryStr = SettingsPaths::getTempPath();
+    settingsDirctoryStr = SettingsPaths::getSettingsPath();
+    QDir indenterDirctory = QDir(indenterDirctoryStr);
 
     errorMessageDialog = new UiGuiErrorMessage(mainWindow);
 
diff -r 028b8e0c6139 -r 2f6b8f923697 src/indenthandler.h
--- a/src/indenthandler.h	Mon Jun 16 09:56:08 2008 +0000
+++ b/src/indenthandler.h	Tue Jun 17 13:05:31 2008 +0000
@@ -50,6 +50,7 @@
 #include "uiguierrormessage.h"
 #include "templateBatchScript.h"
 #include "uiguiIniFileParser.h"
+#include "SettingsPaths.h"
 
 
 class IndentHandler : public QWidget
@@ -57,7 +58,7 @@
     Q_OBJECT
 
 public:
-    IndentHandler(QString indenterDirPathStr, QString settingsDirPathStr, QString tempDirPathStr, int indenterID, QWidget *mainWindow = 0, QWidget *parent = 0);
+    IndentHandler(int indenterID, QWidget *mainWindow = 0, QWidget *parent = 0);
     ~IndentHandler();
 
     QString generateCommandlineCall(QString inputFileExtension);
diff -r 028b8e0c6139 -r 2f6b8f923697 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Mon Jun 16 09:56:08 2008 +0000
+++ b/src/mainwindow.cpp	Tue Jun 17 13:05:31 2008 +0000
@@ -42,10 +42,8 @@
     buildDateStr = buildDate.toString("d. MMMM yyyy");
 
     // Get all necessary paths.
-    settingsDirctoryStr = SettingsPaths::getSettingsPath();
     globalFilesDirectoryStr = SettingsPaths::getGlobalFilesPath();
     indenterDirctoryStr = SettingsPaths::getIndenterPath();
-    tempDirctoryStr = SettingsPaths::getTempPath();
     portableMode = SettingsPaths::getPortableMode();
 
     // Init of some variables.
@@ -331,7 +329,7 @@
 	currentIndenterID = settings->getValueByName("LastSelectedIndenterID").toInt();
 
     // Create the indenter widget with the ID and add it to the layout.
-    indentHandler = new IndentHandler(indenterDirctoryStr, settingsDirctoryStr, tempDirctoryStr, currentIndenterID, this, centralwidget);
+    indentHandler = new IndentHandler(currentIndenterID, this, centralwidget);
     vboxLayout->addWidget(indentHandler);
 
     // If settings for the indenter have changed, let the main window know aboud it.
diff -r 028b8e0c6139 -r 2f6b8f923697 src/mainwindow.h
--- a/src/mainwindow.h	Mon Jun 16 09:56:08 2008 +0000
+++ b/src/mainwindow.h	Tue Jun 17 13:05:31 2008 +0000
@@ -88,8 +88,6 @@
     bool portableMode;
 	QString globalFilesDirectoryStr;
 	QString indenterDirctoryStr;
-    QString tempDirctoryStr;
-    QString settingsDirctoryStr;
 	QString currentEncoding;
     QString sourceFileContent;
     QString sourceFormattedContent;