[Pkg-owncloud-commits] [qtkeychain] 06/115: introduce QKeychain namespace

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit 8d590e0729e96d9856b4f82f783e062f7845757e
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Thu Oct 27 21:17:54 2011 +0200

    introduce QKeychain namespace
---
 keychain.cpp     | 2 ++
 keychain.h       | 3 +++
 keychain_mac.cpp | 2 ++
 keychain_p.h     | 3 +++
 testclient.cpp   | 1 +
 5 files changed, 11 insertions(+)

diff --git a/keychain.cpp b/keychain.cpp
index d7322be..ffcf1ef 100644
--- a/keychain.cpp
+++ b/keychain.cpp
@@ -9,6 +9,8 @@
 #include "keychain.h"
 #include "keychain_p.h"
 
+using namespace QKeychain;
+
 Keychain::Keychain( const QString& service )
     : d( new Private( service ) )
 {
diff --git a/keychain.h b/keychain.h
index 9e209aa..751746e 100644
--- a/keychain.h
+++ b/keychain.h
@@ -11,6 +11,7 @@
 
 #include <QtCore/QString>
 
+namespace QKeychain {
 /**
  *
  */
@@ -99,4 +100,6 @@ private:
     Q_DISABLE_COPY(Keychain)
 };
 
+}
+
 #endif
diff --git a/keychain_mac.cpp b/keychain_mac.cpp
index 41e0e2b..66dbaed 100644
--- a/keychain_mac.cpp
+++ b/keychain_mac.cpp
@@ -12,6 +12,8 @@
 #include <Security/Security.h>
 #include <QDebug>
 
+using namespace QKeychain;
+
 template <typename T>
 struct Releaser {
     explicit Releaser( const T& v ) : value( v ) {}
diff --git a/keychain_p.h b/keychain_p.h
index 853d2b8..4b90235 100644
--- a/keychain_p.h
+++ b/keychain_p.h
@@ -13,6 +13,7 @@
 
 #include "keychain.h"
 
+namespace QKeychain {
 class Keychain::Private {
     Q_DECLARE_TR_FUNCTIONS(Keychain::Private)
 public:
@@ -33,4 +34,6 @@ public:
     QString errorString;
 };
 
+}
+
 #endif // KEYCHAIN_P_H
diff --git a/testclient.cpp b/testclient.cpp
index 8868596..e0fc9e8 100644
--- a/testclient.cpp
+++ b/testclient.cpp
@@ -12,6 +12,7 @@
 #include "keychain.h"
 #include <iostream>
 
+using namespace QKeychain;
 
 int printUsage() {
     std::cerr << "testclient store <account> <password>" << std::endl;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git