Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-11-21 23:03:52 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-11-21 23:03:52 (GMT)
commit38fbde49ec4ff77708237d768581a47e6dd7d553 (patch)
treef1f98389faa7cc5d0312c104a682b5f29f0dd182 /Swift/QtUI
parent18dd39bff0426b6f2cd77395a61faf8fa3108a83 (diff)
downloadswift-38fbde49ec4ff77708237d768581a47e6dd7d553.zip
swift-38fbde49ec4ff77708237d768581a47e6dd7d553.tar.bz2
Removing compiler warnings.
Swiften and Swift now build with no compiler warnings for me on Snow Leopard.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/EventViewer/EventModel.cpp4
-rw-r--r--Swift/QtUI/QtChatTabs.cpp4
-rw-r--r--Swift/QtUI/QtJoinMUCDialog.cpp2
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/EventViewer/EventModel.cpp b/Swift/QtUI/EventViewer/EventModel.cpp
index a2343ed..a3d5406 100644
--- a/Swift/QtUI/EventViewer/EventModel.cpp
+++ b/Swift/QtUI/EventViewer/EventModel.cpp
@@ -1,20 +1,20 @@
#include "EventModel.h"
namespace Swift {
EventModel::EventModel() {
}
EventModel::~EventModel() {
}
-QVariant EventModel::data(const QModelIndex& index, int role) const {
+QVariant EventModel::data(const QModelIndex& /*index*/, int /*role*/) const {
return QVariant();
}
-int EventModel::rowCount(const QModelIndex& parent) const {
+int EventModel::rowCount(const QModelIndex& /*parent*/) const {
return 0;
}
}
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 2dbeed7..e30478c 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -57,57 +57,57 @@ void QtChatTabs::handleWidgetShown() {
void QtChatTabs::handleWantsToActivate() {
QtTabbable* widget = qobject_cast<QtTabbable*>(sender());
Q_ASSERT(widget);
Q_ASSERT(tabs_->indexOf(widget) >= 0);
//Un-minimize and bring to front.
setWindowState(windowState() & ~Qt::WindowMinimized);
setWindowState(windowState() | Qt::WindowActive);
tabs_->setCurrentWidget(widget);
widget->setFocus();
activateWindow();
}
void QtChatTabs::handleTabClosing() {
QWidget* widget = qobject_cast<QWidget*>(sender());
if (!widget) {
return;
}
int index = tabs_->indexOf(widget);
if (index < 0) {
return;
}
tabs_->removeTab(index);
if (tabs_->count() == 0) {
hide();
}
}
void QtChatTabs::handleTabCloseRequested(int index) {
QWidget* widget = tabs_->widget(index);
widget->close();
}
void QtChatTabs::handleTabTitleUpdated() {
QWidget* widget = qobject_cast<QWidget*>(sender());
if (!widget) {
return;
}
int index = tabs_->indexOf(widget);
if (index < 0) {
return;
}
tabs_->setTabText(index, widget->windowTitle());
if (widget == tabs_->currentWidget()) {
setWindowTitle(widget->windowTitle());
}
}
-void QtChatTabs::resizeEvent(QResizeEvent* event) {
+void QtChatTabs::resizeEvent(QResizeEvent*) {
emit geometryChanged();
}
-void QtChatTabs::moveEvent(QMoveEvent* event) {
+void QtChatTabs::moveEvent(QMoveEvent*) {
emit geometryChanged();
}
}
diff --git a/Swift/QtUI/QtJoinMUCDialog.cpp b/Swift/QtUI/QtJoinMUCDialog.cpp
index b6f5814..77879ee 100644
--- a/Swift/QtUI/QtJoinMUCDialog.cpp
+++ b/Swift/QtUI/QtJoinMUCDialog.cpp
@@ -1,32 +1,32 @@
#include "QtJoinMUCDialog.h"
#include "QtSwiftUtil.h"
namespace Swift {
-QtJoinMUCDialog::QtJoinMUCDialog(const QString& nick, const QString& muc, QWidget* parent) : QDialog(parent) {
+QtJoinMUCDialog::QtJoinMUCDialog(const QString&, const QString&, QWidget* parent) : QDialog(parent) {
setupUi(this);
errorLabel_->hide();
setAttribute(Qt::WA_DeleteOnClose, true);
connect(buttons_, SIGNAL(accepted()), SLOT(accept()));
connect(buttons_, SIGNAL(rejected()), SLOT(reject()));
}
void QtJoinMUCDialog::accept() {
if (mucJID_->displayText().isEmpty()) {
showError("You must specify a room to join.");
return;
}
if (nick_->displayText().isEmpty()) {
showError("You must specify a nickname to join a room.");
return;
}
errorLabel_->hide();
emit onJoinCommand(JID(Q2PSTRING(mucJID_->displayText())), nick_->displayText());
QDialog::accept();
}
void QtJoinMUCDialog::showError(const QString& error) {
errorLabel_->setText(QString("<font color='red'>%1</font>").arg(error));
errorLabel_->show();
}
}
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 4daa658..6466692 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -206,58 +206,58 @@ void QtLoginWindow::handleAbout() {
else {
aboutDialog_->show();
aboutDialog_->raise();
aboutDialog_->activateWindow();
}
}
void QtLoginWindow::handleQuit() {
QApplication::quit();
}
void QtLoginWindow::setInitialMenus() {
menuBar_->clear();
menuBar_->addMenu(swiftMenu_);
}
void QtLoginWindow::morphInto(MainWindow *mainWindow) {
QtMainWindow *qtMainWindow = dynamic_cast<QtMainWindow*>(mainWindow);
assert(qtMainWindow);
stack_->addWidget(qtMainWindow);
stack_->setCurrentWidget(qtMainWindow);
setEnabled(true);
setInitialMenus();
foreach (QMenu* menu, qtMainWindow->getMenus()) {
menuBar_->addMenu(menu);
}
}
void QtLoginWindow::setMessage(const String& message) {
if (!message.isEmpty()) {
message_->setText("<center><font color=\"red\">" + P2QSTRING(message) + "</font></center>");
}
else {
message_->setText("");
}
}
void QtLoginWindow::bringToFront() {
if (isHidden()) {
showNormal();
raise();
activateWindow();
}
else {
hide();
}
}
-void QtLoginWindow::resizeEvent(QResizeEvent* event) {
+void QtLoginWindow::resizeEvent(QResizeEvent*) {
emit geometryChanged();
}
-void QtLoginWindow::moveEvent(QMoveEvent* event) {
+void QtLoginWindow::moveEvent(QMoveEvent*) {
emit geometryChanged();
}
}