forked from qt-creator/qt-creator
Replace some struct with classes
* Fixes warnings about struct/class mixup in windows Reviewed-by: thorbjorn
This commit is contained in:
@@ -47,7 +47,7 @@ namespace Utils {
|
||||
}
|
||||
|
||||
namespace TextEditor {
|
||||
struct TabSettings;
|
||||
class TabSettings;
|
||||
|
||||
namespace Internal {
|
||||
class BaseTextEditorPrivate;
|
||||
@@ -85,10 +85,10 @@ class ITextMarkable;
|
||||
class BaseTextDocument;
|
||||
class BaseTextEditorEditable;
|
||||
class FontSettings;
|
||||
struct BehaviorSettings;
|
||||
struct CompletionSettings;
|
||||
struct DisplaySettings;
|
||||
struct StorageSettings;
|
||||
class BehaviorSettings;
|
||||
class CompletionSettings;
|
||||
class DisplaySettings;
|
||||
class StorageSettings;
|
||||
|
||||
class TEXTEDITOR_EXPORT BaseTextEditorAnimator : public QObject
|
||||
{
|
||||
|
||||
@@ -42,8 +42,9 @@ namespace TextEditor {
|
||||
* Settings that describe how the text editor behaves. This does not include
|
||||
* the TabSettings and StorageSettings.
|
||||
*/
|
||||
struct TEXTEDITOR_EXPORT BehaviorSettings
|
||||
class TEXTEDITOR_EXPORT BehaviorSettings
|
||||
{
|
||||
public:
|
||||
BehaviorSettings();
|
||||
|
||||
void toSettings(const QString &category, QSettings *s) const;
|
||||
|
||||
@@ -36,12 +36,13 @@
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct TabSettings;
|
||||
struct StorageSettings;
|
||||
struct BehaviorSettings;
|
||||
class TabSettings;
|
||||
class StorageSettings;
|
||||
class BehaviorSettings;
|
||||
|
||||
struct BehaviorSettingsPageParameters
|
||||
class BehaviorSettingsPageParameters
|
||||
{
|
||||
public:
|
||||
QString id;
|
||||
QString displayName;
|
||||
QString settingsPrefix;
|
||||
|
||||
@@ -53,8 +53,9 @@ enum CompletionTrigger {
|
||||
/**
|
||||
* Settings that describe how the code completion behaves.
|
||||
*/
|
||||
struct TEXTEDITOR_EXPORT CompletionSettings
|
||||
class TEXTEDITOR_EXPORT CompletionSettings
|
||||
{
|
||||
public:
|
||||
CompletionSettings();
|
||||
|
||||
void toSettings(const QString &category, QSettings *s) const;
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct CompletionItem;
|
||||
class CompletionItem;
|
||||
class ICompletionCollector;
|
||||
class ITextEditable;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct CompletionItem;
|
||||
class CompletionItem;
|
||||
class ITextEditable;
|
||||
|
||||
namespace Internal {
|
||||
|
||||
@@ -38,8 +38,9 @@ QT_END_NAMESPACE
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct TEXTEDITOR_EXPORT DisplaySettings
|
||||
class TEXTEDITOR_EXPORT DisplaySettings
|
||||
{
|
||||
public:
|
||||
DisplaySettings();
|
||||
|
||||
void toSettings(const QString &category, QSettings *s) const;
|
||||
|
||||
@@ -36,10 +36,11 @@
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct DisplaySettings;
|
||||
class DisplaySettings;
|
||||
|
||||
struct DisplaySettingsPageParameters
|
||||
class DisplaySettingsPageParameters
|
||||
{
|
||||
public:
|
||||
QString id;
|
||||
QString displayName;
|
||||
QString settingsPrefix;
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct TabSettings;
|
||||
class TabSettings;
|
||||
|
||||
namespace Internal {
|
||||
|
||||
|
||||
@@ -44,10 +44,11 @@ class ICompletionCollectorPrivate;
|
||||
|
||||
class ICompletionCollector;
|
||||
class ITextEditable;
|
||||
struct CompletionSettings;
|
||||
class CompletionSettings;
|
||||
|
||||
struct CompletionItem
|
||||
class CompletionItem
|
||||
{
|
||||
public:
|
||||
CompletionItem(ICompletionCollector *collector = 0)
|
||||
: relevance(0),
|
||||
duplicateCount(0),
|
||||
|
||||
@@ -41,7 +41,7 @@ QT_END_NAMESPACE
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct TabSettings;
|
||||
class TabSettings;
|
||||
|
||||
class TEXTEDITOR_EXPORT Indenter
|
||||
{
|
||||
|
||||
@@ -38,8 +38,9 @@ QT_END_NAMESPACE
|
||||
|
||||
namespace TextEditor {
|
||||
|
||||
struct TEXTEDITOR_EXPORT StorageSettings
|
||||
class TEXTEDITOR_EXPORT StorageSettings
|
||||
{
|
||||
public:
|
||||
StorageSettings();
|
||||
|
||||
void toSettings(const QString &category, QSettings *s) const;
|
||||
|
||||
@@ -42,8 +42,9 @@ namespace TextEditor {
|
||||
|
||||
// Tab settings: Data type the GeneralSettingsPage acts on
|
||||
// with some convenience functions for formatting.
|
||||
struct TEXTEDITOR_EXPORT TabSettings
|
||||
class TEXTEDITOR_EXPORT TabSettings
|
||||
{
|
||||
public:
|
||||
// This enum must match the indexes of tabKeyBehavior widget
|
||||
enum TabKeyBehavior {
|
||||
TabNeverIndents = 0,
|
||||
|
||||
@@ -38,11 +38,11 @@ namespace TextEditor {
|
||||
|
||||
class BaseTextEditor;
|
||||
class FontSettings;
|
||||
struct TabSettings;
|
||||
struct StorageSettings;
|
||||
struct BehaviorSettings;
|
||||
struct DisplaySettings;
|
||||
struct CompletionSettings;
|
||||
class TabSettings;
|
||||
class StorageSettings;
|
||||
class BehaviorSettings;
|
||||
class DisplaySettings;
|
||||
class CompletionSettings;
|
||||
class HighlighterSettings;
|
||||
|
||||
namespace Internal {
|
||||
|
||||
Reference in New Issue
Block a user