summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-09 19:00:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-09 19:19:59 (GMT)
commit644051bad4ce7b088ea8af07c9b82a5920c96f4b (patch)
tree5c18f3cee950a7e9a683e6cbb666ec0ea128ee0e /Swift/QtUI
parentb3b77f1d4a85a9a933b1a913a90b57a0e2db42a3 (diff)
downloadswift-644051bad4ce7b088ea8af07c9b82a5920c96f4b.zip
swift-644051bad4ce7b088ea8af07c9b82a5920c96f4b.tar.bz2
Enabled & fixed some more C++ warnings.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/ChatList/QtChatListWindowFactory.cpp2
-rw-r--r--Swift/QtUI/EventViewer/QtEventWindowFactory.cpp2
-rw-r--r--Swift/QtUI/QtStatusWidget.cpp2
-rw-r--r--Swift/QtUI/Roster/RosterModel.cpp2
-rw-r--r--Swift/QtUI/SConscript2
5 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/ChatList/QtChatListWindowFactory.cpp b/Swift/QtUI/ChatList/QtChatListWindowFactory.cpp
index 2705058..0e9d324 100644
--- a/Swift/QtUI/ChatList/QtChatListWindowFactory.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindowFactory.cpp
@@ -16,7 +16,7 @@ QtChatListWindowFactory::QtChatListWindowFactory(QtMainWindowFactory* mainWindow
}
ChatListWindow* QtChatListWindowFactory::createWindow(UIEventStream* /*uiEventStream*/) {
- return ((QtMainWindow*)mainWindowFactory_->getLastCreatedWindow())->getChatListWindow();
+ return static_cast<QtMainWindow*>(mainWindowFactory_->getLastCreatedWindow())->getChatListWindow();
}
}
diff --git a/Swift/QtUI/EventViewer/QtEventWindowFactory.cpp b/Swift/QtUI/EventViewer/QtEventWindowFactory.cpp
index ac8ae06..45f6da0 100644
--- a/Swift/QtUI/EventViewer/QtEventWindowFactory.cpp
+++ b/Swift/QtUI/EventViewer/QtEventWindowFactory.cpp
@@ -16,7 +16,7 @@ QtEventWindowFactory::QtEventWindowFactory(QtMainWindowFactory* mainWindowFactor
}
EventWindow* QtEventWindowFactory::createEventWindow() {
- return ((QtMainWindow*)mainWindowFactory_->getLastCreatedWindow())->getEventWindow();
+ return static_cast<QtMainWindow*>(mainWindowFactory_->getLastCreatedWindow())->getEventWindow();
}
}
diff --git a/Swift/QtUI/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp
index d7c0e63..459b283 100644
--- a/Swift/QtUI/QtStatusWidget.cpp
+++ b/Swift/QtUI/QtStatusWidget.cpp
@@ -205,7 +205,7 @@ StatusShow::Type QtStatusWidget::getSelectedStatusShow() {
void QtStatusWidget::handleItemClicked(QListWidgetItem* item) {
editing_ = false;
- selectedStatusType_ = (StatusShow::Type)(item->data(Qt::UserRole).toInt());
+ selectedStatusType_ = static_cast<StatusShow::Type>(item->data(Qt::UserRole).toInt());
newStatusText_ = item->data(Qt::DisplayRole).toString();
statusEdit_->setText(newStatusText_);
handleEditComplete();
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index fa9becd..d705d34 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -169,7 +169,7 @@ QModelIndex RosterModel::index(int row, int column, const QModelIndex& parent) c
parentItem = dynamic_cast<GroupRosterItem*>(getItem(parent));
if (!parentItem) return QModelIndex();
}
- return (size_t)row < parentItem->getDisplayedChildren().size() ? createIndex(row, column, parentItem->getDisplayedChildren()[row]) : QModelIndex();
+ return static_cast<size_t>(row) < parentItem->getDisplayedChildren().size() ? createIndex(row, column, parentItem->getDisplayedChildren()[row]) : QModelIndex();
}
QModelIndex RosterModel::index(RosterItem* item) const {
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 80e3d56..ddc0b31 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -20,7 +20,7 @@ def generateDefaultTheme(dir) :
Import("env")
myenv = env.Clone()
-
+myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
if myenv["HAVE_XSS"] :