Commit 893b93eb authored by Volker Krause's avatar Volker Krause
Browse files

Fix a bunch of class name clashes when linking statically. Thanks to the

compiler for not informing us earlier about those :-/

svn path=/trunk/KDE/kdepim/runtime/; revision=1200966
parent 02c5c81f
......@@ -28,7 +28,7 @@ kde4_add_ui_files(akonotesresource_SRCS ../maildir/settings.ui)
kde4_add_kcfg_files(akonotesresource_SRCS ../maildir/settings.kcfgc)
qt4_add_dbus_adaptor(akonotesresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h Settings
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h MaildirSettings maildirsettingsadaptor MaildirSettingsAdaptor
)
install( FILES akonotesresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
......
......@@ -17,7 +17,7 @@ kde4_add_ui_files(contactsresource_SRCS settingsdialog.ui)
kde4_add_kcfg_files(contactsresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/contactsresource.kcfg org.kde.Akonadi.Contacts.Settings)
qt4_add_dbus_adaptor(contactsresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Contacts.Settings.xml settings.h Settings
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Contacts.Settings.xml settings.h ContactsResourceSettings contactsresourcesettingsadaptor ContactsResourceSettingsAdaptor
)
install( FILES contactsresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
......
......@@ -19,7 +19,8 @@
#include "contactsresource.h"
#include "settingsadaptor.h"
#include "settings.h"
#include "contactsresourcesettingsadaptor.h"
#include "settingsdialog.h"
#include <QtCore/QDir>
......@@ -37,10 +38,10 @@ using namespace Akonadi;
ContactsResource::ContactsResource( const QString &id )
: ResourceBase( id ),
mSettings( new Settings( componentData().config() ) )
mSettings( new ContactsResourceSettings( componentData().config() ) )
{
// setup the resource
new SettingsAdaptor( mSettings );
new ContactsResourceSettingsAdaptor( mSettings );
DBusConnectionPool::threadConnection().registerObject( QLatin1String( "/Settings" ),
mSettings, QDBusConnection::ExportAdaptors );
......
......@@ -27,7 +27,7 @@
#include <kabc/contactgrouptool.h>
#include <kabc/vcardconverter.h>
class Settings;
class ContactsResourceSettings;
class QDir;
class ContactsResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2
......@@ -71,7 +71,7 @@ class ContactsResource : public Akonadi::ResourceBase, public Akonadi::AgentBase
private:
QStringList mSupportedMimeTypes;
Settings *mSettings;
ContactsResourceSettings *mSettings;
};
#endif
File=contactsresource.kcfg
ClassName=Settings
ClassName=ContactsResourceSettings
Mutators=true
ItemAccessors=true
SetUserTexts=true
......
......@@ -28,7 +28,7 @@
using namespace Akonadi;
SettingsDialog::SettingsDialog( Settings *settings, WId windowId )
SettingsDialog::SettingsDialog( ContactsResourceSettings *settings, WId windowId )
: KDialog(),
mSettings( settings )
{
......
......@@ -24,7 +24,7 @@
#include <KDE/KDialog>
class Settings;
class ContactsResourceSettings;
class KConfigDialogManager;
namespace Akonadi {
......@@ -33,7 +33,7 @@ class SettingsDialog : public KDialog
{
Q_OBJECT
public:
explicit SettingsDialog( Settings* settings, WId windowId );
explicit SettingsDialog( ContactsResourceSettings* settings, WId windowId );
private Q_SLOTS:
void save();
......@@ -42,7 +42,7 @@ class SettingsDialog : public KDialog
private:
Ui::SettingsDialog ui;
KConfigDialogManager* mManager;
Settings *mSettings;
ContactsResourceSettings *mSettings;
};
}
......
......@@ -31,7 +31,7 @@ kde4_add_kcfg_files(maildirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings)
qt4_add_dbus_adaptor(maildirresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h Settings
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h MaildirSettings maildirsettingsadaptor MaildirSettingsAdaptor
)
if (NOT WINCE)
......
......@@ -28,7 +28,7 @@
using KPIM::Maildir;
ConfigDialog::ConfigDialog( Settings *settings, QWidget * parent) :
ConfigDialog::ConfigDialog( MaildirSettings *settings, QWidget * parent) :
KDialog( parent ),
mSettings( settings ),
mToplevelIsContainer( false )
......
......@@ -25,13 +25,13 @@
#include "ui_settings.h"
class KConfigDialogManager;
class Settings;
class MaildirSettings;
class ConfigDialog : public KDialog
{
Q_OBJECT
public:
explicit ConfigDialog( Settings *settings, QWidget *parent = 0 );
explicit ConfigDialog( MaildirSettings *settings, QWidget *parent = 0 );
private slots:
void checkPath();
......@@ -40,7 +40,7 @@ class ConfigDialog : public KDialog
private:
Ui::ConfigDialog ui;
KConfigDialogManager* mManager;
Settings *mSettings;
MaildirSettings *mSettings;
bool mToplevelIsContainer;
};
......
......@@ -19,7 +19,7 @@
#include "maildirresource.h"
#include "settings.h"
#include "settingsadaptor.h"
#include "maildirsettingsadaptor.h"
#include "configdialog.h"
#include <QtCore/QDir>
......@@ -63,9 +63,9 @@ Maildir MaildirResource::maildirForCollection( const Collection &col ) const
MaildirResource::MaildirResource( const QString &id )
:ResourceBase( id ),
mSettings( new Settings( componentData().config() ) )
mSettings( new MaildirSettings( componentData().config() ) )
{
new SettingsAdaptor( mSettings );
new MaildirSettingsAdaptor( mSettings );
DBusConnectionPool::threadConnection().registerObject( QLatin1String( "/Settings" ),
mSettings, QDBusConnection::ExportAdaptors );
connect( this, SIGNAL(reloadConfiguration()), SLOT(configurationChanged()) );
......
......@@ -23,7 +23,7 @@
#include <akonadi/collection.h>
#include <akonadi/resourcebase.h>
class Settings;
class MaildirSettings;
namespace KPIM
{
class Maildir;
......@@ -71,7 +71,7 @@ class MaildirResource : public Akonadi::ResourceBase, public Akonadi::AgentBase:
KPIM::Maildir maildirForCollection( const Akonadi::Collection &col ) const;
private:
Settings *mSettings;
MaildirSettings *mSettings;
};
......
File=maildirresource.kcfg
ClassName=Settings
ClassName=MaildirSettings
Mutators=true
ItemAccessors=true
SetUserTexts=true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment