summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBuildTools/CheckTabs.py2
-rw-r--r--Swift/Controllers/UIInterfaces/ChatListWindow.h2
-rw-r--r--Swift/QtUI/ContextMenus/QtContextMenu.h2
-rw-r--r--Swiften/SASL/SCRAMSHA1ClientAuthenticator.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/CheckTabs.py b/BuildTools/CheckTabs.py
index 2cc1cf7..6074a66 100755
--- a/BuildTools/CheckTabs.py
+++ b/BuildTools/CheckTabs.py
@@ -5,7 +5,7 @@ import os, sys
foundExpandedTabs = False
for (path, dirs, files) in os.walk(".") :
- if not "3rdParty" in path and not ".sconf" in path :
+ if not "3rdParty" in path and not ".sconf" in path and not ".framework" in path :
for filename in [os.path.join(path, file) for file in files if (file.endswith(".cpp") or file.endswith(".h")) and not "ui_" in file and not "moc_" in file and not "qrc_" in file] :
file = open(filename, "r")
contents = []
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h
index 3c27de4..6a0762b 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h
@@ -13,7 +13,7 @@
namespace Swift {
class ChatListWindow {
public:
- virtual ~ChatListWindow();
+ virtual ~ChatListWindow();
virtual void addMUCBookmark(boost::shared_ptr<MUCBookmark> bookmark) = 0;
virtual void removeMUCBookmark(boost::shared_ptr<MUCBookmark> bookmark) = 0;
diff --git a/Swift/QtUI/ContextMenus/QtContextMenu.h b/Swift/QtUI/ContextMenus/QtContextMenu.h
index 6c188fc..baa0180 100644
--- a/Swift/QtUI/ContextMenus/QtContextMenu.h
+++ b/Swift/QtUI/ContextMenus/QtContextMenu.h
@@ -10,7 +10,7 @@ namespace Swift {
class QtTreeWidgetItem;
class QtContextMenu {
public:
- virtual ~QtContextMenu();
+ virtual ~QtContextMenu();
virtual void show(QtTreeWidgetItem* item) = 0;
};
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
index 64f210f..045c1b1 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
@@ -30,7 +30,7 @@ namespace Swift {
enum Step {
Initial,
Proof,
- Final
+ Final
} step;
String clientnonce;
ByteArray initialServerMessage;