more file cosmetics

This commit is contained in:
hjk
2008-12-02 15:08:31 +01:00
parent 2ef79dca1c
commit df7aacd637
209 changed files with 895 additions and 689 deletions

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "rightpane.h"
#include <QtGui/QVBoxLayout>

View File

@@ -30,16 +30,18 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef RIGHTPANE_H
#define RIGHTPANE_H
#include "core_global.h"
#include <QtGui/QWidget>
#include <QtCore/QSettings>
namespace Core {
class IMode;
class IMode;
class RightPaneWidget;
// TODO: The right pane works only for the help plugin atm.
@@ -104,5 +106,4 @@ private:
} // namespace Core
#endif // RIGHTPANE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef METATYPEDECLARATIONS_H
#define METATYPEDECLARATIONS_H

View File

@@ -30,9 +30,14 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "qworkbench_wrapper.h"
#include <wrap_helpers.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/editormanager/editorgroup.h>
#include <QtCore/QDebug>
#include <QtCore/QSettings>
@@ -41,9 +46,6 @@
#include <QtGui/QToolBar>
#include <QtScript/QScriptEngine>
#include <coreplugin/messagemanager.h>
#include <coreplugin/editormanager/editorgroup.h>
namespace {
enum { debugQWorkbenchWrappers = 0 };
}
@@ -377,5 +379,5 @@ Core::EditorGroup *EditorGroupPrototype::callee() const
return rc;
}
}
}
} // namespace Internal
} // namespace Core

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef QWORKBENCH_WRAPPER_H
#define QWORKBENCH_WRAPPER_H
@@ -45,7 +46,8 @@ namespace Internal {
// Script prototype for the core interface.
class CorePrototype : public QObject, public QScriptable {
class CorePrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(Core::MessageManager* messageManager READ messageManager DESIGNABLE false SCRIPTABLE true STORED false)
@@ -97,7 +99,8 @@ public slots:
// Script prototype for the file manager interface.
class FileManagerPrototype : public QObject, public QScriptable {
class FileManagerPrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(QStringList recentFiles READ recentFiles DESIGNABLE false SCRIPTABLE true STORED false)
@@ -163,7 +166,8 @@ private:
// Script prototype for the editor manager interface.
class EditorManagerPrototype : public QObject, public QScriptable {
class EditorManagerPrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(QList<Core::IEditor*> openedEditors READ openedEditors DESIGNABLE false SCRIPTABLE true STORED false)
@@ -195,7 +199,8 @@ private:
// Script prototype for the editor interface.
class EditorPrototype : public QObject, public QScriptable {
class EditorPrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(QString kind READ kind DESIGNABLE false SCRIPTABLE true STORED false)
@@ -228,7 +233,8 @@ private:
// Script prototype for the editor group interface with Script-managed life cycle.
class EditorGroupPrototype : public QObject, public QScriptable {
class EditorGroupPrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(int editorCount READ editorCount DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false)
@@ -259,4 +265,4 @@ private:
} // namespace Internal
} // namespace Core
#endif //QWORKBENCH_WRAPPER_H
#endif // QWORKBENCH_WRAPPER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "scriptmanager.h"
#include "qworkbench_wrapper.h"
#include "metatypedeclarations.h"
@@ -309,5 +310,5 @@ QString ScriptManager::engineError(QScriptEngine &scriptEngine)
return QObject::tr("Unknown error");
}
}
}
} // namespace Internal
} // namespace Core

View File

@@ -30,16 +30,17 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef SCRIPTMANAGER_H
#define SCRIPTMANAGER_H
#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
#include <coreplugin/icore.h>
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtScript/QScriptEngine>
#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
#include <coreplugin/icore.h>
namespace Core {
namespace Internal {
@@ -68,4 +69,4 @@ private:
} // namespace Internal
} // namespace Core
#endif //SCRIPTMANAGER_H
#endif // SCRIPTMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef SCRIPTMANAGERINTERFACE_H
#define SCRIPTMANAGERINTERFACE_H

View File

@@ -30,9 +30,11 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "sidebar.h"
#include "imode.h"
#include "modemanager.h"
#include "actionmanager/actionmanagerinterface.h"
#include <QtCore/QDebug>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef SIDEBAR_H
#define SIDEBAR_H

View File

@@ -30,11 +30,11 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "styleanimator.h"
#include <QtGui/QStyleOption>
Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const
{
if (!widget)

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef ANIMATION_H
#define ANIMATION_H

View File

@@ -30,20 +30,23 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "stylehelper.h"
#include <QtGui/QPixmapCache>
#include <QtGui/QWidget>
// Clamps float color values within (0, 255)
static int clamp(float x) {
static int clamp(float x)
{
const int val = x > 255 ? 255 : static_cast<int>(x);
return val < 0 ? 0 : val;
}
// Clamps float color values within (0, 255)
/*
static int range(float x, int min, int max) {
static int range(float x, int min, int max)
{
int val = x > max ? max : x;
return val < min ? min : val;
}

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef STYLEHELPER_H
#define STYLEHELPER_H
@@ -43,7 +44,8 @@
// Helper class holding all custom color values
class CORE_EXPORT StyleHelper {
class CORE_EXPORT StyleHelper
{
public:
// Height of the project explorer navigation bar
static int navigationWidgetHeight() { return 24; }

View File

@@ -30,19 +30,19 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "tabpositionindicator.h"
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
#include <QtGui/QBrush>
#include <QtGui/QPalette>
#include "tabpositionindicator.h"
using namespace Core::Internal;
TabPositionIndicator::TabPositionIndicator()
: QWidget(0, Qt::ToolTip)
{
}
void TabPositionIndicator::paintEvent(QPaintEvent *event)

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef TABPOSITIONINDICATOR_H
#define TABPOSITIONINDICATOR_H
@@ -43,9 +44,10 @@ namespace Internal {
class TabPositionIndicator : public QWidget
{
Q_OBJECT
public:
TabPositionIndicator();
inline int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; }
int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; }
private:
void paintEvent(QPaintEvent *event);
@@ -54,4 +56,4 @@ private:
} // namespace Internal
} // namespace Core
#endif //TABPOSITIONINDICATOR_H
#endif // TABPOSITIONINDICATOR_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "uniqueidmanager.h"
#include "coreconstants.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef UNIQUEIDMANAGER_H
#define UNIQUEIDMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "variablemanager.h"
using namespace Core;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef VARIABLEMANAGER_H
#define VARIABLEMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "vcsmanager.h"
#include "iversioncontrol.h"
@@ -110,4 +111,4 @@ void VCSManager::showDeleteDialog(const QString &fileName)
}
}
}
} // namespace Core

View File

@@ -30,11 +30,12 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef VCSMANAGER_H
#define VCSMANAGER_H
#include "core_global.h"
#include <QtCore/QString>
namespace Core {

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "versiondialog.h"
#include "coreconstants.h"
#include "coreimpl.h"
@@ -46,8 +47,8 @@ using namespace Core::Constants;
#include <QtGui/QDialogButtonBox>
#include <QtGui/QTextBrowser>
VersionDialog::VersionDialog(QWidget *parent):
QDialog(parent)
VersionDialog::VersionDialog(QWidget *parent)
: QDialog(parent)
{
// We need to set the window icon explicitly here since for some reason the
// application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME)

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef VERSIONDIALOG_H
#define VERSIONDIALOG_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "viewmanager.h"
#include "coreconstants.h"
@@ -37,24 +38,23 @@
#include "uniqueidmanager.h"
#include "iview.h"
#include <QtCore/QSettings>
#include <QtGui/QAction>
#include <QtGui/QActionGroup>
#include <QtGui/QDockWidget>
#include <QtGui/QVBoxLayout>
#include <QtGui/QMenu>
#include <QtGui/QStatusBar>
#include <QtGui/QLabel>
#include <QtGui/QComboBox>
#include <QtGui/QStackedWidget>
#include <QtGui/QToolButton>
#include <coreplugin/actionmanager/actionmanagerinterface.h>
#include <coreplugin/actionmanager/icommand.h>
#include <extensionsystem/ExtensionSystemInterfaces>
#include <aggregation/aggregate.h>
#include <QtCore/QSettings>
#include <QtGui/QAction>
#include <QtGui/QActionGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDockWidget>
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QStackedWidget>
#include <QtGui/QStatusBar>
#include <QtGui/QToolButton>
#include <QtGui/QVBoxLayout>
using namespace Core;
using namespace Core::Internal;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef VIEWMANAGER_H
#define VIEWMANAGER_H
@@ -83,4 +84,4 @@ private:
} // namespace Internal
} // namespace Core
#endif //VIEWMANAGER_H
#endif // VIEWMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef VIEWMANAGERINTERFACE_H
#define VIEWMANAGERINTERFACE_H
@@ -59,6 +60,6 @@ public:
virtual IView * view(const QString & id) = 0;
};
} //namespace Core
} // namespace Core
#endif //VIEWMANAGERINTERFACE_H
#endif // VIEWMANAGERINTERFACE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "welcomemode.h"
#include "coreconstants.h"
#include "uniqueidmanager.h"
@@ -65,7 +66,8 @@ static QString readFile(const QString &name)
return ts.readAll();
}
struct WelcomeModePrivate {
struct WelcomeModePrivate
{
WelcomeModePrivate();
QWidget *m_widget;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef WELCOMEMODE_H
#define WELCOMEMODE_H
@@ -44,7 +45,6 @@ class QLabel;
QT_END_NAMESPACE
namespace Core {
namespace Internal {
struct WelcomeModePrivate;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cpasterplugin.h"
#include "ui_pasteselect.h"
@@ -64,9 +65,7 @@ using namespace TextEditor;
Core::ICore *gCoreInstance = NULL;
CodepasterPlugin::CodepasterPlugin()
: m_settingsPage(0)
, m_fetcher(0)
, m_poster(0)
: m_settingsPage(0), m_fetcher(0), m_poster(0)
{
}
@@ -125,7 +124,8 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
void CodepasterPlugin::extensionsInitialized()
{
m_projectExplorer = ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::ProjectExplorerPlugin>();
m_projectExplorer = ExtensionSystem::PluginManager::instance()
->getObject<ProjectExplorer::ProjectExplorerPlugin>();
}
void CodepasterPlugin::post()
@@ -268,18 +268,14 @@ void CustomFetcher::list(QListWidget* list)
Fetcher::fetch(url);
}
CustomPoster::CustomPoster(const QString &host
, bool copyToClipboard
, bool displayOutput)
: Poster(host)
, m_copy(copyToClipboard)
, m_output(displayOutput)
CustomPoster::CustomPoster(const QString &host, bool copyToClipboard, bool displayOutput)
: Poster(host), m_copy(copyToClipboard), m_output(displayOutput)
{
// cpaster calls QCoreApplication::exit which we want to avoid here
disconnect(this, SIGNAL(requestFinished(int,bool))
,this, SLOT(gotRequestFinished(int,bool)));
connect(this, SIGNAL(requestFinished(int,bool))
, SLOT(customRequestFinished(int,bool)));
disconnect(this, SIGNAL(requestFinished(int,bool)),
this, SLOT(gotRequestFinished(int,bool)));
connect(this, SIGNAL(requestFinished(int,bool)),
SLOT(customRequestFinished(int,bool)));
}
void CustomPoster::customRequestFinished(int, bool error)

View File

@@ -30,8 +30,9 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CodepasterPlugin_H
#define CodepasterPlugin_H
#ifndef CODEPASTERPLUGIN_H
#define CODEPASTERPLUGIN_H
#include "settingspage.h"
#include "fetcher.h"
@@ -58,62 +59,65 @@ class CodepasterPlugin : public ExtensionSystem::IPlugin
Q_OBJECT
public:
CodepasterPlugin();
~CodepasterPlugin();
CodepasterPlugin();
~CodepasterPlugin();
bool initialize(const QStringList &arguments
, QString *error_message);
void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
public slots:
void post();
void fetch();
void post();
void fetch();
private:
QAction *m_postAction;
QAction *m_fetchAction;
QAction *m_postAction;
QAction *m_fetchAction;
ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
SettingsPage *m_settingsPage;
CustomFetcher *m_fetcher;
CustomPoster *m_poster;
SettingsPage *m_settingsPage;
CustomFetcher *m_fetcher;
CustomPoster *m_poster;
};
class CustomFetcher : public Fetcher
{
Q_OBJECT
public:
CustomFetcher(const QString &host);
CustomFetcher(const QString &host);
int fetch(int pasteID);
inline bool hadCustomError() { return m_customError; }
int fetch(int pasteID);
bool hadCustomError() { return m_customError; }
void list(QListWidget *);
void list(QListWidget*);
private slots:
void customRequestFinished(int id, bool error);
void customRequestFinished(int id, bool error);
private:
QString m_host;
QListWidget *m_listWidget;
int m_id;
bool m_customError;
QString m_host;
QListWidget *m_listWidget;
int m_id;
bool m_customError;
};
class CustomPoster : public Poster
{
Q_OBJECT
public:
CustomPoster(const QString &host
, bool copyToClipboard = true
, bool displayOutput = true);
CustomPoster(const QString &host, bool copyToClipboard = true,
bool displayOutput = true);
private slots:
void customRequestFinished(int id, bool error);
void customRequestFinished(int id, bool error);
private:
bool m_copy;
bool m_output;
bool m_copy;
bool m_output;
};
} // namespace CodePaster
#endif
#endif // CODEPASTERPLUGIN_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "settingspage.h"
#include <coreplugin/icore.h>

View File

@@ -30,15 +30,16 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef SETTINGSPAGE_H
#define SETTINGSPAGE_H
#include <QtCore/QUrl>
#include <QtGui/QWidget>
#include "ui_settingspage.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include "ui_settingspage.h"
#include <QtCore/QUrl>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QSettings;
@@ -51,31 +52,31 @@ class SettingsPage : public Core::IOptionsPage
Q_OBJECT
public:
SettingsPage();
SettingsPage();
QString name() const;
QString category() const;
QString trCategory() const;
QString name() const;
QString category() const;
QString trCategory() const;
QWidget* createPage(QWidget *parent);
void finished(bool accepted);
QWidget *createPage(QWidget *parent);
void finished(bool accepted);
QString username() const;
QUrl serverUrl() const;
QString username() const;
QUrl serverUrl() const;
bool copyToClipBoard() const;
bool displayOutput() const;
bool copyToClipBoard() const;
bool displayOutput() const;
private:
Ui_SettingsPage m_ui;
QSettings *m_settings;
Ui_SettingsPage m_ui;
QSettings *m_settings;
QString m_username;
QUrl m_server;
bool m_copy;
bool m_output;
QString m_username;
QUrl m_server;
bool m_copy;
bool m_output;
};
} //namespace CodePaster
} // namespace CodePaster
#endif
#endif // SETTINGSPAGE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppclasswizard.h"
#include "cppeditorconstants.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPCLASSWIZARD_H
#define CPPCLASSWIZARD_H
@@ -45,9 +46,9 @@ class QComboBox;
QT_END_NAMESPACE
namespace Core {
namespace Utils {
class NewClassWidget;
}
namespace Utils {
class NewClassWidget;
}
}
namespace CppEditor {

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppeditor.h"
#include "cppeditorconstants.h"
#include "cppplugin.h"
@@ -138,7 +139,7 @@ QualifiedNameId *qualifiedNameIdForSymbol(Symbol *s, const LookupContext &contex
}
CPPEditorEditable::CPPEditorEditable(CPPEditor *editor)
:BaseTextEditorEditable(editor)
: BaseTextEditorEditable(editor)
{
Core::ICore *core = CppPlugin::core();
m_context << core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPEDITOR_H
#define CPPEDITOR_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPEDITOR_GLOBAL_H
#define CPPEDITOR_GLOBAL_H

View File

@@ -48,7 +48,11 @@ CPPEditorActionHandler::~CPPEditorActionHandler()
{ }
void CPPEditorActionHandler::createActions()
{ TextEditor::TextEditorActionHandler::createActions(); }
{
TextEditor::TextEditorActionHandler::createActions();
}
void CPPEditorActionHandler::updateActions(UpdateMode um)
{ TextEditor::TextEditorActionHandler::updateActions(um); }
{
TextEditor::TextEditorActionHandler::updateActions(um);
}

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPEDITORACTIONHANDLER_H
#define CPPEDITORACTIONHANDLER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPPLUGIN_GLOBAL_H
#define CPPPLUGIN_GLOBAL_H
@@ -53,6 +54,7 @@ const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
const char * const C_HEADER_MIMETYPE = "text/x-chdr";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
} // namespace Constants
} // namespace CppEditor

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPPLUGIN_ENUMS_H
#define CPPPLUGIN_ENUMS_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppfilewizard.h"
#include "cppeditor.h"
#include "cppeditorconstants.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPFILEWIZARD_H
#define CPPFILEWIZARD_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cpphighlighter.h"
#include <Token.h>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPHIGHLIGHTER_H
#define CPPHIGHLIGHTER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppplugin.h"
#include "cppeditor.h"
#include "cppeditorconstants.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPPLUGIN_H
#define CPPPLUGIN_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppcodecompletion.h"
#include "cppmodelmanager.h"

View File

@@ -30,13 +30,10 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPCODECOMPLETION_H
#define CPPCODECOMPLETION_H
// Qt
#include <QtCore/QObject>
#include <QtCore/QPointer>
// C++ front-end
#include <ASTfwd.h>
#include <FullySpecifiedType.h>
@@ -47,6 +44,10 @@
// Qt Creator
#include <texteditor/icompletioncollector.h>
// Qt
#include <QtCore/QObject>
#include <QtCore/QPointer>
namespace Core {
class ICore;
}

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cpphoverhandler.h"
#include "cppmodelmanager.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPHOVERHANDLER_H
#define CPPHOVERHANDLER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#define _SCL_SECURE_NO_WARNINGS 1
#include "pp.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPMODELMANAGER_H
#define CPPMODELMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPMODELMANAGERINTERFACE_H
#define CPPMODELMANAGERINTERFACE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cppquickopenfilter.h"
#include <Literals.h>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPQUICKOPENFILTER_H
#define CPPQUICKOPENFILTER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "cpptools.h"
#include "cppcodecompletion.h"
#include "cpphoverhandler.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPTOOLS_H
#define CPPTOOLS_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPTOOLS_GLOBAL_H
#define CPPTOOLS_GLOBAL_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPTOOLSCONSTANTS_H
#define CPPTOOLSCONSTANTS_H
@@ -43,7 +44,8 @@ const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
const char * const C_HEADER_MIMETYPE = "text/x-chdr";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
}
}
#endif //CPPTOOLSCONSTANTS_H
} // namespace Constants
} // namespace CppTools
#endif // CPPTOOLSCONSTANTS_H

View File

@@ -35,6 +35,7 @@
#include "cppmodelmanager.h"
#include <texteditor/itexteditor.h>
#include <QTimer>
using namespace CppTools::Internal;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef CPPTOOLSEDITORSUPPORT_H
#define CPPTOOLSEDITORSUPPORT_H
@@ -81,7 +82,7 @@ private:
QFuture<void> _documentParser;
};
} // end of namespace Internal
} // end of namespace CppTools
} // namespace Internal
} // namespace CppTools
#endif // CPPTOOLSEDITORSUPPORT_H

View File

@@ -72,5 +72,3 @@ inline bool pp_isspace (int __ch)
} // namespace rpp
#endif // PP_CCTYPE_H
// kate: space-indent on; indent-width 2; replace-tabs on;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef PP_CLIENT_H
#define PP_CLIENT_H
@@ -64,6 +65,6 @@ public:
virtual void stopSkippingBlocks(unsigned offset) = 0;
};
} // end of namespace rpp
} // namespace rpp
#endif // PP_CLIENT_H

View File

@@ -51,6 +51,7 @@
*/
#include "pp.h"
#include <Lexer.h>
#include <Token.h>
#include <QtDebug>

View File

@@ -54,6 +54,7 @@
#define PP_ENGINE_H
#include "pp-client.h"
#include <Token.h>
#include <QVector>

View File

@@ -56,26 +56,23 @@
#include <QByteArray>
namespace rpp {
namespace _PP_internal {
namespace _PP_internal
{
inline bool comment_p (const char *__first, const char *__last)
{
if (__first == __last)
return false;
inline bool comment_p (const char *__first, const char *__last)
{
if (__first == __last)
return false;
if (*__first != '/')
return false;
if (*__first != '/')
return false;
if (++__first == __last)
return false;
if (++__first == __last)
return false;
return (*__first == '/' || *__first == '*');
}
} // _PP_internal
return (*__first == '/' || *__first == '*');
}
} // _PP_internal
} // namespace rpp
#endif // PP_INTERNAL_H

View File

@@ -38,11 +38,11 @@
using namespace rpp;
MacroExpander::MacroExpander (Environment &env, pp_frame *frame)
: env (env), frame (frame),
lines (0), generated_lines (0)
: env(env), frame(frame),
lines(0), generated_lines(0)
{ }
const QByteArray *MacroExpander::resolve_formal (const QByteArray &__name)
const QByteArray *MacroExpander::resolve_formal(const QByteArray &__name)
{
if (! (frame && frame->expanding_macro))
return 0;

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_QWB_ASSERT_H
#define DEBUGGER_QWB_ASSERT_H
@@ -41,5 +42,5 @@
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
#endif
#endif
#endif // DEBUGGER_QWB_ASSERT_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "attachexternaldialog.h"
#include <QDebug>
@@ -39,6 +40,13 @@
#include <QStandardItemModel>
#include <QHeaderView>
#ifdef Q_OS_WINDOWS
#include <windows.h>
#include <tlhelp32.h>
#include <tchar.h>
#include <stdio.h>
#endif
using namespace Debugger::Internal;
AttachExternalDialog::AttachExternalDialog(QWidget *parent, const QString &pid)
@@ -70,7 +78,8 @@ static bool isProcessName(const QString &procname)
return true;
}
struct ProcData {
struct ProcData
{
QString ppid;
QString name;
QString state;
@@ -143,11 +152,6 @@ void AttachExternalDialog::rebuildProcessList()
#ifdef Q_OS_WINDOWS
#include <windows.h>
#include <tlhelp32.h>
#include <tchar.h>
#include <stdio.h>
// Forward declarations:
BOOL GetProcessList( );
BOOL ListProcessModules( DWORD dwPID );

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef ATTACHEXTERNALDIALOG_H
#define ATTACHEXTERNALDIALOG_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "attachremotedialog.h"
#include <QDebug>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef ATTACHREMOTE_DIALOG_H
#define ATTACHREMOTE_DIALOG_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "breakhandler.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_BREAKHANDLER_H
#define DEBUGGER_BREAKHANDLER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "breakwindow.h"
#include "ui_breakcondition.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_BREAKWINDOW_H
#define DEBUGGER_BREAKWINDOW_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGERCONSTANTS_H
#define DEBUGGERCONSTANTS_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_DEBUGGERMANAGER_H
#define DEBUGGER_DEBUGGERMANAGER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "debuggeroutputwindow.h"
#include <QtCore/QDebug>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_OUTPUTWINDOW_H
#define DEBUGGER_OUTPUTWINDOW_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "debuggerplugin.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGERPLUGIN_H
#define DEBUGGERPLUGIN_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "debuggerrunner.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGERRUNNER_H
#define DEBUGGERRUNNER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "disassemblerhandler.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DISASSEMBLERHANDLER_H
#define DISASSEMBLERHANDLER_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "disassemblerwindow.h"
#include <QAction>

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_DISASSEMBLERWINDOW_H
#define DEBUGGER_DISASSEMBLERWINDOW_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_GDBENGINE_H
#define DEBUGGER_GDBENGINE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "gdbmi.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "gdboptionpage.h"
#include "gdbengine.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef GDBOPTIONPAGE_H
#define GDBOPTIONPAGE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "gdboptionpage.h"
#include "gdbengine.h"
#include "imports.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_IDEBUGGERENGINE_H
#define DEBUGGER_IDEBUGGERENGINE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_IMPORTS_H
#define DEBUGGER_IMPORTS_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "mode.h"
#include "assert.h"

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_DEBUGMODE_H
#define DEBUGGER_DEBUGMODE_H

View File

@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#include "moduleshandler.h"
#include "assert.h"

Some files were not shown because too many files have changed in this diff Show More