diff --git a/Code/Tools/AssetBundler/source/utils/utils.cpp b/Code/Tools/AssetBundler/source/utils/utils.cpp index 12830166b7..6daf3c571b 100644 --- a/Code/Tools/AssetBundler/source/utils/utils.cpp +++ b/Code/Tools/AssetBundler/source/utils/utils.cpp @@ -110,7 +110,6 @@ namespace AssetBundler const char RestrictedDirectoryName[] = "restricted"; const char PlatformsDirectoryName[] = "Platforms"; const char GemsDirectoryName[] = "Gems"; - const char GemsAssetsDirectoryName[] = "Assets"; const char GemsSeedFileName[] = "seedList"; const char EngineSeedFileName[] = "SeedAssetList"; diff --git a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp index 8c334c4468..4d2053c6d1 100644 --- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp +++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp @@ -174,12 +174,6 @@ namespace AssetProcessor static const char* CREATEINDEX_TYPEOFDEPENDENCY_SOURCEDEPENDENCY = "AssetProcessor::CreateIndexTypeOfDependency_SourceDependency"; static const char* CREATEINDEX_TYPEOFDEPENDENCY_SOURCEDEPENDENCY_STATEMENT = "CREATE INDEX IF NOT EXISTS TypeOfDependency_SourceDependency ON SourceDependency (TypeOfDependency);"; - - static const char* CREATEINDEX_SCANFOLDERS_SOURCES = "AssetProcesser::CreateIndexScanFoldersSources"; - static const char* CREATEINDEX_SCANFOLDERS_SOURCES_STATEMENT = - "CREATE INDEX IF NOT EXISTS ScanFolders_Sources ON Sources (ScanFolderPK);"; - static const char* DROPINDEX_SCANFOLDERS_SOURCES_STATEMENT = - "DROP INDEX IF EXISTS ScanFolders_Sources_idx;"; static const char* CREATEINDEX_SCANFOLDERS_SOURCES_SCANFOLDER = "AssetProcesser::CreateIndexScanFoldersSourcesScanFolder"; static const char* CREATEINDEX_SCANFOLDERS_SOURCES_SCANFOLDER_STATEMENT = @@ -188,20 +182,14 @@ namespace AssetProcessor static const char* CREATEINDEX_SOURCES_JOBS = "AssetProcesser::CreateIndexSourcesJobs"; static const char* CREATEINDEX_SOURCES_JOBS_STATEMENT = "CREATE INDEX IF NOT EXISTS Sources_Jobs ON Jobs (SourcePK);"; - static const char* DROPINDEX_SOURCES_JOBS_STATEMENT = - "DROP INDEX IF EXISTS Sources_Jobs_idx;"; static const char* CREATEINDEX_JOBS_PRODUCTS = "AssetProcesser::CreateIndexJobsProducts"; static const char* CREATEINDEX_JOBS_PRODUCTS_STATEMENT = "CREATE INDEX IF NOT EXISTS Jobs_Products ON Products (JobPK);"; - static const char* DROPINDEX_JOBS_PRODUCTS_STATEMENT = - "DROP INDEX IF EXISTS Jobs_Products_idx;"; static const char* CREATEINDEX_SOURCE_NAME = "AssetProcessor::CreateIndexSourceName"; static const char* CREATEINDEX_SOURCE_NAME_STATEMENT = "CREATE INDEX IF NOT EXISTS Sources_SourceName ON Sources (SourceName);"; - static const char* DROPINDEX_SOURCE_NAME_STATEMENT = - "DROP INDEX IF EXISTS Sources_SourceName_idx;"; static const char* CREATEINDEX_SOURCE_GUID = "AssetProcessor::CreateIndexSourceGuid"; static const char* CREATEINDEX_SOURCE_GUID_STATEMENT = @@ -210,8 +198,6 @@ namespace AssetProcessor static const char* CREATEINDEX_PRODUCT_NAME = "AssetProcessor::CreateIndexProductName"; static const char* CREATEINDEX_PRODUCT_NAME_STATEMENT = "CREATE INDEX IF NOT EXISTS Products_ProductName ON Products (ProductName);"; - static const char* DROPINDEX_PRODUCT_NAME_STATEMENT = - "DROP INDEX IF EXISTS Products_ProductName_idx;"; static const char* CREATEINDEX_PRODUCT_SUBID = "AssetProcessor::CreateIndexProductSubID"; static const char* CREATEINDEX_PRODUCT_SUBID_STATEMENT = diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp index eacff14180..aaf6496f7b 100644 --- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp +++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjob.cpp @@ -22,7 +22,6 @@ namespace { - unsigned long s_jobSerial = 1; bool s_typesRegistered = false; // You have up to 60 minutes to finish processing an asset. // This was increased from 10 to account for PVRTC compression diff --git a/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp index b34f79142c..bbeafda342 100644 --- a/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp +++ b/Code/Tools/AssetProcessor/native/unittests/UtilitiesUnitTests.cpp @@ -30,15 +30,6 @@ using namespace AssetProcessor; namespace AssetProcessor { - const char* const TEST_BOOTSTRAP_DATA = - "project_path = TestProject \r\n\ - assets = pc \r\n\ - -- ip and port of the asset processor.Only if you need to change defaults \r\n\ - -- remote_ip = 127.0.0.1 \r\n\ - windows_remote_ip = 127.0.0.7 \r\n\ - remote_port = 45645 \r\n\ - assetProcessor_branch_token = 0xDD814240"; - // simple utility class to make sure threads join and don't cause asserts // if the unit test exits early. class AutoThreadJoiner final diff --git a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp index 07106614cf..a1bc508899 100644 --- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp @@ -681,7 +681,6 @@ namespace AssetProcessor const char AssetConfigPlatformDir[] = "AssetProcessorConfig/"; const char AssetProcessorPlatformConfigFileName[] = "AssetProcessorPlatformConfig.ini"; - const char RestrictedPlatformDir[] = "restricted"; PlatformConfiguration::PlatformConfiguration(QObject* pParent) : QObject(pParent) diff --git a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp index 3152862d80..fa1598a224 100644 --- a/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp +++ b/Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp @@ -14,7 +14,6 @@ namespace Driller { static const int k_contractedSize = 20; - static const int k_textWidth = 153; AnnotationHeaderView::AnnotationHeaderView(AnnotationsProvider* ptrAnnotations, QWidget* parent, Qt::WindowFlags flags) : QWidget(parent, flags) diff --git a/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp b/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp index 0fd94476e3..d5c845b438 100644 --- a/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp +++ b/Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp @@ -24,10 +24,6 @@ namespace Driller { - static const int k_contractedSize = 28; - static const int k_expandedSize = 64; - static const int k_textWidth = 128; - static const int k_barHeight = 5; ////////////////////////