diff options
| author | Cidorvan Leite <cidorvan.leite@openbossa.org> | 2012-03-19 11:46:14 -0300 |
|---|---|---|
| committer | Anselmo L. S. Melo <anselmo.melo@openbossa.org> | 2012-03-22 19:35:08 +0100 |
| commit | 669c8c9eb4f35e4c1690b1ffb93a86f982c5b7dd (patch) | |
| tree | c8df8d33cc02b7a521f78ea0adc5dba0d7c1f47e | |
| parent | 98b34dfc3a1eee68a1f144d42b5d1a5d428cd84e (diff) | |
Fixed UiCompletionModel headers
Fixed #ifndef and class declaration
Change-Id: I67d0c5304504c093e2b142023372633d50af5ffe
Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
| -rw-r--r-- | src/models/uicompletionmodel.cpp | 7 | ||||
| -rw-r--r-- | src/models/uicompletionmodel.h | 8 | ||||
| -rw-r--r-- | src/models/uicompletionmodel_p.h | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/models/uicompletionmodel.cpp b/src/models/uicompletionmodel.cpp index 83fe489..9a71644 100644 --- a/src/models/uicompletionmodel.cpp +++ b/src/models/uicompletionmodel.cpp @@ -39,10 +39,9 @@ ** ****************************************************************************/ -#include "uicompletionmodel_p.h" - -#ifndef QT_NO_COMPLETER +#ifndef QT_NO_COMPLETIONMODEL +#include "uicompletionmodel_p.h" #include "QtCore/qstringlistmodel.h" #include "QtCore/qdir.h" @@ -824,4 +823,4 @@ QT_END_NAMESPACE_UIHELPERS #include "moc_uicompletionmodel.cpp" -#endif // QT_NO_COMPLETER +#endif // QT_NO_COMPLETIONMODEL diff --git a/src/models/uicompletionmodel.h b/src/models/uicompletionmodel.h index be2a0f1..de0220e 100644 --- a/src/models/uicompletionmodel.h +++ b/src/models/uicompletionmodel.h @@ -42,10 +42,14 @@ #ifndef UICOMPLETIONMODEL_H #define UICOMPLETIONMODEL_H +#ifndef QT_NO_COMPLETIONMODEL + +#include "uihelpersglobal.h" #include <QtCore/qobject.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> #include <QtCore/qabstractitemmodel.h> +#include "QtCore/qabstractproxymodel.h" #include <QtCore/qrect.h> QT_BEGIN_HEADER @@ -54,9 +58,10 @@ QT_BEGIN_NAMESPACE_UIHELPERS class UiCompletionModelPrivate; -class UiCompletionModel : public QAbstractProxyModel +class UIHELPERS_EXPORT UiCompletionModel : public QAbstractProxyModel { Q_OBJECT + Q_ENUMS(ModelSorting) Q_PROPERTY(Qt::CaseSensitivity caseSensitivity READ caseSensitivity WRITE setCaseSensitivity) Q_PROPERTY(ModelSorting modelSorting READ modelSorting WRITE setModelSorting) Q_PROPERTY(int completionColumn READ completionColumn WRITE setCompletionColumn) @@ -120,4 +125,5 @@ QT_END_NAMESPACE_UIHELPERS QT_END_HEADER +#endif // QT_NO_COMPLETIONMODEL #endif // UICOMPLETIONMODEL_H diff --git a/src/models/uicompletionmodel_p.h b/src/models/uicompletionmodel_p.h index 56ee586..900327a 100644 --- a/src/models/uicompletionmodel_p.h +++ b/src/models/uicompletionmodel_p.h @@ -42,6 +42,7 @@ #ifndef UICOMPLETIONMODEL_P_H #define UICOMPLETIONMODEL_P_H +#ifndef QT_NO_COMPLETIONMODEL // // W A R N I N G @@ -56,10 +57,6 @@ #include "private/qobject_p.h" -#ifndef QT_NO_COMPLETIONMODEL - -#include "uihelpersglobal.h" -#include "QtCore/qabstractproxymodel.h" #include "uicompletionmodel.h" #include "private/qabstractproxymodel_p.h" #include "QtCore/qstringlist.h" |