summaryrefslogtreecommitdiffstats
path: root/certmanager/conf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /certmanager/conf
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/conf')
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp6
-rw-r--r--certmanager/conf/appearanceconfigpage.h2
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp12
-rw-r--r--certmanager/conf/appearanceconfigwidget.h2
-rw-r--r--certmanager/conf/configuredialog.cpp4
-rw-r--r--certmanager/conf/dirservconfigpage.cpp8
-rw-r--r--certmanager/conf/dirservconfigpage.h2
-rw-r--r--certmanager/conf/dnorderconfigpage.cpp6
-rw-r--r--certmanager/conf/dnorderconfigpage.h2
-rw-r--r--certmanager/conf/kleopatra_config_appear.desktop2
-rw-r--r--certmanager/conf/kleopatra_config_dirserv.desktop2
-rw-r--r--certmanager/conf/kleopatra_config_dnorder.desktop2
12 files changed, 25 insertions, 25 deletions
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74a..53030bbd7 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -39,7 +39,7 @@
#include <tdepimmacros.h>
AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout* lay = new TQVBoxLayout( this );
mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()
extern "C"
{
- KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
{
AppearanceConfigurationPage *page =
new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
}
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void AppearanceConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 89c56cfcb..9425e1e68 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "Appearance" configuration page for kleopatra's configuration dialog
*/
-class AppearanceConfigurationPage : public KCModule {
+class AppearanceConfigurationPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 57a767419..96c0bfffc 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -66,7 +66,7 @@ using namespace Kleo;
class CategoryListViewItem : public TQListViewItem
{
public:
- CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
+ CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
: TQListViewItem( lv, prev ) {
setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
mDirty = false;
}
- void save( KConfigBase& config ) {
+ void save( TDEConfigBase& config ) {
config.writeEntry( "Name", text( 0 ) );
config.writeEntry( "foreground-color", mForegroundColor );
config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
void AppearanceConfigWidget::load()
{
categoriesLV->clear();
- KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+ TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
- KConfigGroup cfg( config, *it );
+ TDEConfigGroup cfg( config, *it );
(void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
}
}
void AppearanceConfigWidget::save()
{
- KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+ TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
// We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
TQListViewItemIterator lvit( categoriesLV );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
- KConfigGroup cfg( config, *it );
+ TDEConfigGroup cfg( config, *it );
item->save( cfg );
}
config->sync();
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 3840df131..f6ca9c8e6 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -36,7 +36,7 @@
#include "appearanceconfigwidgetbase.h"
#include <tqstringlist.h>
-class KConfig;
+class TDEConfig;
namespace Kleo {
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 57ed0ee41..fde9df9db 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
- const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+ const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}
void ConfigureDialog::hideEvent( TQHideEvent * ) {
- KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+ TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
geometry.writeEntry( "ConfigureDialogWidth", width() );
geometry.writeEntry( "ConfigureDialogHeight",height() );
}
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 9d82d86e7..40ab0998d 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -116,7 +116,7 @@ public:
}
private:
- KConfig mConfig;
+ TDEConfig mConfig;
};
#endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
static const char s_addnewservers_entryName[] = "add-servers";
DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
mConfig = Kleo::CryptoBackendFactory::instance()->config();
TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()
extern "C"
{
- KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
{
DirectoryServicesConfigurationPage *page =
new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
}
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DirectoryServicesConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index c5ebcad1d..536cf76ef 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -50,7 +50,7 @@ namespace Kleo {
* The user can configure LDAP servers in this page, to be used for listing/fetching
* remote certificates in kleopatra.
*/
-class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
+class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7a..a802a06fe 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -39,7 +39,7 @@
#include <tqlayout.h>
DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this );
mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
mWidget->defaults();
}
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DNOrderConfigPage::slotChanged() {
emit changed(true);
}
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
+extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
}
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index b053c5cb0..b183b1f21 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "DN Order" configuration page for kleopatra's configuration dialog
*/
-class DNOrderConfigPage : public KCModule {
+class DNOrderConfigPage : public TDECModule {
Q_OBJECT
public:
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index 1fb2cc719..b0ee2ac70 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration-appearance.html
X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index f645cffb5..33e65a7a7 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=network
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration.html#configuration-directory-services
X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index beec7945d..f77761ac4 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kleopatra/configuration-dn-order.html
X-TDE-ModuleType=Library