deinline 2k+ big inlines in DBusServerProxy.h. No logic changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 248 insertions, 179 deletions

diff --git a/lib/CommLayer/DBusServerProxy.cpp b/lib/CommLayer/DBusServerProxy.cpp
new file mode 100644
index 0000000..24aaaad
--- /dev/null
+++ b/lib/CommLayer/DBusServerProxy.cpp
@@ -0,0 +1,200 @@
+/*
+    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 "DBusServerProxy.h"
+//#include <dbus-c++/dbus.h>
+//#include <dbus-c++/glib-integration.h>
+//#include "DBusCommon.h"
+//#include <map>
+//#include <iostream>
+#include <stdlib.h>
+
+/* public: */
+
+CDBusServer_adaptor::CDBusServer_adaptor()
+: DBus::InterfaceAdaptor(CC_DBUS_IFACE)
+{
+    register_method(CDBusServer_adaptor, GetCrashInfos, _GetCrashInfos_stub);
+    register_method(CDBusServer_adaptor, CreateReport, _CreateReport_stub);
+    register_method(CDBusServer_adaptor, Report, _Report_stub);
+    register_method(CDBusServer_adaptor, DeleteDebugDump, _DeleteDebugDump_stub);
+    register_method(CDBusServer_adaptor, GetJobResult, _GetJobResult_stub);
+}
+/* reveal Interface introspection when we stabilize the API */
+/*
+DBus::IntrospectedInterface *const CDBusServer_adaptor::introspect() const
+{
+    static DBus::IntrospectedArgument GetCrashInfos_args[] =
+    {
+        //{ "uid", "i", true},
+        { "info", "a{ss}", false },
+        { 0, 0, 0 }
+    };
+    static DBus::IntrospectedArgument Crash_args[] =
+    {
+        { "package", "s", false },
+        { 0, 0, 0 }
+    };
+    static DBus::IntrospectedMethod CDBusServer_adaptor_methods[] =
+    {
+        { "GetCrashInfos", GetCrashInfos_args },
+        { 0, 0 },
+        { "GetCrashInfosMap", GetCrashInfos_args },
+        { 0, 0 }
+    };
+    static DBus::IntrospectedMethod CDBusServer_adaptor_signals[] =
+    {
+        { "Crash", Crash_args },
+        { 0, 0 }
+    };
+    static DBus::IntrospectedProperty CDBusServer_adaptor_properties[] =
+    {
+        { 0, 0, 0, 0 }
+    };
+    static DBus::IntrospectedInterface CDBusServer_adaptor_interface =
+    {
+        "com.redhat.abrt",
+        CDBusServer_adaptor_methods,
+        CDBusServer_adaptor_signals,
+        CDBusServer_adaptor_properties
+    };
+    return &CDBusServer_adaptor_interface;
+}
+*/
+
+/* public: */
+
+/* signal emitters for this interface */
+
+/* Notify the clients (UI) about a new crash */
+void CDBusServer_adaptor::Crash(const std::string& arg1)
+{
+    ::DBus::SignalMessage sig("Crash");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << arg1;
+    emit_signal(sig);
+}
+
+/* Notify the clients that creating a report has finished */
+void CDBusServer_adaptor::AnalyzeComplete(map_crash_report_t arg1)
+{
+    ::DBus::SignalMessage sig("AnalyzeComplete");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << arg1;
+    emit_signal(sig);
+}
+
+void CDBusServer_adaptor::JobDone(const std::string &pDest, uint64_t job_id)
+{
+    ::DBus::SignalMessage sig("JobDone");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << pDest;
+    wi << job_id;
+    emit_signal(sig);
+}
+
+void CDBusServer_adaptor::Error(const std::string& arg1)
+{
+    ::DBus::SignalMessage sig("Error");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << arg1;
+    emit_signal(sig);
+}
+
+void CDBusServer_adaptor::Update(const std::string pDest, const std::string& pMessage)
+{
+    ::DBus::SignalMessage sig("Update");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << pDest;
+    wi << pMessage;
+    emit_signal(sig);
+}
+
+void CDBusServer_adaptor::Warning(const std::string& arg1)
+{
+    ::DBus::SignalMessage sig("Warning");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << arg1;
+    emit_signal(sig);
+}
+
+/* private: */
+
+/* unmarshalers (to unpack the DBus message before calling the actual interface method)
+ */
+DBus::Message CDBusServer_adaptor::_GetCrashInfos_stub(const DBus::CallMessage &call)
+{
+    DBus::MessageIter ri = call.reader();
+    //FIXME: @@@REMOVE!!
+    vector_crash_infos_t argout1 = GetCrashInfos(call.sender());
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << argout1;
+    return reply;
+}
+
+DBus::Message CDBusServer_adaptor::_CreateReport_stub(const DBus::CallMessage &call)
+{
+    DBus::MessageIter ri = call.reader();
+
+    std::string argin1; ri >> argin1;
+    uint64_t argout1 = CreateReport_t(argin1, call.sender());
+    if(sizeof (uint64_t) != 8) abort ();
+    //map_crash_report_t argout1 = CreateReport(argin1,call.sender());
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << argout1;
+    return reply;
+}
+
+DBus::Message CDBusServer_adaptor::_Report_stub(const DBus::CallMessage &call)
+{
+    DBus::MessageIter ri = call.reader();
+
+    map_crash_report_t argin1; ri >> argin1;
+    bool argout1 = Report(argin1, call.sender());
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << argout1;
+    return reply;
+}
+
+DBus::Message CDBusServer_adaptor::_DeleteDebugDump_stub(const DBus::CallMessage &call)
+{
+    DBus::MessageIter ri = call.reader();
+
+    std::string argin1; ri >> argin1;
+    bool argout1 = DeleteDebugDump(argin1, call.sender());
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << argout1;
+    return reply;
+}
+
+DBus::Message CDBusServer_adaptor::_GetJobResult_stub(const DBus::CallMessage &call)
+{
+    DBus::MessageIter ri = call.reader();
+    uint64_t job_id;
+    ri >> job_id;
+    map_crash_report_t report = GetJobResult(job_id, call.sender());
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << report;
+    return reply;
+}
diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h
index dbf48ad..9ade7a6 100644
--- a/lib/CommLayer/DBusServerProxy.h
+++ b/lib/CommLayer/DBusServerProxy.h
@@ -16,204 +16,62 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
+#ifndef DBUSSERVERPROXY_H_
+#define DBUSSERVERPROXY_H_
+
 #include <dbus-c++/dbus.h>
 #include <dbus-c++/glib-integration.h>
 #include "DBusCommon.h"
-#include <map>
-#include <iostream>
-#include <stdlib.h>
+//#include <map>
+//#include <iostream>
+//#include <stdlib.h>
 
 class CDBusServer_adaptor
 : public DBus::InterfaceAdaptor
 {
 public:
-
-    CDBusServer_adaptor()
-    : DBus::InterfaceAdaptor(CC_DBUS_IFACE)
-    {
-        register_method(CDBusServer_adaptor, GetCrashInfos, _GetCrashInfos_stub);
-        register_method(CDBusServer_adaptor, CreateReport, _CreateReport_stub);
-        register_method(CDBusServer_adaptor, Report, _Report_stub);
-        register_method(CDBusServer_adaptor, DeleteDebugDump, _DeleteDebugDump_stub);
-        register_method(CDBusServer_adaptor, GetJobResult, _GetJobResult_stub);
-    }
+    CDBusServer_adaptor();
 /* reveal Interface introspection when we stabilize the API */
 /*
-    DBus::IntrospectedInterface *const introspect() const
-    {
-        static DBus::IntrospectedArgument GetCrashInfos_args[] =
-        {
-            //{ "uid", "i", true},
-            { "info", "a{ss}", false },
-            { 0, 0, 0 }
-        };
-        static DBus::IntrospectedArgument Crash_args[] =
-        {
-            { "package", "s", false },
-            { 0, 0, 0 }
-        };
-        static DBus::IntrospectedMethod CDBusServer_adaptor_methods[] =
-        {
-            { "GetCrashInfos", GetCrashInfos_args },
-            { 0, 0 },
-            { "GetCrashInfosMap", GetCrashInfos_args },
-            { 0, 0 }
-        };
-        static DBus::IntrospectedMethod CDBusServer_adaptor_signals[] =
-        {
-            { "Crash", Crash_args },
-            { 0, 0 }
-        };
-        static DBus::IntrospectedProperty CDBusServer_adaptor_properties[] =
-        {
-            { 0, 0, 0, 0 }
-        };
-        static DBus::IntrospectedInterface CDBusServer_adaptor_interface =
-        {
-            "com.redhat.abrt",
-            CDBusServer_adaptor_methods,
-            CDBusServer_adaptor_signals,
-            CDBusServer_adaptor_properties
-        };
-        return &CDBusServer_adaptor_interface;
-    }
+    DBus::IntrospectedInterface *const introspect() const;
 */
-public:
 
+public:
     /* properties exposed by this interface, use
      * property() and property(value) to get and set a particular property
      */
 
 public:
-
     /* methods exported by this interface,
      * you will have to implement them in your ObjectAdaptor
      */
      virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0;
-     virtual map_crash_report_t CreateReport(const std::string &pUUID,const std::string &pDBusSender) = 0;
-     virtual uint64_t CreateReport_t(const std::string &pUUID,const std::string &pDBusSender) = 0;
+     virtual map_crash_report_t CreateReport(const std::string &pUUID, const std::string &pDBusSender) = 0;
+     virtual uint64_t CreateReport_t(const std::string &pUUID, const std::string &pDBusSender) = 0;
      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
      */
     /* Notify the clients (UI) about a new crash */
-    void Crash(const std::string& arg1)
-    {
-        ::DBus::SignalMessage sig("Crash");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << arg1;
-        emit_signal(sig);
-    }
+    void Crash(const std::string& arg1);
     /* Notify the clients that creating a report has finished */
-    void AnalyzeComplete(map_crash_report_t arg1)
-    {
-        ::DBus::SignalMessage sig("AnalyzeComplete");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << arg1;
-        emit_signal(sig);
-    }
-
-    void JobDone(const std::string &pDest, uint64_t job_id)
-    {
-        ::DBus::SignalMessage sig("JobDone");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << pDest;
-        wi << job_id;
-        emit_signal(sig);
-    }
-
-    void Error(const std::string& arg1)
-    {
-        ::DBus::SignalMessage sig("Error");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << arg1;
-        emit_signal(sig);
-    }
-
-    void Update(const std::string pDest, const std::string& pMessage)
-    {
-        ::DBus::SignalMessage sig("Update");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << pDest;
-        wi << pMessage;
-        emit_signal(sig);
-    }
-
-    void Warning(const std::string& arg1)
-    {
-        ::DBus::SignalMessage sig("Warning");
-        ::DBus::MessageIter wi = sig.writer();
-        wi << arg1;
-        emit_signal(sig);
-    }
+    void AnalyzeComplete(map_crash_report_t arg1);
+    void JobDone(const std::string &pDest, uint64_t job_id);
+    void Error(const std::string& arg1);
+    void Update(const std::string pDest, const std::string& pMessage);
+    void Warning(const std::string& arg1);
 
 private:
-
     /* unmarshalers (to unpack the DBus message before calling the actual interface method)
      */
-    DBus::Message _GetCrashInfos_stub(const DBus::CallMessage &call)
-    {
-        DBus::MessageIter ri = call.reader();
-        //FIXME: @@@REMOVE!!
-        vector_crash_infos_t argout1 = GetCrashInfos(call.sender());
-        DBus::ReturnMessage reply(call);
-        DBus::MessageIter wi = reply.writer();
-        wi << argout1;
-        return reply;
-    }
-
-    DBus::Message _CreateReport_stub(const DBus::CallMessage &call)
-    {
-        DBus::MessageIter ri = call.reader();
-
-        std::string argin1; ri >> argin1;
-        uint64_t argout1 = CreateReport_t(argin1,call.sender());
-        if(sizeof (uint64_t) != 8) abort ();
-        //map_crash_report_t argout1 = CreateReport(argin1,call.sender());
-        DBus::ReturnMessage reply(call);
-        DBus::MessageIter wi = reply.writer();
-        wi << argout1;
-        return reply;
-    }
-
-    DBus::Message _Report_stub(const DBus::CallMessage &call)
-    {
-        DBus::MessageIter ri = call.reader();
-
-        map_crash_report_t argin1; ri >> argin1;
-        bool argout1 = Report(argin1, call.sender());
-        DBus::ReturnMessage reply(call);
-        DBus::MessageIter wi = reply.writer();
-        wi << argout1;
-        return reply;
-    }
-
-    DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call)
-    {
-        DBus::MessageIter ri = call.reader();
-
-        std::string argin1; ri >> argin1;
-        bool argout1 = DeleteDebugDump(argin1,call.sender());
-        DBus::ReturnMessage reply(call);
-        DBus::MessageIter wi = reply.writer();
-        wi << argout1;
-        return reply;
-    }
-
-    DBus::Message _GetJobResult_stub(const DBus::CallMessage &call)
-    {
-        DBus::MessageIter ri = call.reader();
-        uint64_t job_id;
-        ri >> job_id;
-        map_crash_report_t report = GetJobResult(job_id,call.sender());
-        DBus::ReturnMessage reply(call);
-        DBus::MessageIter wi = reply.writer();
-        wi << report;
-        return reply;
-    }
+    DBus::Message _GetCrashInfos_stub(const DBus::CallMessage &call);
+    DBus::Message _CreateReport_stub(const DBus::CallMessage &call);
+    DBus::Message _Report_stub(const DBus::CallMessage &call);
+    DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call);
+    DBus::Message _GetJobResult_stub(const DBus::CallMessage &call);
 };
 
+#endif
diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am
index 0b52369..a7ab193 100644
--- a/lib/CommLayer/Makefile.am
+++ b/lib/CommLayer/Makefile.am
@@ -1,20 +1,31 @@
 lib_LTLIBRARIES = libABRTCommLayer.la
-libABRTCommLayer_la_SOURCES = CommLayerServer.h CommLayerServer.cpp \
-                           CommLayerServerSocket.h CommLayerServerSocket.cpp \
-                           CommLayerServerDBus.h CommLayerServerDBus.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_SOURCES = \
+    CommLayerServer.h CommLayerServer.cpp \
+    CommLayerServerSocket.h CommLayerServerSocket.cpp \
+    CommLayerServerDBus.h CommLayerServerDBus.cpp \
+    DBusServerProxy.h DBusServerProxy.cpp \
+    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\
-                        -I$(srcdir)/../../lib/DBus -I$(srcdir)/../../inc\
-                        -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \
-                        -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-                        -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-                        -DCONF_DIR=\"$(CONF_DIR)\" -D_GNU_SOURCE \
-                        -DVAR_RUN=\"$(VAR_RUN)\"
+libABRTCommLayer_la_CPPFLAGS = \
+    -Wall -Werror \
+    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../../lib/MiddleWare \
+    -I$(srcdir)/../../lib/DBus \
+    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+    -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    -DCONF_DIR=\"$(CONF_DIR)\" \
+    -DVAR_RUN=\"$(VAR_RUN)\" \
+    $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \
+    -D_GNU_SOURCE
 
 #check_PROGRAMS = test
 #test_SOURCES = test.cpp