[Telepathy-commits] [telepathy-qt4/master] Moved debug-internal.hpp to debug-internal.h.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Dec 29 12:07:07 PST 2008
---
TelepathyQt4/Client/channel.cpp | 2 +-
TelepathyQt4/Client/connection-manager.cpp | 2 +-
TelepathyQt4/Client/connection.cpp | 2 +-
TelepathyQt4/Client/dbus-proxy.cpp | 2 +-
TelepathyQt4/Client/optional-interface-factory.cpp | 2 +-
TelepathyQt4/Client/pending-channel.cpp | 2 +-
TelepathyQt4/Client/pending-operation.cpp | 2 +-
TelepathyQt4/Makefile.am | 1 -
TelepathyQt4/debug-internal.h | 90 ++++++++++++++++++++
TelepathyQt4/debug-internal.hpp | 90 --------------------
TelepathyQt4/debug.cpp | 2 +-
TelepathyQt4/key-file.cpp | 2 +-
TelepathyQt4/manager-file.cpp | 2 +-
13 files changed, 100 insertions(+), 101 deletions(-)
create mode 100644 TelepathyQt4/debug-internal.h
delete mode 100644 TelepathyQt4/debug-internal.hpp
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 320e277..3310693 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -28,7 +28,7 @@
#include <TelepathyQt4/_gen/cli-channel.moc.hpp>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
#include <QQueue>
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index 415ab9d..5ca1e37 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -28,7 +28,7 @@
#include <TelepathyQt4/Client/DBus>
#include <TelepathyQt4/ManagerFile>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
#include <QQueue>
#include <QStringList>
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index 4e8ac84..549f1c5 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -27,7 +27,7 @@
#include <TelepathyQt4/Client/PendingChannel>
#include <TelepathyQt4/Client/PendingVoidMethodCall>
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
#include <QMap>
#include <QQueue>
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index f98b57d..164dbb9 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -22,7 +22,7 @@
#include "dbus-proxy.h"
#include "dbus-proxy.moc.hpp"
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/optional-interface-factory.cpp b/TelepathyQt4/Client/optional-interface-factory.cpp
index 2e070e4..8f88842 100644
--- a/TelepathyQt4/Client/optional-interface-factory.cpp
+++ b/TelepathyQt4/Client/optional-interface-factory.cpp
@@ -21,7 +21,7 @@
#include "optional-interface-factory.h"
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
#include <QMap>
#include <QString>
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/Client/pending-channel.cpp
index 07d5e54..72c7f26 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/Client/pending-channel.cpp
@@ -23,7 +23,7 @@
#include "pending-channel.moc.hpp"
#include <TelepathyQt4/Client/channel.h>
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/Client/pending-operation.cpp
index c2fe9d6..c8426a1 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/Client/pending-operation.cpp
@@ -24,7 +24,7 @@
#include "pending-operation.moc.hpp"
#include "simple-pending-operations.moc.hpp"
-#include <TelepathyQt4/debug-internal.hpp>
+#include <TelepathyQt4/debug-internal.h>
#include <QDBusPendingCall>
#include <QDBusPendingCallWatcher>
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 12a397a..4c71f23 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -49,7 +49,6 @@ libtelepathy_qt4_la_SOURCES = \
Client/pending-operation.cpp \
Client/properties.cpp \
debug.cpp \
- debug-internal.hpp \
key-file.cpp \
manager-file.cpp \
types.cpp \
diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt4/debug-internal.h
new file mode 100644
index 0000000..9e755cf
--- /dev/null
+++ b/TelepathyQt4/debug-internal.h
@@ -0,0 +1,90 @@
+/*
+ * This file is part of TelepathyQt4
+ *
+ * Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2008 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _TelepathyQt4_debug_HEADER_GUARD_
+#define _TelepathyQt4_debug_HEADER_GUARD_
+
+#include <QDebug>
+
+#include <config.h>
+
+namespace Telepathy
+{
+#ifdef ENABLE_DEBUG
+
+QDebug enabledDebug();
+QDebug enabledWarning();
+
+inline QDebug debug()
+{
+ QDebug debug = enabledDebug();
+ debug.nospace() << PACKAGE_NAME " (version " PACKAGE_VERSION ") DEBUG:";
+ return debug.space();
+}
+
+inline QDebug warning()
+{
+ QDebug warning = enabledWarning();
+ warning.nospace() << PACKAGE_NAME " (version " PACKAGE_VERSION ") WARNING:";
+ return warning.space();
+}
+
+#else /* #ifdef ENABLE_DEBUG */
+
+struct NoDebug
+{
+ template <typename T>
+ NoDebug& operator<<(const T&)
+ {
+ return *this;
+ }
+
+ NoDebug& space()
+ {
+ return *this;
+ }
+
+ NoDebug& nospace()
+ {
+ return *this;
+ }
+
+ NoDebug& maybeSpace()
+ {
+ return *this;
+ }
+};
+
+inline NoDebug debug()
+{
+ return NoDebug();
+}
+
+inline NoDebug warning()
+{
+ return NoDebug();
+}
+
+#endif /* #ifdef ENABLE_DEBUG */
+
+} /* namespace Telepathy */
+
+#endif
diff --git a/TelepathyQt4/debug-internal.hpp b/TelepathyQt4/debug-internal.hpp
deleted file mode 100644
index 9e755cf..0000000
--- a/TelepathyQt4/debug-internal.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This file is part of TelepathyQt4
- *
- * Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2008 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TelepathyQt4_debug_HEADER_GUARD_
-#define _TelepathyQt4_debug_HEADER_GUARD_
-
-#include <QDebug>
-
-#include <config.h>
-
-namespace Telepathy
-{
-#ifdef ENABLE_DEBUG
-
-QDebug enabledDebug();
-QDebug enabledWarning();
-
-inline QDebug debug()
-{
- QDebug debug = enabledDebug();
- debug.nospace() << PACKAGE_NAME " (version " PACKAGE_VERSION ") DEBUG:";
- return debug.space();
-}
-
-inline QDebug warning()
-{
- QDebug warning = enabledWarning();
- warning.nospace() << PACKAGE_NAME " (version " PACKAGE_VERSION ") WARNING:";
- return warning.space();
-}
-
-#else /* #ifdef ENABLE_DEBUG */
-
-struct NoDebug
-{
- template <typename T>
- NoDebug& operator<<(const T&)
- {
- return *this;
- }
-
- NoDebug& space()
- {
- return *this;
- }
-
- NoDebug& nospace()
- {
- return *this;
- }
-
- NoDebug& maybeSpace()
- {
- return *this;
- }
-};
-
-inline NoDebug debug()
-{
- return NoDebug();
-}
-
-inline NoDebug warning()
-{
- return NoDebug();
-}
-
-#endif /* #ifdef ENABLE_DEBUG */
-
-} /* namespace Telepathy */
-
-#endif
diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt4/debug.cpp
index 6973a08..6632141 100644
--- a/TelepathyQt4/debug.cpp
+++ b/TelepathyQt4/debug.cpp
@@ -20,7 +20,7 @@
*/
#include "debug.h"
-#include "debug-internal.hpp"
+#include "debug-internal.h"
#include <QIODevice>
diff --git a/TelepathyQt4/key-file.cpp b/TelepathyQt4/key-file.cpp
index 431a228..c957a60 100644
--- a/TelepathyQt4/key-file.cpp
+++ b/TelepathyQt4/key-file.cpp
@@ -21,7 +21,7 @@
#include "key-file.h"
-#include "debug-internal.hpp"
+#include "debug-internal.h"
#include <QtCore/QByteArray>
#include <QtCore/QFile>
diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt4/manager-file.cpp
index a026149..7012469 100644
--- a/TelepathyQt4/manager-file.cpp
+++ b/TelepathyQt4/manager-file.cpp
@@ -21,7 +21,7 @@
#include "manager-file.h"
-#include "debug-internal.hpp"
+#include "debug-internal.h"
#include <TelepathyQt4/KeyFile>
#include <TelepathyQt4/Constants>
--
1.5.6.5
More information about the Telepathy-commits
mailing list