From f74503ce1b2872712090c76ed8715419eef8aa36 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 22 Feb 2013 11:44:51 -0600 Subject: Fix FTBFS --- tderesources/birthdays/resourcekabc.cpp | 8 ++++---- tderesources/birthdays/resourcekabc.h | 10 +++++----- tderesources/birthdays/resourcekabcconfig.cpp | 16 ++++++++-------- tderesources/birthdays/resourcekabcconfig.h | 6 +++--- tderesources/carddav/prefsskel.kcfgc | 2 +- tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc | 2 +- tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc | 2 +- tderesources/slox/tdeabcsloxprefs.kcfgc | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tderesources') diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp index 6b8d31705..68ef63390 100644 --- a/tderesources/birthdays/resourcekabc.cpp +++ b/tderesources/birthdays/resourcekabc.cpp @@ -62,11 +62,11 @@ extern "C" { TDEGlobal::locale()->insertCatalogue( "kres_birthday" ); TDEGlobal::locale()->insertCatalogue( "libkcal" ); - return new KRES::PluginFactory(); + return new KRES::PluginFactory(); } } -ResourceTDEABC::ResourceKABC( const TDEConfig* config ) +ResourceTDEABC::ResourceTDEABC( const TDEConfig* config ) : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { @@ -79,14 +79,14 @@ ResourceTDEABC::ResourceKABC( const TDEConfig* config ) init(); } -ResourceTDEABC::ResourceKABC() +ResourceTDEABC::ResourceTDEABC() : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { init(); } -ResourceTDEABC::~ResourceKABC() +ResourceTDEABC::~ResourceTDEABC() { delete mLock; } diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h index 21cd66a4b..bea4b4637 100644 --- a/tderesources/birthdays/resourcekabc.h +++ b/tderesources/birthdays/resourcekabc.h @@ -45,17 +45,17 @@ namespace KCal { /** Resource providing birthdays and anniversaries as events. */ -class KDE_EXPORT ResourceKABC : public ResourceCalendar +class KDE_EXPORT ResourceTDEABC : public ResourceCalendar { Q_OBJECT - friend class ResourceKABCConfig; + friend class ResourceTDEABCConfig; public: - ResourceKABC( const TDEConfig * ); - ResourceKABC( ); - virtual ~ResourceKABC(); + ResourceTDEABC( const TDEConfig * ); + ResourceTDEABC( ); + virtual ~ResourceTDEABC(); void readConfig( const TDEConfig *config ); void writeConfig( TDEConfig* config ); diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 5bb459091..6bead14b5 100644 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp @@ -33,7 +33,7 @@ using namespace KCal; -ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name ) +ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) { TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 ); @@ -78,9 +78,9 @@ ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name ) new TQCheckListItem( mCategoryView, *it, TQCheckListItem::CheckBox ); } -void ResourceKABCConfig::loadSettings( KRES::Resource *resource ) +void ResourceTDEABCConfig::loadSettings( KRES::Resource *resource ) { - ResourceKABC *res = static_cast( resource ); + ResourceTDEABC *res = static_cast( resource ); if ( res ) { mAlarm->setChecked( res->alarm() ); TQString days; @@ -101,13 +101,13 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource ) mUseCategories->setChecked( res->useCategories() ); } else { - kdDebug(5700) << "ERROR: ResourceKABCConfig::loadSettings(): no ResourceKABC, cast failed" << endl; + kdDebug(5700) << "ERROR: ResourceTDEABCConfig::loadSettings(): no ResourceTDEABC, cast failed" << endl; } } -void ResourceKABCConfig::saveSettings( KRES::Resource *resource ) +void ResourceTDEABCConfig::saveSettings( KRES::Resource *resource ) { - ResourceKABC *res = static_cast( resource ); + ResourceTDEABC *res = static_cast( resource ); if ( res ) { res->setAlarm( mAlarm->isChecked() ); res->setAlarmDays( mAlarmTimeEdit->text().toInt() ); @@ -122,11 +122,11 @@ void ResourceKABCConfig::saveSettings( KRES::Resource *resource ) res->setCategories( categories ); res->setUseCategories( mUseCategories->isChecked() ); } else { - kdDebug(5700) << "ERROR: ResourceKABCConfig::saveSettings(): no ResourceKABC, cast failed" << endl; + kdDebug(5700) << "ERROR: ResourceTDEABCConfig::saveSettings(): no ResourceTDEABC, cast failed" << endl; } } -void ResourceKABCConfig::alarmClicked() +void ResourceTDEABCConfig::alarmClicked() { mAlarmTimeEdit->setDisabled(!mAlarm->isChecked()); mALabel->setDisabled(!mAlarm->isChecked()); diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index 41cf1b88a..c62037c2a 100644 --- a/tderesources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -36,14 +36,14 @@ namespace KCal { /** Configuration widget for birtday/anniversaries resource. - @see ResourceKABC + @see ResourceTDEABC */ -class ResourceKABCConfig : public KRES::ConfigWidget +class ResourceTDEABCConfig : public KRES::ConfigWidget { Q_OBJECT public: - ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/tderesources/carddav/prefsskel.kcfgc b/tderesources/carddav/prefsskel.kcfgc index 5eb6ae284..ad1d6ddcf 100644 --- a/tderesources/carddav/prefsskel.kcfgc +++ b/tderesources/carddav/prefsskel.kcfgc @@ -1,7 +1,7 @@ # Code generation options for tdeconfig_compiler File=prefsskel.kcfg ClassName=CardDavPrefsSkel -NameSpace=KABC +NameSpace=TDEABC Singleton=false Mutators=true GlobalEnums=true diff --git a/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc b/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc index 50c0d2394..ab89220a6 100644 --- a/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc @@ -1,7 +1,7 @@ # Code generation options for tdeconfig_compiler File=tderesources_tdeabc_egroupware.kcfg ClassName=EGroupwarePrefs -NameSpace=KABC +NameSpace=TDEABC Singleton=false Mutators=true Inherits=KResourcePrefs diff --git a/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc b/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc index 0dd55c2f6..36669ce17 100644 --- a/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc +++ b/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc @@ -4,5 +4,5 @@ GlobalEnums=true IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs Mutators=true -NameSpace=KABC +NameSpace=TDEABC Singleton=false diff --git a/tderesources/slox/tdeabcsloxprefs.kcfgc b/tderesources/slox/tdeabcsloxprefs.kcfgc index 70c006f52..5cd87ee38 100644 --- a/tderesources/slox/tdeabcsloxprefs.kcfgc +++ b/tderesources/slox/tdeabcsloxprefs.kcfgc @@ -1,7 +1,7 @@ # Code generation options for tdeconfig_compiler File=tderesources_tdeabc_slox.kcfg ClassName=SloxPrefs -NameSpace=KABC +NameSpace=TDEABC Singleton=false Mutators=true Inherits=KResourcePrefs -- cgit v1.2.1