diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/quickopen/basefilefilter.h index 70b5ed8f6af93c935c737cd999aad019c26e6140..7802f67eb94ac0bd85268cc4834609db87b06b88 100644 --- a/src/plugins/quickopen/basefilefilter.h +++ b/src/plugins/quickopen/basefilefilter.h @@ -30,7 +30,7 @@ #ifndef BASEFILEFILTER_H #define BASEFILEFILTER_H -#include "quickopen_global.h" +#include "locator_global.h" #include "ilocatorfilter.h" #include <QtCore/QString> @@ -38,7 +38,7 @@ namespace QuickOpen { -class QUICKOPEN_EXPORT BaseFileFilter : public QuickOpen::ILocatorFilter +class LOCATOR_EXPORT BaseFileFilter : public QuickOpen::ILocatorFilter { Q_OBJECT diff --git a/src/plugins/quickopen/ilocatorfilter.h b/src/plugins/quickopen/ilocatorfilter.h index a4502253e96cfb377e015915432e3a77fb6c2050..008ae237382211551936da3fefd191a0814fc1ed 100644 --- a/src/plugins/quickopen/ilocatorfilter.h +++ b/src/plugins/quickopen/ilocatorfilter.h @@ -30,7 +30,7 @@ #ifndef ILOCATORFILTER_H #define ILOCATORFILTER_H -#include "quickopen_global.h" +#include "locator_global.h" #include <QtCore/QDir> #include <QtCore/QVariant> @@ -73,7 +73,7 @@ struct FilterEntry bool resolveFileIcon; }; -class QUICKOPEN_EXPORT ILocatorFilter : public QObject +class LOCATOR_EXPORT ILocatorFilter : public QObject { Q_OBJECT diff --git a/src/plugins/quickopen/quickopen_global.h b/src/plugins/quickopen/locator_global.h similarity index 86% rename from src/plugins/quickopen/quickopen_global.h rename to src/plugins/quickopen/locator_global.h index 9b91cdad5fb6c20b34bbcce34e913bbe9f697fb0..7dc95b7fdee0c053151970cc46232a8b28fb5d59 100644 --- a/src/plugins/quickopen/quickopen_global.h +++ b/src/plugins/quickopen/locator_global.h @@ -27,15 +27,15 @@ ** **************************************************************************/ -#ifndef QUICKOPEN_GLOBAL_H -#define QUICKOPEN_GLOBAL_H +#ifndef LOCATOR_GLOBAL_H +#define LOCATOR_GLOBAL_H #include <QtCore/qglobal.h> -#if defined(QUICKOPEN_LIBRARY) -# define QUICKOPEN_EXPORT Q_DECL_EXPORT +#if defined(LOCATOR_LIBRARY) +# define LOCATOR_EXPORT Q_DECL_EXPORT #else -# define QUICKOPEN_EXPORT Q_DECL_IMPORT +# define LOCATOR_EXPORT Q_DECL_IMPORT #endif -#endif // QUICKOPEN_GLOBAL_H +#endif // LOCATOR_GLOBAL_H diff --git a/src/plugins/quickopen/locatormanager.h b/src/plugins/quickopen/locatormanager.h index 12e3f89712d557b0c604169cd429f8de7d40521a..5f00bb5d896fa98821a6c2cfd5e1eb59e19e6783 100644 --- a/src/plugins/quickopen/locatormanager.h +++ b/src/plugins/quickopen/locatormanager.h @@ -30,7 +30,7 @@ #ifndef LOCATORMANAGER_H #define LOCATORMANAGER_H -#include "quickopen_global.h" +#include "locator_global.h" #include <QtCore/QObject> @@ -40,7 +40,7 @@ namespace Internal { class LocatorWidget; } -class QUICKOPEN_EXPORT LocatorManager : public QObject +class LOCATOR_EXPORT LocatorManager : public QObject { Q_OBJECT diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro index 5b56c4edf09a3e32b5f10be1d52e63924603be43..bbd669b562d59cbd9fb9bbbe9bab1d0d3d524c3f 100644 --- a/src/plugins/quickopen/quickopen.pro +++ b/src/plugins/quickopen/quickopen.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = QuickOpen -DEFINES += QUICKOPEN_LIBRARY +DEFINES += LOCATOR_LIBRARY include(../../qtcreatorplugin.pri) include(quickopen_dependencies.pri) HEADERS += locatorplugin.h \ @@ -14,7 +14,7 @@ HEADERS += locatorplugin.h \ directoryfilter.h \ locatormanager.h \ basefilefilter.h \ - quickopen_global.h + locator_global.h SOURCES += locatorplugin.cpp \ locatorwidget.cpp \ locatorfiltersfilter.cpp \