[KPhotoAlbum] [PATCH 3/3] Cleanup: ConfigWindow -> AnnotationDialog

[Michael Witten]

A simple name change to better reflect code/purpose.

Signed-off-by: Michael Witten <mfwitten at mit.edu>
---
 AnnotationDialog/Dialog.cpp |    6 +++---
 Settings/SettingsData.cpp   |    2 +-
 Settings/SettingsData.h     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp
index b5c732a..a01b703 100644
--- a/AnnotationDialog/Dialog.cpp
+++ b/AnnotationDialog/Dialog.cpp
@@ -170,7 +170,7 @@ AnnotationDialog::Dialog::Dialog( QWidget* parent )
     // If I don't explicit show _dockWindow here, then no windows will show up.
     _dockWindow->show();
 
-    setGeometry( Settings::SettingsData::instance()->windowGeometry( Settings::ConfigWindow ) );
+    setGeometry( Settings::SettingsData::instance()->windowGeometry( Settings::AnnotationDialog ) );
 
     setupActions();
     shortCutManager.setupShortCuts();
@@ -866,12 +866,12 @@ void AnnotationDialog::Dialog::showHelpDialog( UsageMode type )
 
 void AnnotationDialog::Dialog::resizeEvent( QResizeEvent* )
 {
-    Settings::SettingsData::instance()->setWindowGeometry( Settings::ConfigWindow, geometry() );
+    Settings::SettingsData::instance()->setWindowGeometry( Settings::AnnotationDialog, geometry() );
 }
 
 void AnnotationDialog::Dialog::moveEvent( QMoveEvent * )
 {
-    Settings::SettingsData::instance()->setWindowGeometry( Settings::ConfigWindow, geometry() );
+    Settings::SettingsData::instance()->setWindowGeometry( Settings::AnnotationDialog, geometry() );
 
 }
 
diff --git a/Settings/SettingsData.cpp b/Settings/SettingsData.cpp
index 4a9ef80..1dd5693 100644
--- a/Settings/SettingsData.cpp
+++ b/Settings/SettingsData.cpp
@@ -112,7 +112,7 @@ static bool _smoothScale = true;
 using namespace Settings;
 
 const WindowType Settings::MainWindow   = "MainWindow";
-const WindowType Settings::ConfigWindow = "ConfigWindow";
+const WindowType Settings::AnnotationDialog = "AnnotationDialog";
 
 SettingsData* SettingsData::_instance = 0;
 
diff --git a/Settings/SettingsData.h b/Settings/SettingsData.h
index 3876fcd..764176d 100644
--- a/Settings/SettingsData.h
+++ b/Settings/SettingsData.h
@@ -58,7 +58,7 @@ namespace Settings
     enum ThumbnailAspectRatio { Aspect_1_1, Aspect_4_3, Aspect_3_2, Aspect_16_9, Aspect_3_4, Aspect_2_3, Aspect_9_16 };
 
     typedef const char* WindowType;
-    extern const WindowType MainWindow, ConfigWindow;
+    extern const WindowType MainWindow, AnnotationDialog;
 
 class SettingsData : public QObject
 {
-- 
1.6.0.2.302.ge6cbd1