Separate OTRPlugin object code from the OTRPluginFactory definition.

This resolves bug 1153.

Fix support for GCC hidden visibility.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 3 years ago
parent 541bc109cb
commit 8403288e01
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -8,7 +8,7 @@ INCLUDES = $(all_includes) -I$(kde_includes)/kopete -I$(kde_includes)/tde/kopete
kde_module_LTLIBRARIES = kcm_kopete_otr.la kopete_otr.la kde_module_LTLIBRARIES = kcm_kopete_otr.la kopete_otr.la
kopete_otr_la_SOURCES = kopete_otr.kcfgc otrguiclient.cpp otrplugin.cpp kopete_otr_la_SOURCES = otrplugin-factory.cpp
kopete_otr_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) \ kopete_otr_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) \
@ -39,7 +39,9 @@ rc_DATA = otrchatui.rc otrui.rc
lib_LTLIBRARIES = libkotr.la lib_LTLIBRARIES = libkotr.la
libkotr_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) libkotr_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
libkotr_la_SOURCES = otrlchatinterface.cpp otrlconfinterface.cpp \ libkotr_la_SOURCES = \
kopete_otr.kcfgc otrguiclient.cpp otrplugin.cpp \
otrlchatinterface.cpp otrlconfinterface.cpp \
privkeypopup.cpp privkeypopupui.ui smppopup.cpp smppopupui.ui verifypopup.cpp \ privkeypopup.cpp privkeypopupui.ui smppopup.cpp smppopupui.ui verifypopup.cpp \
verifypopupui.ui verifypopupui.ui
libkotr_la_LIBADD = -lotr libkotr_la_LIBADD = -lotr

@ -41,7 +41,7 @@ extern "C" {
#include <libotr/userstate.h> #include <libotr/userstate.h>
} }
class OtrlChatInterface: public TQObject class KDE_EXPORT OtrlChatInterface: public TQObject
{ {
Q_OBJECT Q_OBJECT

@ -40,7 +40,7 @@ extern "C" {
#include <libotr/context.h> #include <libotr/context.h>
} }
class OtrlConfInterface class KDE_EXPORT OtrlConfInterface
{ {
public: public:

@ -0,0 +1,32 @@
/***************************************************************************
* Copyright (C) 2007 by Michael Zanetti *
* *
* *
* 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 <kgenericfactory.h>
#include <tdeaboutdata.h>
#include "otrplugin.h"
/**
* @author Michael Zanetti
*/
typedef KGenericFactory<OTRPlugin> OTRPluginFactory;
static const TDEAboutData aboutdata("kopete_otr", I18N_NOOP("OTR") , "0.7" );
K_EXPORT_COMPONENT_FACTORY( kopete_otr, OTRPluginFactory( &aboutdata ) )

@ -31,7 +31,6 @@
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <tdeaboutdata.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
@ -59,8 +58,6 @@
typedef KGenericFactory<OTRPlugin> OTRPluginFactory; typedef KGenericFactory<OTRPlugin> OTRPluginFactory;
static const TDEAboutData aboutdata("kopete_otr", I18N_NOOP("OTR") , "0.7" );
K_EXPORT_COMPONENT_FACTORY( kopete_otr, OTRPluginFactory( &aboutdata ) )
OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )
: Kopete::Plugin( OTRPluginFactory::instance(), parent, name ) : Kopete::Plugin( OTRPluginFactory::instance(), parent, name )

@ -65,7 +65,7 @@ public:
} }
}; };
class OTRPlugin : public Kopete::Plugin class KDE_EXPORT OTRPlugin : public Kopete::Plugin
{ {
Q_OBJECT Q_OBJECT

Loading…
Cancel
Save