Commit 6a4e4cfb authored by Tobias Hunger's avatar Tobias Hunger Committed by hjk

GLSLEditor: Remove needlessly exported symbols

... and move code into Internal namespace.

Change-Id: I02a90c33db0ffe574af43bdb8d8e37b4159f8f0f
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent a94aba2a
......@@ -30,8 +30,6 @@
#ifndef GLSLEDITOR_H
#define GLSLEDITOR_H
#include "glsleditor_global.h"
#include <texteditor/basetexteditor.h>
#include <QSharedPointer>
......@@ -46,19 +44,17 @@ namespace GLSL {
class Engine;
class TranslationUnitAST;
class Scope;
}
} // namespace GLSL
namespace Core {
class ICore;
}
namespace Core { class ICore; }
namespace GLSLEditor {
class GLSLTextEditorWidget;
namespace Internal {
class GLSLEditorEditable;
}
class GLSLTextEditorWidget;
class GLSLEDITOR_EXPORT Document
class Document
{
public:
typedef QSharedPointer<Document> Ptr;
......@@ -87,7 +83,7 @@ private:
friend class GLSLTextEditorWidget;
};
class GLSLEDITOR_EXPORT GLSLTextEditorWidget : public TextEditor::BaseTextEditorWidget
class GLSLTextEditorWidget : public TextEditor::BaseTextEditorWidget
{
Q_OBJECT
......@@ -127,6 +123,7 @@ private:
Document::Ptr m_glslDocument;
};
} // namespace Internal
} // namespace GLSLEditor
#endif // GLSLEDITOR_H
......@@ -5,7 +5,6 @@ DEFINES += \
HEADERS += \
glsleditor.h \
glsleditor_global.h \
glsleditorconstants.h \
glsleditoreditable.h \
glsleditorfactory.h \
......
......@@ -21,7 +21,6 @@ QtcPlugin {
"glsleditor.cpp",
"glsleditor.h",
"glsleditor.qrc",
"glsleditor_global.h",
"glsleditorconstants.h",
"glsleditoreditable.cpp",
"glsleditoreditable.h",
......
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef GLSLEDITOR_GLOBAL_H
#define GLSLEDITOR_GLOBAL_H
#include <QtGlobal>
#if defined(GLSLEDITOR_LIBRARY)
# define GLSLEDITOR_EXPORT Q_DECL_EXPORT
#else
# define GLSLEDITOR_EXPORT Q_DECL_IMPORT
#endif
#endif // GLSLEDITOR_GLOBAL_H
......@@ -33,10 +33,10 @@
#include <texteditor/basetexteditor.h>
namespace GLSLEditor {
class GLSLTextEditorWidget;
namespace Internal {
class GLSLTextEditorWidget;
class GLSLEditorEditable : public TextEditor::BaseTextEditor
{
Q_OBJECT
......
......@@ -58,7 +58,7 @@ GLSLEditorFactory::GLSLEditorFactory(QObject *parent)
Core::IEditor *GLSLEditorFactory::createEditor(QWidget *parent)
{
GLSLEditor::GLSLTextEditorWidget *rc = new GLSLEditor::GLSLTextEditorWidget(parent);
GLSLTextEditorWidget *rc = new GLSLTextEditorWidget(parent);
GLSLEditorPlugin::instance()->initializeEditor(rc);
return rc->editor();
}
......
......@@ -215,7 +215,7 @@ ExtensionSystem::IPlugin::ShutdownFlag GLSLEditorPlugin::aboutToShutdown()
return IPlugin::aboutToShutdown();
}
void GLSLEditorPlugin::initializeEditor(GLSLEditor::GLSLTextEditorWidget *editor)
void GLSLEditorPlugin::initializeEditor(GLSLTextEditorWidget *editor)
{
QTC_CHECK(m_instance);
m_actionHandler->setupActions(editor);
......
......@@ -48,15 +48,13 @@ namespace Core {
class Command;
class ActionContainer;
class ActionManager;
}
} // namespace Core
namespace GLSLEditor {
class GLSLTextEditorWidget;
namespace Internal {
class GLSLEditorFactory;
class GLSLTextEditorWidget;
class GLSLEditorPlugin : public ExtensionSystem::IPlugin
{
......@@ -74,7 +72,7 @@ public:
static GLSLEditorPlugin *instance() { return m_instance; }
void initializeEditor(GLSLEditor::GLSLTextEditorWidget *editor);
void initializeEditor(GLSLTextEditorWidget *editor);
struct InitFile
{
......
......@@ -32,10 +32,10 @@
#include <texteditor/syntaxhighlighter.h>
namespace GLSLEditor {
class GLSLTextEditorWidget;
namespace Internal {
class GLSLTextEditorWidget;
class Highlighter : public TextEditor::SyntaxHighlighter
{
Q_OBJECT
......
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