summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core/Core
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2017-10-23 10:47:49 +0300
committerAntti Määttä <antti.maatta@qt.io>2017-10-24 13:24:20 +0000
commite0307030ff18b911a91ff5e4fa7958cd77493c42 (patch)
tree06154565d413773c445b8ea99bf42837c82f7237 /src/Authoring/Client/Code/Core/Core
parent9bd7da7fc5c25589c80869f9f554d120e978a69a (diff)
Rename the rest of the UIC to Qt3DS
Task-number: QT3DS-18 Change-Id: Ia8141980f575565ee7dbfa33422f25f121da5fe1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core/Core')
-rw-r--r--src/Authoring/Client/Code/Core/Core/Core.cpp20
-rw-r--r--src/Authoring/Client/Code/Core/Core/Core.h8
-rw-r--r--src/Authoring/Client/Code/Core/Core/Dispatch.cpp10
-rw-r--r--src/Authoring/Client/Code/Core/Core/Dispatch.h10
-rw-r--r--src/Authoring/Client/Code/Core/Core/DispatchListeners.h10
5 files changed, 29 insertions, 29 deletions
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index a8c276be..bda56381 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -113,16 +113,16 @@ bool CCore::LoadBuildConfigurations()
{
using namespace Q3DStudio;
// See if we can find the build configurations where they are located first
- CFilePath theCurrentPath(CUICFile::GetApplicationDirectory().GetAbsolutePath());
+ CFilePath theCurrentPath(Qt3DSFile::GetApplicationDirectory().GetAbsolutePath());
CFilePath theMainDir = theCurrentPath.GetDirectory()
.GetDirectory()
.GetDirectory(); //.GetDirectory(); // Developing directory
CFilePath theStudioDir =
CFilePath::CombineBaseAndRelative(theMainDir, CFilePath(L"Studio/Build Configurations"));
- CUICFile theConfigurationDirectory(theStudioDir);
+ Qt3DSFile theConfigurationDirectory(theStudioDir);
if (!theStudioDir.IsDirectory())
- theConfigurationDirectory = CUICFile(
- CUICFile::GetApplicationDirectory().GetAbsolutePath(),
+ theConfigurationDirectory = Qt3DSFile(
+ Qt3DSFile::GetApplicationDirectory().GetAbsolutePath(),
Q3DStudio::CString(L"Build Configurations")); // Installed directory // TODO: Localize
Q3DStudio::CBuildConfigParser theParser(m_BuildConfigurations);
@@ -207,7 +207,7 @@ void CCore::RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler)
Qt::Key_BracketRight);
}
-void CCore::GetCreateDirectoryFileName(const CUICFile &inDocument,
+void CCore::GetCreateDirectoryFileName(const Qt3DSFile &inDocument,
Q3DStudio::CFilePath &outFinalDir,
Q3DStudio::CFilePath &outFinalDoc)
{
@@ -225,7 +225,7 @@ void CCore::GetCreateDirectoryFileName(const CUICFile &inDocument,
* Call to create a new document.
* This will clear out the current doc (if there is one) then create a new one.
*/
-void CCore::OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory)
+void CCore::OnNewDocument(const Qt3DSFile &inDocument, bool inCreateDirectory)
{
CDispatchDataModelNotificationScope __dispatchScope(*m_Dispatch);
@@ -263,7 +263,7 @@ void CCore::OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory)
* This will do all the prompting, directory stuff necessary and perform the
* saving of the document.
*/
-void CCore::OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy /*= false*/)
+void CCore::OnSaveDocument(const Qt3DSFile &inDocument, bool inSaveCopy /*= false*/)
{
m_JustSaved = true;
GetDispatch()->FireOnSavingPresentation(&inDocument);
@@ -288,14 +288,14 @@ void CCore::OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy /*= false
* leave the document in a dirty state and not update it to point to the new
* file path.
*/
-void CCore::OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy /*= false*/)
+void CCore::OnSaveDocumentCatcher(const Qt3DSFile &inDocument, bool inSaveCopy /*= false*/)
{
m_Dispatch->FireOnProgressBegin(Q3DStudio::CString::fromQString(QObject::tr("Saving ")),
inDocument.GetName());
bool theDisplaySaveFailDialog = false;
bool theFileExists = inDocument.Exists();
- CUICFile theTempFile(inDocument);
+ Qt3DSFile theTempFile(inDocument);
// Test for readonly files
if (theFileExists && inDocument.CanWrite() == false)
@@ -305,7 +305,7 @@ void CCore::OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy /*
// if file already exists, write to a temp file first, to prevent corrupting the
// original file.
if (theFileExists) {
- theTempFile = CUICFile::GetTemporaryFile();
+ theTempFile = Qt3DSFile::GetTemporaryFile();
// sanity check: if we fail to get a temporary file
if (theTempFile.GetAbsolutePosixPath().IsEmpty()) { // too bad, we'll have to use
// the original (which might be
diff --git a/src/Authoring/Client/Code/Core/Core/Core.h b/src/Authoring/Client/Code/Core/Core/Core.h
index e057e4e3..2e78e227 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.h
+++ b/src/Authoring/Client/Code/Core/Core/Core.h
@@ -73,16 +73,16 @@ public: // Methods
bool LoadBuildConfigurations();
void RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler);
- void OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory);
- void OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy = false);
- void OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy = false);
+ void OnNewDocument(const Qt3DSFile &inDocument, bool inCreateDirectory);
+ void OnSaveDocument(const Qt3DSFile &inDocument, bool inSaveCopy = false);
+ void OnSaveDocumentCatcher(const Qt3DSFile &inDocument, bool inSaveCopy = false);
void SetCommandStackModifier(ICmdStackModifier *inModifier);
bool ExecuteCommand(CCmd *inCommand, bool inIsSynchronous = true);
void CommitCurrentCommand();
void SetCommandModifiedFlag(bool inModified) override;
void CommandUpdate(unsigned long inUpdateFlags) override;
- void GetCreateDirectoryFileName(const CUICFile &inDocument, Q3DStudio::CFilePath &outFinalDir,
+ void GetCreateDirectoryFileName(const Qt3DSFile &inDocument, Q3DStudio::CFilePath &outFinalDir,
Q3DStudio::CFilePath &outFinalDoc);
// CPresentationListener
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
index 41434270..b807494d 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
@@ -315,7 +315,7 @@ void CDispatch::FireOnLoadedSubPresentation()
*/
void CDispatch::FireOnNewPresentation()
{
- UICPROFILE(FireOnNewPresentation);
+ QT3DS_PROFILE(FireOnNewPresentation);
m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnNewPresentation);
}
@@ -329,7 +329,7 @@ void CDispatch::FireOnClosingPresentation()
m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnClosingPresentation);
}
-void CDispatch::FireOnSavingPresentation(const CUICFile *inNewPresentationFile)
+void CDispatch::FireOnSavingPresentation(const Qt3DSFile *inNewPresentationFile)
{
m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnSavingPresentation,
inNewPresentationFile);
@@ -428,7 +428,7 @@ void CDispatch::RemoveFileOpenListener(CFileOpenListener *inListener)
/**
* Fire an event to all the file open listeners that a has been opened.
*/
-void CDispatch::FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded)
+void CDispatch::FireOnOpenDocument(const Qt3DSFile &inFile, bool inSucceeded)
{
m_FileOpenListeners.FireEvent(&CFileOpenListener::OnOpenDocument, inFile, inSucceeded);
}
@@ -437,7 +437,7 @@ void CDispatch::FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded)
/**
* Fire an event to all the file open listeners that a has been saved.
*/
-void CDispatch::FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, bool inSaveCopy)
+void CDispatch::FireOnSaveDocument(const Qt3DSFile &inFile, bool inSucceeded, bool inSaveCopy)
{
m_FileOpenListeners.FireEvent(&CFileOpenListener::OnSaveDocument, inFile, inSucceeded,
inSaveCopy);
@@ -447,7 +447,7 @@ void CDispatch::FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, boo
/**
* Fire an event to all the file open listeners that a has been saved.
*/
-void CDispatch::FireOnDocumentPathChanged(const CUICFile &inNewPath)
+void CDispatch::FireOnDocumentPathChanged(const Qt3DSFile &inNewPath)
{
m_FileOpenListeners.FireEvent(&CFileOpenListener::OnDocumentPathChanged, inNewPath);
}
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.h b/src/Authoring/Client/Code/Core/Core/Dispatch.h
index 16c817bd..8a70923e 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.h
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.h
@@ -51,7 +51,7 @@
class CSceneDragListener;
class CSelectionChangeListener;
class CAsset;
-class CUICFile;
+class Qt3DSFile;
class CURL;
class CPresentationChangeListener;
class CResourceChangeListener;
@@ -137,7 +137,7 @@ public:
void FireOnLoadedSubPresentation();
void FireOnNewPresentation();
void FireOnClosingPresentation();
- void FireOnSavingPresentation(const CUICFile *inNewPresentationFile = NULL);
+ void FireOnSavingPresentation(const Qt3DSFile *inNewPresentationFile = NULL);
void FireOnExportingAsset(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
void FireOnPresentationModifiedExternally();
@@ -153,9 +153,9 @@ public:
void AddFileOpenListener(CFileOpenListener *inListener);
void RemoveFileOpenListener(CFileOpenListener *inListener);
- void FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded);
- void FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, bool inSaveCopy);
- void FireOnDocumentPathChanged(const CUICFile &inNewPath);
+ void FireOnOpenDocument(const Qt3DSFile &inFile, bool inSucceeded);
+ void FireOnSaveDocument(const Qt3DSFile &inFile, bool inSucceeded, bool inSaveCopy);
+ void FireOnDocumentPathChanged(const Qt3DSFile &inNewPath);
// Toolbar changes
void AddToolbarChangeListener(CToolbarChangeListener *inListener);
diff --git a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
index 8ed46f08..fd63d85c 100644
--- a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
+++ b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
@@ -46,7 +46,7 @@
//==============================================================================
class CAsset;
-class CUICFile;
+class Qt3DSFile;
class CURL;
class ISelectable;
class CCmd;
@@ -179,7 +179,7 @@ public:
/**
* The current presentation is being saved.
*/
- virtual void OnSavingPresentation(const CUICFile *inNewPresentationFile)
+ virtual void OnSavingPresentation(const Qt3DSFile *inNewPresentationFile)
{
Q_UNUSED(inNewPresentationFile);
}
@@ -226,9 +226,9 @@ public:
class CFileOpenListener
{
public:
- virtual void OnOpenDocument(const CUICFile &inFilename, bool inSucceeded) = 0;
- virtual void OnSaveDocument(const CUICFile &inFilename, bool inSucceeded, bool inSaveCopy) = 0;
- virtual void OnDocumentPathChanged(const CUICFile &inNewPath) = 0;
+ virtual void OnOpenDocument(const Qt3DSFile &inFilename, bool inSucceeded) = 0;
+ virtual void OnSaveDocument(const Qt3DSFile &inFilename, bool inSucceeded, bool inSaveCopy) = 0;
+ virtual void OnDocumentPathChanged(const Qt3DSFile &inNewPath) = 0;
};
class CSelectedNodePropChangeListener