diff options
author | Harald Fernengel <harry@kdevelop.org> | 2005-09-23 16:24:36 +0000 |
---|---|---|
committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:11 -0400 |
commit | 73b1c2eda63427d991eca3a01219a9f28d95ff02 (patch) | |
tree | 4de96b8978d7de947cc31511d33410d27e03edd5 | |
parent | 253362457b4e2cd8fca2e08c94259aa3b34b9657 (diff) |
adding an autotest and "dbus-ify" the build process and include scheme
-rw-r--r-- | qt/Makefile.am | 9 | ||||
-rw-r--r-- | qt/qdbus.h | 31 | ||||
-rw-r--r-- | qt/qdbusconnection.cpp | 2 | ||||
-rw-r--r-- | qt/qdbusconnection.h | 2 | ||||
-rw-r--r-- | qt/qdbusconnection_p.h | 4 | ||||
-rw-r--r-- | qt/qdbuserror.h | 2 | ||||
-rw-r--r-- | qt/qdbusmacros.h | 34 | ||||
-rw-r--r-- | qt/qdbusmessage.h | 3 | ||||
-rw-r--r-- | qt/qdbusserver.h | 2 | ||||
-rw-r--r-- | qt/qdbusvariant.h | 2 |
10 files changed, 11 insertions, 80 deletions
diff --git a/qt/Makefile.am b/qt/Makefile.am index 71ae352..4d99f9d 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -1,5 +1,5 @@ if HAVE_QT -INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) +INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) -DDBUS_COMPILATION dbusincludedir=$(includedir)/dbus-1.0/dbus @@ -7,11 +7,9 @@ lib_LTLIBRARIES=libdbus-qt-1.la dbusinclude_HEADERS= \ qdbuserror.h \ - qdbusmacros.h \ qdbusmessage.h \ qdbusserver.h \ - qdbus.h \ - qdbusmarshall.h \ + qdbusconnection.h \ qdbusvariant.h libdbus_qt_1_la_SOURCES = \ @@ -23,11 +21,10 @@ libdbus_qt_1_la_SOURCES = \ $(top_srcdir)/qt/qdbusserver.cpp \ $(top_srcdir)/qt/qdbusconnection.h \ $(top_srcdir)/qt/qdbuserror.h \ - $(top_srcdir)/qt/qdbusmacros.h \ $(top_srcdir)/qt/qdbusmessage.h \ $(top_srcdir)/qt/qdbusserver.h \ $(top_srcdir)/qt/qdbusconnection_p.h \ - $(top_srcdir)/qt/qdbus.h \ + $(top_srcdir)/dbus/qdbus.h \ $(top_srcdir)/qt/qdbusmarshall.h \ $(top_srcdir)/qt/qdbusmessage_p.h \ $(top_srcdir)/qt/qdbusvariant.h diff --git a/qt/qdbus.h b/qt/qdbus.h deleted file mode 100644 index 3545421..0000000 --- a/qt/qdbus.h +++ /dev/null @@ -1,31 +0,0 @@ -/* qdbus.h precompiled header - * - * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org> - * - * Licensed under the Academic Free License version 2.1 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#ifndef QDBUS_H -#define QDBUS_H - -#include <QtDBUS/qdbusconnection.h> -#include <QtDBUS/qdbuserror.h> -#include <QtDBUS/qdbusmessage.h> -#include <QtDBUS/qdbusserver.h> - -#endif diff --git a/qt/qdbusconnection.cpp b/qt/qdbusconnection.cpp index 6493ef2..49acc24 100644 --- a/qt/qdbusconnection.cpp +++ b/qt/qdbusconnection.cpp @@ -24,8 +24,6 @@ #include <QtCore/qcoreapplication.h> #include "qdbusconnection.h" -#include "qdbuserror.h" -#include "qdbusmessage.h" #include "qdbusconnection_p.h" QT_STATIC_CONST_IMPL char *QDBusConnection::default_connection_name = "qt_dbus_default_connection"; diff --git a/qt/qdbusconnection.h b/qt/qdbusconnection.h index 16ab2b1..eccc7d1 100644 --- a/qt/qdbusconnection.h +++ b/qt/qdbusconnection.h @@ -23,7 +23,7 @@ #ifndef QDBUSCONNECTION_H #define QDBUSCONNECTION_H -#include "qdbusmacros.h" +#include "dbus/qdbus.h" #include <QtCore/qstring.h> class QDBusConnectionPrivate; diff --git a/qt/qdbusconnection_p.h b/qt/qdbusconnection_p.h index 9dcd7d2..3f78dad 100644 --- a/qt/qdbusconnection_p.h +++ b/qt/qdbusconnection_p.h @@ -35,6 +35,8 @@ #ifndef QDBUSCONNECTION_P_H #define QDBUSCONNECTION_P_H +#include "qdbuserror.h" + #include <QtCore/qatomic.h> #include <QtCore/qhash.h> #include <QtCore/qobject.h> @@ -43,8 +45,6 @@ #include <dbus/dbus.h> -#include "qdbuserror.h" - class QDBusMessage; class QSocketNotifier; class QTimerEvent; diff --git a/qt/qdbuserror.h b/qt/qdbuserror.h index d554426..07d2c56 100644 --- a/qt/qdbuserror.h +++ b/qt/qdbuserror.h @@ -23,7 +23,7 @@ #ifndef QDBUSERROR_H #define QDBUSERROR_H -#include "qdbusmacros.h" +#include "dbus/qdbus.h" #include <QtCore/qstring.h> struct DBusError; diff --git a/qt/qdbusmacros.h b/qt/qdbusmacros.h deleted file mode 100644 index ee88cdf..0000000 --- a/qt/qdbusmacros.h +++ /dev/null @@ -1,34 +0,0 @@ -/* qdbusmessage.h QDBusMessage object - * - * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org> - * - * Licensed under the Academic Free License version 2.1 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#ifndef QDBUSMACROS_H -#define QDBUSMACROS_H - -#include <QtCore/qglobal.h> - -#ifdef QDBUS_MAKEDLL -# define QDBUS_EXPORT Q_DECL_EXPORT -#else -# define QDBUS_EXPORT Q_DECL_IMPORT -#endif - -#endif diff --git a/qt/qdbusmessage.h b/qt/qdbusmessage.h index 5f70182..03a475e 100644 --- a/qt/qdbusmessage.h +++ b/qt/qdbusmessage.h @@ -23,7 +23,8 @@ #ifndef QDBUSMESSAGE_H #define QDBUSMESSAGE_H -#include "qdbusmacros.h" +#include "dbus/qdbus.h" + #include <QtCore/qlist.h> #include <QtCore/qvariant.h> diff --git a/qt/qdbusserver.h b/qt/qdbusserver.h index 5560786..bc191a2 100644 --- a/qt/qdbusserver.h +++ b/qt/qdbusserver.h @@ -23,7 +23,7 @@ #ifndef QDBUSSERVER_H #define QDBUSSERVER_H -#include "qdbusmacros.h" +#include "dbus/qdbus.h" #include <QtCore/qobject.h> #include <QtCore/qstring.h> diff --git a/qt/qdbusvariant.h b/qt/qdbusvariant.h index 1a92a60..bd18bef 100644 --- a/qt/qdbusvariant.h +++ b/qt/qdbusvariant.h @@ -23,7 +23,7 @@ #ifndef QDBUSVARIANT_H #define QDBUSVARIANT_H -#include "qdbusmacros.h" +#include "dbus/qdbus.h" #include <QtCore/qmetatype.h> #include <QtCore/qstring.h> |