summaryrefslogtreecommitdiffstats
path: root/kontact/src
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/src')
-rw-r--r--kontact/src/kcmkontact.cpp4
-rw-r--r--kontact/src/kcmkontact.h4
-rw-r--r--kontact/src/kontactconfig.desktop2
-rw-r--r--kontact/src/mainwindow.cpp16
-rw-r--r--kontact/src/mainwindow.h6
-rw-r--r--kontact/src/profilemanager.cpp12
-rw-r--r--kontact/src/profilemanager.h2
7 files changed, 23 insertions, 23 deletions
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 9e46eef2d..96101ec00 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -42,7 +42,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) {
return new KcmKontact( parent, "kcmkontact" );
}
}
@@ -100,7 +100,7 @@ const TDEAboutData* KcmKontact::aboutData() const
}
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent )
{
mItem = item;
mPluginCombo = new TQComboBox( parent );
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index c15ecf048..6e0c402af 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -53,7 +53,7 @@ class PluginSelection : public KPrefsWid
public:
- PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
+ PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent );
~PluginSelection();
void readConfig();
@@ -65,7 +65,7 @@ class PluginSelection : public KPrefsWid
private:
TQComboBox *mPluginCombo;
TQValueList<KService::Ptr> mPluginList;
- KConfigSkeleton::ItemString *mItem;
+ TDEConfigSkeleton::ItemString *mItem;
};
#endif
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index 6ea38e238..0c094d502 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -2,7 +2,7 @@
Exec=kcmshell kontactconfig
Icon=kontact
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kontact
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 5ac040f73..8a6a7f354 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -338,7 +338,7 @@ void MainWindow::setupActions()
KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
actionCollection(), "action_new" );
- KConfig* const cfg = Prefs::self()->config();
+ TDEConfig* const cfg = Prefs::self()->config();
cfg->setGroup( "Kontact Groupware Settings" );
mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true );
@@ -371,7 +371,7 @@ void MainWindow::slotConfigureProfiles()
}
namespace {
- void copyConfigEntry( KConfig* source, KConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
+ void copyConfigEntry( TDEConfig* source, TDEConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
{
source->setGroup( group );
dest->setGroup( group );
@@ -385,12 +385,12 @@ void MainWindow::slotSaveToProfile( const TQString& id )
if ( path.isNull() )
return;
- KConfig* const cfg = Prefs::self()->config();
+ TDEConfig* const cfg = Prefs::self()->config();
Prefs::self()->writeConfig();
saveMainWindowSettings( cfg );
saveSettings();
- KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+ TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
::copyConfigEntry( cfg, &profile, "MainWindow Toolbar navigatorToolBar", "Hidden", "true" );
::copyConfigEntry( cfg, &profile, "View", "SidePaneSplitter" );
::copyConfigEntry( cfg, &profile, "Icons", "Theme" );
@@ -409,12 +409,12 @@ void MainWindow::slotLoadProfile( const TQString& id )
if ( path.isNull() )
return;
- KConfig* const cfg = Prefs::self()->config();
+ TDEConfig* const cfg = Prefs::self()->config();
Prefs::self()->writeConfig();
saveMainWindowSettings( cfg );
saveSettings();
- const KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+ const TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
const TQStringList groups = profile.groupList();
for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it )
{
@@ -1091,7 +1091,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
}
}
-void MainWindow::readProperties( KConfig *config )
+void MainWindow::readProperties( TDEConfig *config )
{
Core::readProperties( config );
@@ -1109,7 +1109,7 @@ void MainWindow::readProperties( KConfig *config )
}
}
-void MainWindow::saveProperties( KConfig *config )
+void MainWindow::saveProperties( TDEConfig *config )
{
Core::saveProperties( config );
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 90e9045bd..42b55420b 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -43,7 +43,7 @@ class TQVBox;
class TQFrame;
class KAction;
-class KConfig;
+class TDEConfig;
class KPluginInfo;
class KRSqueezedTextLabel;
class KHTMLPart;
@@ -129,8 +129,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
void setupActions();
void showTip( bool );
virtual bool queryClose();
- virtual void readProperties( KConfig *config );
- virtual void saveProperties( KConfig *config );
+ virtual void readProperties( TDEConfig *config );
+ virtual void saveProperties( TDEConfig *config );
void paintAboutScreen( const TQString& msg );
static TQString introductionString();
KToolBar* findToolBar(const char* name);
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index c64cbf978..295f4615d 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -151,7 +151,7 @@ void Kontact::ProfileManager::writeConfig() const
Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal )
{
- KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
+ TDEConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) );
profileCfg.setGroup( "Kontact Profile" );
const TQString id = profileCfg.readEntry( "Identifier" );
@@ -168,7 +168,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
{
const TQString profileDir = profile.saveLocation();
const TQString cfgPath = profileDir + "/profile.cfg";
- KConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
+ TDEConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
profileCfg.setGroup( "Kontact Profile" );
profileCfg.writeEntry( "Identifier", profile.id() );
profileCfg.writeEntry( "Name", profile.name() );
@@ -235,7 +235,7 @@ void Kontact::Profile::copyConfigFiles( const TQString& source_, const TQString&
{
const KURL source = KURL::fromPathOrURL( source_+"/*rc" );
const KURL dest = KURL::fromPathOrURL( dest_ );
- KIO::CopyJob* job = KIO::copy( source, dest, /*showProgressInfo=*/false );
+ TDEIO::CopyJob* job = TDEIO::copy( source, dest, /*showProgressInfo=*/false );
// TODO better check for the copy result
}
@@ -283,7 +283,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
Kontact::Profile profile = profileById( id );
if ( profile.isLocal() ) {
KURL location = KURL::fromPathOrURL( profile.saveLocation() );
- KIO::DeleteJob* job = KIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
+ TDEIO::DeleteJob* job = TDEIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
// TODO check result
}
m_profiles.remove( id );
@@ -302,7 +302,7 @@ Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDir
const KURL source = KURL::fromPathOrURL( profile.saveLocation() );
const KURL target = KURL::fromPathOrURL( path + TQDir::separator() + profile.name() );
- KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+ TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
// TODO check result
return SuccessfulExport;
@@ -319,7 +319,7 @@ Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromD
const KURL source = KURL::fromPathOrURL( path );
const KURL target = KURL::fromPathOrURL( profile.saveLocation() );
- KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+ TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
// TODO better check for the copy result
addProfile( profile );
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 12ed57471..b72511f5c 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -31,7 +31,7 @@
template <class T> class TQValueList;
-namespace KIO {
+namespace TDEIO {
class Job;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 05:52:44 +0000