Commit c757c3f4 authored by Alessandro Portale's avatar Alessandro Portale

Rename QWORKBENCH_UTILS_EXPORT to QTCREATOR_UTILS_EXPORT

Rename QWORKBENCH_UTILS_LIBRARY to QTCREATOR_UTILS_LIBRARY
parent 2be72262
......@@ -37,7 +37,7 @@
namespace Core {
namespace Utils {
class QWORKBENCH_UTILS_EXPORT AbstractProcess
class QTCREATOR_UTILS_EXPORT AbstractProcess
{
public:
AbstractProcess() {}
......
......@@ -50,7 +50,7 @@ struct BaseValidatingLineEditPrivate;
* "<Enter name here>". This results in state 'DisplayingInitialText', which
* is not valid, but is not marked red.
*/
class QWORKBENCH_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(BaseValidatingLineEdit)
......
......@@ -41,7 +41,7 @@ struct ClassNameValidatingLineEditPrivate;
/* A Line edit that validates a C++ class name and emits a signal
* to derive suggested file names from it. */
class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit
class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit
: public Core::Utils::BaseValidatingLineEdit
{
Q_DISABLE_COPY(ClassNameValidatingLineEdit)
......
......@@ -53,7 +53,7 @@ static QString toAlphaNum(const QString &s)
return rc;
}
QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file)
QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file)
{
const QFileInfo fi(file);
QString rc = toAlphaNum(fi.completeBaseName()).toUpper();
......@@ -62,7 +62,7 @@ QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file)
return rc;
}
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
void writeIncludeFileDirective(const QString &file, bool globalInclude,
QTextStream &str)
{
......@@ -71,7 +71,7 @@ void writeIncludeFileDirective(const QString &file, bool globalInclude,
str << QLatin1String("#include ") << opening << file << closing << QLatin1Char('\n');
}
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
QString writeOpeningNameSpaces(const QStringList &l, const QString &indent,
QTextStream &str)
{
......@@ -87,7 +87,7 @@ QString writeOpeningNameSpaces(const QStringList &l, const QString &indent,
return rc;
}
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
void writeClosingNameSpaces(const QStringList &l, const QString &indent,
QTextStream &str)
{
......
......@@ -41,22 +41,22 @@ QT_END_NAMESPACE
namespace Core {
namespace Utils {
QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file);
QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file);
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
void writeIncludeFileDirective(const QString &file,
bool globalInclude,
QTextStream &str);
// Write opening namespaces and return an indentation string to be used
// in the following code if there are any.
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
QString writeOpeningNameSpaces(const QStringList &namespaces,
const QString &indent,
QTextStream &str);
// Close namespacesnamespaces
QWORKBENCH_UTILS_EXPORT
QTCREATOR_UTILS_EXPORT
void writeClosingNameSpaces(const QStringList &namespaces,
const QString &indent,
QTextStream &str);
......
......@@ -54,7 +54,7 @@ QT_END_NAMESPACE
namespace Core {
namespace Utils {
class QWORKBENCH_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
{
Q_OBJECT
......
......@@ -46,7 +46,7 @@ class FancyLineEditPrivate;
* text if isShowingHintText() returns true (that is, does not contain
* valid user input).
*/
class QWORKBENCH_UTILS_EXPORT FancyLineEdit : public QLineEdit
class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit
{
Q_DISABLE_COPY(FancyLineEdit)
Q_OBJECT
......
......@@ -39,7 +39,7 @@ namespace Utils {
* A control that let's the user choose a file name, based on a QLineEdit. Has
* some validation logic for embedding into QWizardPage.
*/
class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(FileNameValidatingLineEdit)
......
......@@ -39,7 +39,7 @@
namespace Core {
namespace Utils {
class QWORKBENCH_UTILS_EXPORT FileSearchResult
class QTCREATOR_UTILS_EXPORT FileSearchResult
{
public:
FileSearchResult() {}
......@@ -54,10 +54,10 @@ public:
int matchLength;
};
QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files,
QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files,
QTextDocument::FindFlags flags);
QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files,
QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files,
QTextDocument::FindFlags flags);
} // namespace Utils
......
......@@ -44,7 +44,7 @@ class FileWizardPage;
and path. Custom pages can be added via Core::IWizardExtension.
*/
class QWORKBENCH_UTILS_EXPORT FileWizardDialog : public QWizard {
class QTCREATOR_UTILS_EXPORT FileWizardDialog : public QWizard {
Q_OBJECT
Q_DISABLE_COPY(FileWizardDialog)
public:
......
......@@ -46,7 +46,7 @@ struct FileWizardPagePrivate;
* The name and path labels can be changed. By default they are simply "Name:"
* and "Path:".
*/
class QWORKBENCH_UTILS_EXPORT FileWizardPage : public QWizardPage
class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage
{
Q_OBJECT
Q_DISABLE_COPY(FileWizardPage)
......
......@@ -39,7 +39,7 @@ namespace Utils {
/* A label suitable for displaying cursor positions, etc. with a fixed
* with derived from a sample text. */
class QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel
class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel
{
Q_DISABLE_COPY(LineColumnLabel)
Q_OBJECT
......
......@@ -49,7 +49,7 @@ struct NewClassWidgetPrivate;
* names for header, source and form files. Has some smart logic to derive
* the file names from the class name.
*/
class QWORKBENCH_UTILS_EXPORT NewClassWidget : public QWidget
class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
{
Q_DISABLE_COPY(NewClassWidget)
Q_OBJECT
......
......@@ -43,7 +43,7 @@ struct PathChooserPrivate;
* A control that let's the user choose a path, consisting of a QLineEdit and
* a "Browse" button. Has some validation logic for embedding into QWizardPage.
*/
class QWORKBENCH_UTILS_EXPORT PathChooser : public QWidget
class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
{
Q_DISABLE_COPY(PathChooser)
Q_OBJECT
......
......@@ -55,7 +55,7 @@ struct PathListEditorPrivate;
* by new line characters for convenience.
*/
class QWORKBENCH_UTILS_EXPORT PathListEditor : public QWidget
class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget
{
Q_DISABLE_COPY(PathListEditor)
Q_OBJECT
......
......@@ -52,7 +52,7 @@ struct ProjectIntroPagePrivate;
* layout, otherwise, QWizard will squeeze it due to its strange expanding
* hacks. */
class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage
class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage
{
Q_OBJECT
Q_DISABLE_COPY(ProjectIntroPage)
......
......@@ -35,7 +35,7 @@
namespace Core {
namespace Utils {
class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
Q_DISABLE_COPY(ProjectNameValidatingLineEdit)
......
......@@ -37,7 +37,7 @@
namespace Core {
namespace Utils {
class QWORKBENCH_UTILS_EXPORT QtColorButton : public QToolButton
class QTCREATOR_UTILS_EXPORT QtColorButton : public QToolButton
{
Q_OBJECT
Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
......
......@@ -34,7 +34,7 @@
using namespace Core;
using namespace Core::Utils;
QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
Core::Utils::reloadPrompt(const QString &fileName, QWidget *parent)
{
return reloadPrompt(QObject::tr("File Changed"),
......@@ -42,7 +42,7 @@ QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
parent);
}
QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent)
{
switch (QMessageBox::question(parent, title, prompt,
......
......@@ -42,8 +42,8 @@ namespace Utils {
enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone };
QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent);
QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent);
QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
} // namespace Utils
} // namespace Core
......
......@@ -48,7 +48,7 @@ namespace Utils {
enum ApplyMode { ImmediateApply, DeferedApply };
class QWORKBENCH_UTILS_EXPORT SavedAction : public QAction
class QTCREATOR_UTILS_EXPORT SavedAction : public QAction
{
Q_OBJECT
......@@ -106,7 +106,7 @@ private:
ApplyMode m_applyMode;
};
class QWORKBENCH_UTILS_EXPORT SavedActionSet
class QTCREATOR_UTILS_EXPORT SavedActionSet
{
public:
SavedActionSet() {}
......
......@@ -34,7 +34,7 @@
namespace Core {
namespace Utils {
QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category)
QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category)
{
QString rc(category);
const QChar underscore = QLatin1Char('_');
......
......@@ -37,7 +37,7 @@ namespace Utils {
// Create a usable settings key from a category,
// for example Editor|C++ -> Editor_C__
QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category);
QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category);
} // namespace Utils
} // namespace Core
......
......@@ -68,7 +68,7 @@ struct SubmitEditorWidgetPrivate;
* Care should be taken to ensure the widget is deleted properly when the
* editor closes. */
class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget
class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget
{
Q_OBJECT
Q_DISABLE_COPY(SubmitEditorWidget)
......
......@@ -20,7 +20,7 @@ struct SubmitFieldWidgetPrivate;
* When choosing a different field in the combo, a new row is opened if text
* has been entered for the current field. Optionally, a "Browse..." button and
* completer can be added. */
class QWORKBENCH_UTILS_EXPORT SubmitFieldWidget : public QWidget
class QTCREATOR_UTILS_EXPORT SubmitFieldWidget : public QWidget
{
Q_OBJECT
Q_PROPERTY(QStringList fields READ fields WRITE setFields DESIGNABLE true)
......
......@@ -60,7 +60,7 @@ void SynchronousProcessResponse::clear()
stdErr.clear();
}
QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r)
QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r)
{
QDebug nsp = str.nospace();
nsp << "SynchronousProcessResponse: result=" << r.result << " ex=" << r.exitCode << '\n'
......
......@@ -48,7 +48,7 @@ namespace Utils {
struct SynchronousProcessPrivate;
/* Result of SynchronousProcess execution */
struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse
struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse
{
enum Result {
// Finished with return code 0
......@@ -71,7 +71,7 @@ struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse
QString stdErr;
};
QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &);
QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &);
/* SynchronousProcess: Runs a synchronous process in its own event loop
* that blocks only user input events. Thus, it allows for the gui to
......@@ -85,7 +85,7 @@ QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessRe
* stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled().
* They would typically be used for log windows. */
class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject
class QTCREATOR_UTILS_EXPORT SynchronousProcess : public QObject
{
Q_OBJECT
public:
......
......@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Utils
QT += gui network
DEFINES += QWORKBENCH_UTILS_LIBRARY
DEFINES += QTCREATOR_UTILS_LIBRARY
include(../../qtcreatorlibrary.pri)
......
......@@ -32,10 +32,10 @@
#include <QtCore/qglobal.h>
#if defined(QWORKBENCH_UTILS_LIBRARY)
# define QWORKBENCH_UTILS_EXPORT Q_DECL_EXPORT
#if defined(QTCREATOR_UTILS_LIBRARY)
# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
#else
# define QWORKBENCH_UTILS_EXPORT Q_DECL_IMPORT
# define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
#endif
#endif // UTILS_GLOBAL_H
......@@ -35,7 +35,7 @@
namespace Core {
namespace Utils {
QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error)
QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error)
{
QString rc = QString::fromLatin1("#%1: ").arg(error);
ushort *lpMsgBuf;
......
......@@ -41,7 +41,7 @@ namespace Utils {
// Helper to format a Windows error message, taking the
// code as returned by the GetLastError()-API.
QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error);
QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error);
} // namespace Utils
} // namespace Core
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment