summaryrefslogtreecommitdiffstats
path: root/libkcal
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal')
-rw-r--r--libkcal/attachmenthandler.cpp10
-rw-r--r--libkcal/calendarnull.h2
-rw-r--r--libkcal/calendarresources.cpp2
-rw-r--r--libkcal/calendarresources.h6
-rw-r--r--libkcal/freebusyurlstore.cpp2
-rw-r--r--libkcal/freebusyurlstore.h4
-rw-r--r--libkcal/resourcecached.cpp6
-rw-r--r--libkcal/resourcecached.h6
-rw-r--r--libkcal/resourcecalendar.cpp4
-rw-r--r--libkcal/resourcecalendar.h4
-rw-r--r--libkcal/resourcelocal.cpp4
-rw-r--r--libkcal/resourcelocal.h8
-rw-r--r--libkcal/resourcelocaldir.cpp6
-rw-r--r--libkcal/resourcelocaldir.h8
-rw-r--r--libkcal/tests/testresource.cpp6
-rw-r--r--libkcal/tests/testresource.h6
16 files changed, 42 insertions, 42 deletions
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index 47ba6d1ce..20035bc58 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -75,7 +75,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen
}
if ( a->isUri() ) {
- if ( !KIO::NetAccess::exists( a->uri(), true, parent ) ) {
+ if ( !TDEIO::NetAccess::exists( a->uri(), true, parent ) ) {
KMessageBox::sorry(
parent,
i18n( "The attachment \"%1\" is a web link that is inaccessible from this computer. " ).
@@ -216,14 +216,14 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment )
bool stat = false;
if ( attachment->isUri() ) {
// save the attachment url
- stat = KIO::NetAccess::file_copy( attachment->uri(), KURL( saveAsFile ), -1, true );
+ stat = TDEIO::NetAccess::file_copy( attachment->uri(), KURL( saveAsFile ), -1, true );
} else {
// put the attachment in a temporary file and save it
KURL tempUrl = tempFileForAttachment( attachment );
if ( tempUrl.isValid() ) {
- stat = KIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true );
- if ( !stat && KIO::NetAccess::lastError() ) {
- KMessageBox::error( parent, KIO::NetAccess::lastErrorString() );
+ stat = TDEIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true );
+ if ( !stat && TDEIO::NetAccess::lastError() ) {
+ KMessageBox::error( parent, TDEIO::NetAccess::lastErrorString() );
}
} else {
stat = false;
diff --git a/libkcal/calendarnull.h b/libkcal/calendarnull.h
index 8ea0afa91..4db35bce7 100644
--- a/libkcal/calendarnull.h
+++ b/libkcal/calendarnull.h
@@ -30,7 +30,7 @@
#include "calendar.h"
#include "libkcal_export.h"
-class KConfig;
+class TDEConfig;
/**
@namespace KCal
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index abd1cc213..5ab08bd76 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -143,7 +143,7 @@ CalendarResources::~CalendarResources()
delete mAskPolicy;
}
-void CalendarResources::readConfig( KConfig *config )
+void CalendarResources::readConfig( TDEConfig *config )
{
mManager->readConfig( config );
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index 3f6f17740..921fb227a 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -171,7 +171,7 @@ class LIBKCAL_EXPORT CalendarResources :
/**
Loads all Incidences from the Resources. The Resources must be added
- first using either readConfig(KConfig *config), which adds the system
+ first using either readConfig(TDEConfig *config), which adds the system
Resources, or manually using resourceAdded(ResourceCalendar *resource).
*/
void load();
@@ -251,12 +251,12 @@ class LIBKCAL_EXPORT CalendarResources :
/**
Read the Resources settings from a config file.
- @param config The KConfig object which points to the config file.
+ @param config The TDEConfig object which points to the config file.
If no object is given (null pointer) the standard config file is used.
@note Call this method <em>before</em> load().
*/
- void readConfig( KConfig *config = 0 );
+ void readConfig( TDEConfig *config = 0 );
/**
Set the destination policy such that Incidences are always added
diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp
index 2e913d56f..62cf26e6e 100644
--- a/libkcal/freebusyurlstore.cpp
+++ b/libkcal/freebusyurlstore.cpp
@@ -42,7 +42,7 @@ FreeBusyUrlStore *FreeBusyUrlStore::self()
FreeBusyUrlStore::FreeBusyUrlStore()
{
TQString configFile = locateLocal( "data", "korganizer/freebusyurls" );
- mConfig = new KConfig( configFile );
+ mConfig = new TDEConfig( configFile );
}
FreeBusyUrlStore::~FreeBusyUrlStore()
diff --git a/libkcal/freebusyurlstore.h b/libkcal/freebusyurlstore.h
index 6beb4d03a..95b3026cf 100644
--- a/libkcal/freebusyurlstore.h
+++ b/libkcal/freebusyurlstore.h
@@ -25,7 +25,7 @@
#include "libkcal_export.h"
-class KConfig;
+class TDEConfig;
namespace KCal {
@@ -46,7 +46,7 @@ class LIBKCAL_EXPORT FreeBusyUrlStore
static FreeBusyUrlStore *mSelf;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
}
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index d32fad054..aab9216db 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -48,7 +48,7 @@ using namespace KCal;
static bool m_editoropen = false;
-ResourceCached::ResourceCached( const KConfig* config )
+ResourceCached::ResourceCached( const TDEConfig* config )
: ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mReloadPolicy( ReloadNever ), mReloadInterval( 10 ),
mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ),
@@ -107,7 +107,7 @@ int ResourceCached::saveInterval() const
return mSaveInterval;
}
-void ResourceCached::readConfig( const KConfig *config )
+void ResourceCached::readConfig( const TDEConfig *config )
{
mReloadPolicy = config->readNumEntry( "ReloadPolicy", ReloadNever );
mReloadInterval = config->readNumEntry( "ReloadInterval", 10 );
@@ -144,7 +144,7 @@ void ResourceCached::setupReloadTimer()
}
}
-void ResourceCached::writeConfig( KConfig *config )
+void ResourceCached::writeConfig( TDEConfig *config )
{
config->writeEntry( "ReloadPolicy", mReloadPolicy );
config->writeEntry( "ReloadInterval", mReloadInterval );
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index a26c3c539..5f56e3907 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -61,11 +61,11 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
*/
enum { SaveNever, SaveOnExit, SaveInterval, SaveDelayed, SaveAlways };
- ResourceCached( const KConfig * );
+ ResourceCached( const TDEConfig * );
virtual ~ResourceCached();
- void readConfig( const KConfig *config );
- void writeConfig( KConfig *config );
+ void readConfig( const TDEConfig *config );
+ void writeConfig( TDEConfig *config );
static bool editorWindowOpen();
static void setEditorWindowOpen(bool open);
diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp
index 9f611e75e..36a0932b0 100644
--- a/libkcal/resourcecalendar.cpp
+++ b/libkcal/resourcecalendar.cpp
@@ -32,7 +32,7 @@
using namespace KCal;
-ResourceCalendar::ResourceCalendar( const KConfig *config )
+ResourceCalendar::ResourceCalendar( const TDEConfig *config )
: KRES::Resource( config ), mResolveConflict( false )
{
mException = 0;
@@ -81,7 +81,7 @@ TQString ResourceCalendar::infoText() const
return txt;
}
-void ResourceCalendar::writeConfig( KConfig* config )
+void ResourceCalendar::writeConfig( TDEConfig* config )
{
// kdDebug(5800) << "ResourceCalendar::writeConfig()" << endl;
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index c1c1e492f..e63a2ad61 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -59,7 +59,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
Q_OBJECT
public:
- ResourceCalendar( const KConfig * );
+ ResourceCalendar( const TDEConfig * );
virtual ~ResourceCalendar();
/**
@@ -81,7 +81,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
void setResolveConflict( bool b);
- virtual void writeConfig( KConfig* config );
+ virtual void writeConfig( TDEConfig* config );
/**
Return rich text with info about the resource. Adds standard info and
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index 2f10dce4b..8b0bc1cca 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -56,7 +56,7 @@ class ResourceLocal::Private
TQDateTime mLastModified;
};
-ResourceLocal::ResourceLocal( const KConfig* config )
+ResourceLocal::ResourceLocal( const TDEConfig* config )
: ResourceCached( config ), mLock( 0 )
{
if ( config ) {
@@ -87,7 +87,7 @@ ResourceLocal::ResourceLocal( const TQString& fileName )
}
-void ResourceLocal::writeConfig( KConfig* config )
+void ResourceLocal::writeConfig( TDEConfig* config )
{
kdDebug(5800) << "ResourceLocal::writeConfig()" << endl;
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index d5a28eaab..a2b6818b9 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -28,7 +28,7 @@
#include <kurl.h>
#include <kdirwatch.h>
#include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
#include "calendarlocal.h"
#include "libkcal_export.h"
@@ -51,16 +51,16 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
public:
/**
- Create resource from configuration information stored in a KConfig object.
+ Create resource from configuration information stored in a TDEConfig object.
*/
- ResourceLocal( const KConfig * );
+ ResourceLocal( const TDEConfig * );
/**
Create resource for file named @a fileName.
*/
ResourceLocal( const TQString& fileName );
virtual ~ResourceLocal();
- virtual void writeConfig( KConfig* config );
+ virtual void writeConfig( TDEConfig* config );
KABC::Lock *lock();
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index f1e00f327..63221ca04 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -52,7 +52,7 @@
using namespace KCal;
-ResourceLocalDir::ResourceLocalDir( const KConfig* config )
+ResourceLocalDir::ResourceLocalDir( const TDEConfig* config )
: ResourceCached( config ), mLock( 0 )
{
if ( config ) {
@@ -71,13 +71,13 @@ ResourceLocalDir::ResourceLocalDir( const TQString& dirName )
}
-void ResourceLocalDir::readConfig( const KConfig *config )
+void ResourceLocalDir::readConfig( const TDEConfig *config )
{
TQString url = config->readPathEntry( "CalendarURL" );
mURL = KURL( url );
}
-void ResourceLocalDir::writeConfig( KConfig *config )
+void ResourceLocalDir::writeConfig( TDEConfig *config )
{
kdDebug(5800) << "ResourceLocalDir::writeConfig()" << endl;
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index e5fe7f81e..0adbf1cb6 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -30,7 +30,7 @@
#include "libkcal_export.h"
class TQString;
-class KConfig;
+class TDEConfig;
namespace KCal {
@@ -50,12 +50,12 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
friend class ResourceLocalDirConfig;
public:
- ResourceLocalDir( const KConfig * );
+ ResourceLocalDir( const TDEConfig * );
ResourceLocalDir( const TQString& fileName );
virtual ~ResourceLocalDir();
- void readConfig( const KConfig *config );
- void writeConfig( KConfig* config );
+ void readConfig( const TDEConfig *config );
+ void writeConfig( TDEConfig* config );
KABC::Lock *lock();
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index b7f2f24c4..25c9e5d6c 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -68,9 +68,9 @@ int main(int argc, char *argv[])
TQString type = TQString();
if ( args->getOption( "resource" ) )
type = TQString::fromLocal8Bit( args->getOption( "resource" ) );
- KConfig *config = 0;
+ TDEConfig *config = 0;
if ( args->getOption( "configfile" ) )
- config = new KConfig( KURL( args->getOption( "configfile" ) ).url() );
+ config = new TDEConfig( KURL( args->getOption( "configfile" ) ).url() );
kdDebug() << KURL( args->getOption( "configfile" ) ).url() << endl;
KCal::TestResource test( type, config );
test.setup();
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
namespace KCal {
-TestResource::TestResource( const TQString &type, KConfig *config )
+TestResource::TestResource( const TQString &type, TDEConfig *config )
:m_resource_type( type ), m_config( config ), m_res( 0 )
{}
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index f6d7fc127..4d17c7b48 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -20,7 +20,7 @@
#define TESTRESOURCE_H
#include <tqobject.h>
-class KConfig;
+class TDEConfig;
namespace KCal {
@@ -32,7 +32,7 @@ class TestResource : public TQObject
public:
- TestResource( const TQString& type, KConfig *config );
+ TestResource( const TQString& type, TDEConfig *config );
void setup();
void runAll();
void cleanup();
@@ -49,7 +49,7 @@ public:
private:
bool check(const TQString& txt, TQString a, TQString b);
TQString m_resource_type;
- KConfig *m_config;
+ TDEConfig *m_config;
ResourceCalendar *m_res;
};
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 05:39:39 +0000