# HG changeset patch # User lbajardsilogic # Date 1178898177 0 # Node ID e612e4012ca885c00865094b304bc553ae84ee42 # Parent f1602cb4cd0b405b55ede368ebc313d7339fd55c add connection setting information reading and saving diff -r f1602cb4cd0b -r e612e4012ca8 base/TempDirectory.cpp --- a/base/TempDirectory.cpp Fri May 11 15:42:33 2007 +0000 +++ b/base/TempDirectory.cpp Fri May 11 15:42:57 2007 +0000 @@ -52,38 +52,50 @@ cleanupDirectory(""); } +QString +TempDirectory::getDir() +{ + QMutexLocker locker(&m_mutex); + + if (m_tmpdir != "") return m_tmpdir; + + QString svDirBase = ".easaier"; + QString svDir = QDir::home().filePath(svDirBase); + if (!QFileInfo(svDir).exists()) { + if (!QDir::home().mkdir(svDirBase)) { + throw DirectoryCreationFailed(QString("%1 directory in $HOME") + .arg(svDirBase)); + } + } else if (!QFileInfo(svDir).isDir()) { + throw DirectoryCreationFailed(QString("$HOME/%1 is not a directory") + .arg(svDirBase)); + } + + cleanupAbandonedDirectories(svDir); + + return svDir; +} + QString TempDirectory::getPath() { - QMutexLocker locker(&m_mutex); - if (m_tmpdir != "") return m_tmpdir; - QSettings settings; - settings.beginGroup("TempDirectory"); - QString svDirParent = settings.value("create-in", "$HOME").toString(); - settings.endGroup(); - - svDirParent.replace("$HOME", QDir::home().absolutePath()); - - QString svDirBase = ".sv1"; - QString svDir = QDir(svDirParent).filePath(svDirBase); - if (!QFileInfo(svDir).exists()) { - if (!QDir(svDirParent).mkdir(svDirBase)) { - throw DirectoryCreationFailed(QString("%1 directory in %2") - .arg(svDirBase).arg(svDirParent)); - } - } else if (!QFileInfo(svDir).isDir()) { - throw DirectoryCreationFailed(QString("%1/%2 is not a directory") - .arg(svDirParent).arg(svDirBase)); - } - - cleanupAbandonedDirectories(svDir); + QString svDir = getDir(); return createTempDirectoryIn(svDir); } QString +TempDirectory::getConfigPath() +{ + QString configPath = getDir(); + configPath.append("/config.xml"); + + return configPath; +} + +QString TempDirectory::createTempDirectoryIn(QString dir) { // Entered with mutex held. diff -r f1602cb4cd0b -r e612e4012ca8 base/TempDirectory.h --- a/base/TempDirectory.h Fri May 11 15:42:33 2007 +0000 +++ b/base/TempDirectory.h Fri May 11 15:42:57 2007 +0000 @@ -52,6 +52,9 @@ */ QString getSubDirectoryPath(QString subdir); + QString getDir(); + QString getConfigPath(); + /** * Delete the temporary directory (before exiting). */ @@ -68,6 +71,7 @@ QMutex m_mutex; static TempDirectory *m_instance; + };