From 703bf88b42510067cefa8c75a5d0b58cfd94de19 Mon Sep 17 00:00:00 2001
From: Vladimir <riuson@gmail.com>
Date: Wed, 21 May 2014 20:23:22 +0600
Subject: [PATCH] Preset::currentName() renamed to selectedName()

---
 classes/action-handlers/actionfilehandlers.cpp | 2 +-
 classes/cmdline/modeconvertimage.cpp           | 4 ++--
 classes/settings/presets/preset.cpp            | 4 ++--
 classes/settings/presets/preset.h              | 4 ++--
 controls/setup/dialogoptions.cpp               | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/classes/action-handlers/actionfilehandlers.cpp b/classes/action-handlers/actionfilehandlers.cpp
index fbb1d82..a687003 100644
--- a/classes/action-handlers/actionfilehandlers.cpp
+++ b/classes/action-handlers/actionfilehandlers.cpp
@@ -372,7 +372,7 @@ void ActionFileHandlers::convertDocument(IDocument *document, bool request)
         if (file.open(QFile::WriteOnly))
         {
             Preset preset;
-            preset.load(Preset::currentName());
+            preset.load(Preset::selectedName());
 
             QString result = document->convert(&preset);
 
diff --git a/classes/cmdline/modeconvertimage.cpp b/classes/cmdline/modeconvertimage.cpp
index bc486f9..ceb5f2a 100644
--- a/classes/cmdline/modeconvertimage.cpp
+++ b/classes/cmdline/modeconvertimage.cpp
@@ -82,7 +82,7 @@ int ModeConvertImage::process()
             // check preset exists
             if (Preset::presetsList().contains(this->mPresetName))
             {
-                Preset::setCurrentName(this->mPresetName);
+                Preset::setSelectedName(this->mPresetName);
 
                 // load image from input file
                 QImage imageLoaded;
@@ -108,7 +108,7 @@ int ModeConvertImage::process()
                         if (file.open(QFile::WriteOnly))
                         {
                             Preset preset;
-                            preset.load(Preset::currentName());
+                            preset.load(Preset::selectedName());
 
                             QString result = imageDocument.convert(&preset);
 
diff --git a/classes/settings/presets/preset.cpp b/classes/settings/presets/preset.cpp
index 1a45f72..834a134 100644
--- a/classes/settings/presets/preset.cpp
+++ b/classes/settings/presets/preset.cpp
@@ -98,7 +98,7 @@ QStringList Preset::presetsList()
     return names;
 }
 //-----------------------------------------------------------------------------
-QString Preset::currentName()
+QString Preset::selectedName()
 {
     QSettings sett;
     sett.beginGroup("presets");
@@ -108,7 +108,7 @@ QString Preset::currentName()
     return result;
 }
 //-----------------------------------------------------------------------------
-void Preset::setCurrentName(const QString &value)
+void Preset::setSelectedName(const QString &value)
 {
     QSettings sett;
     sett.beginGroup("presets");
diff --git a/classes/settings/presets/preset.h b/classes/settings/presets/preset.h
index 647224a..c387607 100644
--- a/classes/settings/presets/preset.h
+++ b/classes/settings/presets/preset.h
@@ -50,8 +50,8 @@ public:
     TemplateOptions *templates();
 
     static QStringList presetsList();
-    static QString currentName();
-    static void setCurrentName(const QString &value);
+    static QString selectedName();
+    static void setSelectedName(const QString &value);
     static void remove(const QString &value);
 
     QString name() const;
diff --git a/controls/setup/dialogoptions.cpp b/controls/setup/dialogoptions.cpp
index 5f94399..3c18470 100644
--- a/controls/setup/dialogoptions.cpp
+++ b/controls/setup/dialogoptions.cpp
@@ -51,7 +51,7 @@ DialogOptions::DialogOptions(DataContainer *dataContainer, QWidget *parent) :
     this->mSetupFont       = new SetupTabFont(this->mPreset, this);
     this->mSetupTemplates  = new SetupTabTemplates(this->mPreset, this);
 
-    QString selectedPreset = Preset::currentName();
+    QString selectedPreset = Preset::selectedName();
     int presetsCount = Preset::presetsList().length();
 
     // create default presets
@@ -255,7 +255,7 @@ void DialogOptions::done(int result)
                 }
 
                 this->mPreset->save(name);
-                Preset::setCurrentName(name);
+                Preset::setSelectedName(name);
 
                 QDialog::done(result);
                 break;