summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-09 18:37:20 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-09 18:37:20 (GMT)
commitb3b77f1d4a85a9a933b1a913a90b57a0e2db42a3 (patch)
tree687cbc55d73155be38adcd00b275f10bc6e5c947
parentd94f950b51dbf4822ebebeb4e27d12002dc1b09e (diff)
downloadswift-b3b77f1d4a85a9a933b1a913a90b57a0e2db42a3.zip
swift-b3b77f1d4a85a9a933b1a913a90b57a0e2db42a3.tar.bz2
Fixed compilation warnings.
-rw-r--r--BuildTools/SCons/SConstruct2
-rw-r--r--Swift/Controllers/UIInterfaces/ChatListWindowFactory.h1
-rw-r--r--Swift/QtUI/ChatList/ChatListItem.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index f14fae6..a8c8529 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -110,7 +110,7 @@ if env["warnings"] :
if env["PLATFORM"] == "win32" :
env.Append(CCFLAGS = ["/Wall"])
else :
- env.Append(CCFLAGS = ["-W", "-Wall", "-Wnon-virtual-dtor"])
+ env.Append(CXXFLAGS = ["-W", "-Wall", "-Wnon-virtual-dtor"])
#env.Append(CCFLAGS = ["-W", "-Wall", "-Wredundant-decls", "-pedantic", "-Wno-long-long", "-Woverloaded-virtual", "-Wundef", "-Wfloat-equal", "-Wold-style-cast"])
gccVersion = env["CCVERSION"].split(".")
if gccVersion >= ["4", "5", "0"] :
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h
index 7f1afe1..b920e43 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h
@@ -12,6 +12,7 @@ namespace Swift {
class UIEventStream;
class ChatListWindowFactory {
public:
+ virtual ~ChatListWindowFactory() {}
virtual ChatListWindow* createWindow(UIEventStream* uiEventStream) = 0;
};
}
diff --git a/Swift/QtUI/ChatList/ChatListItem.h b/Swift/QtUI/ChatList/ChatListItem.h
index b919c6b..57a85da 100644
--- a/Swift/QtUI/ChatList/ChatListItem.h
+++ b/Swift/QtUI/ChatList/ChatListItem.h
@@ -13,8 +13,11 @@ namespace Swift {
class ChatListItem {
public:
ChatListItem(ChatListGroupItem* parent) {parent_ = parent;};
+ virtual ~ChatListItem() {}
+
ChatListGroupItem* parent() {return parent_;};
virtual QVariant data(int role) = 0;
+
private:
ChatListGroupItem* parent_;
};