diff options
141 files changed, 790 insertions, 647 deletions
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp index b2413b3870..5b90a8d41b 100644 --- a/src/plugins/analyzerbase/startremotedialog.cpp +++ b/src/plugins/analyzerbase/startremotedialog.cpp @@ -43,7 +43,7 @@ namespace Analyzer { StartRemoteDialog::StartRemoteDialog(QWidget *parent) : QDialog(parent) - , m_ui(new Ui::StartRemoteDialog) + , m_ui(new Internal::Ui::StartRemoteDialog) { m_ui->setupUi(this); diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h index 5ad308f8db..4c3f932b85 100644 --- a/src/plugins/analyzerbase/startremotedialog.h +++ b/src/plugins/analyzerbase/startremotedialog.h @@ -37,16 +37,24 @@ #include <QtGui/QDialog> -namespace Utils { -class SshConnectionParameters; -} +QT_BEGIN_NAMESPACE namespace Analyzer { - +namespace Internal { namespace Ui { class StartRemoteDialog; +} // namespace Ui +} // namespace Internal +} // namespace Analyzer + +QT_END_NAMESPACE + +namespace Utils { +class SshConnectionParameters; } +namespace Analyzer { + class ANALYZER_EXPORT StartRemoteDialog : public QDialog { Q_OBJECT @@ -65,7 +73,7 @@ private slots: virtual void accept(); private: - Ui::StartRemoteDialog *m_ui; + Internal::Ui::StartRemoteDialog *m_ui; }; } // namespace Analyzer diff --git a/src/plugins/analyzerbase/startremotedialog.ui b/src/plugins/analyzerbase/startremotedialog.ui index f5157f00ca..f4334acf4c 100644 --- a/src/plugins/analyzerbase/startremotedialog.ui +++ b/src/plugins/analyzerbase/startremotedialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Analyzer::StartRemoteDialog</class> - <widget class="QDialog" name="Analyzer::StartRemoteDialog"> + <class>Analyzer::Internal::StartRemoteDialog</class> + <widget class="QDialog" name="Analyzer::Internal::StartRemoteDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>446</width> - <height>329</height> + <height>363</height> </rect> </property> <property name="windowTitle"> @@ -165,6 +165,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 8c6b065b81..32f065c08f 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -69,7 +69,7 @@ CommandMappings::~CommandMappings() QWidget *CommandMappings::createPage(QWidget *parent) { - m_page = new Ui_CommandMappings(); + m_page = new Ui::CommandMappings(); QWidget *w = new QWidget(parent); m_page->setupUi(w); m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index b3e92cab29..217b5098d4 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -41,7 +41,13 @@ QT_BEGIN_NAMESPACE class QLineEdit; class QTreeWidget; class QTreeWidgetItem; -class Ui_CommandMappings; +namespace Core { +namespace Internal { +namespace Ui { +class CommandMappings; +} // namespace Ui +} // namespace Internal +} // namespace Core QT_END_NAMESPACE namespace Core { @@ -92,7 +98,7 @@ protected: virtual void markPossibleCollisions(QTreeWidgetItem *) {} virtual void resetCollisionMarkers() {} private: - Ui_CommandMappings *m_page; + Internal::Ui::CommandMappings *m_page; }; } // namespace Core diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui index 8a6cb60746..ee4f1119cd 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.ui +++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CommandMappings</class> - <widget class="QWidget" name="CommandMappings"> + <class>Core::Internal::CommandMappings</class> + <widget class="QWidget" name="Core::Internal::CommandMappings"> <property name="geometry"> <rect> <x>0</x> @@ -155,8 +155,13 @@ </widget> <customwidgets> <customwidget> - <class>Utils::FilterLineEdit</class> + <class>Utils::FancyLineEdit</class> <extends>QLineEdit</extends> + <header location="global">utils/fancylineedit.h</header> + </customwidget> + <customwidget> + <class>Utils::FilterLineEdit</class> + <extends>Utils::FancyLineEdit</extends> <header location="global">utils/filterlineedit.h</header> </customwidget> </customwidgets> diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.ui b/src/plugins/coreplugin/dialogs/openwithdialog.ui index 1ec069d598..eb5916a89e 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.ui +++ b/src/plugins/coreplugin/dialogs/openwithdialog.ui @@ -1,7 +1,8 @@ -<ui version="4.0" > - <class>OpenWithDialog</class> - <widget class="QWidget" name="OpenWithDialog" > - <property name="geometry" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Core::Internal::OpenWithDialog</class> + <widget class="QWidget" name="Core::Internal::OpenWithDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,33 +10,33 @@ <height>199</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Open File With...</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Open file extension with:</string> </property> </widget> </item> <item> - <widget class="QListWidget" name="editorListWidget" /> + <widget class="QListWidget" name="editorListWidget"/> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > - <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.ui b/src/plugins/coreplugin/dialogs/saveitemsdialog.ui index 2565ed2c4e..44f2e497e5 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.ui +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>SaveItemsDialog</class> - <widget class="QDialog" name="SaveItemsDialog"> + <class>Core::Internal::SaveItemsDialog</class> + <widget class="QDialog" name="Core::Internal::SaveItemsDialog"> <property name="geometry"> <rect> <x>0</x> @@ -83,7 +83,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>SaveItemsDialog</receiver> + <receiver>Core::Internal::SaveItemsDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.ui b/src/plugins/coreplugin/editormanager/openeditorsview.ui index a94a803135..299538e66a 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.ui +++ b/src/plugins/coreplugin/editormanager/openeditorsview.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>OpenEditorsView</class> - <widget class="QWidget" name="OpenEditorsView"> + <class>Core::Internal::OpenEditorsView</class> + <widget class="QWidget" name="Core::Internal::OpenEditorsView"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/coreplugin/mimetypemagicdialog.ui b/src/plugins/coreplugin/mimetypemagicdialog.ui index 0976d1ad27..f884cfa851 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.ui +++ b/src/plugins/coreplugin/mimetypemagicdialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MimeTypeMagicDialog</class> - <widget class="QDialog" name="MimeTypeMagicDialog"> + <class>Core::Internal::MimeTypeMagicDialog</class> + <widget class="QDialog" name="Core::Internal::MimeTypeMagicDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>480</width> - <height>286</height> + <width>556</width> + <height>334</height> </rect> </property> <property name="windowTitle"> @@ -189,7 +189,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>MimeTypeMagicDialog</receiver> + <receiver>Core::Internal::MimeTypeMagicDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/coreplugin/mimetypesettingspage.ui b/src/plugins/coreplugin/mimetypesettingspage.ui index 5006a9dee3..5fe2e67e10 100644 --- a/src/plugins/coreplugin/mimetypesettingspage.ui +++ b/src/plugins/coreplugin/mimetypesettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MimeTypeSettingsPage</class> - <widget class="QWidget" name="MimeTypeSettingsPage"> + <class>Core::Internal::MimeTypeSettingsPage</class> + <widget class="QWidget" name="Core::Internal::MimeTypeSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp index 165841e55b..03501af7d1 100644 --- a/src/plugins/coreplugin/variablechooser.cpp +++ b/src/plugins/coreplugin/variablechooser.cpp @@ -47,7 +47,7 @@ using namespace Core; VariableChooser::VariableChooser(QWidget *parent) : QWidget(parent), - ui(new Ui::VariableChooser), + ui(new Internal::Ui::VariableChooser), m_lineEdit(0), m_textEdit(0), m_plainTextEdit(0) diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index 0c16266b01..5db5b05164 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/src/plugins/coreplugin/variablechooser.h @@ -43,6 +43,15 @@ class QLineEdit; class QTextEdit; class QPlainTextEdit; class QListWidgetItem; + +namespace Core { +namespace Internal { +namespace Ui { +class VariableChooser; +} // namespace Ui +} // namespace Internal +} // namespace Core + QT_END_NAMESPACE namespace Utils { @@ -51,10 +60,6 @@ class IconButton; namespace Core { -namespace Ui { - class VariableChooser; -} - class CORE_EXPORT VariableChooser : public QWidget { Q_OBJECT @@ -76,7 +81,7 @@ private slots: private: void createIconButton(); - Ui::VariableChooser *ui; + Internal::Ui::VariableChooser *ui; QString m_defaultDescription; QPointer<QLineEdit> m_lineEdit; QPointer<QTextEdit> m_textEdit; diff --git a/src/plugins/coreplugin/variablechooser.ui b/src/plugins/coreplugin/variablechooser.ui index 7cb04a0ce9..d7aaf5e197 100644 --- a/src/plugins/coreplugin/variablechooser.ui +++ b/src/plugins/coreplugin/variablechooser.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Core::VariableChooser</class> - <widget class="QWidget" name="Core::VariableChooser"> + <class>Core::Internal::VariableChooser</class> + <widget class="QWidget" name="Core::Internal::VariableChooser"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.h b/src/plugins/cpaster/fileshareprotocolsettingspage.h index 2f5e2bfe7a..27e24dc55b 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.h +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.h @@ -70,7 +70,7 @@ public: FileShareProtocolSettings settings() const; private: - Ui::FileShareProtocolSettingsWidget m_ui; + Internal::Ui::FileShareProtocolSettingsWidget m_ui; }; class FileShareProtocolSettingsPage : public Core::IOptionsPage { diff --git a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui index fe59dba5de..b0816fb2a3 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui +++ b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CodePaster::FileShareProtocolSettingsWidget</class> - <widget class="QWidget" name="CodePaster::FileShareProtocolSettingsWidget"> + <class>CodePaster::Internal::FileShareProtocolSettingsWidget</class> + <widget class="QWidget" name="CodePaster::Internal::FileShareProtocolSettingsWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/cpaster/pastebindotcomsettings.cpp b/src/plugins/cpaster/pastebindotcomsettings.cpp index 6648925b6b..064fb2ae29 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.cpp +++ b/src/plugins/cpaster/pastebindotcomsettings.cpp @@ -78,7 +78,7 @@ QIcon PasteBinDotComSettings::categoryIcon() const QWidget *PasteBinDotComSettings::createPage(QWidget *parent) { - Ui_PasteBinComSettingsWidget ui; + Internal::Ui::PasteBinComSettingsWidget ui; QWidget *w = new QWidget(parent); ui.setupUi(w); ui.lineEdit->setText(hostPrefix()); diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui index c56c271a2a..869566a80d 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.ui +++ b/src/plugins/cpaster/pastebindotcomsettings.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>PasteBinComSettingsWidget</class> - <widget class="QWidget" name="PasteBinComSettingsWidget"> + <class>CodePaster::Internal::PasteBinComSettingsWidget</class> + <widget class="QWidget" name="CodePaster::Internal::PasteBinComSettingsWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/cpaster/pasteselect.ui b/src/plugins/cpaster/pasteselect.ui index 5e6aad331c..4c7e495eb4 100644 --- a/src/plugins/cpaster/pasteselect.ui +++ b/src/plugins/cpaster/pasteselect.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CodePaster::PasteSelectDialog</class> - <widget class="QDialog" name="CodePaster::PasteSelectDialog"> + <class>CodePaster::Internal::PasteSelectDialog</class> + <widget class="QDialog" name="CodePaster::Internal::PasteSelectDialog"> <property name="geometry"> <rect> <x>0</x> @@ -78,7 +78,7 @@ <connection> <sender>buttons</sender> <signal>accepted()</signal> - <receiver>CodePaster::PasteSelectDialog</receiver> + <receiver>CodePaster::Internal::PasteSelectDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -94,7 +94,7 @@ <connection> <sender>buttons</sender> <signal>rejected()</signal> - <receiver>CodePaster::PasteSelectDialog</receiver> + <receiver>CodePaster::Internal::PasteSelectDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> @@ -126,7 +126,7 @@ <connection> <sender>listWidget</sender> <signal>doubleClicked(QModelIndex)</signal> - <receiver>CodePaster::PasteSelectDialog</receiver> + <receiver>CodePaster::Internal::PasteSelectDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/cpaster/pasteselectdialog.h b/src/plugins/cpaster/pasteselectdialog.h index 9fdc5b0888..ba69954a46 100644 --- a/src/plugins/cpaster/pasteselectdialog.h +++ b/src/plugins/cpaster/pasteselectdialog.h @@ -67,7 +67,7 @@ private slots: private: const QList<Protocol*> m_protocols; - Ui_PasteSelectDialog m_ui; + Internal::Ui::PasteSelectDialog m_ui; QPushButton *m_refreshButton; }; diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h index 167da31008..b3373fa2d9 100644 --- a/src/plugins/cpaster/pasteview.h +++ b/src/plugins/cpaster/pasteview.h @@ -86,7 +86,7 @@ private: const QString m_commentPlaceHolder; const QString m_mimeType; - Ui::ViewDialog m_ui; + Internal::Ui::ViewDialog m_ui; FileDataList m_parts; Mode m_mode; }; diff --git a/src/plugins/cpaster/pasteview.ui b/src/plugins/cpaster/pasteview.ui index 436db08551..5bc18658ca 100644 --- a/src/plugins/cpaster/pasteview.ui +++ b/src/plugins/cpaster/pasteview.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ViewDialog</class> - <widget class="QDialog" name="ViewDialog"> + <class>CodePaster::Internal::ViewDialog</class> + <widget class="QDialog" name="CodePaster::Internal::ViewDialog"> <property name="geometry"> <rect> <x>0</x> @@ -83,8 +83,8 @@ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">&lt;Comment&gt;</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;Comment&gt;</p></body></html></string> </property> </widget> </item> @@ -200,7 +200,7 @@ p, li { white-space: pre-wrap; } <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ViewDialog</receiver> + <receiver>CodePaster::Internal::ViewDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -216,7 +216,7 @@ p, li { white-space: pre-wrap; } <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ViewDialog</receiver> + <receiver>CodePaster::Internal::ViewDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 2ef8fa9256..9cb5852a3c 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -58,7 +58,7 @@ public: QString searchKeywords() const; private: - Ui_SettingsPage m_ui; + Internal::Ui::SettingsPage m_ui; }; class SettingsPage : public Core::IOptionsPage diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui index 043f046d9b..21ee0564d0 100644 --- a/src/plugins/cpaster/settingspage.ui +++ b/src/plugins/cpaster/settingspage.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CodePaster::SettingsPage</class> - <widget class="QWidget" name="CodePaster::SettingsPage"> + <class>CodePaster::Internal::SettingsPage</class> + <widget class="QWidget" name="CodePaster::Internal::SettingsPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>281</width> + <width>291</width> <height>229</height> </rect> </property> diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp index 2bf014f69b..7af6d37709 100644 --- a/src/plugins/cpptools/completionsettingspage.cpp +++ b/src/plugins/cpptools/completionsettingspage.cpp @@ -65,7 +65,7 @@ QString CompletionSettingsPage::displayName() const QWidget *CompletionSettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - m_page = new Ui_CompletionSettingsPage; + m_page = new Ui::CompletionSettingsPage; m_page->setupUi(w); const TextEditor::CompletionSettings &settings = diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h index 0784ff4fe5..d7cccaf9fb 100644 --- a/src/plugins/cpptools/completionsettingspage.h +++ b/src/plugins/cpptools/completionsettingspage.h @@ -37,7 +37,13 @@ #include <texteditor/texteditoroptionspage.h> QT_BEGIN_NAMESPACE -class Ui_CompletionSettingsPage; +namespace CppTools { +namespace Internal { +namespace Ui { +class CompletionSettingsPage; +} // namespace Ui +} // namespace Internal +} // namespace CppTools QT_END_NAMESPACE namespace CppTools { @@ -65,7 +71,7 @@ private: TextEditor::CaseSensitivity caseSensitivity() const; TextEditor::CompletionTrigger completionTrigger() const; - Ui_CompletionSettingsPage *m_page; + Ui::CompletionSettingsPage *m_page; QString m_searchKeywords; }; diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui index 3153acdddb..0be439363b 100644 --- a/src/plugins/cpptools/completionsettingspage.ui +++ b/src/plugins/cpptools/completionsettingspage.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CompletionSettingsPage</class> - <widget class="QWidget" name="CompletionSettingsPage"> + <class>CppTools::Internal::CompletionSettingsPage</class> + <widget class="QWidget" name="CppTools::Internal::CompletionSettingsPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>363</width> + <width>393</width> <height>241</height> </rect> </property> diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index ae2e426154..71d5451a4f 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -234,7 +234,7 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) : QWidget(parent), - m_ui(new Ui::CppFileSettingsPage) + m_ui(new Internal::Ui::CppFileSettingsPage) { m_ui->setupUi(this); const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase(); diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index 51ca8bfa2e..d160777f21 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -39,10 +39,17 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE + +namespace CppTools { +namespace Internal { namespace Ui { - class CppFileSettingsPage; -} +class CppFileSettingsPage; +} // namespace Ui +} // namespace Internal +} // namespace CppTools + class QSettings; + QT_END_NAMESPACE namespace CppTools { @@ -91,7 +98,7 @@ private: inline QString licenseTemplatePath() const; inline void setLicenseTemplatePath(const QString &); - Ui::CppFileSettingsPage *m_ui; + Internal::Ui::CppFileSettingsPage *m_ui; }; class CppFileSettingsPage : public Core::IOptionsPage diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui index 312454c567..2b8626f05e 100644 --- a/src/plugins/cpptools/cppfilesettingspage.ui +++ b/src/plugins/cpptools/cppfilesettingspage.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CppFileSettingsPage</class> - <widget class="QWidget" name="CppFileSettingsPage"> + <class>CppTools::Internal::CppFileSettingsPage</class> + <widget class="QWidget" name="CppTools::Internal::CppFileSettingsPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>283</width> + <width>291</width> <height>142</height> </rect> </property> @@ -79,6 +79,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/debugger/attachcoredialog.ui b/src/plugins/debugger/attachcoredialog.ui index 9a8aa98335..680a603d3b 100644 --- a/src/plugins/debugger/attachcoredialog.ui +++ b/src/plugins/debugger/attachcoredialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>AttachCoreDialog</class> - <widget class="QDialog" name="AttachCoreDialog"> + <class>Debugger::Internal::AttachCoreDialog</class> + <widget class="QDialog" name="Debugger::Internal::AttachCoreDialog"> <property name="geometry"> <rect> <x>0</x> @@ -42,7 +42,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="Utils::PathChooser" name="execFileName"/> + <widget class="Utils::PathChooser" name="execFileName" native="true"/> </item> <item row="1" column="0"> <widget class="QLabel" name="coreLabel"> @@ -55,7 +55,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="Utils::PathChooser" name="coreFileName"/> + <widget class="Utils::PathChooser" name="coreFileName" native="true"/> </item> <item row="2" column="0"> <widget class="QLabel" name="toolchainLabel"> @@ -81,7 +81,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="Utils::PathChooser" name="sysrootPathChooser"/> + <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/> </item> <item row="4" column="0"> <widget class="QLabel" name="overrideStartScriptLabel"> @@ -94,7 +94,7 @@ </widget> </item> <item row="4" column="1"> - <widget class="Utils::PathChooser" name="overrideStartScriptFileName"/> + <widget class="Utils::PathChooser" name="overrideStartScriptFileName" native="true"/> </item> </layout> </item> @@ -136,6 +136,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> <customwidget> <class>Debugger::Internal::DebuggerToolChainComboBox</class> diff --git a/src/plugins/debugger/attachexternaldialog.ui b/src/plugins/debugger/attachexternaldialog.ui index 6767ea86a9..c2f945a4cc 100644 --- a/src/plugins/debugger/attachexternaldialog.ui +++ b/src/plugins/debugger/attachexternaldialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>AttachExternalDialog</class> - <widget class="QDialog" name="AttachExternalDialog"> + <class>Debugger::Internal::AttachExternalDialog</class> + <widget class="QDialog" name="Debugger::Internal::AttachExternalDialog"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/debugger/attachtoqmlportdialog.ui b/src/plugins/debugger/attachtoqmlportdialog.ui index fdcc849cf3..caf141f5df 100644 --- a/src/plugins/debugger/attachtoqmlportdialog.ui +++ b/src/plugins/debugger/attachtoqmlportdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>AttachToQmlPortDialog</class> - <widget class="QDialog" name="AttachToQmlPortDialog"> + <class>Debugger::Internal::AttachToQmlPortDialog</class> + <widget class="QDialog" name="Debugger::Internal::AttachToQmlPortDialog"> <property name="geometry"> <rect> <x>0</x> @@ -86,6 +86,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui index 3e8ec5e937..8cf9ae4f0e 100644 --- a/src/plugins/debugger/commonoptionspage.ui +++ b/src/plugins/debugger/commonoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CommonOptionsPage</class> - <widget class="QWidget" name="CommonOptionsPage"> + <class>Debugger::Internal::CommonOptionsPage</class> + <widget class="QWidget" name="Debugger::Internal::CommonOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index a484143d33..c8c726779a 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -45,6 +45,8 @@ class QPushButton; class QLineEdit; class QDialogButtonBox; +namespace Debugger { +namespace Internal { namespace Ui { class AttachCoreDialog; class AttachExternalDialog; @@ -53,6 +55,8 @@ class StartRemoteDialog; class AttachToQmlPortDialog; class StartRemoteEngineDialog; } // namespace Ui +} // namespace Internal +} // namespace Debugger QT_END_NAMESPACE diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui index eb8c227ff4..7c500d6014 100644 --- a/src/plugins/debugger/dumperoptionpage.ui +++ b/src/plugins/debugger/dumperoptionpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>DebuggingHelperOptionPage</class> - <widget class="QWidget" name="DebuggingHelperOptionPage"> + <class>Debugger::Internal::DebuggingHelperOptionPage</class> + <widget class="QWidget" name="Debugger::Internal::DebuggingHelperOptionPage"> <property name="geometry"> <rect> <x>0</x> @@ -88,18 +88,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>Utils::PathChooser</class> - <extends>QWidget</extends> - <header location="global">utils/pathchooser.h</header> - <container>1</container> - <slots> - <signal>editingFinished()</signal> - <signal>browsingFinished()</signal> - </slots> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui index b389ce882a..a53133d4aa 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.ui +++ b/src/plugins/debugger/gdb/gdboptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>GdbOptionsPage</class> - <widget class="QWidget" name="GdbOptionsPage"> + <class>Debugger::Internal::GdbOptionsPage</class> + <widget class="QWidget" name="Debugger::Internal::GdbOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/debugger/lldb/lldboptionspagewidget.ui b/src/plugins/debugger/lldb/lldboptionspagewidget.ui index d9db166c90..78e77699f0 100644 --- a/src/plugins/debugger/lldb/lldboptionspagewidget.ui +++ b/src/plugins/debugger/lldb/lldboptionspagewidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>LldbOptionsPageWidget</class> - <widget class="QWidget" name="LldbOptionsPageWidget"> + <class>Debugger::Internal::LldbOptionsPageWidget</class> + <widget class="QWidget" name="Debugger::Internal::LldbOptionsPageWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/debugger/startexternaldialog.ui b/src/plugins/debugger/startexternaldialog.ui index ab6047a9b2..f694b7c8fd 100644 --- a/src/plugins/debugger/startexternaldialog.ui +++ b/src/plugins/debugger/startexternaldialog.ui @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>StartExternalDialog</class> - <widget class="QDialog" name="StartExternalDialog"> + <class>Debugger::Internal::StartExternalDialog</class> + <widget class="QDialog" name="Debugger::Internal::StartExternalDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>263</width> + <height>214</height> + </rect> + </property> <property name="windowTitle"> <string>Start Debugger</string> </property> @@ -28,7 +36,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="Utils::PathChooser" name="execFile"/> + <widget class="Utils::PathChooser" name="execFile" native="true"/> </item> <item row="1" column="0"> <widget class="QLabel" name="argsLabel"> @@ -67,7 +75,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="Utils::PathChooser" name="workingDirectory"/> + <widget class="Utils::PathChooser" name="workingDirectory" native="true"/> </item> <item row="4" column="0"> <widget class="QLabel" name="toolChainLabel"> @@ -139,6 +147,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> <customwidget> <class>Debugger::Internal::DebuggerToolChainComboBox</class> diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui index 1dabe7c23d..24794c04c9 100644 --- a/src/plugins/debugger/startremotedialog.ui +++ b/src/plugins/debugger/startremotedialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>StartRemoteDialog</class> - <widget class="QDialog" name="StartRemoteDialog"> + <class>Debugger::Internal::StartRemoteDialog</class> + <widget class="QDialog" name="Debugger::Internal::StartRemoteDialog"> <property name="geometry"> <rect> <x>0</x> @@ -27,7 +27,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="Utils::PathChooser" name="debuggerPathChooser"/> + <widget class="Utils::PathChooser" name="debuggerPathChooser" native="true"/> </item> <item row="1" column="0"> <widget class="QLabel" name="executableLabel"> @@ -40,7 +40,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="Utils::PathChooser" name="executablePathChooser"/> + <widget class="Utils::PathChooser" name="executablePathChooser" native="true"/> </item> <item row="2" column="0"> <widget class="QLabel" name="channelLabel"> @@ -104,7 +104,7 @@ </widget> </item> <item row="5" column="1"> - <widget class="Utils::PathChooser" name="sysrootPathChooser"/> + <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/> </item> <item row="6" column="0"> <widget class="QLabel" name="debuginfoLabel"> @@ -117,7 +117,7 @@ </widget> </item> <item row="6" column="1"> - <widget class="Utils::PathChooser" name="debuginfoPathChooser"/> + <widget class="Utils::PathChooser" name="debuginfoPathChooser" native="true"/> </item> <item row="7" column="0"> <widget class="QLabel" name="overrideStartScriptLabel"> @@ -130,7 +130,7 @@ </widget> </item> <item row="7" column="1"> - <widget class="Utils::PathChooser" name="overrideStartScriptPathChooser"/> + <widget class="Utils::PathChooser" name="overrideStartScriptPathChooser" native="true"/> </item> <item row="8" column="0"> <widget class="QLabel" name="useServerStartScriptLabel"> @@ -156,7 +156,7 @@ </widget> </item> <item row="9" column="1"> - <widget class="Utils::PathChooser" name="serverStartScriptPathChooser"/> + <widget class="Utils::PathChooser" name="serverStartScriptPathChooser" native="true"/> </item> </layout> </item> @@ -178,6 +178,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/debugger/startremoteenginedialog.ui b/src/plugins/debugger/startremoteenginedialog.ui index 83d647e0fc..1f686f7938 100644 --- a/src/plugins/debugger/startremoteenginedialog.ui +++ b/src/plugins/debugger/startremoteenginedialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>StartRemoteEngineDialog</class> - <widget class="QDialog" name="StartRemoteEngineDialog"> + <class>Debugger::Internal::StartRemoteEngineDialog</class> + <widget class="QDialog" name="Debugger::Internal::StartRemoteEngineDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>233</width> - <height>207</height> + <height>214</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui index 9045b3f9f3..7bf9ec57d7 100644 --- a/src/plugins/fakevim/fakevimoptions.ui +++ b/src/plugins/fakevim/fakevimoptions.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>FakeVimOptionPage</class> - <widget class="QWidget" name="FakeVimOptionPage"> + <class>FakeVim::Internal::FakeVimOptionPage</class> + <widget class="QWidget" name="FakeVim::Internal::FakeVimOptionPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>513</width> - <height>445</height> + <height>449</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index bf73878efc..d321fdbd72 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -36,11 +36,17 @@ #include <projectexplorer/abstractprocessstep.h> QT_BEGIN_NAMESPACE + class QListWidgetItem; +namespace GenericProjectManager { +namespace Internal { namespace Ui { class GenericMakeStep; -} +} // namespace Ui +} // namespace Internal +} // namespace GenericProjectManager + QT_END_NAMESPACE namespace GenericProjectManager { diff --git a/src/plugins/genericprojectmanager/genericmakestep.ui b/src/plugins/genericprojectmanager/genericmakestep.ui index 619584891a..f3b7d9c8ac 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.ui +++ b/src/plugins/genericprojectmanager/genericmakestep.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>GenericMakeStep</class> - <widget class="QWidget" name="GenericMakeStep"> + <class>GenericProjectManager::Internal::GenericMakeStep</class> + <widget class="QWidget" name="GenericProjectManager::Internal::GenericMakeStep"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui index 704596b3a8..1b6180cad2 100644 --- a/src/plugins/git/changeselectiondialog.ui +++ b/src/plugins/git/changeselectiondialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ChangeSelectionDialog</class> - <widget class="QDialog" name="ChangeSelectionDialog"> + <class>Git::Internal::ChangeSelectionDialog</class> + <widget class="QDialog" name="Git::Internal::ChangeSelectionDialog"> <property name="geometry"> <rect> <x>0</x> @@ -58,7 +58,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ChangeSelectionDialog</receiver> + <receiver>Git::Internal::ChangeSelectionDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -74,7 +74,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ChangeSelectionDialog</receiver> + <receiver>Git::Internal::ChangeSelectionDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui index 0b0d85f4f2..93fb3f9f8e 100644 --- a/src/plugins/help/docsettingspage.ui +++ b/src/plugins/help/docsettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>DocSettingsPage</class> - <widget class="QWidget" name="DocSettingsPage"> + <class>Help::Internal::DocSettingsPage</class> + <widget class="QWidget" name="Help::Internal::DocSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui index fdbaf8e74d..af7fd81c8f 100644 --- a/src/plugins/help/filtersettingspage.ui +++ b/src/plugins/help/filtersettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>FilterSettingsPage</class> - <widget class="QWidget" name="FilterSettingsPage"> + <class>Help::Internal::FilterSettingsPage</class> + <widget class="QWidget" name="Help::Internal::FilterSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui index 4726aa030f..c536c1fc85 100644 --- a/src/plugins/help/generalsettingspage.ui +++ b/src/plugins/help/generalsettingspage.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>GeneralSettingsPage</class> - <widget class="QWidget" name="GeneralSettingsPage"> + <class>Help::Internal::GeneralSettingsPage</class> + <widget class="QWidget" name="Help::Internal::GeneralSettingsPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>491</width> - <height>360</height> + <width>595</width> + <height>407</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/madde/maemodeployconfigurationwidget.h b/src/plugins/madde/maemodeployconfigurationwidget.h index 4e9d766604..0cae54b9e3 100644 --- a/src/plugins/madde/maemodeployconfigurationwidget.h +++ b/src/plugins/madde/maemodeployconfigurationwidget.h @@ -36,9 +36,15 @@ #include <projectexplorer/deployconfiguration.h> QT_BEGIN_NAMESPACE + +namespace Madde { +namespace Internal { namespace Ui { class MaemoDeployConfigurationWidget; -} +} // namespace Ui +} // namespace Internal +} // namespace Madde + QT_END_NAMESPACE namespace RemoteLinux { diff --git a/src/plugins/madde/maemodeployconfigurationwidget.ui b/src/plugins/madde/maemodeployconfigurationwidget.ui index 6cca3cac01..04f5b74fd9 100644 --- a/src/plugins/madde/maemodeployconfigurationwidget.ui +++ b/src/plugins/madde/maemodeployconfigurationwidget.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeployConfigurationWidget</class> - <widget class="QWidget" name="MaemoDeployConfigurationWidget"> + <class>Madde::Internal::MaemoDeployConfigurationWidget</class> + <widget class="QWidget" name="Madde::Internal::MaemoDeployConfigurationWidget"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>273</width> + <width>276</width> <height>45</height> </rect> </property> diff --git a/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui b/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui index 2d38c79d3f..3d968d8b3b 100644 --- a/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui +++ b/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeviceConfigWizardKeyCreationPage</class> - <widget class="QWizardPage" name="MaemoDeviceConfigWizardKeyCreationPage"> + <class>Madde::Internal::MaemoDeviceConfigWizardKeyCreationPage</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoDeviceConfigWizardKeyCreationPage"> <property name="geometry"> <rect> <x>0</x> @@ -34,7 +34,7 @@ </widget> </item> <item> - <widget class="Utils::PathChooser" name="keyDirPathChooser"/> + <widget class="Utils::PathChooser" name="keyDirPathChooser" native="true"/> </item> <item> <widget class="QPushButton" name="createKeysButton"> @@ -72,6 +72,11 @@ <class>Utils::PathChooser</class> <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui b/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui index ec9069fff5..9bbc07258e 100644 --- a/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui +++ b/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeviceConfigWizardKeyDeploymentPage</class> - <widget class="QWizardPage" name="MaemoDeviceConfigWizardKeyDeploymentPage"> + <class>Madde::Internal::MaemoDeviceConfigWizardKeyDeploymentPage</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoDeviceConfigWizardKeyDeploymentPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui b/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui index 46f20e9e1a..23f0d1a2d6 100644 --- a/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui +++ b/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeviceConfigWizardCheckPreviousKeySetupPage</class> - <widget class="QWizardPage" name="MaemoDeviceConfigWizardCheckPreviousKeySetupPage"> + <class>Madde::Internal::MaemoDeviceConfigWizardCheckPreviousKeySetupPage</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoDeviceConfigWizardCheckPreviousKeySetupPage"> <property name="geometry"> <rect> <x>0</x> @@ -54,7 +54,7 @@ </widget> </item> <item> - <widget class="Utils::PathChooser" name="privateKeyFilePathChooser"/> + <widget class="Utils::PathChooser" name="privateKeyFilePathChooser" native="true"/> </item> </layout> </item> @@ -89,6 +89,11 @@ <class>Utils::PathChooser</class> <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui index 0f4c5bf987..f0a2681f89 100644 --- a/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui +++ b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeviceConfigWizardReuseKeysCheckPage</class> - <widget class="QWizardPage" name="MaemoDeviceConfigWizardReuseKeysCheckPage"> + <class>Madde::Internal::MaemoDeviceConfigWizardReuseKeysCheckPage</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoDeviceConfigWizardReuseKeysCheckPage"> <property name="geometry"> <rect> <x>0</x> @@ -86,10 +86,10 @@ </widget> </item> <item row="0" column="1"> - <widget class="Utils::PathChooser" name="publicKeyFilePathChooser"/> + <widget class="Utils::PathChooser" name="publicKeyFilePathChooser" native="true"/> </item> <item row="1" column="1"> - <widget class="Utils::PathChooser" name="privateKeyFilePathChooser"/> + <widget class="Utils::PathChooser" name="privateKeyFilePathChooser" native="true"/> </item> </layout> </item> @@ -126,6 +126,11 @@ <class>Utils::PathChooser</class> <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/madde/maemodeviceconfigwizardstartpage.ui b/src/plugins/madde/maemodeviceconfigwizardstartpage.ui index 4df4e3f850..94e3cc836a 100644 --- a/src/plugins/madde/maemodeviceconfigwizardstartpage.ui +++ b/src/plugins/madde/maemodeviceconfigwizardstartpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoDeviceConfigWizardStartPage</class> - <widget class="QWizardPage" name="MaemoDeviceConfigWizardStartPage"> + <class>Madde::Internal::MaemoDeviceConfigWizardStartPage</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoDeviceConfigWizardStartPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/madde/maemopackagecreationwidget.h b/src/plugins/madde/maemopackagecreationwidget.h index 73b356a3a5..fde0d40e8c 100644 --- a/src/plugins/madde/maemopackagecreationwidget.h +++ b/src/plugins/madde/maemopackagecreationwidget.h @@ -35,7 +35,15 @@ #include <projectexplorer/buildstep.h> QT_BEGIN_NAMESPACE -namespace Ui { class MaemoPackageCreationWidget; } + +namespace Madde { +namespace Internal { +namespace Ui { +class MaemoPackageCreationWidget; +} // namespace Ui +} // namespace Internal +} // namespace Madde + QT_END_NAMESPACE namespace Madde { diff --git a/src/plugins/madde/maemopackagecreationwidget.ui b/src/plugins/madde/maemopackagecreationwidget.ui index cdadad9388..08d30453d3 100644 --- a/src/plugins/madde/maemopackagecreationwidget.ui +++ b/src/plugins/madde/maemopackagecreationwidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoPackageCreationWidget</class> - <widget class="QWidget" name="MaemoPackageCreationWidget"> + <class>Madde::Internal::MaemoPackageCreationWidget</class> + <widget class="QWidget" name="Madde::Internal::MaemoPackageCreationWidget"> <property name="geometry"> <rect> <x>0</x> @@ -264,7 +264,7 @@ <connection> <sender>major</sender> <signal>valueChanged(int)</signal> - <receiver>MaemoPackageCreationWidget</receiver> + <receiver>Madde::Internal::MaemoPackageCreationWidget</receiver> <slot>versionInfoChanged()</slot> <hints> <hint type="sourcelabel"> @@ -280,7 +280,7 @@ <connection> <sender>minor</sender> <signal>valueChanged(int)</signal> - <receiver>MaemoPackageCreationWidget</receiver> + <receiver>Madde::Internal::MaemoPackageCreationWidget</receiver> <slot>versionInfoChanged()</slot> <hints> <hint type="sourcelabel"> @@ -296,7 +296,7 @@ <connection> <sender>patch</sender> <signal>valueChanged(int)</signal> - <receiver>MaemoPackageCreationWidget</receiver> + <receiver>Madde::Internal::MaemoPackageCreationWidget</receiver> <slot>versionInfoChanged()</slot> <hints> <hint type="sourcelabel"> @@ -312,7 +312,7 @@ <connection> <sender>editDebianFileButton</sender> <signal>clicked()</signal> - <receiver>MaemoPackageCreationWidget</receiver> + <receiver>Madde::Internal::MaemoPackageCreationWidget</receiver> <slot>editDebianFile()</slot> <hints> <hint type="sourcelabel"> @@ -328,7 +328,7 @@ <connection> <sender>packageManagerIconButton</sender> <signal>clicked()</signal> - <receiver>MaemoPackageCreationWidget</receiver> + <receiver>Madde::Internal::MaemoPackageCreationWidget</receiver> <slot>setPackageManagerIcon()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h index c4934dbb55..6b2295a156 100644 --- a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h @@ -36,9 +36,13 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE +namespace Madde { +namespace Internal { namespace Ui { - class MaemoPublishingWizardPageFremantleFree; -} +class MaemoPublishingWizardPageFremantleFree; +} // namespace Ui +} // namespace Internal +} // namespace Madde QT_END_NAMESPACE namespace ProjectExplorer { class Project; } diff --git a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui index 6e536f6cc8..a77aa6f951 100644 --- a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui +++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoPublishingWizardPageFremantleFree</class> - <widget class="QWizardPage" name="MaemoPublishingWizardPageFremantleFree"> + <class>Madde::Internal::MaemoPublishingWizardPageFremantleFree</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoPublishingWizardPageFremantleFree"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/madde/maemopublishingfileselectiondialog.h b/src/plugins/madde/maemopublishingfileselectiondialog.h index 423b2f7acf..cd7df261ac 100644 --- a/src/plugins/madde/maemopublishingfileselectiondialog.h +++ b/src/plugins/madde/maemopublishingfileselectiondialog.h @@ -36,9 +36,13 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE +namespace Madde { +namespace Internal { namespace Ui { - class MaemoPublishingFileSelectionDialog; -} +class MaemoPublishingFileSelectionDialog; +} // namespace Ui +} // namespace Internal +} // namespace Madde QT_END_NAMESPACE namespace Madde { diff --git a/src/plugins/madde/maemopublishingfileselectiondialog.ui b/src/plugins/madde/maemopublishingfileselectiondialog.ui index a66247f9ee..441d082706 100644 --- a/src/plugins/madde/maemopublishingfileselectiondialog.ui +++ b/src/plugins/madde/maemopublishingfileselectiondialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoPublishingFileSelectionDialog</class> - <widget class="QDialog" name="MaemoPublishingFileSelectionDialog"> + <class>Madde::Internal::MaemoPublishingFileSelectionDialog</class> + <widget class="QDialog" name="Madde::Internal::MaemoPublishingFileSelectionDialog"> <property name="geometry"> <rect> <x>0</x> @@ -45,7 +45,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>MaemoPublishingFileSelectionDialog</receiver> + <receiver>Madde::Internal::MaemoPublishingFileSelectionDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -61,7 +61,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>MaemoPublishingFileSelectionDialog</receiver> + <receiver>Madde::Internal::MaemoPublishingFileSelectionDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.h b/src/plugins/madde/maemopublishingresultpagefremantlefree.h index 0c0f1adf74..c4c9753aae 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.h +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.h @@ -36,9 +36,15 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE + +namespace Madde { +namespace Internal { namespace Ui { - class MaemoPublishingResultPageFremantleFree; -} +class MaemoPublishingResultPageFremantleFree; +} // namespace Ui +} // namespace Internal +} // namespace Madde + QT_END_NAMESPACE namespace Madde { diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.ui b/src/plugins/madde/maemopublishingresultpagefremantlefree.ui index f7f429ccf8..981a7e671f 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.ui +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoPublishingResultPageFremantleFree</class> - <widget class="QWizardPage" name="MaemoPublishingResultPageFremantleFree"> + <class>Madde::Internal::MaemoPublishingResultPageFremantleFree</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoPublishingResultPageFremantleFree"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h index 5448062700..c3c546b63f 100644 --- a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h @@ -35,9 +35,13 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE +namespace Madde { +namespace Internal { namespace Ui { - class MaemoPublishingUploadSettingsPageFremantleFree; -} +class MaemoPublishingUploadSettingsPageFremantleFree; +} // namespace Ui +} // namespace Internal +} // namespace Madde QT_END_NAMESPACE namespace Madde { diff --git a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui index 48064654d3..e1c5350fe1 100644 --- a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui +++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoPublishingUploadSettingsPageFremantleFree</class> - <widget class="QWizardPage" name="MaemoPublishingUploadSettingsPageFremantleFree"> + <class>Madde::Internal::MaemoPublishingUploadSettingsPageFremantleFree</class> + <widget class="QWizardPage" name="Madde::Internal::MaemoPublishingUploadSettingsPageFremantleFree"> <property name="geometry"> <rect> <x>0</x> @@ -88,6 +88,11 @@ <class>Utils::PathChooser</class> <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/madde/maemoqemusettingswidget.h b/src/plugins/madde/maemoqemusettingswidget.h index edb5f0e659..b54ec1d82d 100644 --- a/src/plugins/madde/maemoqemusettingswidget.h +++ b/src/plugins/madde/maemoqemusettingswidget.h @@ -35,9 +35,15 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE + +namespace Madde { +namespace Internal { namespace Ui { - class MaemoQemuSettingsWidget; -} +class MaemoQemuSettingsWidget; +} // namespace Ui +} // namespace Internal +} // namespace Madde + QT_END_NAMESPACE namespace Madde { diff --git a/src/plugins/madde/maemoqemusettingswidget.ui b/src/plugins/madde/maemoqemusettingswidget.ui index f500f94680..769f94df0c 100644 --- a/src/plugins/madde/maemoqemusettingswidget.ui +++ b/src/plugins/madde/maemoqemusettingswidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MaemoQemuSettingsWidget</class> - <widget class="QWidget" name="MaemoQemuSettingsWidget"> + <class>Madde::Internal::MaemoQemuSettingsWidget</class> + <widget class="QWidget" name="Madde::Internal::MaemoQemuSettingsWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.h b/src/plugins/projectexplorer/codestylesettingspropertiespage.h index d620d4e884..adfc87dfc7 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.h +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.h @@ -62,7 +62,7 @@ public: CodeStyleSettingsWidget(Project *project); private: - ProjectExplorer::Ui::CodeStyleSettingsPropertiesPage m_ui; + Ui::CodeStyleSettingsPropertiesPage m_ui; Project *m_project; }; diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.ui b/src/plugins/projectexplorer/codestylesettingspropertiespage.ui index 88fd2146b7..fa12711cea 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.ui +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ProjectExplorer::CodeStyleSettingsPropertiesPage</class> - <widget class="QWidget" name="ProjectExplorer::CodeStyleSettingsPropertiesPage"> + <class>ProjectExplorer::Internal::CodeStyleSettingsPropertiesPage</class> + <widget class="QWidget" name="ProjectExplorer::Internal::CodeStyleSettingsPropertiesPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/projectexplorer/projectwelcomeplugin.ui b/src/plugins/projectexplorer/projectwelcomeplugin.ui deleted file mode 100644 index 9ad7e162b0..0000000000 --- a/src/plugins/projectexplorer/projectwelcomeplugin.ui +++ /dev/null @@ -1,21 +0,0 @@ -<ui version="4.0" > - <author/> - <comment/> - <exportmacro/> - <class>ProjectWelcomePage</class> - <widget class="QWidget" name="ProjectWelcomePage" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - </widget> - <pixmapfunction/> - <connections/> -</ui> diff --git a/src/plugins/projectexplorer/toolchainoptionspage.ui b/src/plugins/projectexplorer/toolchainoptionspage.ui index 3f5bb0eab9..8c31359673 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.ui +++ b/src/plugins/projectexplorer/toolchainoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ToolChainOptionsPage</class> - <widget class="QWidget" name="ToolChainOptionsPage"> + <class>ProjectExplorer::Internal::ToolChainOptionsPage</class> + <widget class="QWidget" name="ProjectExplorer::Internal::ToolChainOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp index 765d84ab7b..836e0ae249 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp @@ -92,7 +92,7 @@ void BehaviorWidget::buttonPressed(bool show) } } -BehaviorDialog::BehaviorDialog(QWidget *parent) : QDialog(parent), m_ui(new Ui_BehaviorDialog) +BehaviorDialog::BehaviorDialog(QWidget *parent) : QDialog(parent), m_ui(new Internal::Ui::BehaviorDialog) { m_ui->setupUi(this); setModal(true); diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h index b743d4ba3c..413c77b616 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h @@ -91,7 +91,7 @@ public slots: private: ModelNode m_modelNode; QString m_propertyName; - QScopedPointer<Ui_BehaviorDialog> m_ui; + QScopedPointer<Internal::Ui::BehaviorDialog> m_ui; }; diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui index c04735264a..2d0d3257d2 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>BehaviorDialog</class> - <widget class="QDialog" name="BehaviorDialog"> + <class>QmlDesigner::Internal::BehaviorDialog</class> + <widget class="QDialog" name="QmlDesigner::Internal::BehaviorDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>267</width> - <height>333</height> + <width>269</width> + <height>354</height> </rect> </property> <property name="sizePolicy"> @@ -423,7 +423,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( <connection> <sender>ButtonGroup</sender> <signal>accepted()</signal> - <receiver>BehaviorDialog</receiver> + <receiver>QmlDesigner::Internal::BehaviorDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -439,7 +439,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( <connection> <sender>ButtonGroup</sender> <signal>rejected()</signal> - <receiver>BehaviorDialog</receiver> + <receiver>QmlDesigner::Internal::BehaviorDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h index 9bd4777a1e..4ea91267da 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h @@ -36,9 +36,15 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE + +namespace QmlJSEditor { +namespace Internal { namespace Ui { class ComponentNameDialog; -} +} // namespace Ui +} // namespace Internal +} // namespace QmlJSEditor + QT_END_NAMESPACE namespace QmlJSEditor { diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.ui b/src/plugins/qmljseditor/qmljscomponentnamedialog.ui index 3b9171ceec..4bc64c3ce6 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.ui +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ComponentNameDialog</class> - <widget class="QDialog" name="ComponentNameDialog"> + <class>QmlJSEditor::Internal::ComponentNameDialog</class> + <widget class="QDialog" name="QmlJSEditor::Internal::ComponentNameDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>495</width> - <height>130</height> + <height>138</height> </rect> </property> <property name="windowTitle"> @@ -91,7 +91,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ComponentNameDialog</receiver> + <receiver>QmlJSEditor::Internal::ComponentNameDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -107,7 +107,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ComponentNameDialog</receiver> + <receiver>QmlJSEditor::Internal::ComponentNameDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index d7d770d278..a7d540e224 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -289,7 +289,7 @@ void MakeStep::setUserArguments(const QString &arguments) } MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) - : BuildStepConfigWidget(), m_ui(new Ui::MakeStep), m_makeStep(makeStep), m_ignoreChange(false) + : BuildStepConfigWidget(), m_ui(new Internal::Ui::MakeStep), m_makeStep(makeStep), m_ignoreChange(false) { m_ui->setupUi(this); diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index cb4059933c..86d034130d 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -40,9 +40,15 @@ #include <projectexplorer/task.h> QT_BEGIN_NAMESPACE + +namespace Qt4ProjectManager { +namespace Internal { namespace Ui { class MakeStep; -} +} // namespace Ui +} // namespace Internal +} // namespace Qt4ProjectManager + QT_END_NAMESPACE namespace ProjectExplorer { @@ -141,7 +147,7 @@ private slots: void userArgumentsChanged(); void qtVersionChanged(); private: - Ui::MakeStep *m_ui; + Internal::Ui::MakeStep *m_ui; MakeStep *m_makeStep; QString m_summaryText; bool m_ignoreChange; diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui index 015936f46c..62882df759 100644 --- a/src/plugins/qt4projectmanager/makestep.ui +++ b/src/plugins/qt4projectmanager/makestep.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MakeStep</class> - <widget class="QWidget" name="MakeStep"> + <class>Qt4ProjectManager::Internal::MakeStep</class> + <widget class="QWidget" name="Qt4ProjectManager::Internal::MakeStep"> <property name="geometry"> <rect> <x>0</x> @@ -18,7 +18,7 @@ <number>0</number> </property> <item row="0" column="1"> - <widget class="Utils::PathChooser" name="makePathChooser"/> + <widget class="Utils::PathChooser" name="makePathChooser" native="true"/> </item> <item row="1" column="0"> <widget class="QLabel" name="makeArgumentsLabel"> @@ -42,8 +42,13 @@ <customwidgets> <customwidget> <class>Utils::PathChooser</class> - <extends>QLineEdit</extends> - <header>utils/pathchooser.h</header> + <extends>QWidget</extends> + <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 28696949df..a8653b7eb1 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -492,7 +492,7 @@ bool QMakeStep::fromMap(const QVariantMap &map) //// QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) - : BuildStepConfigWidget(), m_ui(new Ui::QMakeStep), m_step(step), + : BuildStepConfigWidget(), m_ui(new Internal::Ui::QMakeStep), m_step(step), m_ignoreChange(false) { m_ui->setupUi(this); diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 68c041a970..6ab8b831e9 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -39,7 +39,15 @@ #include <QtCore/QStringList> QT_BEGIN_NAMESPACE -namespace Ui { class QMakeStep; } + +namespace Qt4ProjectManager { +namespace Internal { +namespace Ui { +class QMakeStep; +} // namespace Ui +} // namespace Internal +} // namespace Qt4ProjectManager + QT_END_NAMESPACE namespace ProjectExplorer { @@ -172,7 +180,7 @@ private: void setSummaryText(const QString &); void setAdditionalSummaryText(const QString &); - Ui::QMakeStep *m_ui; + Internal::Ui::QMakeStep *m_ui; QMakeStep *m_step; QString m_summaryText; QString m_additionalSummaryText; diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui index 154254562c..aae5c1f758 100644 --- a/src/plugins/qt4projectmanager/qmakestep.ui +++ b/src/plugins/qt4projectmanager/qmakestep.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>QMakeStep</class> - <widget class="QWidget" name="QMakeStep"> + <class>Qt4ProjectManager::Internal::QMakeStep</class> + <widget class="QWidget" name="Qt4ProjectManager::Internal::QMakeStep"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.ui b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.ui index 7d5c276edc..076515885f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>S60CertificateDetailsDialog</class> - <widget class="QDialog" name="S60CertificateDetailsDialog"> + <class>Qt4ProjectManager::Internal::S60CertificateDetailsDialog</class> + <widget class="QDialog" name="Qt4ProjectManager::Internal::S60CertificateDetailsDialog"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui index 4b45e615c4..17f55a750c 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>517</width> - <height>156</height> + <height>171</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h index 591744179f..7b5977e63a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h @@ -36,9 +36,15 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE + +namespace Qt4ProjectManager { +namespace Internal { namespace Ui { class S60PublishingBuildSettingsPageOvi; -} +} // namespace Ui +} // namespace Internal +} // namespace Qt4ProjectManager + QT_END_NAMESPACE namespace ProjectExplorer { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui index b227a8a464..b4efc6b00e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>S60PublishingBuildSettingsPageOvi</class> - <widget class="QWidget" name="S60PublishingBuildSettingsPageOvi"> + <class>Qt4ProjectManager::Internal::S60PublishingBuildSettingsPageOvi</class> + <widget class="QWidget" name="Qt4ProjectManager::Internal::S60PublishingBuildSettingsPageOvi"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>400</width> + <width>414</width> <height>300</height> </rect> </property> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h index cf5a245167..764315c298 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h @@ -36,7 +36,15 @@ #include <QWizardPage> QT_BEGIN_NAMESPACE -namespace Ui {class S60PublishingResultsPageOvi;} + +namespace Qt4ProjectManager { +namespace Internal { +namespace Ui { +class S60PublishingResultsPageOvi; +} // namespace Ui +} // namespace Internal +} // namespace Qt4ProjectManager + QT_END_NAMESPACE namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.ui index 1f08d83681..b5307d8e56 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>S60PublishingResultsPageOvi</class> - <widget class="QWidget" name="S60PublishingResultsPageOvi"> + <class>Qt4ProjectManager::Internal::S60PublishingResultsPageOvi</class> + <widget class="QWidget" name="Qt4ProjectManager::Internal::S60PublishingResultsPageOvi"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h index 1b7c46d9b3..a6362b6802 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h @@ -36,11 +36,17 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE + +namespace Qt4ProjectManager { +namespace Internal { namespace Ui { class S60PublishingSisSettingsPageOvi; -} +} // namespace Ui +} // namespace Internal +} // namespace Qt4ProjectManager class QLabel; + QT_END_NAMESPACE namespace ProjectExplorer { class Project; } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui index aba275bf0f..80dbd6325e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>S60PublishingSisSettingsPageOvi</class> - <widget class="QWidget" name="S60PublishingSisSettingsPageOvi"> + <class>Qt4ProjectManager::Internal::S60PublishingSisSettingsPageOvi</class> + <widget class="QWidget" name="Qt4ProjectManager::Internal::S60PublishingSisSettingsPageOvi"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro index 81c8548fdf..2daa79eaed 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pro +++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro @@ -130,7 +130,6 @@ SOURCES += qt4projectmanagerplugin.cpp \ FORMS += makestep.ui \ qmakestep.ui \ qt4projectconfigwidget.ui \ - showbuildlog.ui \ librarydetailswidget.ui \ wizards/testwizardpage.ui \ wizards/targetsetuppage.ui \ diff --git a/src/plugins/qt4projectmanager/showbuildlog.ui b/src/plugins/qt4projectmanager/showbuildlog.ui deleted file mode 100644 index e29e89494d..0000000000 --- a/src/plugins/qt4projectmanager/showbuildlog.ui +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>ShowBuildLog</class> - <widget class="QDialog" name="ShowBuildLog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle"> - <string>Debugging Helper Build Log</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QPlainTextEdit" name="log"> - <property name="tabChangesFocus"> - <bool>true</bool> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>ShowBuildLog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>ShowBuildLog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui index 85a7ca0f0f..65d5854170 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Html5AppWizardSourcesPage</class> - <widget class="QWizardPage" name="Html5AppWizardSourcesPage"> + <class>Qt4ProjectManager::Internal::Html5AppWizardSourcesPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::Html5AppWizardSourcesPage"> <property name="geometry"> <rect> <x>0</x> @@ -38,7 +38,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="Utils::PathChooser" name="importLineEdit"> + <widget class="Utils::PathChooser" name="importLineEdit" native="true"> <property name="enabled"> <bool>true</bool> </property> @@ -162,7 +162,7 @@ <customwidgets> <customwidget> <class>Utils::PathChooser</class> - <extends>QLineEdit</extends> + <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> <slots> diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui index 337fdbc7d3..e82630a631 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MobileAppWizardGenericOptionsPage</class> - <widget class="QWizardPage" name="MobileAppWizardGenericOptionsPage"> + <class>Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui index 7354c26ecc..864fc7ee6c 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MobileAppWizardHarmattanOptionsPage</class> - <widget class="QWizardPage" name="MobileAppWizardHarmattanOptionsPage"> + <class>Qt4ProjectManager::Internal::MobileAppWizardHarmattanOptionsPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardHarmattanOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui index 20f1f979d2..4a9fe0d563 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MobileAppWizardMaemoOptionsPage</class> - <widget class="QWizardPage" name="MobileAppWizardMaemoOptionsPage"> + <class>Qt4ProjectManager::Internal::MobileAppWizardMaemoOptionsPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardMaemoOptionsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui index a4dfcb7967..2a900fc8bc 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MobileAppWizardSymbianOptionsPage</class> - <widget class="QWizardPage" name="MobileAppWizardSymbianOptionsPage"> + <class>Qt4ProjectManager::Internal::MobileAppWizardSymbianOptionsPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardSymbianOptionsPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>315</width> - <height>116</height> + <height>125</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui index c42815fe0b..429b1face4 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MobileLibraryWizardOptionPage</class> - <widget class="QWizardPage" name="MobileLibraryWizardOptionPage"> + <class>Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>404</width> - <height>130</height> + <height>131</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui index 43437de33a..70ea88a0fc 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui +++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>QtQuickComponentSetOptionsPage</class> - <widget class="QWizardPage" name="QtQuickComponentSetOptionsPage"> + <class>Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage</class> + <widget class="QWizardPage" name="Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage"> <property name="geometry"> <rect> <x>0</x> @@ -16,180 +16,180 @@ <property name="title"> <string/> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QRadioButton" name="qtquick10RadioButton"> - <property name="text"> - <string>Built-in elements only (for all platforms)</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> - </attribute> - </widget> - </item> - <item> - <widget class="QRadioButton" name="symbian10RadioButton"> - <property name="text"> - <string>Qt Quick Components for Symbian</string> - </property> - <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> - </attribute> - </widget> - </item> - <item> - <widget class="QRadioButton" name="meego10RadioButton"> - <property name="text"> - <string>Qt Quick Components for MeeGo/Harmattan</string> - </property> - <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> - </attribute> - </widget> - </item> - <item> - <widget class="QRadioButton" name="importRadioButton"> - <property name="text"> - <string>Use an existing .qml file</string> - </property> - <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> - </attribute> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>12</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="Utils::PathChooser" name="importLineEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QStackedWidget" name="descriptionStackedWidget"> - <property name="currentIndex"> - <number>3</number> - </property> - <widget class="QWidget" name="qtquick10DescriptionWidget"> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="qtquick10DescriptionLabel"> - <property name="text"> - <string>The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel. + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="qtquick10RadioButton"> + <property name="text"> + <string>Built-in elements only (for all platforms)</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> + </widget> + </item> + <item> + <widget class="QRadioButton" name="symbian10RadioButton"> + <property name="text"> + <string>Qt Quick Components for Symbian</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> + </widget> + </item> + <item> + <widget class="QRadioButton" name="meego10RadioButton"> + <property name="text"> + <string>Qt Quick Components for MeeGo/Harmattan</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> + </widget> + </item> + <item> + <widget class="QRadioButton" name="importRadioButton"> + <property name="text"> + <string>Use an existing .qml file</string> + </property> + <attribute name="buttonGroup"> + <string notr="true">buttonGroup</string> + </attribute> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Maximum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>12</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="Utils::PathChooser" name="importLineEdit" native="true"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QStackedWidget" name="descriptionStackedWidget"> + <property name="currentIndex"> + <number>3</number> + </property> + <widget class="QWidget" name="qtquick10DescriptionWidget"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="qtquick10DescriptionLabel"> + <property name="text"> + <string>The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel. Requires Qt 4.7.1 or newer.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> - <widget class="QWidget" name="symbian10DescriptionWidget"> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0"> - <widget class="QLabel" name="symbian10DescriptionLabel"> - <property name="text"> - <string>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform. + </item> + </layout> + </widget> + <widget class="QWidget" name="symbian10DescriptionWidget"> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="symbian10DescriptionLabel"> + <property name="text"> + <string>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform. Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> - <widget class="QWidget" name="meego10DescriptionWidget"> - <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0"> - <widget class="QLabel" name="meego1DescriptionLabel"> - <property name="text"> - <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform. + </item> + </layout> + </widget> + <widget class="QWidget" name="meego10DescriptionWidget"> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QLabel" name="meego1DescriptionLabel"> + <property name="text"> + <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform. Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> - <widget class="QWidget" name="importDescriptionWidget"> - <layout class="QGridLayout" name="gridLayout_5"> - <item row="0" column="0"> - <widget class="QLabel" name="importDescriptionLabel"> - <property name="text"> - <string>All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="importDescriptionWidget"> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <widget class="QLabel" name="importDescriptionLabel"> + <property name="text"> + <string>All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> - </widget> - </item> + </item> + </layout> + </widget> + </widget> + </item> </layout> </widget> <customwidgets> <customwidget> <class>Utils::PathChooser</class> - <extends>QLineEdit</extends> + <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> <slots> diff --git a/src/plugins/qtsupport/showbuildlog.ui b/src/plugins/qtsupport/showbuildlog.ui index e29e89494d..9a25d7da2d 100644 --- a/src/plugins/qtsupport/showbuildlog.ui +++ b/src/plugins/qtsupport/showbuildlog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ShowBuildLog</class> - <widget class="QDialog" name="ShowBuildLog"> + <class>QtSupport::Internal::ShowBuildLog</class> + <widget class="QDialog" name="QtSupport::Internal::ShowBuildLog"> <property name="geometry"> <rect> <x>0</x> @@ -41,7 +41,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ShowBuildLog</receiver> + <receiver>QtSupport::Internal::ShowBuildLog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -57,7 +57,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ShowBuildLog</receiver> + <receiver>QtSupport::Internal::ShowBuildLog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui index 5755203271..bbfb6b2c00 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>GenericLinuxDeviceConfigurationWizardSetupPage</class> - <widget class="QWizardPage" name="GenericLinuxDeviceConfigurationWizardSetupPage"> + <class>RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage</class> + <widget class="QWizardPage" name="RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp index 6a81f81280..fef007b06c 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp @@ -98,7 +98,7 @@ private: LinuxDeviceConfigurationsSettingsWidget::LinuxDeviceConfigurationsSettingsWidget(QWidget *parent) : QWidget(parent), - m_ui(new Ui_LinuxDeviceConfigurationsSettingsWidget), + m_ui(new Ui::LinuxDeviceConfigurationsSettingsWidget), m_devConfigs(LinuxDeviceConfigurations::cloneInstance()), m_nameValidator(new NameValidator(m_devConfigs.data(), this)), m_saveSettingsRequested(false), diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h index bd5b33de4b..734e8ffd96 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h @@ -39,10 +39,18 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE + class QLineEdit; class QSignalMapper; -class Ui_LinuxDeviceConfigurationsSettingsWidget; +namespace RemoteLinux { +namespace Internal { +namespace Ui { +class LinuxDeviceConfigurationsSettingsWidget; +} // namespace Ui +} // namespace Internal +} // namespace RemoteLinux + QT_END_NAMESPACE namespace RemoteLinux { @@ -96,7 +104,7 @@ private: void updatePortsWarningLabel(); const ILinuxDeviceConfigurationFactory *factoryForCurrentConfig() const; - Ui_LinuxDeviceConfigurationsSettingsWidget *m_ui; + Ui::LinuxDeviceConfigurationsSettingsWidget *m_ui; const QScopedPointer<LinuxDeviceConfigurations> m_devConfigs; NameValidator * const m_nameValidator; bool m_saveSettingsRequested; diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui index 5628076281..651146308f 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>LinuxDeviceConfigurationsSettingsWidget</class> - <widget class="QWidget" name="LinuxDeviceConfigurationsSettingsWidget"> + <class>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</class> + <widget class="QWidget" name="RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget"> <property name="geometry"> <rect> <x>0</x> @@ -420,7 +420,7 @@ <connection> <sender>hostLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>hostNameEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -436,7 +436,7 @@ <connection> <sender>userLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>userNameEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -452,7 +452,7 @@ <connection> <sender>pwdLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>passwordEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -468,7 +468,7 @@ <connection> <sender>addConfigButton</sender> <signal>clicked()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>addConfig()</slot> <hints> <hint type="sourcelabel"> @@ -484,7 +484,7 @@ <connection> <sender>passwordButton</sender> <signal>toggled(bool)</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>authenticationTypeChanged()</slot> <hints> <hint type="sourcelabel"> @@ -500,7 +500,7 @@ <connection> <sender>keyFileLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>keyFileEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -516,7 +516,7 @@ <connection> <sender>keyFileLineEdit</sender> <signal>browsingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>keyFileEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -532,7 +532,7 @@ <connection> <sender>keyButton</sender> <signal>toggled(bool)</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>authenticationTypeChanged()</slot> <hints> <hint type="sourcelabel"> @@ -548,7 +548,7 @@ <connection> <sender>nameLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>configNameEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -564,7 +564,7 @@ <connection> <sender>generateKeyButton</sender> <signal>clicked()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>showGenerateSshKeyDialog()</slot> <hints> <hint type="sourcelabel"> @@ -580,7 +580,7 @@ <connection> <sender>timeoutSpinBox</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>timeoutEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -596,7 +596,7 @@ <connection> <sender>timeoutSpinBox</sender> <signal>valueChanged(int)</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>timeoutEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -612,7 +612,7 @@ <connection> <sender>sshPortSpinBox</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>sshPortEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -628,7 +628,7 @@ <connection> <sender>sshPortSpinBox</sender> <signal>valueChanged(int)</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>sshPortEditingFinished()</slot> <hints> <hint type="sourcelabel"> @@ -644,7 +644,7 @@ <connection> <sender>showPasswordCheckBox</sender> <signal>toggled(bool)</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>showPassword(bool)</slot> <hints> <hint type="sourcelabel"> @@ -660,7 +660,7 @@ <connection> <sender>portsLineEdit</sender> <signal>editingFinished()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>handleFreePortsChanged()</slot> <hints> <hint type="sourcelabel"> @@ -676,7 +676,7 @@ <connection> <sender>removeConfigButton</sender> <signal>clicked()</signal> - <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceConfigurationsSettingsWidget</receiver> <slot>deleteConfig()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h index 666bd9c2d0..48067132e1 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h @@ -36,9 +36,15 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE + +namespace RemoteLinux { +namespace Internal { namespace Ui { class LinuxDeviceFactorySelectionDialog; } // namespace Ui +} // namespace Internal +} // namespace RemoteLinux + QT_END_NAMESPACE namespace RemoteLinux { diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui index bb394e4f67..9cbcddf434 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>LinuxDeviceFactorySelectionDialog</class> - <widget class="QDialog" name="LinuxDeviceFactorySelectionDialog"> + <class>RemoteLinux::Internal::LinuxDeviceFactorySelectionDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::LinuxDeviceFactorySelectionDialog"> <property name="geometry"> <rect> <x>0</x> @@ -54,7 +54,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>LinuxDeviceFactorySelectionDialog</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceFactorySelectionDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -70,7 +70,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>LinuxDeviceFactorySelectionDialog</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceFactorySelectionDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.ui b/src/plugins/remotelinux/linuxdevicetestdialog.ui index 2bde24ad09..4160d13452 100644 --- a/src/plugins/remotelinux/linuxdevicetestdialog.ui +++ b/src/plugins/remotelinux/linuxdevicetestdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>LinuxDeviceTestDialog</class> - <widget class="QDialog" name="LinuxDeviceTestDialog"> + <class>RemoteLinux::Internal::LinuxDeviceTestDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::LinuxDeviceTestDialog"> <property name="geometry"> <rect> <x>0</x> @@ -38,7 +38,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>LinuxDeviceTestDialog</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceTestDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -54,7 +54,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>LinuxDeviceTestDialog</receiver> + <receiver>RemoteLinux::Internal::LinuxDeviceTestDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/profilesupdatedialog.h b/src/plugins/remotelinux/profilesupdatedialog.h index 4294d18f17..72248bb8cb 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.h +++ b/src/plugins/remotelinux/profilesupdatedialog.h @@ -38,9 +38,15 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE + +namespace RemoteLinux { +namespace Internal { namespace Ui { class ProFilesUpdateDialog; -} +} // namespace Ui +} // namespace Internal +} // namespace RemoteLinux + QT_END_NAMESPACE namespace RemoteLinux { diff --git a/src/plugins/remotelinux/profilesupdatedialog.ui b/src/plugins/remotelinux/profilesupdatedialog.ui index fa1b003803..7885a3f418 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.ui +++ b/src/plugins/remotelinux/profilesupdatedialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ProFilesUpdateDialog</class> - <widget class="QDialog" name="ProFilesUpdateDialog"> + <class>RemoteLinux::Internal::ProFilesUpdateDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::ProFilesUpdateDialog"> <property name="geometry"> <rect> <x>0</x> @@ -106,7 +106,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ProFilesUpdateDialog</receiver> + <receiver>RemoteLinux::Internal::ProFilesUpdateDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -122,7 +122,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ProFilesUpdateDialog</receiver> + <receiver>RemoteLinux::Internal::ProFilesUpdateDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.ui b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.ui index 5f66ee9205..caba98032e 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.ui +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>RemoteLinuxDeployConfigurationWidget</class> - <widget class="QWidget" name="RemoteLinuxDeployConfigurationWidget"> + <class>RemoteLinux::Internal::RemoteLinuxDeployConfigurationWidget</class> + <widget class="QWidget" name="RemoteLinux::Internal::RemoteLinuxDeployConfigurationWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/remotelinux/remotelinuxprocessesdialog.ui b/src/plugins/remotelinux/remotelinuxprocessesdialog.ui index 3ee7a59991..6042adc86f 100644 --- a/src/plugins/remotelinux/remotelinuxprocessesdialog.ui +++ b/src/plugins/remotelinux/remotelinuxprocessesdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>RemoteLinuxProcessesDialog</class> - <widget class="QDialog" name="RemoteLinuxProcessesDialog"> + <class>RemoteLinux::Internal::RemoteLinuxProcessesDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::RemoteLinuxProcessesDialog"> <property name="geometry"> <rect> <x>0</x> @@ -115,7 +115,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>RemoteLinuxProcessesDialog</receiver> + <receiver>RemoteLinux::Internal::RemoteLinuxProcessesDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -131,7 +131,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>RemoteLinuxProcessesDialog</receiver> + <receiver>RemoteLinux::Internal::RemoteLinuxProcessesDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/sshkeycreationdialog.ui b/src/plugins/remotelinux/sshkeycreationdialog.ui index 58cddd1ad9..981e947d8c 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.ui +++ b/src/plugins/remotelinux/sshkeycreationdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>SshKeyCreationDialog</class> - <widget class="QDialog" name="SshKeyCreationDialog"> + <class>RemoteLinux::Internal::SshKeyCreationDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::SshKeyCreationDialog"> <property name="enabled"> <bool>true</bool> </property> @@ -254,7 +254,7 @@ <connection> <sender>closeButton</sender> <signal>clicked()</signal> - <receiver>SshKeyCreationDialog</receiver> + <receiver>RemoteLinux::Internal::SshKeyCreationDialog</receiver> <slot>close()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/remotelinux/startgdbserverdialog.ui b/src/plugins/remotelinux/startgdbserverdialog.ui index eec5f521be..faa74d9cc4 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.ui +++ b/src/plugins/remotelinux/startgdbserverdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>StartGdbServerDialog</class> - <widget class="QDialog" name="StartGdbServerDialog"> + <class>RemoteLinux::Internal::StartGdbServerDialog</class> + <widget class="QDialog" name="RemoteLinux::Internal::StartGdbServerDialog"> <property name="geometry"> <rect> <x>0</x> @@ -143,21 +143,13 @@ </layout> </item> </layout> - <zorder>buttonBox</zorder> - <zorder>filterLabel</zorder> - <zorder>processFilterLineEdit</zorder> - <zorder>deviceComboBox</zorder> - <zorder>label</zorder> - <zorder>updateListButton</zorder> - <zorder>attachProcessButton</zorder> - <zorder>textBrowser</zorder> </widget> <resources/> <connections> <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>StartGdbServerDialog</receiver> + <receiver>RemoteLinux::Internal::StartGdbServerDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -173,7 +165,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>StartGdbServerDialog</receiver> + <receiver>RemoteLinux::Internal::StartGdbServerDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 657c9f1497..c6714f813c 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -56,7 +56,7 @@ struct BehaviorSettingsPage::BehaviorSettingsPagePrivate explicit BehaviorSettingsPagePrivate(const BehaviorSettingsPageParameters &p); const BehaviorSettingsPageParameters m_parameters; - Ui::BehaviorSettingsPage *m_page; + Internal::Ui::BehaviorSettingsPage *m_page; void init(); @@ -122,7 +122,7 @@ QString BehaviorSettingsPage::displayName() const QWidget *BehaviorSettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - d->m_page = new Ui::BehaviorSettingsPage; + d->m_page = new Internal::Ui::BehaviorSettingsPage; d->m_page->setupUi(w); d->m_pageCodeStyle = new SimpleCodeStylePreferences(w); d->m_pageCodeStyle->setDelegatingPool(d->m_codeStyle->delegatingPool()); diff --git a/src/plugins/texteditor/behaviorsettingspage.ui b/src/plugins/texteditor/behaviorsettingspage.ui index b5b3316bde..d2773135e5 100644 --- a/src/plugins/texteditor/behaviorsettingspage.ui +++ b/src/plugins/texteditor/behaviorsettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>BehaviorSettingsPage</class> - <widget class="QWidget" name="BehaviorSettingsPage"> + <class>TextEditor::Internal::BehaviorSettingsPage</class> + <widget class="QWidget" name="TextEditor::Internal::BehaviorSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp index e01acbd499..cf07d15b09 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.cpp +++ b/src/plugins/texteditor/behaviorsettingswidget.cpp @@ -52,7 +52,7 @@ namespace TextEditor { struct BehaviorSettingsWidgetPrivate { - ::Ui::BehaviorSettingsWidget m_ui; + Internal::Ui::BehaviorSettingsWidget m_ui; QList<QTextCodec *> m_codecs; }; diff --git a/src/plugins/texteditor/behaviorsettingswidget.ui b/src/plugins/texteditor/behaviorsettingswidget.ui index 6eefc5aaa7..faf07fd5e9 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.ui +++ b/src/plugins/texteditor/behaviorsettingswidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>BehaviorSettingsWidget</class> - <widget class="QWidget" name="BehaviorSettingsWidget"> + <class>TextEditor::Internal::BehaviorSettingsWidget</class> + <widget class="QWidget" name="TextEditor::Internal::BehaviorSettingsWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index eaf75a9a24..cc46913c2d 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -171,7 +171,7 @@ CodeStyleSelectorWidget::CodeStyleSelectorWidget(ICodeStylePreferencesFactory *f QWidget(parent), m_factory(factory), m_codeStyle(0), - m_ui(new Ui::CodeStyleSelectorWidget), + m_ui(new Internal::Ui::CodeStyleSelectorWidget), m_ignoreGuiSignals(false) { m_ui->setupUi(this); diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index 261a6dbec7..37bb33ea24 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -38,11 +38,21 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE + class QHBoxLayout; class QComboBox; class QLabel; class QCheckBox; class QPushButton; + +namespace TextEditor { +namespace Internal { +namespace Ui { +class CodeStyleSelectorWidget; +} // namespace Ui +} // namespace Internal +} // namespace TextEditor + QT_END_NAMESPACE namespace TextEditor { @@ -50,10 +60,6 @@ namespace TextEditor { class ICodeStylePreferences; class ICodeStylePreferencesFactory; -namespace Ui { -class CodeStyleSelectorWidget; -} - class TEXTEDITOR_EXPORT CodeStyleSelectorWidget : public QWidget { Q_OBJECT @@ -85,7 +91,7 @@ private: QString displayName(ICodeStylePreferences *codeStyle) const; - Ui::CodeStyleSelectorWidget *m_ui; + Internal::Ui::CodeStyleSelectorWidget *m_ui; bool m_ignoreGuiSignals; }; diff --git a/src/plugins/texteditor/codestyleselectorwidget.ui b/src/plugins/texteditor/codestyleselectorwidget.ui index 462062cd94..582b4ca917 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.ui +++ b/src/plugins/texteditor/codestyleselectorwidget.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>TextEditor::CodeStyleSelectorWidget</class> - <widget class="QWidget" name="TextEditor::CodeStyleSelectorWidget"> + <class>TextEditor::Internal::CodeStyleSelectorWidget</class> + <widget class="QWidget" name="TextEditor::Internal::CodeStyleSelectorWidget"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>523</width> - <height>58</height> + <width>536</width> + <height>59</height> </rect> </property> <property name="windowTitle"> diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 41a72bdd33..f5e201f8be 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -46,7 +46,7 @@ struct DisplaySettingsPage::DisplaySettingsPagePrivate explicit DisplaySettingsPagePrivate(const DisplaySettingsPageParameters &p); const DisplaySettingsPageParameters m_parameters; - Ui::DisplaySettingsPage *m_page; + Internal::Ui::DisplaySettingsPage *m_page; DisplaySettings m_displaySettings; QString m_searchKeywords; }; @@ -85,7 +85,7 @@ QString DisplaySettingsPage::displayName() const QWidget *DisplaySettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - d->m_page = new Ui::DisplaySettingsPage; + d->m_page = new Internal::Ui::DisplaySettingsPage; d->m_page->setupUi(w); settingsToUI(); if (d->m_searchKeywords.isEmpty()) { diff --git a/src/plugins/texteditor/displaysettingspage.ui b/src/plugins/texteditor/displaysettingspage.ui index c402d98a64..c136ebaece 100644 --- a/src/plugins/texteditor/displaysettingspage.ui +++ b/src/plugins/texteditor/displaysettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>TextEditor::DisplaySettingsPage</class> - <widget class="QWidget" name="TextEditor::DisplaySettingsPage"> + <class>TextEditor::Internal::DisplaySettingsPage</class> + <widget class="QWidget" name="TextEditor::Internal::DisplaySettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui index 5ee668f2de..4e270c068d 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>HighlighterSettingsPage</class> - <widget class="QWidget" name="HighlighterSettingsPage"> + <class>TextEditor::Internal::HighlighterSettingsPage</class> + <widget class="QWidget" name="TextEditor::Internal::HighlighterSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.ui b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.ui index 351d38c275..b24e751002 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.ui +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ManageDefinitionsDialog</class> - <widget class="QDialog" name="ManageDefinitionsDialog"> + <class>TextEditor::Internal::ManageDefinitionsDialog</class> + <widget class="QDialog" name="TextEditor::Internal::ManageDefinitionsDialog"> <property name="geometry"> <rect> <x>0</x> @@ -135,7 +135,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ManageDefinitionsDialog</receiver> + <receiver>TextEditor::Internal::ManageDefinitionsDialog</receiver> <slot>close()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.ui b/src/plugins/texteditor/snippets/snippetssettingspage.ui index 320810dbc9..f8faf09c1c 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.ui +++ b/src/plugins/texteditor/snippets/snippetssettingspage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>SnippetsSettingsPage</class> - <widget class="QWidget" name="SnippetsSettingsPage"> + <class>TextEditor::Internal::SnippetsSettingsPage</class> + <widget class="QWidget" name="TextEditor::Internal::SnippetsSettingsPage"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/texteditor/tabsettingswidget.cpp b/src/plugins/texteditor/tabsettingswidget.cpp index 54c4d4f050..02e3a91c88 100644 --- a/src/plugins/texteditor/tabsettingswidget.cpp +++ b/src/plugins/texteditor/tabsettingswidget.cpp @@ -40,7 +40,7 @@ namespace TextEditor { TabSettingsWidget::TabSettingsWidget(QWidget *parent) : QWidget(parent), - ui(new Ui::TabSettingsWidget) + ui(new Internal::Ui::TabSettingsWidget) { ui->setupUi(this); diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index 4e0ae84b90..4194cfd052 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.h @@ -35,16 +35,24 @@ #include "texteditor_global.h" +QT_BEGIN_NAMESPACE + +namespace TextEditor { +namespace Internal { +namespace Ui { +class TabSettingsWidget; +} // namespace Ui +} // namespace Internal +} // namespace TextEditor + +QT_END_NAMESPACE + #include <QtGui/QWidget> namespace TextEditor { class TabSettings; -namespace Ui { - class TabSettingsWidget; -} - class TEXTEDITOR_EXPORT TabSettingsWidget : public QWidget { Q_OBJECT @@ -71,7 +79,7 @@ private slots: void slotSettingsChanged(); private: - Ui::TabSettingsWidget *ui; + Internal::Ui::TabSettingsWidget *ui; }; } // namespace TextEditor diff --git a/src/plugins/texteditor/tabsettingswidget.ui b/src/plugins/texteditor/tabsettingswidget.ui index 901cf57199..ef3e32d9f7 100644 --- a/src/plugins/texteditor/tabsettingswidget.ui +++ b/src/plugins/texteditor/tabsettingswidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>TextEditor::TabSettingsWidget</class> - <widget class="QWidget" name="TextEditor::TabSettingsWidget"> + <class>TextEditor::Internal::TabSettingsWidget</class> + <widget class="QWidget" name="TextEditor::Internal::TabSettingsWidget"> <property name="geometry"> <rect> <x>0</x> diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.cpp b/src/plugins/vcsbase/basecheckoutwizardpage.cpp index d50ec28875..96853b7c4b 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.cpp +++ b/src/plugins/vcsbase/basecheckoutwizardpage.cpp @@ -52,7 +52,7 @@ namespace VCSBase { struct BaseCheckoutWizardPagePrivate { BaseCheckoutWizardPagePrivate() : m_valid(false), m_directoryEdited(false) {} - Ui::BaseCheckoutWizardPage ui; + Internal::Ui::BaseCheckoutWizardPage ui; bool m_valid; bool m_directoryEdited; }; diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h index 44ec05ad05..79faa6cb68 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.h +++ b/src/plugins/vcsbase/basecheckoutwizardpage.h @@ -37,11 +37,18 @@ #include <QtGui/QWizardPage> -namespace VCSBase { +QT_BEGIN_NAMESPACE +namespace VCSBase { +namespace Internal { namespace Ui { - class BaseCheckoutWizardPage; -} +class BaseCheckoutWizardPage; +} // namespace Ui +} // namespace Internal +} // namespace VCSBase +QT_END_NAMESPACE + +namespace VCSBase { struct BaseCheckoutWizardPagePrivate; diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.ui b/src/plugins/vcsbase/basecheckoutwizardpage.ui index 1cca58b102..2cd0124ca8 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.ui +++ b/src/plugins/vcsbase/basecheckoutwizardpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>VCSBase::BaseCheckoutWizardPage</class> - <widget class="QWizardPage" name="VCSBase::BaseCheckoutWizardPage"> + <class>VCSBase::Internal::BaseCheckoutWizardPage</class> + <widget class="QWizardPage" name="VCSBase::Internal::BaseCheckoutWizardPage"> <property name="geometry"> <rect> <x>0</x> @@ -142,8 +142,13 @@ <customwidgets> <customwidget> <class>Utils::PathChooser</class> - <extends>QLineEdit</extends> - <header>utils/pathchooser.h</header> + <extends>QWidget</extends> + <header location="global">utils/pathchooser.h</header> + <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp index e5007b89eb..00e867d332 100644 --- a/src/plugins/vcsbase/cleandialog.cpp +++ b/src/plugins/vcsbase/cleandialog.cpp @@ -137,7 +137,7 @@ void CleanFilesTask::run() struct CleanDialogPrivate { CleanDialogPrivate(); - Ui::CleanDialog ui; + Internal::Ui::CleanDialog ui; QStandardItemModel *m_filesModel; QString m_workingDirectory; }; diff --git a/src/plugins/vcsbase/cleandialog.ui b/src/plugins/vcsbase/cleandialog.ui index a24f047a59..c61fec540d 100644 --- a/src/plugins/vcsbase/cleandialog.ui +++ b/src/plugins/vcsbase/cleandialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>VCSBase::CleanDialog</class> - <widget class="QDialog" name="VCSBase::CleanDialog"> + <class>VCSBase::Internal::CleanDialog</class> + <widget class="QDialog" name="VCSBase::Internal::CleanDialog"> <property name="geometry"> <rect> <x>0</x> @@ -40,7 +40,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>VCSBase::CleanDialog</receiver> + <receiver>VCSBase::Internal::CleanDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -56,7 +56,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>VCSBase::CleanDialog</receiver> + <receiver>VCSBase::Internal::CleanDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h index d28ea48e17..c13f556c3d 100644 --- a/src/plugins/vcsbase/commonsettingspage.h +++ b/src/plugins/vcsbase/commonsettingspage.h @@ -41,9 +41,15 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE + +namespace VCSBase { +namespace Internal { namespace Ui { class CommonSettingsPage; -} +} // namespace Ui +} // namespace Internal +} // namespace VCSBase + QT_END_NAMESPACE namespace VCSBase { diff --git a/src/plugins/vcsbase/commonsettingspage.ui b/src/plugins/vcsbase/commonsettingspage.ui index e4a8cdd6b8..1ab6270a77 100644 --- a/src/plugins/vcsbase/commonsettingspage.ui +++ b/src/plugins/vcsbase/commonsettingspage.ui @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CommonSettingsPage</class> - <widget class="QWidget" name="CommonSettingsPage"> + <class>VCSBase::Internal::CommonSettingsPage</class> + <widget class="QWidget" name="VCSBase::Internal::CommonSettingsPage"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>322</width> + <height>180</height> + </rect> + </property> <layout class="QFormLayout" name="formLayout"> <property name="fieldGrowthPolicy"> <enum>QFormLayout::ExpandingFieldsGrow</enum> @@ -59,7 +67,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="Utils::PathChooser" name="submitMessageCheckScriptChooser"/> + <widget class="Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/> </item> <item row="3" column="0"> <widget class="QLabel" name="nickNameMailMapLabel"> @@ -76,7 +84,7 @@ name <email> alias <email></string> </widget> </item> <item row="3" column="1"> - <widget class="Utils::PathChooser" name="nickNameMailMapChooser"/> + <widget class="Utils::PathChooser" name="nickNameMailMapChooser" native="true"/> </item> <item row="4" column="0"> <widget class="QLabel" name="nickNameFieldsFileLabel"> @@ -92,10 +100,10 @@ name <email> alias <email></string> </widget> </item> <item row="4" column="1"> - <widget class="Utils::PathChooser" name="nickNameFieldsFileChooser"/> + <widget class="Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/> </item> <item row="5" column="1"> - <widget class="Utils::PathChooser" name="sshPromptChooser"/> + <widget class="Utils::PathChooser" name="sshPromptChooser" native="true"/> </item> <item row="6" column="0" colspan="2"> <spacer name="verticalSpacer"> @@ -124,7 +132,7 @@ name <email> alias <email></string> </widget> </item> <item row="7" column="1"> - <widget class="Utils::PathChooser" name="patchChooser"/> + <widget class="Utils::PathChooser" name="patchChooser" native="true"/> </item> <item row="5" column="0"> <widget class="QLabel" name="sshPromptLabel"> @@ -148,6 +156,10 @@ should a repository require SSH-authentication (see documentation on SSH and the <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/> diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp index eacfb0c6e2..ab86c46970 100644 --- a/src/plugins/vcsbase/nicknamedialog.cpp +++ b/src/plugins/vcsbase/nicknamedialog.cpp @@ -169,7 +169,7 @@ QDebug operator<<(QDebug d, const NickNameEntry &e) NickNameDialog::NickNameDialog(QStandardItemModel *model, QWidget *parent) : QDialog(parent), - m_ui(new Ui::NickNameDialog), + m_ui(new Internal::Ui::NickNameDialog), m_model(model), m_filterModel(new QSortFilterProxyModel(this)) { diff --git a/src/plugins/vcsbase/nicknamedialog.h b/src/plugins/vcsbase/nicknamedialog.h index ebd64f560d..0f1dc9e6ae 100644 --- a/src/plugins/vcsbase/nicknamedialog.h +++ b/src/plugins/vcsbase/nicknamedialog.h @@ -36,13 +36,20 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE + +namespace VCSBase { +namespace Internal { namespace Ui { - class NickNameDialog; -} +class NickNameDialog; +} // namespace Ui +} // namespace Internal +} // namespace VCSBase + class QSortFilterProxyModel; class QStandardItemModel; class QModelIndex; class QPushButton; + QT_END_NAMESPACE namespace VCSBase { diff --git a/src/plugins/vcsbase/nicknamedialog.ui b/src/plugins/vcsbase/nicknamedialog.ui index 21c157365e..9e0673e757 100644 --- a/src/plugins/vcsbase/nicknamedialog.ui +++ b/src/plugins/vcsbase/nicknamedialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>NickNameDialog</class> - <widget class="QDialog" name="NickNameDialog"> + <class>VCSBase::Internal::NickNameDialog</class> + <widget class="QDialog" name="VCSBase::Internal::NickNameDialog"> <property name="geometry"> <rect> <x>0</x> @@ -49,7 +49,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>NickNameDialog</receiver> + <receiver>VCSBase::Internal::NickNameDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -65,7 +65,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>NickNameDialog</receiver> + <receiver>VCSBase::Internal::NickNameDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/src/plugins/vcsbase/vcsconfigurationpage.cpp b/src/plugins/vcsbase/vcsconfigurationpage.cpp index e8b8d41343..44546af633 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.cpp +++ b/src/plugins/vcsbase/vcsconfigurationpage.cpp @@ -41,6 +41,7 @@ #include <coreplugin/iversioncontrol.h> namespace VCSBase { +namespace Internal { class VcsConfigurationPagePrivate { @@ -58,9 +59,11 @@ public: const Core::IVersionControl *m_versionControl; }; +} // namespace Internal + VcsConfigurationPage::VcsConfigurationPage(const Core::IVersionControl *vc, QWidget *parent) : QWizardPage(parent), - d(new VcsConfigurationPagePrivate) + d(new Internal::VcsConfigurationPagePrivate) { Q_ASSERT(vc); setTitle(tr("Configuration")); diff --git a/src/plugins/vcsbase/vcsconfigurationpage.h b/src/plugins/vcsbase/vcsconfigurationpage.h index 2681e9b8dc..1b7384bebb 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.h +++ b/src/plugins/vcsbase/vcsconfigurationpage.h @@ -43,7 +43,9 @@ class IVersionControl; namespace VCSBase { +namespace Internal { class VcsConfigurationPagePrivate; +} // namespace Internal class VCSBASE_EXPORT VcsConfigurationPage : public QWizardPage { Q_OBJECT @@ -57,7 +59,7 @@ public: private slots: void openConfiguration(); private: - VcsConfigurationPagePrivate *const d; + Internal::VcsConfigurationPagePrivate *const d; }; } // namespace VCSBase diff --git a/src/plugins/vcsbase/vcsconfigurationpage.ui b/src/plugins/vcsbase/vcsconfigurationpage.ui index 8488e6fd42..7d0efca266 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.ui +++ b/src/plugins/vcsbase/vcsconfigurationpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>VCSBase::VcsConfigurationPage</class> - <widget class="QWizardPage" name="VCSBase::VcsConfigurationPage"> + <class>VCSBase::Internal::VcsConfigurationPage</class> + <widget class="QWizardPage" name="VCSBase::Internal::VcsConfigurationPage"> <property name="geometry"> <rect> <x>0</x> |