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

C++ style settings: Compile fix for namespaced Qt.

Browse Source 
Change-Id: I89db5239576385823315443474669f5fd9ef69b4
Reviewed-on: http://codereview.qt.nokia.com/87
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
This commit is contained in:
Christian Kamm
2011-05-24 13:56:19 +02:00
committed by hjk
parent 3cf5379380
commit 312f6d0ff1
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -179,7 +179,7 @@ CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent)
: QWidget(parent),
m_tabPreferences(0),
m_cppCodeStylePreferences(0),
m_ui(new ::Ui::CppCodeStyleSettingsPage)
m_ui(new Ui::CppCodeStyleSettingsPage)
{
m_ui->setupUi(this);

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

@@ -13,12 +13,6 @@
#include "cppcodestylesettings.h"
#include "cppcodeformatter.h"
QT_BEGIN_NAMESPACE
namespace Ui {
class CppCodeStyleSettingsPage;
}
QT_END_NAMESPACE
namespace TextEditor {
class FontSettings;
class TabSettings;
@@ -33,6 +27,10 @@ class CppCodeStylePreferences;
namespace Internal {
namespace Ui {
class CppCodeStyleSettingsPage;
}
class CppCodeStylePreferencesWidget : public QWidget
{
Q_OBJECT

8
src/plugins/cpptools/cppcodestylesettingspage.ui
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CppCodeStyleSettingsPage</class>
<widget class="QWidget" name="CppCodeStyleSettingsPage">
<class>CppTools::Internal::CppCodeStyleSettingsPage</class>
<widget class="QWidget" name="CppTools::Internal::CppCodeStyleSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>759</width>
<height>467</height>
<width>757</width>
<height>465</height>
</rect>
</property>
<property name="windowTitle">