feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

compile fix with namespaces

Browse Source 
Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-24 13:00:01 +01:00
committed by hjk
parent 4ba95878b3
commit f012bf4494
31 changed files with 90 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/completionsettingspage.h
View File

@@ -36,18 +36,10 @@
#include <texteditor/completionsettings.h>
#include <texteditor/texteditoroptionspage.h>
QT_BEGIN_NAMESPACE
namespace CppTools {
namespace Internal {
namespace Ui {
class CompletionSettingsPage;
} // namespace Ui
} // namespace Internal
} // namespace CppTools
QT_END_NAMESPACE
namespace CppTools {
namespace Internal {
namespace Ui { class CompletionSettingsPage; }
// TODO: Move this class to the text editor plugin

5
src/plugins/cpptools/cppcodestylesettings.h
View File

@@ -88,11 +88,10 @@ public:
void fromMap(const QString &prefix, const QVariantMap &map);
bool equals(const CppCodeStyleSettings &rhs) const;
bool operator==(const CppCodeStyleSettings &s) const { return equals(s); }
bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); }
};
inline bool operator==(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return s1.equals(s2); }
inline bool operator!=(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return !s1.equals(s2); }
} // namespace CppTools
Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings)

20
src/plugins/cpptools/cppfilesettingspage.h
View File

@@ -34,27 +34,20 @@
#define CPPSETTINGSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer>
#include <QtCore/QSharedPointer>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
namespace CppTools {
namespace Internal {
namespace Ui {
class CppFileSettingsPage;
} // namespace Ui
} // namespace Internal
} // namespace CppTools
class QSettings;
QT_END_NAMESPACE
namespace CppTools {
namespace Internal {
namespace Ui { class CppFileSettingsPage; }
struct CppFileSettings
{
CppFileSettings();
@@ -73,11 +66,10 @@ struct CppFileSettings
static QString licenseTemplate(const QString &file = QString(), const QString &className = QString());
bool equals(const CppFileSettings &rhs) const;
bool operator==(const CppFileSettings &s) const { return equals(s); }
bool operator!=(const CppFileSettings &s) const { return !equals(s); }
};
inline bool operator==(const CppFileSettings &s1, const CppFileSettings &s2) { return s1.equals(s2); }
inline bool operator!=(const CppFileSettings &s1, const CppFileSettings &s2) { return !s1.equals(s2); }
class CppFileSettingsWidget : public QWidget
{
Q_OBJECT
@@ -98,7 +90,7 @@ private:
inline QString licenseTemplatePath() const;
inline void setLicenseTemplatePath(const QString &);
Internal::Ui::CppFileSettingsPage *m_ui;
Ui::CppFileSettingsPage *m_ui;
};
class CppFileSettingsPage : public Core::IOptionsPage