summaryrefslogtreecommitdiffstats
path: root/tderesources/scalix
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/scalix')
-rw-r--r--tderesources/scalix/CMakeLists.txt2
-rw-r--r--tderesources/scalix/Makefile.am2
-rw-r--r--tderesources/scalix/kabc/resourcescalix.cpp8
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/jobs.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/jobs.h2
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/settings.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/settings.h4
-rw-r--r--tderesources/scalix/tdeioslave/CMakeLists.txt (renamed from tderesources/scalix/kioslave/CMakeLists.txt)0
-rw-r--r--tderesources/scalix/tdeioslave/Makefile.am (renamed from tderesources/scalix/kioslave/Makefile.am)2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp (renamed from tderesources/scalix/kioslave/scalix.cpp)2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.h (renamed from tderesources/scalix/kioslave/scalix.h)4
-rw-r--r--tderesources/scalix/tdeioslave/scalix.protocol (renamed from tderesources/scalix/kioslave/scalix.protocol)2
-rw-r--r--tderesources/scalix/tdeioslave/scalixs.protocol (renamed from tderesources/scalix/kioslave/scalixs.protocol)2
15 files changed, 23 insertions, 23 deletions
diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt
index ca7fc5237..0be4fd954 100644
--- a/tderesources/scalix/CMakeLists.txt
+++ b/tderesources/scalix/CMakeLists.txt
@@ -12,6 +12,6 @@
add_subdirectory( shared )
add_subdirectory( kabc )
add_subdirectory( kcal )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
add_subdirectory( knotes )
add_subdirectory( scalixadmin )
diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am
index 1a58c7ec9..ca3230486 100644
--- a/tderesources/scalix/Makefile.am
+++ b/tderesources/scalix/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = shared kabc kcal kioslave knotes scalixadmin
+SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin
messages: rc.cpp
$(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index 42aef92d5..13ee99ec8 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.cpp
@@ -38,8 +38,8 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <ktempfile.h>
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
#include <kmainwindow.h>
#include <kapplication.h>
#include <dcopclient.h>
@@ -193,8 +193,8 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
// If it's too big the progressbar is jumpy.
const int nbMessages = 200;
- (void)Observer::self(); // ensure kio_uiserver is running
- UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+ (void)Observer::self(); // ensure tdeio_uiserver is running
+ UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
int progressId = 0;
if ( count > 200 ) {
progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index a757c81fc..672a7bfbf 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -33,8 +33,8 @@
#include "resourcescalix.h"
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
#include <kapplication.h>
#include <dcopclient.h>
#include <libkcal/icalformat.h>
@@ -161,8 +161,8 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
: i18n( "Loading events..." );
const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
if ( useProgress )
- (void)::Observer::self(); // ensure kio_uiserver is running
- UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+ (void)::Observer::self(); // ensure tdeio_uiserver is running
+ UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
int progressId = 0;
if ( useProgress ) {
progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp
index 49b0a8fe5..e7dd94457 100644
--- a/tderesources/scalix/scalixadmin/jobs.cpp
+++ b/tderesources/scalix/scalixadmin/jobs.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
#include <klocale.h>
#include "jobs.h"
diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h
index 0c73fb507..832db0700 100644
--- a/tderesources/scalix/scalixadmin/jobs.h
+++ b/tderesources/scalix/scalixadmin/jobs.h
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kio/job.h>
+#include <tdeio/job.h>
#ifndef JOBS_H
#define JOBS_H
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 6dd8ab10e..9bdc13776 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -24,7 +24,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstringhandler.h>
diff --git a/tderesources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp
index 279491c5f..277a0631d 100644
--- a/tderesources/scalix/scalixadmin/settings.cpp
+++ b/tderesources/scalix/scalixadmin/settings.cpp
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kconfig.h>
-#include <kio/scheduler.h>
+#include <tdeconfig.h>
+#include <tdeio/scheduler.h>
#include <kstringhandler.h>
#include "settings.h"
diff --git a/tderesources/scalix/scalixadmin/settings.h b/tderesources/scalix/scalixadmin/settings.h
index 29028f3b8..490b98a7d 100644
--- a/tderesources/scalix/scalixadmin/settings.h
+++ b/tderesources/scalix/scalixadmin/settings.h
@@ -22,8 +22,8 @@
#define SETTINGS_H
#include <kurl.h>
-#include <kio/global.h>
-#include <kio/slave.h>
+#include <tdeio/global.h>
+#include <tdeio/slave.h>
class Settings
{
diff --git a/tderesources/scalix/kioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt
index 7ba76f672..7ba76f672 100644
--- a/tderesources/scalix/kioslave/CMakeLists.txt
+++ b/tderesources/scalix/tdeioslave/CMakeLists.txt
diff --git a/tderesources/scalix/kioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am
index 5607fb9d7..1e66f7091 100644
--- a/tderesources/scalix/kioslave/Makefile.am
+++ b/tderesources/scalix/tdeioslave/Makefile.am
@@ -14,4 +14,4 @@ kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtde
kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kio_scalix.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot
diff --git a/tderesources/scalix/kioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 1b4cc7b8f..40084669d 100644
--- a/tderesources/scalix/kioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -25,7 +25,7 @@
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <tdeversion.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <klocale.h>
#include <tdepimmacros.h>
diff --git a/tderesources/scalix/kioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h
index dc034b7b5..f4dbdeadd 100644
--- a/tderesources/scalix/kioslave/scalix.h
+++ b/tderesources/scalix/tdeioslave/scalix.h
@@ -21,8 +21,8 @@
#ifndef SCALIX_H
#define SCALIX_H
-#include <kio/job.h>
-#include <kio/slavebase.h>
+#include <tdeio/job.h>
+#include <tdeio/slavebase.h>
#include <tqobject.h>
diff --git a/tderesources/scalix/kioslave/scalix.protocol b/tderesources/scalix/tdeioslave/scalix.protocol
index a527d77dd..91a213e87 100644
--- a/tderesources/scalix/kioslave/scalix.protocol
+++ b/tderesources/scalix/tdeioslave/scalix.protocol
@@ -1,5 +1,5 @@
[Protocol]
-DocPath=kioslave/scalix.html
+DocPath=tdeioslave/scalix.html
exec=kio_scalix
input=none
output=filesystem
diff --git a/tderesources/scalix/kioslave/scalixs.protocol b/tderesources/scalix/tdeioslave/scalixs.protocol
index fd13db6ad..19defac56 100644
--- a/tderesources/scalix/kioslave/scalixs.protocol
+++ b/tderesources/scalix/tdeioslave/scalixs.protocol
@@ -1,5 +1,5 @@
[Protocol]
-DocPath=kioslave/scalix.html
+DocPath=tdeioslave/scalix.html
exec=kio_scalix
input=none
output=filesystem