summaryrefslogtreecommitdiffstats
path: root/lib/CommLayer
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-08-06 02:13:24 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-08-06 02:13:24 +0200
commit94e55c784463fea7913791ebd9a53875f3be2e5c (patch)
tree2f96c856c2e3975d80ce3f2890db1c5dcdf3e51d /lib/CommLayer
parent0acf7bbbbb822f1259cf1e3211e5e79724be6bf7 (diff)
downloadabrt-94e55c784463fea7913791ebd9a53875f3be2e5c.tar.gz
abrt-94e55c784463fea7913791ebd9a53875f3be2e5c.tar.xz
abrt-94e55c784463fea7913791ebd9a53875f3be2e5c.zip
trailing whitespace removal. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/CommLayer')
-rw-r--r--lib/CommLayer/DBusClientProxy.h72
-rw-r--r--lib/CommLayer/DBusServerProxy.h11
-rw-r--r--lib/CommLayer/Makefile.am2
3 files changed, 42 insertions, 43 deletions
diff --git a/lib/CommLayer/DBusClientProxy.h b/lib/CommLayer/DBusClientProxy.h
index 52ba75d5..0293b0a9 100644
--- a/lib/CommLayer/DBusClientProxy.h
+++ b/lib/CommLayer/DBusClientProxy.h
@@ -1,22 +1,22 @@
-/*
- Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com)
- Copyright (C) 2009 RedHat inc.
-
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com)
+ Copyright (C) 2009 RedHat inc.
+
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
#include <dbus-c++/dbus.h>
#include <dbus-c++/glib-integration.h>
#include "DBusCommon.h"
@@ -62,7 +62,8 @@ private:
ri >> name;
ri >> old_owner;
ri >> new_owner;
- if(name.compare("com.redhat.abrt") == 0){
+ if(name.compare("com.redhat.abrt") == 0)
+ {
if(new_owner.length() > 0)
{
if(m_pStateChangeHandler)
@@ -107,7 +108,7 @@ public:
std::cout << "~DaemonWatcher" << std::endl;
}
};
-
+
class CDBusClient_proxy
: public DBus::InterfaceProxy
@@ -119,7 +120,7 @@ private:
std::string m_sConnName;
public:
-
+
CDBusClient_proxy()
: DBus::InterfaceProxy(CC_DBUS_IFACE)
{
@@ -127,7 +128,7 @@ public:
connect_signal(CDBusClient_proxy, JobDone, _JobDone_stub);
m_sConnName = "";
}
-
+
CDBusClient_proxy(::DBus::Connection &pConnection)
: DBus::InterfaceProxy(CC_DBUS_IFACE)
{
@@ -144,8 +145,8 @@ public:
* this functions will invoke the corresponding methods on the remote objects
*/
/*
-
- <
+
+ <
<m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
<m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
<m_sUUID;m_sUID;m_sCount;m_sExecutable;m_sPackage>
@@ -155,7 +156,6 @@ public:
vector_crash_infos_t GetCrashInfos()
{
DBus::CallMessage call;
-
DBus::MessageIter wi = call.writer();
call.member("GetCrashInfos");
@@ -166,11 +166,11 @@ public:
ri >> argout;
return argout;
}
-
+
bool DeleteDebugDump(const std::string& pUUID)
{
DBus::CallMessage call;
-
+
DBus::MessageIter wi = call.writer();
wi << pUUID;
@@ -182,12 +182,12 @@ public:
ri >> argout;
return argout;
}
-
+
map_crash_report_t CreateReport(const std::string& pUUID)
{
m_bJobDone = false;
DBus::CallMessage call;
-
+
DBus::MessageIter wi = call.writer();
wi << pUUID;
@@ -199,11 +199,11 @@ public:
g_main_loop_run(gloop);
return GetJobResult(m_iPendingJobID);
};
-
+
void Report(map_crash_report_t pReport)
{
DBus::CallMessage call;
-
+
DBus::MessageIter wi = call.writer();
wi << pReport;
@@ -211,11 +211,11 @@ public:
DBus::Message ret = invoke_method(call);
DBus::MessageIter ri = ret.reader();
}
-
+
map_crash_report_t GetJobResult(uint64_t pJobID)
{
DBus::CallMessage call;
-
+
DBus::MessageIter wi = call.writer();
wi << pJobID;
@@ -226,13 +226,13 @@ public:
ri >> argout;
return argout;
}
-
+
public:
/* signal handlers for this interface
*/
virtual void Crash(std::string& value){}
-
+
private:
/* unmarshalers (to unpack the DBus message before calling the actual signal handler)
@@ -244,7 +244,7 @@ private:
std::string value; ri >> value;
Crash(value);
}
-
+
void _JobDone_stub(const ::DBus::SignalMessage &sig)
{
DBus::MessageIter ri = sig.reader();
diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h
index 1b8159b6..dbf48ad1 100644
--- a/lib/CommLayer/DBusServerProxy.h
+++ b/lib/CommLayer/DBusServerProxy.h
@@ -95,7 +95,7 @@ public:
virtual bool Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0;
virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0;
-
+
public:
/* signal emitters for this interface
@@ -116,8 +116,7 @@ public:
wi << arg1;
emit_signal(sig);
}
-
-
+
void JobDone(const std::string &pDest, uint64_t job_id)
{
::DBus::SignalMessage sig("JobDone");
@@ -134,7 +133,7 @@ public:
wi << arg1;
emit_signal(sig);
}
-
+
void Update(const std::string pDest, const std::string& pMessage)
{
::DBus::SignalMessage sig("Update");
@@ -143,7 +142,7 @@ public:
wi << pMessage;
emit_signal(sig);
}
-
+
void Warning(const std::string& arg1)
{
::DBus::SignalMessage sig("Warning");
@@ -204,7 +203,7 @@ private:
wi << argout1;
return reply;
}
-
+
DBus::Message _GetJobResult_stub(const DBus::CallMessage &call)
{
DBus::MessageIter ri = call.reader();
diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index 5a1fa503..0b52369f 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -5,7 +5,7 @@ libABRTCommLayer_la_SOURCES = CommLayerServer.h CommLayerServer.cpp \
DBusServerProxy.h Observer.h DBusCommon.h \
CommLayerInner.h CommLayerInner.cpp \
DBusClientProxy.h CommLayerClientDBus.h CommLayerClientDBus.cpp
-
+
libABRTCommLayer_la_LIBADD = ../../lib/MiddleWare/libABRTMiddleWare.la $(DL_LIBS) $(DBUSCPP_LIBS)
libABRTCommLayer_la_LDFLAGS = -version-info 0:1:0
libABRTCommLayer_la_CPPFLAGS = -Wall -Werror -I$(srcdir)/../../lib/MiddleWare\