From: Manuel Nickschas Date: Fri, 1 Feb 2008 18:03:24 +0000 (+0000) Subject: Renaming the classes and .ui files that got temp names because of collisions X-Git-Tag: 0.2.0-alpha1~153 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=48ed2b53aeb10bcbda6cdc46696bf649c0f6e670 Renaming the classes and .ui files that got temp names because of collisions with the old dialogs. --- diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index 236617aa..e24ff46e 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -187,12 +187,15 @@ src/qtui/settingspages/fontssettingspage.ui src/qtui/settingspages/identitiessettingspage.cpp src/qtui/settingspages/identitiessettingspage.h src/qtui/settingspages/identitiessettingspage.ui +src/qtui/settingspages/networkeditdlg.ui src/qtui/settingspages/networkeditdlgnew.ui src/qtui/settingspages/networkssettingspage.cpp src/qtui/settingspages/networkssettingspage.h src/qtui/settingspages/networkssettingspage.ui +src/qtui/settingspages/nickeditdlg.ui src/qtui/settingspages/nickeditdlgnew.ui src/qtui/settingspages/saveidentitiesdlg.ui +src/qtui/settingspages/servereditdlg.ui src/qtui/settingspages/servereditdlgnew.ui src/qtui/settingspages/settingspages.pri src/qtui/topicwidget.cpp diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index c84c33ab..bd8fccdb 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -363,7 +363,7 @@ void IdentitiesSettingsPage::on_renameIdentity_clicked() { void IdentitiesSettingsPage::on_addNick_clicked() { QStringList existing; for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text(); - NickEditDlgNew dlg(QString(), existing, this); + NickEditDlg dlg(QString(), existing, this); if(dlg.exec() == QDialog::Accepted) { ui.nicknameList->addItem(dlg.nick()); ui.nicknameList->setCurrentRow(ui.nicknameList->count()-1); @@ -387,7 +387,7 @@ void IdentitiesSettingsPage::on_renameNick_clicked() { QString old = ui.nicknameList->selectedItems()[0]->text(); QStringList existing; for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text(); - NickEditDlgNew dlg(old, existing, this); + NickEditDlg dlg(old, existing, this); if(dlg.exec() == QDialog::Accepted) { ui.nicknameList->selectedItems()[0]->setText(dlg.nick()); } @@ -486,7 +486,7 @@ void SaveIdentitiesDlg::clientEvent() { /*************************************************************************************************/ -NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent) +NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), oldNick(old), existing(exist) { ui.setupUi(this); @@ -503,12 +503,12 @@ NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWi } else ui.nickEdit->setText(old); } -QString NickEditDlgNew::nick() const { +QString NickEditDlg::nick() const { return ui.nickEdit->text(); } -void NickEditDlgNew::on_nickEdit_textChanged(const QString &text) { +void NickEditDlg::on_nickEdit_textChanged(const QString &text) { ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text)); } diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h index b4ebadf2..c0c862bc 100644 --- a/src/qtui/settingspages/identitiessettingspage.h +++ b/src/qtui/settingspages/identitiessettingspage.h @@ -27,7 +27,7 @@ #include "ui_identitiessettingspage.h" #include "ui_createidentitydlg.h" #include "ui_saveidentitiesdlg.h" -#include "ui_nickeditdlgnew.h" +#include "ui_nickeditdlg.h" class QAbstractItemModel; @@ -117,11 +117,11 @@ class SaveIdentitiesDlg : public QDialog { }; -class NickEditDlgNew : public QDialog { +class NickEditDlg : public QDialog { Q_OBJECT public: - NickEditDlgNew(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0); + NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0); QString nick() const; @@ -129,7 +129,7 @@ class NickEditDlgNew : public QDialog { void on_nickEdit_textChanged(const QString &); private: - Ui::NickEditDlgNew ui; + Ui::NickEditDlg ui; QString oldNick; QStringList existing; diff --git a/src/qtui/settingspages/networkeditdlgnew.ui b/src/qtui/settingspages/networkeditdlg.ui similarity index 91% rename from src/qtui/settingspages/networkeditdlgnew.ui rename to src/qtui/settingspages/networkeditdlg.ui index c072133b..700c69a9 100644 --- a/src/qtui/settingspages/networkeditdlgnew.ui +++ b/src/qtui/settingspages/networkeditdlg.ui @@ -1,6 +1,6 @@ - NetworkEditDlgNew - + NetworkEditDlg + 0 @@ -57,7 +57,7 @@ buttonBox accepted() - NetworkEditDlgNew + NetworkEditDlg accept() @@ -73,7 +73,7 @@ buttonBox rejected() - NetworkEditDlgNew + NetworkEditDlg reject() diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 5170826c..924fd34f 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -391,7 +391,7 @@ void NetworksSettingsPage::on_networkList_itemSelectionChanged() { void NetworksSettingsPage::on_addNetwork_clicked() { QStringList existing; for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); - NetworkEditDlgNew dlg(QString(), existing, this); + NetworkEditDlg dlg(QString(), existing, this); if(dlg.exec() == QDialog::Accepted) { NetworkId id; for(id = 1; id <= networkInfos.count(); id++) { @@ -433,7 +433,7 @@ void NetworksSettingsPage::on_renameNetwork_clicked() { QString old = ui.networkList->selectedItems()[0]->text(); QStringList existing; for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); - NetworkEditDlgNew dlg(old, existing, this); + NetworkEditDlg dlg(old, existing, this); if(dlg.exec() == QDialog::Accepted) { ui.networkList->selectedItems()[0]->setText(dlg.networkName()); NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); @@ -459,7 +459,7 @@ void NetworksSettingsPage::on_serverList_itemSelectionChanged() { void NetworksSettingsPage::on_addServer_clicked() { if(currentId == 0) return; - ServerEditDlgNew dlg(QVariantMap(), this); + ServerEditDlg dlg(QVariantMap(), this); if(dlg.exec() == QDialog::Accepted) { networkInfos[currentId].serverList.append(dlg.serverData()); displayNetwork(currentId); @@ -472,7 +472,7 @@ void NetworksSettingsPage::on_addServer_clicked() { void NetworksSettingsPage::on_editServer_clicked() { if(currentId == 0) return; int cur = ui.serverList->currentRow(); - ServerEditDlgNew dlg(networkInfos[currentId].serverList[cur], this); + ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this); if(dlg.exec() == QDialog::Accepted) { networkInfos[currentId].serverList[cur] = dlg.serverData(); displayNetwork(currentId); @@ -512,7 +512,7 @@ void NetworksSettingsPage::on_downServer_clicked() { * NetworkEditDlg *************************************************************************/ -NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) { +NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) { ui.setupUi(this); if(old.isEmpty()) { @@ -522,12 +522,12 @@ NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exis } else ui.networkEdit->setText(old); } -QString NetworkEditDlgNew::networkName() const { +QString NetworkEditDlg::networkName() const { return ui.networkEdit->text(); } -void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) { +void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) { ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text)); } @@ -536,7 +536,7 @@ void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) { * ServerEditDlg *************************************************************************/ -ServerEditDlgNew::ServerEditDlgNew(const QVariant &_serverData, QWidget *parent) : QDialog(parent) { +ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) { ui.setupUi(this); QVariantMap serverData = _serverData.toMap(); if(serverData.count()) { @@ -550,7 +550,7 @@ ServerEditDlgNew::ServerEditDlgNew(const QVariant &_serverData, QWidget *parent) on_host_textChanged(); } -QVariant ServerEditDlgNew::serverData() const { +QVariant ServerEditDlg::serverData() const { QVariantMap _serverData; _serverData["Host"] = ui.host->text(); _serverData["Port"] = ui.port->value(); @@ -559,7 +559,7 @@ QVariant ServerEditDlgNew::serverData() const { return _serverData; } -void ServerEditDlgNew::on_host_textChanged() { +void ServerEditDlg::on_host_textChanged() { ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty()); } diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index 0c10a574..bb6499f0 100644 --- a/src/qtui/settingspages/networkssettingspage.h +++ b/src/qtui/settingspages/networkssettingspage.h @@ -25,8 +25,8 @@ #include "settingspage.h" #include "ui_networkssettingspage.h" -#include "ui_networkeditdlgnew.h" -#include "ui_servereditdlgnew.h" +#include "ui_networkeditdlg.h" +#include "ui_servereditdlg.h" #include "ui_saveidentitiesdlg.h" #include "network.h" @@ -92,11 +92,11 @@ class NetworksSettingsPage : public SettingsPage { void saveToNetworkInfo(NetworkInfo &); }; -class NetworkEditDlgNew : public QDialog { +class NetworkEditDlg : public QDialog { Q_OBJECT public: - NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0); + NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0); QString networkName() const; @@ -104,18 +104,18 @@ class NetworkEditDlgNew : public QDialog { void on_networkEdit_textChanged(const QString &); private: - Ui::NetworkEditDlgNew ui; + Ui::NetworkEditDlg ui; QStringList existing; }; -class ServerEditDlgNew : public QDialog { +class ServerEditDlg : public QDialog { Q_OBJECT public: - ServerEditDlgNew(const QVariant &serverData = QVariant(), QWidget *parent = 0); + ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0); QVariant serverData() const; @@ -123,7 +123,7 @@ class ServerEditDlgNew : public QDialog { void on_host_textChanged(); private: - Ui::ServerEditDlgNew ui; + Ui::ServerEditDlg ui; }; diff --git a/src/qtui/settingspages/nickeditdlgnew.ui b/src/qtui/settingspages/nickeditdlg.ui similarity index 93% rename from src/qtui/settingspages/nickeditdlgnew.ui rename to src/qtui/settingspages/nickeditdlg.ui index 0ab92c92..6a6ff005 100644 --- a/src/qtui/settingspages/nickeditdlgnew.ui +++ b/src/qtui/settingspages/nickeditdlg.ui @@ -1,6 +1,6 @@ - NickEditDlgNew - + NickEditDlg + 0 @@ -67,7 +67,7 @@ buttonBox accepted() - NickEditDlgNew + NickEditDlg accept() @@ -83,7 +83,7 @@ buttonBox rejected() - NickEditDlgNew + NickEditDlg reject() diff --git a/src/qtui/settingspages/servereditdlgnew.ui b/src/qtui/settingspages/servereditdlg.ui similarity index 95% rename from src/qtui/settingspages/servereditdlgnew.ui rename to src/qtui/settingspages/servereditdlg.ui index 0c9a9ebf..dec2b543 100644 --- a/src/qtui/settingspages/servereditdlgnew.ui +++ b/src/qtui/settingspages/servereditdlg.ui @@ -1,6 +1,6 @@ - ServerEditDlgNew - + ServerEditDlg + 0 @@ -113,7 +113,7 @@ buttonBox accepted() - ServerEditDlgNew + ServerEditDlg accept() @@ -129,7 +129,7 @@ buttonBox rejected() - ServerEditDlgNew + ServerEditDlg reject() diff --git a/src/qtui/settingspages/settingspages.pri b/src/qtui/settingspages/settingspages.pri index 81645746..09483dac 100644 --- a/src/qtui/settingspages/settingspages.pri +++ b/src/qtui/settingspages/settingspages.pri @@ -5,4 +5,4 @@ SETTINGSPAGES = fonts identities networks # Specify additional files (e.g. for subdialogs) here! SP_SRCS = SP_HDRS = -SP_FRMS = createidentitydlg.ui saveidentitiesdlg.ui networkeditdlgnew.ui nickeditdlgnew.ui servereditdlgnew.ui +SP_FRMS = createidentitydlg.ui saveidentitiesdlg.ui networkeditdlg.ui nickeditdlg.ui servereditdlg.ui