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