From e57241fe4a1413a8013737707e6aeda20d248a20 Mon Sep 17 00:00:00 2001
From: dfighter1985 <devnull@localhost>
Date: Mon, 19 May 2014 02:08:03 +0200
Subject: [PATCH] Renames.

---
 code/studio/CMakeLists.txt                   | 2 +-
 code/studio/ovqt_config.h.cmake              | 4 ++--
 code/studio/src/main.cpp                     | 6 +++---
 code/studio/src/plugins/core/main_window.cpp | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/studio/CMakeLists.txt b/code/studio/CMakeLists.txt
index b301430cf..bf9ee062c 100644
--- a/code/studio/CMakeLists.txt
+++ b/code/studio/CMakeLists.txt
@@ -27,7 +27,7 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 IF(UNIX AND WITH_STATIC)
-	MESSAGE(FATAL_ERROR "OVQT does not work with static NeL builds on Unix atm.")
+	MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.")
 ENDIF()
 
 ADD_SUBDIRECTORY(src)
diff --git a/code/studio/ovqt_config.h.cmake b/code/studio/ovqt_config.h.cmake
index 5b3a49654..9d4907473 100644
--- a/code/studio/ovqt_config.h.cmake
+++ b/code/studio/ovqt_config.h.cmake
@@ -1,7 +1,7 @@
 #ifndef OVQT_CONFIG_H
 #define OVQT_CONFIG_H
 
-#define DATA_DIR "${NL_SHARE_ABSOLUTE_PREFIX}/object_viewer_qt"
-#define PLUGINS_DIR "${NL_LIB_ABSOLUTE_PREFIX}/object_viewer_qt"
+#define DATA_DIR "${NL_SHARE_ABSOLUTE_PREFIX}/studio"
+#define PLUGINS_DIR "${NL_LIB_ABSOLUTE_PREFIX}/studio"
 
 #endif
diff --git a/code/studio/src/main.cpp b/code/studio/src/main.cpp
index d0407ccfd..e94bac9d6 100644
--- a/code/studio/src/main.cpp
+++ b/code/studio/src/main.cpp
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
 	pluginManager.setSettings(settings);
 	QStringList pluginPaths;
 #if defined(NL_OS_MAC)
-	pluginPaths << settings->value("PluginPath", qApp->applicationDirPath() + QString("/../PlugIns/ovqt")).toString();
+	pluginPaths << settings->value("PluginPath", qApp->applicationDirPath() + QString("/../PlugIns/studio")).toString();
 #else
 	pluginPaths << settings->value("PluginPath", QString("%1/plugins").arg(DATA_DIR)).toString();
 #endif
@@ -180,7 +180,7 @@ int main(int argc, char **argv)
 	{
 		QDir absolutePluginPaths(pluginPaths.join(QLatin1String(",")));
 		QString absolutePaths = absolutePluginPaths.absolutePath();
-		const QString reason = QCoreApplication::translate("Application", "Could not find ovqt_plugin_core in %1").arg(absolutePaths);
+		const QString reason = QCoreApplication::translate("Application", "Could not find studio_plugin_core in %1").arg(absolutePaths);
 		displayError(msgCoreLoadFailure(reason));
 
 		QString newPath = QFileDialog::getExistingDirectory(0, QCoreApplication::translate("Application", "Change the plugins path"), QDir::homePath());
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
 		errors.append(spec->fileName() + " : " + spec->errorString());
 
 	if (!errors.isEmpty())
-		QMessageBox::warning(0, QCoreApplication::translate("Application", "Object Viewer Qt - Plugin loader messages"),
+		QMessageBox::warning(0, QCoreApplication::translate("Application", "Studio - Plugin loader messages"),
 		                     errors.join(QString::fromLatin1("\n\n")));
 
 	int result = app.exec();
diff --git a/code/studio/src/plugins/core/main_window.cpp b/code/studio/src/plugins/core/main_window.cpp
index a90e67bc0..fcde24fbf 100644
--- a/code/studio/src/plugins/core/main_window.cpp
+++ b/code/studio/src/plugins/core/main_window.cpp
@@ -46,13 +46,13 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *
 	  m_undoGroup(0),
 	  m_settings(0)
 {
-	QCoreApplication::setApplicationName(QLatin1String("ObjectViewerQt"));
+	QCoreApplication::setApplicationName(QLatin1String("Studio"));
 	QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::OVQT_VERSION_LONG));
 	QCoreApplication::setOrganizationName(QLatin1String("RyzomCore"));
 
 	setObjectName(Constants::MAIN_WINDOW);
 	setWindowIcon(QIcon(Constants::ICON_PILL));
-	setWindowTitle(tr("Object Viewer Qt"));
+	setWindowTitle(tr("Ryzom Core Studio"));
 
 	m_pluginManager = pluginManager;
 	m_settings = m_pluginManager->settings();
@@ -232,8 +232,8 @@ bool MainWindow::showOptionsDialog(const QString &group,
 
 void MainWindow::about()
 {
-	QMessageBox::about(this, tr("About Object Viewer Qt"),
-					   tr("<h2>Object Viewer Qt</h2>"
+	QMessageBox::about(this, tr("About Ryzom Core Studio"),
+					   tr("<h2>Ryzom Core Studio</h2>"
 						  "<p> Ryzom Core team <p>Compiled on %1 %2").arg(__DATE__).arg(__TIME__));
 }