Commit df7aacd6 authored by hjk's avatar hjk

more file cosmetics

parent 2ef79dca
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "rightpane.h" #include "rightpane.h"
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
......
...@@ -30,16 +30,18 @@ ...@@ -30,16 +30,18 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef RIGHTPANE_H #ifndef RIGHTPANE_H
#define RIGHTPANE_H #define RIGHTPANE_H
#include "core_global.h" #include "core_global.h"
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QSettings> #include <QtCore/QSettings>
namespace Core { namespace Core {
class IMode;
class IMode;
class RightPaneWidget; class RightPaneWidget;
// TODO: The right pane works only for the help plugin atm. // TODO: The right pane works only for the help plugin atm.
...@@ -104,5 +106,4 @@ private: ...@@ -104,5 +106,4 @@ private:
} // namespace Core } // namespace Core
#endif // RIGHTPANE_H #endif // RIGHTPANE_H
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef METATYPEDECLARATIONS_H #ifndef METATYPEDECLARATIONS_H
#define METATYPEDECLARATIONS_H #define METATYPEDECLARATIONS_H
......
...@@ -30,9 +30,14 @@ ...@@ -30,9 +30,14 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "qworkbench_wrapper.h" #include "qworkbench_wrapper.h"
#include <wrap_helpers.h> #include <wrap_helpers.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/editormanager/editorgroup.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QSettings> #include <QtCore/QSettings>
...@@ -41,9 +46,6 @@ ...@@ -41,9 +46,6 @@
#include <QtGui/QToolBar> #include <QtGui/QToolBar>
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <coreplugin/messagemanager.h>
#include <coreplugin/editormanager/editorgroup.h>
namespace { namespace {
enum { debugQWorkbenchWrappers = 0 }; enum { debugQWorkbenchWrappers = 0 };
} }
...@@ -377,5 +379,5 @@ Core::EditorGroup *EditorGroupPrototype::callee() const ...@@ -377,5 +379,5 @@ Core::EditorGroup *EditorGroupPrototype::callee() const
return rc; return rc;
} }
} } // namespace Internal
} } // namespace Core
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef QWORKBENCH_WRAPPER_H #ifndef QWORKBENCH_WRAPPER_H
#define QWORKBENCH_WRAPPER_H #define QWORKBENCH_WRAPPER_H
...@@ -45,7 +46,8 @@ namespace Internal { ...@@ -45,7 +46,8 @@ namespace Internal {
// Script prototype for the core interface. // Script prototype for the core interface.
class CorePrototype : public QObject, public QScriptable { class CorePrototype : public QObject, public QScriptable
{
Q_OBJECT Q_OBJECT
Q_PROPERTY(Core::MessageManager* messageManager READ messageManager DESIGNABLE false SCRIPTABLE true STORED false) Q_PROPERTY(Core::MessageManager* messageManager READ messageManager DESIGNABLE false SCRIPTABLE true STORED false)
...@@ -97,7 +99,8 @@ public slots: ...@@ -97,7 +99,8 @@ public slots:
// Script prototype for the file manager interface. // Script prototype for the file manager interface.
class FileManagerPrototype : public QObject, public QScriptable { class FileManagerPrototype : public QObject, public QScriptable
{
Q_OBJECT Q_OBJECT
Q_PROPERTY(QStringList recentFiles READ recentFiles DESIGNABLE false SCRIPTABLE true STORED false) Q_PROPERTY(QStringList recentFiles READ recentFiles DESIGNABLE false SCRIPTABLE true STORED false)
...@@ -163,7 +166,8 @@ private: ...@@ -163,7 +166,8 @@ private:
// Script prototype for the editor manager interface. // Script prototype for the editor manager interface.
class EditorManagerPrototype : public QObject, public QScriptable { class EditorManagerPrototype : public QObject, public QScriptable
{
Q_OBJECT Q_OBJECT
Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false) 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) Q_PROPERTY(QList<Core::IEditor*> openedEditors READ openedEditors DESIGNABLE false SCRIPTABLE true STORED false)
...@@ -195,7 +199,8 @@ private: ...@@ -195,7 +199,8 @@ private:
// Script prototype for the editor interface. // Script prototype for the editor interface.
class EditorPrototype : public QObject, public QScriptable { class EditorPrototype : public QObject, public QScriptable
{
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName DESIGNABLE false SCRIPTABLE true STORED false) 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) Q_PROPERTY(QString kind READ kind DESIGNABLE false SCRIPTABLE true STORED false)
...@@ -228,7 +233,8 @@ private: ...@@ -228,7 +233,8 @@ private:
// Script prototype for the editor group interface with Script-managed life cycle. // 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_OBJECT
Q_PROPERTY(int editorCount READ editorCount DESIGNABLE false SCRIPTABLE true STORED false) 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) Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false)
...@@ -259,4 +265,4 @@ private: ...@@ -259,4 +265,4 @@ private:
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core
#endif //QWORKBENCH_WRAPPER_H #endif // QWORKBENCH_WRAPPER_H
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "scriptmanager.h" #include "scriptmanager.h"
#include "qworkbench_wrapper.h" #include "qworkbench_wrapper.h"
#include "metatypedeclarations.h" #include "metatypedeclarations.h"
...@@ -309,5 +310,5 @@ QString ScriptManager::engineError(QScriptEngine &scriptEngine) ...@@ -309,5 +310,5 @@ QString ScriptManager::engineError(QScriptEngine &scriptEngine)
return QObject::tr("Unknown error"); return QObject::tr("Unknown error");
} }
} } // namespace Internal
} } // namespace Core
...@@ -30,16 +30,17 @@ ...@@ -30,16 +30,17 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef SCRIPTMANAGER_H #ifndef SCRIPTMANAGER_H
#define SCRIPTMANAGER_H #define SCRIPTMANAGER_H
#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
#include <coreplugin/icore.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
#include <coreplugin/icore.h>
namespace Core { namespace Core {
namespace Internal { namespace Internal {
...@@ -68,4 +69,4 @@ private: ...@@ -68,4 +69,4 @@ private:
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core
#endif //SCRIPTMANAGER_H #endif // SCRIPTMANAGER_H
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef SCRIPTMANAGERINTERFACE_H #ifndef SCRIPTMANAGERINTERFACE_H
#define SCRIPTMANAGERINTERFACE_H #define SCRIPTMANAGERINTERFACE_H
......
...@@ -30,9 +30,11 @@ ...@@ -30,9 +30,11 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "sidebar.h" #include "sidebar.h"
#include "imode.h" #include "imode.h"
#include "modemanager.h" #include "modemanager.h"
#include "actionmanager/actionmanagerinterface.h" #include "actionmanager/actionmanagerinterface.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef SIDEBAR_H #ifndef SIDEBAR_H
#define SIDEBAR_H #define SIDEBAR_H
......
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "styleanimator.h" #include "styleanimator.h"
#include <QtGui/QStyleOption> #include <QtGui/QStyleOption>
Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const
{ {
if (!widget) if (!widget)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef ANIMATION_H #ifndef ANIMATION_H
#define ANIMATION_H #define ANIMATION_H
......
...@@ -30,20 +30,23 @@ ...@@ -30,20 +30,23 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "stylehelper.h" #include "stylehelper.h"
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
#include <QtGui/QWidget> #include <QtGui/QWidget>
// Clamps float color values within (0, 255) // 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); const int val = x > 255 ? 255 : static_cast<int>(x);
return val < 0 ? 0 : val; return val < 0 ? 0 : val;
} }
// Clamps float color values within (0, 255) // 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; int val = x > max ? max : x;
return val < min ? min : val; return val < min ? min : val;
} }
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef STYLEHELPER_H #ifndef STYLEHELPER_H
#define STYLEHELPER_H #define STYLEHELPER_H
...@@ -43,7 +44,8 @@ ...@@ -43,7 +44,8 @@
// Helper class holding all custom color values // Helper class holding all custom color values
class CORE_EXPORT StyleHelper { class CORE_EXPORT StyleHelper
{
public: public:
// Height of the project explorer navigation bar // Height of the project explorer navigation bar
static int navigationWidgetHeight() { return 24; } static int navigationWidgetHeight() { return 24; }
......
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "tabpositionindicator.h"
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QPaintEvent> #include <QtGui/QPaintEvent>
#include <QtGui/QBrush> #include <QtGui/QBrush>
#include <QtGui/QPalette> #include <QtGui/QPalette>
#include "tabpositionindicator.h"
using namespace Core::Internal; using namespace Core::Internal;
TabPositionIndicator::TabPositionIndicator() TabPositionIndicator::TabPositionIndicator()
: QWidget(0, Qt::ToolTip) : QWidget(0, Qt::ToolTip)
{ {
} }
void TabPositionIndicator::paintEvent(QPaintEvent *event) void TabPositionIndicator::paintEvent(QPaintEvent *event)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef TABPOSITIONINDICATOR_H #ifndef TABPOSITIONINDICATOR_H
#define TABPOSITIONINDICATOR_H #define TABPOSITIONINDICATOR_H
...@@ -43,9 +44,10 @@ namespace Internal { ...@@ -43,9 +44,10 @@ namespace Internal {
class TabPositionIndicator : public QWidget class TabPositionIndicator : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
TabPositionIndicator(); TabPositionIndicator();
inline int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; } int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; }
private: private:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
...@@ -54,4 +56,4 @@ private: ...@@ -54,4 +56,4 @@ private:
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core
#endif //TABPOSITIONINDICATOR_H #endif // TABPOSITIONINDICATOR_H
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "uniqueidmanager.h" #include "uniqueidmanager.h"
#include "coreconstants.h" #include "coreconstants.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef UNIQUEIDMANAGER_H #ifndef UNIQUEIDMANAGER_H
#define UNIQUEIDMANAGER_H #define UNIQUEIDMANAGER_H
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "variablemanager.h" #include "variablemanager.h"
using namespace Core; using namespace Core;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#ifndef VARIABLEMANAGER_H #ifndef VARIABLEMANAGER_H
#define VARIABLEMANAGER_H #define VARIABLEMANAGER_H
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package. ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
** **
***************************************************************************/ ***************************************************************************/
#include "vcsmanager.h" #include "vcsmanager.h"
#include "iversioncontrol.h" #include "iversioncontrol.h"