Browse Source

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
3c5631f74d
100 changed files with 425 additions and 425 deletions
  1. 1
    1
      kamera/kcontrol/kamera.cpp
  2. 2
    2
      kamera/kcontrol/kamera.h
  3. 2
    2
      kamera/kcontrol/kameradevice.cpp
  4. 4
    4
      kamera/kcontrol/kameradevice.h
  5. 23
    23
      kamera/kioslave/kamera.cpp
  6. 4
    4
      kamera/kioslave/kamera.h
  7. 2
    2
      kcoloredit/kcoloredit.h
  8. 3
    3
      kdvi/dviRenderer.cpp
  9. 1
    1
      kdvi/infodialog.cpp
  10. 1
    1
      kdvi/kdvi_multipage.cpp
  11. 1
    1
      kdvi/kdvi_multipage.h
  12. 3
    3
      kfax/kfax.cpp
  13. 2
    2
      kfax/kfax.h
  14. 6
    6
      kgamma/kcmkgamma/kgamma.cpp
  15. 1
    1
      kgamma/kcmkgamma/kgamma.h
  16. 1
    1
      kghostview/displayoptions.h
  17. 2
    2
      kghostview/kghostview.upd
  18. 13
    13
      kghostview/kgv_view.cpp
  19. 3
    3
      kghostview/kgv_view.h
  20. 2
    2
      kghostview/kgvconfigdialog.cpp
  21. 1
    1
      kghostview/kgvdocument.cpp
  22. 2
    2
      kghostview/kgvshell.cpp
  23. 3
    3
      kghostview/kgvshell.h
  24. 2
    2
      kiconedit/kicon.cpp
  25. 3
    3
      kiconedit/kiconedit.cpp
  26. 2
    2
      kiconedit/kiconedit.h
  27. 2
    2
      kiconedit/knew.cpp
  28. 2
    2
      kiconedit/properties.cpp
  29. 1
    1
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  30. 1
    1
      kmrml/kmrml/kcontrol/kcmkmrml.h
  31. 1
    1
      kmrml/kmrml/kcontrol/mainpage.cpp
  32. 4
    4
      kmrml/kmrml/lib/kmrml_config.cpp
  33. 4
    4
      kmrml/kmrml/lib/kmrml_config.h
  34. 10
    10
      kmrml/kmrml/loader.cpp
  35. 4
    4
      kmrml/kmrml/loader.h
  36. 4
    4
      kmrml/kmrml/mrml.cpp
  37. 1
    1
      kmrml/kmrml/mrml.h
  38. 18
    18
      kmrml/kmrml/mrml_part.cpp
  39. 7
    7
      kmrml/kmrml/mrml_part.h
  40. 4
    4
      kolourpaint/kpcommandhistory.cpp
  41. 9
    9
      kolourpaint/kpdocument.cpp
  42. 12
    12
      kolourpaint/kpdocumentsaveoptions.cpp
  43. 12
    12
      kolourpaint/kpdocumentsaveoptions.h
  44. 6
    6
      kolourpaint/kpdocumentsaveoptionswidget.cpp
  45. 11
    11
      kolourpaint/kpmainwindow.cpp
  46. 2
    2
      kolourpaint/kpmainwindow.h
  47. 15
    15
      kolourpaint/kpmainwindow_file.cpp
  48. 2
    2
      kolourpaint/kpmainwindow_help.cpp
  49. 4
    4
      kolourpaint/kpmainwindow_image.cpp
  50. 2
    2
      kolourpaint/kpmainwindow_settings.cpp
  51. 14
    14
      kolourpaint/kpmainwindow_text.cpp
  52. 4
    4
      kolourpaint/kpmainwindow_tools.cpp
  53. 10
    10
      kolourpaint/kpmainwindow_view.cpp
  54. 4
    4
      kolourpaint/pixmapfx/kpeffectflatten.cpp
  55. 2
    2
      kolourpaint/pixmapfx/kppixmapfx.cpp
  56. 2
    2
      kolourpaint/widgets/kptooltoolbar.cpp
  57. 4
    4
      kolourpaint/widgets/kptoolwidgetbase.cpp
  58. 1
    1
      kooka/CHANGES
  59. 10
    10
      kooka/img_saver.cpp
  60. 9
    9
      kooka/kocrbase.cpp
  61. 1
    1
      kooka/kocrbase.h
  62. 2
    2
      kooka/kocrgocr.cpp
  63. 4
    4
      kooka/kocrkadmos.cpp
  64. 1
    1
      kooka/kocrkadmos.h
  65. 2
    2
      kooka/kocrocrad.cpp
  66. 4
    4
      kooka/kooka.cpp
  67. 3
    3
      kooka/kooka.h
  68. 1
    1
      kooka/kookapref.cpp
  69. 2
    2
      kooka/kookapref.h
  70. 2
    2
      kooka/kookaview.cpp
  71. 2
    2
      kooka/kookaview.h
  72. 4
    4
      kooka/ksaneocr.cpp
  73. 2
    2
      kooka/ksaneocr.h
  74. 6
    6
      kooka/scanpackager.cpp
  75. 5
    5
      kooka/scanpackager.h
  76. 7
    7
      kooka/thumbview.cpp
  77. 4
    4
      kooka/thumbview.h
  78. 1
    1
      kpdf/TODO
  79. 2
    2
      kpdf/conf/preferencesdialog.cpp
  80. 3
    3
      kpdf/conf/preferencesdialog.h
  81. 8
    8
      kpdf/part.cpp
  82. 5
    5
      kpdf/part.h
  83. 4
    4
      kpdf/shell/shell.cpp
  84. 5
    5
      kpdf/shell/shell.h
  85. 2
    2
      kpovmodeler/pmcontrolpoint.cpp
  86. 3
    3
      kpovmodeler/pmcontrolpoint.h
  87. 2
    2
      kpovmodeler/pmdialogeditbase.cpp
  88. 3
    3
      kpovmodeler/pmdialogeditbase.h
  89. 8
    8
      kpovmodeler/pmdockwidget.cpp
  90. 16
    16
      kpovmodeler/pmdockwidget.h
  91. 2
    2
      kpovmodeler/pmdocumentationmap.cpp
  92. 3
    3
      kpovmodeler/pmdocumentationmap.h
  93. 2
    2
      kpovmodeler/pmerrordialog.cpp
  94. 3
    3
      kpovmodeler/pmerrordialog.h
  95. 2
    2
      kpovmodeler/pmglview.cpp
  96. 3
    3
      kpovmodeler/pmglview.h
  97. 3
    3
      kpovmodeler/pmlibrarybrowser.cpp
  98. 3
    3
      kpovmodeler/pmlibrarybrowser.h
  99. 2
    2
      kpovmodeler/pmlibraryhandleedit.cpp
  100. 0
    0
      kpovmodeler/pmlibraryhandleedit.h

+ 1
- 1
kamera/kcontrol/kamera.cpp View File

@@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
49 49
 KKameraConfig *KKameraConfig::m_instance = NULL;
50 50
 
51 51
 KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
52
-	: KCModule(KKameraConfigFactory::instance(), parent, name)
52
+	: TDECModule(KKameraConfigFactory::instance(), parent, name)
53 53
 {
54 54
 	m_devicePopup = new KPopupMenu(this);
55 55
 	m_actions = new KActionCollection(this);

+ 2
- 2
kamera/kcontrol/kamera.h View File

@@ -44,7 +44,7 @@ class KActionCollection;
44 44
 class KToolBar;
45 45
 class KPopupMenu;
46 46
 
47
-class KKameraConfig : public KCModule
47
+class KKameraConfig : public TDECModule
48 48
 {
49 49
 	Q_OBJECT
50 50
   
@@ -54,7 +54,7 @@ public:
54 54
 	KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
55 55
 	virtual ~KKameraConfig();
56 56
 
57
-	// KCModule interface methods
57
+	// TDECModule interface methods
58 58
 	void load();
59 59
 	void load(bool useDefaults);
60 60
 	void save();

+ 2
- 2
kamera/kcontrol/kameradevice.cpp View File

@@ -190,7 +190,7 @@ bool KCamera::test()
190 190
 	return camera() != 0;
191 191
 }
192 192
 
193
-void KCamera::load(KConfig *config)
193
+void KCamera::load(TDEConfig *config)
194 194
 {
195 195
 	config->setGroup(m_name);
196 196
 	if (m_model.isNull())
@@ -200,7 +200,7 @@ void KCamera::load(KConfig *config)
200 200
 	invalidateCamera();
201 201
 }
202 202
 
203
-void KCamera::save(KConfig *config)
203
+void KCamera::save(TDEConfig *config)
204 204
 {
205 205
 	config->setGroup(m_name);
206 206
 	config->writeEntry("Model", m_model);

+ 4
- 4
kamera/kcontrol/kameradevice.h View File

@@ -27,7 +27,7 @@
27 27
 #include <kdialogbase.h>
28 28
 #include <config.h>
29 29
 
30
-class KConfig;
30
+class TDEConfig;
31 31
 class TQString;
32 32
 class KListView;
33 33
 class TQWidgetStack;
@@ -46,8 +46,8 @@ public:
46 46
 	~KCamera();
47 47
 	void invalidateCamera();
48 48
 	bool configure();
49
-	void load(KConfig *m_config);
50
-	void save(KConfig *m_config);
49
+	void load(TDEConfig *m_config);
50
+	void save(TDEConfig *m_config);
51 51
 	bool test();
52 52
 	TQStringList supportedPorts();
53 53
 
@@ -78,7 +78,7 @@ protected:
78 78
 //	int frontend_prompt(Camera *camera, CameraWidget *widgets);
79 79
 
80 80
 	Camera *m_camera;
81
-//	KConfig *m_config;
81
+//	TDEConfig *m_config;
82 82
 	TQString m_name; // the camera's real name
83 83
 	TQString m_model;
84 84
 	TQString m_path;

+ 23
- 23
kamera/kioslave/kamera.cpp View File

@@ -49,7 +49,7 @@
49 49
 
50 50
 #define tocstr(x) ((x).local8Bit())
51 51
 
52
-using namespace KIO;
52
+using namespace TDEIO;
53 53
 
54 54
 extern "C"
55 55
 {
@@ -213,12 +213,12 @@ void KameraProtocol::get(const KURL &url)
213 213
 	CameraFileType fileType;
214 214
 	int gpr;
215 215
 	if (url.host().isEmpty()) {
216
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
216
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
217 217
 		return;
218 218
 	}
219 219
 
220 220
 	if(!openCamera()) {
221
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
221
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
222 222
 		return;
223 223
 	}
224 224
 
@@ -229,7 +229,7 @@ void KameraProtocol::get(const KURL &url)
229 229
 		CameraText xx;						\
230 230
 		gpr = gp_camera_get_##xx(m_camera,  &xx, m_context);	\
231 231
 		if (gpr != GP_OK) {					\
232
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());	\
232
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());	\
233 233
 			return;						\
234 234
 		}							\
235 235
 		TQByteArray chunkDataBuffer;				\
@@ -260,9 +260,9 @@ void KameraProtocol::get(const KURL &url)
260 260
 		// fprintf(stderr,"Folder %s / File %s not found, gpr is %d\n",folder.latin1(), url.fileName().latin1(), gpr);
261 261
 		gp_file_unref(m_file);
262 262
 		if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
263
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
263
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
264 264
 		else
265
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
265
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
266 266
 		return;
267 267
 	}
268 268
 
@@ -301,12 +301,12 @@ void KameraProtocol::get(const KURL &url)
301 301
 		case GP_ERROR_DIRECTORY_NOT_FOUND:
302 302
 			gp_file_unref(m_file);
303 303
 			m_file = NULL;
304
-			error(KIO::ERR_DOES_NOT_EXIST, url.fileName());
304
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName());
305 305
 			return ;
306 306
 		default:
307 307
 			gp_file_unref(m_file);
308 308
 			m_file = NULL;
309
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
309
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
310 310
 			return;
311 311
 	}
312 312
 	// emit the mimetype
@@ -326,7 +326,7 @@ void KameraProtocol::get(const KURL &url)
326 326
 		kdDebug(7123) << "get():: get_data_and_size failed." << endl;
327 327
 		gp_file_free(m_file);
328 328
 		m_file = NULL;
329
-		error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
329
+		error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
330 330
 		return;
331 331
 	}
332 332
 	// make sure we're not sending zero-sized chunks (=EOF)
@@ -419,7 +419,7 @@ void KameraProtocol::statRegular(const KURL &url)
419 419
 
420 420
 	kdDebug(7123) << "statRegular(\"" << url.path() << "\")" << endl;
421 421
 	if (openCamera() == false) {
422
-		error(KIO::ERR_DOES_NOT_EXIST, url.path());
422
+		error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
423 423
 		return;
424 424
 	}
425 425
 
@@ -433,9 +433,9 @@ void KameraProtocol::statRegular(const KURL &url)
433 433
 	gpr = gp_camera_folder_list_folders(m_camera, tocstr(fix_foldername(url.directory(false))), dirList, m_context);
434 434
 	if (gpr != GP_OK) {
435 435
 		if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
436
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
436
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
437 437
 		else
438
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
438
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
439 439
 		gp_list_free(dirList);
440 440
 		return;
441 441
 	}
@@ -445,7 +445,7 @@ void KameraProtocol::statRegular(const KURL &url)
445 445
 		CameraText xx;						\
446 446
 		gpr = gp_camera_get_about(m_camera,  &xx, m_context);	\
447 447
 		if (gpr != GP_OK) {					\
448
-			error(KIO::ERR_DOES_NOT_EXIST, url.fileName());	\
448
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.fileName());	\
449 449
 			return;						\
450 450
 		}							\
451 451
 		translateTextToUDS(entry,#xx".txt",xx.text);		\
@@ -477,9 +477,9 @@ void KameraProtocol::statRegular(const KURL &url)
477 477
 	gpr = gp_camera_file_get_info(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), &info, m_context);
478 478
 	if (gpr != GP_OK) {
479 479
 		if ((gpr == GP_ERROR_FILE_NOT_FOUND) || (gpr == GP_ERROR_DIRECTORY_NOT_FOUND))
480
-			error(KIO::ERR_DOES_NOT_EXIST, url.path());
480
+			error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
481 481
 		else
482
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
482
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
483 483
 		return;
484 484
 	}
485 485
 	translateFileToUDS(entry, info, url.fileName());
@@ -493,11 +493,11 @@ void KameraProtocol::del(const KURL &url, bool isFile)
493 493
 	kdDebug(7123) << "KameraProtocol::del(" << url.path() << ")" << endl;
494 494
 
495 495
 	if(!openCamera()) {
496
-		error(KIO::ERR_CANNOT_DELETE, url.fileName());
496
+		error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
497 497
 		return;
498 498
 	}
499 499
 	if (!cameraSupportsDel()) {
500
-		error(KIO::ERR_CANNOT_DELETE, url.fileName());
500
+		error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
501 501
 		return;
502 502
 	}
503 503
 	if(isFile){
@@ -508,7 +508,7 @@ void KameraProtocol::del(const KURL &url, bool isFile)
508 508
 		ret = gp_camera_file_delete(m_camera, tocstr(fix_foldername(url.directory(false))), tocstr(url.fileName()), m_context);
509 509
 
510 510
 		if(ret != GP_OK) {
511
-			error(KIO::ERR_CANNOT_DELETE, url.fileName());
511
+			error(TDEIO::ERR_CANNOT_DELETE, url.fileName());
512 512
 		} else {
513 513
 			finished();
514 514
 		}
@@ -665,7 +665,7 @@ void KameraProtocol::listDir(const KURL &url)
665 665
 	}
666 666
 
667 667
 	if (!openCamera()) {
668
-		error(KIO::ERR_COULD_NOT_READ,url.path());
668
+		error(TDEIO::ERR_COULD_NOT_READ,url.path());
669 669
 		return;
670 670
 	}
671 671
 
@@ -693,7 +693,7 @@ void KameraProtocol::listDir(const KURL &url)
693 693
 		gp_list_free(dirList);
694 694
 		gp_list_free(fileList);
695 695
 		gp_list_free(specialList);
696
-		error(KIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr));
696
+		error(TDEIO::ERR_COULD_NOT_READ, gp_result_as_string(gpr));
697 697
 		return;
698 698
 	}
699 699
 
@@ -787,7 +787,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
787 787
 		if (idx < 0) {
788 788
 			gp_port_info_list_free(port_info_list);
789 789
 			kdDebug(7123) << "Unable to get port info for path: " << host << endl;
790
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(idx));
790
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(idx));
791 791
 			return;
792 792
 		}
793 793
 		gp_port_info_list_get_info(port_info_list, idx, &port_info);
@@ -796,7 +796,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
796 796
 		// create a new camera object
797 797
 		gpr = gp_camera_new(&m_camera);
798 798
 		if(gpr != GP_OK) {
799
-			error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
799
+			error(TDEIO::ERR_UNKNOWN, gp_result_as_string(gpr));
800 800
 			return;
801 801
 		}
802 802
 
@@ -816,7 +816,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
816 816
 		TQString errstr;
817 817
 		if (!openCamera(errstr)) {
818 818
 			kdDebug(7123) << "Unable to init camera: " << gp_result_as_string(gpr) << endl;
819
-			error(KIO::ERR_SERVICE_NOT_AVAILABLE, errstr);
819
+			error(TDEIO::ERR_SERVICE_NOT_AVAILABLE, errstr);
820 820
 			gp_camera_exit(m_camera, m_context);
821 821
 			return;
822 822
 		}

+ 4
- 4
kamera/kioslave/kamera.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 class KSimpleConfig;
31 31
 
32
-class KameraProtocol : public KIO::SlaveBase
32
+class KameraProtocol : public TDEIO::SlaveBase
33 33
 {
34 34
 public:
35 35
 	KameraProtocol(const TQCString &pool, const TQCString &app);
@@ -63,9 +63,9 @@ private:
63 63
 
64 64
 	void statRoot(void);
65 65
 	void statRegular(const KURL &url);
66
-	void translateTextToUDS(KIO::UDSEntry &udsEntry, const TQString &info, const char *txt);
67
-	void translateFileToUDS(KIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name);
68
-	void translateDirectoryToUDS(KIO::UDSEntry &udsEntry, const TQString &dirname);
66
+	void translateTextToUDS(TDEIO::UDSEntry &udsEntry, const TQString &info, const char *txt);
67
+	void translateFileToUDS(TDEIO::UDSEntry &udsEntry, const CameraFileInfo &info, TQString name);
68
+	void translateDirectoryToUDS(TDEIO::UDSEntry &udsEntry, const TQString &dirname);
69 69
 	bool cameraSupportsPreview(void);
70 70
 	bool cameraSupportsDel(void);
71 71
 	bool cameraSupportsPut(void);

+ 2
- 2
kcoloredit/kcoloredit.h View File

@@ -45,7 +45,7 @@ class KColorEditView;
45 45
   * full session management as well as keyboard accelerator configuration by using KAccel.
46 46
   * @see KMainWindow
47 47
   * @see TDEApplication
48
-  * @see KConfig
48
+  * @see TDEConfig
49 49
   * @see KAccel
50 50
   *
51 51
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -166,7 +166,7 @@ class KColorEditApp : public KMainWindow
166 166
   private:
167 167
 
168 168
     /** the configuration object of the application */
169
-    KConfig *config;
169
+    TDEConfig *config;
170 170
 
171 171
     KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
172 172
     KToggleAction *m_actNames;

+ 3
- 3
kdvi/dviRenderer.cpp View File

@@ -254,8 +254,8 @@ void dviRenderer::showThatSourceInformationIsPresent()
254 254
   // here. Most of the code is stolen from there.
255 255
   
256 256
   // Check if the 'Don't show again' feature was used
257
-  KConfig *config = kapp->config();
258
-  KConfigGroupSaver saver( config, "Notification Messages" );
257
+  TDEConfig *config = kapp->config();
258
+  TDEConfigGroupSaver saver( config, "Notification Messages" );
259 259
   bool showMsg = config->readBoolEntry( "KDVI-info_on_source_specials", true);
260 260
   
261 261
   if (showMsg) {
@@ -294,7 +294,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
294 294
     
295 295
     showMsg = !checkbox->isChecked();
296 296
     if (!showMsg) {
297
-      KConfigGroupSaver saver( config, "Notification Messages" );
297
+      TDEConfigGroupSaver saver( config, "Notification Messages" );
298 298
       config->writeEntry( "KDVI-info_on_source_specials", showMsg);
299 299
     }
300 300
     config->sync();

+ 1
- 1
kdvi/infodialog.cpp View File

@@ -68,7 +68,7 @@ void infoDialog::setDVIData(dvifile *dviFile)
68 68
 
69 69
     TQFile file(dviFile->filename);
70 70
     if (file.exists())
71
-      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
71
+      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(TDEIO::convertSize(file.size())));
72 72
     else
73 73
       text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
74 74
 

+ 1
- 1
kdvi/kdvi_multipage.cpp View File

@@ -198,7 +198,7 @@ TQStringList KDVIMultiPage::fileFormats() const
198 198
 }
199 199
 
200 200
 
201
-void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
201
+void KDVIMultiPage::addConfigDialogs(TDEConfigDialog* configDialog)
202 202
 {
203 203
   static optionDialogFontsWidget* fontConfigWidget = 0;
204 204
   

+ 1
- 1
kdvi/kdvi_multipage.h View File

@@ -32,7 +32,7 @@ public:
32 32
   /// method and return true here.
33 33
   virtual bool isReadWrite() {return true;}
34 34
 
35
-  virtual void addConfigDialogs(KConfigDialog* configDialog);
35
+  virtual void addConfigDialogs(TDEConfigDialog* configDialog);
36 36
 
37 37
   static TDEAboutData* createAboutData();
38 38
 

+ 3
- 3
kfax/kfax.cpp View File

@@ -828,7 +828,7 @@ void TopLevel::saveNetFile( const KURL& dest)
828 828
     statusbar->message( i18n( "Saving..." ) );
829 829
    
830 830
     KURL source = KURL::fromPathOrURL(thispage->pathname);
831
-    bool ok = KIO::NetAccess::file_copy( source, dest, -1, true, false, this);
831
+    bool ok = TDEIO::NetAccess::file_copy( source, dest, -1, true, false, this);
832 832
 
833 833
     statusbar->clear();
834 834
 
@@ -856,13 +856,13 @@ void TopLevel::openNetFile( const KURL &u)
856 856
   {
857 857
     statusbar->message(i18n("Downloading..."));
858 858
     TQString tmpFile = TQString();
859
-    if ( KIO::NetAccess::download( u, tmpFile, this ) )
859
+    if ( TDEIO::NetAccess::download( u, tmpFile, this ) )
860 860
     {
861 861
       openadd( tmpFile );
862 862
       setCaption( u.prettyURL() );
863 863
     }
864 864
     statusbar->clear();
865
-    KIO::NetAccess::removeTempFile( tmpFile );
865
+    TDEIO::NetAccess::removeTempFile( tmpFile );
866 866
   }
867 867
 }
868 868
 

+ 2
- 2
kfax/kfax.h View File

@@ -36,7 +36,7 @@
36 36
 #define Pimage(p)	((XImage *)(p)->extra)
37 37
 
38 38
 class TQPopupMenu;
39
-class KConfig;
39
+class TDEConfig;
40 40
 class KStatusBar;
41 41
 class KAction;
42 42
 class KRecentFilesAction;
@@ -112,7 +112,7 @@ private:
112 112
 
113 113
     int open_mode;
114 114
 
115
-    KConfig *config;
115
+    TDEConfig *config;
116 116
 
117 117
     TQScrollBar *hsb;
118 118
     TQScrollBar *vsb;

+ 6
- 6
kgamma/kcmkgamma/kgamma.cpp View File

@@ -56,7 +56,7 @@ extern "C"
56 56
 }
57 57
 
58 58
 KGamma::KGamma(TQWidget *parent, const char *name, const TQStringList&)
59
-    :KCModule(parent,name)
59
+    :TDECModule(parent,name)
60 60
 {
61 61
   bool ok;
62 62
   GammaCorrection = true;
@@ -291,7 +291,7 @@ void KGamma::load() {
291 291
 /** Restore latest saved gamma values */
292 292
 void KGamma::load(bool useDefaults) {
293 293
   if (GammaCorrection) {
294
-    KConfig *config = new KConfig("kgammarc");
294
+    TDEConfig *config = new TDEConfig("kgammarc");
295 295
 
296 296
 	 config->setReadDefaults( useDefaults );
297 297
 
@@ -344,7 +344,7 @@ void KGamma::save() {
344 344
     }
345 345
     xv->setScreen(currentScreen);
346 346
 
347
-    KConfig *config = new KConfig("kgammarc");
347
+    TDEConfig *config = new TDEConfig("kgammarc");
348 348
     config->setGroup("SyncBox");
349 349
     if ( syncbox->isChecked() ) config->writeEntry("sync", "yes");
350 350
     else config->writeEntry("sync", "no");
@@ -385,7 +385,7 @@ void KGamma::defaults() {
385 385
 }
386 386
 
387 387
 bool KGamma::loadSettings() {
388
-  KConfig *config = new KConfig("kgammarc");
388
+  TDEConfig *config = new TDEConfig("kgammarc");
389 389
   config->setGroup("ConfigFile");
390 390
   TQString ConfigFile( config->readEntry("use") );
391 391
   config->setGroup("SyncBox");
@@ -402,7 +402,7 @@ bool KGamma::loadSettings() {
402 402
 }
403 403
 
404 404
 bool KGamma::loadUserSettings() {
405
-  KConfig *config = new KConfig("kgammarc");
405
+  TDEConfig *config = new TDEConfig("kgammarc");
406 406
 
407 407
   for (int i = 0; i < ScreenCount; i++) {
408 408
     config->setGroup(TQString( "Screen %1" ).arg(i) );
@@ -606,7 +606,7 @@ extern "C"
606 606
     if (ok) {
607 607
       xv.setGammaLimits(0.4, 3.5);
608 608
       float rgamma, ggamma, bgamma;
609
-      KConfig *config = new KConfig("kgammarc");
609
+      TDEConfig *config = new TDEConfig("kgammarc");
610 610
 
611 611
       for (int i = 0; i < xv._ScreenCount(); i++) {
612 612
         xv.setScreen(i);

+ 1
- 1
kgamma/kcmkgamma/kgamma.h View File

@@ -25,7 +25,7 @@ class TQComboBox;
25 25
 class XVidExtWrap;
26 26
 class TDEProcess;
27 27
 
28
-class KGamma: public KCModule
28
+class KGamma: public TDECModule
29 29
 {
30 30
    Q_OBJECT
31 31
   

+ 1
- 1
kghostview/displayoptions.h View File

@@ -22,7 +22,7 @@
22 22
 #include "dscparse_adapter.h"
23 23
 #include <kdemacros.h>
24 24
 class TDECmdLineArgs;
25
-class KConfig;
25
+class TDEConfig;
26 26
 
27 27
 class KDE_EXPORT DisplayOptions 
28 28
 {

+ 2
- 2
kghostview/kghostview.upd View File

@@ -1,4 +1,4 @@
1
-Id=1changeToKConfigXT
1
+Id=1changeToTDEConfigXT
2 2
 File=kghostviewrc
3 3
 Group=General
4 4
 Key=Platform Fonts,PlatformFonts
@@ -7,7 +7,7 @@ Key=Antialiasing arguments,AntialiasingArguments
7 7
 Key=Non-antialiasing arguments,NonAntialiasingArguments
8 8
 Key=Redetection Counter,RedetectionCounter
9 9
 #
10
-Id=2changeToKConfigXT
10
+Id=2changeToTDEConfigXT
11 11
 File=kghostviewrc
12 12
 Group=General
13 13
 Script=update-to-xt-names.pl,perl

+ 13
- 13
kghostview/kgv_view.cpp View File

@@ -434,7 +434,7 @@ bool KGVPart::closeURL()
434 434
 
435 435
 void KGVPart::writeSettings()
436 436
 {
437
-    KConfigGroup general( KGVFactory::instance()->config(), "General" );
437
+    TDEConfigGroup general( KGVFactory::instance()->config(), "General" );
438 438
     if ( !_embeddedInKGhostView )
439 439
         general.writeEntry( "Display Options", DisplayOptions::toString( miniWidget()->displayOptions() ) );
440 440
     general.sync();
@@ -442,7 +442,7 @@ void KGVPart::writeSettings()
442 442
 
443 443
 void KGVPart::readSettings()
444 444
 {
445
-    KConfigGroup general( KGVFactory::instance()->config(), "General" );
445
+    TDEConfigGroup general( KGVFactory::instance()->config(), "General" );
446 446
     
447 447
     _showScrollBars->setChecked( Configuration::showScrollBars() );
448 448
     showScrollBars( _showScrollBars->isChecked() );
@@ -691,17 +691,17 @@ void KGVPart::openURLContinue()
691 691
 	_tmpFile.open( IO_ReadWrite );
692 692
 
693 693
 	/*
694
-	d->m_job = KIO::file_copy( m_url, m_file, 0600, true, false, d->m_showProgressInfo );
694
+	d->m_job = TDEIO::file_copy( m_url, m_file, 0600, true, false, d->m_showProgressInfo );
695 695
 	emit started( d->m_job );
696
-	connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
696
+	connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
697 697
 	*/
698 698
 
699
-	_job = KIO::get( m_url, false, isProgressInfoEnabled() );
699
+	_job = TDEIO::get( m_url, false, isProgressInfoEnabled() );
700 700
 
701
-	connect( _job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
702
-		 TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
703
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ),
704
-		 TQT_SLOT( slotJobFinished( KIO::Job* ) ) );
701
+	connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
702
+		 TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
703
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ),
704
+		 TQT_SLOT( slotJobFinished( TDEIO::Job* ) ) );
705 705
 
706 706
 	emit started( _job );
707 707
     }
@@ -770,7 +770,7 @@ void KGVPart::guiActivateEvent( KParts::GUIActivateEvent* event )
770 770
     KParts::ReadOnlyPart::guiActivateEvent( event );
771 771
 }
772 772
 
773
-void KGVPart::slotData( KIO::Job* job, const TQByteArray& data )
773
+void KGVPart::slotData( TDEIO::Job* job, const TQByteArray& data )
774 774
 {
775 775
     Q_ASSERT( _job == job );
776 776
 
@@ -799,7 +799,7 @@ void KGVPart::slotMimetypeError()
799 799
     emit canceled( TQString() );
800 800
 }
801 801
 
802
-void KGVPart::slotJobFinished( KIO::Job* job )
802
+void KGVPart::slotJobFinished( TDEIO::Job* job )
803 803
 {
804 804
     Q_ASSERT( _job == job );
805 805
 
@@ -1006,9 +1006,9 @@ void KGVRun::foundMimeType( const TQString& mimetype )
1006 1006
 {
1007 1007
     kdDebug(4500) << "KGVRun::foundMimeType( " << mimetype << " )" << endl;
1008 1008
 
1009
-    if( m_job && m_job->inherits( "KIO::TransferJob" ) )
1009
+    if( m_job && m_job->inherits( "TDEIO::TransferJob" ) )
1010 1010
     {
1011
-	KIO::TransferJob *job = static_cast< KIO::TransferJob* >( m_job );
1011
+	TDEIO::TransferJob *job = static_cast< TDEIO::TransferJob* >( m_job );
1012 1012
 	job->putOnHold();
1013 1013
 	m_job = 0;
1014 1014
     }

+ 3
- 3
kghostview/kgv_view.h View File

@@ -135,8 +135,8 @@ public slots:
135 135
     void setDisplayOptions( const DisplayOptions& opts );
136 136
 
137 137
 protected slots:
138
-    void slotData( KIO::Job*, const TQByteArray& );
139
-    void slotJobFinished( KIO::Job* );
138
+    void slotData( TDEIO::Job*, const TQByteArray& );
139
+    void slotJobFinished( TDEIO::Job* );
140 140
 
141 141
     void slotMimetypeFinished( const TQString& );
142 142
     void slotMimetypeError();
@@ -209,7 +209,7 @@ private:
209 209
     KPopupMenu*    _popup;
210 210
 
211 211
     TQFile             _tmpFile;
212
-    KIO::TransferJob* _job;
212
+    TDEIO::TransferJob* _job;
213 213
     KDirWatch*        _fileWatcher;
214 214
     KGVRun*           _mimetypeScanner;
215 215
     TQTimer*           _dirtyHandler;

+ 2
- 2
kghostview/kgvconfigdialog.cpp View File

@@ -133,11 +133,11 @@ namespace {
133 133
 
134 134
 void  ConfigDialog::showSettings( KGVPart* main ) {
135 135
     const char* name = "kghostview-settings";
136
-    if ( KConfigDialog::showDialog( name ) ) return;
136
+    if ( TDEConfigDialog::showDialog( name ) ) return;
137 137
 
138 138
     if ( Configuration::redetectionCounter() < currentRedetection ) redoGSDetection();
139 139
 
140
-    KConfigDialog* dialog = new KConfigDialog( 0, name,
140
+    TDEConfigDialog* dialog = new TDEConfigDialog( 0, name,
141 141
 	    Configuration::self(), KDialogBase::IconList );
142 142
     dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
143 143
 	    i18n( "General" ), TQString::fromLatin1( "kghostview" ) );

+ 1
- 1
kghostview/kgvdocument.cpp View File

@@ -565,7 +565,7 @@ void KGVDocument::saveAs()
565 565
                           TQString(), 
566 566
                           _part->widget(), 
567 567
                           TQString() );
568
-    if( !KIO::NetAccess::upload( _fileName,
568
+    if( !TDEIO::NetAccess::upload( _fileName,
569 569
 				 saveURL,
570 570
 				 static_cast<TQWidget*>( 0 ) ) ) {
571 571
 	// TODO: Proper error dialog

+ 2
- 2
kghostview/kgvshell.cpp View File

@@ -173,7 +173,7 @@ void KGVShell::slotReset()
173 173
 }
174 174
 
175 175
 void
176
-KGVShell::readProperties( KConfig *config )
176
+KGVShell::readProperties( TDEConfig *config )
177 177
 {
178 178
     KURL url = KURL::fromPathOrURL( config->readPathEntry( "URL" ) );
179 179
     if ( url.isValid() ) {
@@ -184,7 +184,7 @@ KGVShell::readProperties( KConfig *config )
184 184
 }
185 185
 
186 186
 void
187
-KGVShell::saveProperties( KConfig* config )
187
+KGVShell::saveProperties( TDEConfig* config )
188 188
 {
189 189
     config->writePathEntry( "URL", m_gvpart->url().prettyURL() );
190 190
     config->writeEntry( "Display Options", DisplayOptions::toString( m_gvpart->miniWidget()->displayOptions() ) );

+ 3
- 3
kghostview/kgvshell.h View File

@@ -29,7 +29,7 @@ class KRecentFilesAction;
29 29
 class ScrollBox;
30 30
 class KGVPart;
31 31
 class KAction;
32
-class KConfig;
32
+class TDEConfig;
33 33
 class KTempFile;
34 34
 class KPopupMenu;
35 35
 class DisplayOptions;
@@ -64,8 +64,8 @@ protected slots:
64 64
 
65 65
 protected:
66 66
     // session management
67
-    virtual void saveProperties( KConfig *config );
68
-    virtual void readProperties( KConfig *config );
67
+    virtual void saveProperties( TDEConfig *config );
68
+    virtual void readProperties( TDEConfig *config );
69 69
     
70 70
     void readSettings();
71 71
     void writeSettings();

+ 2
- 2
kiconedit/kicon.cpp View File

@@ -84,7 +84,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
84 84
     }
85 85
     else
86 86
     {
87
-        if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
87
+        if(!TDEIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
88 88
         {
89 89
             TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
90 90
             KMessageBox::error((TQWidget*)parent(), msg);
@@ -96,7 +96,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
96 96
 
97 97
     if(!url.isLocalFile())
98 98
     {
99
-        KIO::NetAccess::removeTempFile( filename );
99
+        TDEIO::NetAccess::removeTempFile( filename );
100 100
     }
101 101
 
102 102
     if(!loadedOk) 

+ 3
- 3
kiconedit/kiconedit.cpp View File

@@ -192,7 +192,7 @@ bool KIconEdit::queryClose()
192 192
 }
193 193
 
194 194
 // this is for exit by request of the session manager
195
-void KIconEdit::saveProperties(KConfig *config )
195
+void KIconEdit::saveProperties(TDEConfig *config )
196 196
 {
197 197
     kdDebug(4640) << "KIconEdit::saveProperties" << endl;
198 198
 
@@ -200,7 +200,7 @@ void KIconEdit::saveProperties(KConfig *config )
200 200
 }
201 201
 
202 202
 // this is for instances opened by the session manager
203
-void KIconEdit::readProperties(KConfig *config)
203
+void KIconEdit::readProperties(TDEConfig *config)
204 204
 {
205 205
     kdDebug(4640) << "KIconEdit::readProperties" << endl;
206 206
 
@@ -214,7 +214,7 @@ void KIconEdit::readProperties(KConfig *config)
214 214
 */
215 215
 void KIconEdit::writeConfig()
216 216
 {
217
-    KConfig *config = kapp->config();
217
+    TDEConfig *config = kapp->config();
218 218
     m_actRecent->saveEntries( kapp->config() );
219 219
 
220 220
     KIconEditProperties::self()->save();

+ 2
- 2
kiconedit/kiconedit.h View File

@@ -72,8 +72,8 @@ signals:
72 72
   void newname(const TQString &);
73 73
 
74 74
 public slots:
75
-  virtual void saveProperties(KConfig*);
76
-  virtual void readProperties(KConfig*);
75
+  virtual void saveProperties(TDEConfig*);
76
+  virtual void readProperties(TDEConfig*);
77 77
   void updateProperties();
78 78
 
79 79
 protected slots:

+ 2
- 2
kiconedit/knew.cpp View File

@@ -71,7 +71,7 @@ void createStandardTemplates(KIconTemplateContainer *list)
71 71
 
72 72
 void KIconTemplateContainer::save()
73 73
 {
74
-  KConfig *k = kapp->config();
74
+  TDEConfig *k = kapp->config();
75 75
   k->setGroup("Templates");
76 76
   
77 77
   TQStringList names;
@@ -91,7 +91,7 @@ void KIconTemplateContainer::save()
91 91
 KIconTemplateContainer::KIconTemplateContainer() : TQValueList<KIconTemplate>()
92 92
 {  
93 93
   TQStrList names;
94
-  KConfig *k = kapp->config();
94
+  TDEConfig *k = kapp->config();
95 95
   k->setGroup("Templates");
96 96
   k->readListEntry("Names", names);
97 97
   for(int i = 0; i < (int)names.count(); i++)

+ 2
- 2
kiconedit/properties.cpp View File

@@ -35,7 +35,7 @@ KIconEditProperties* KIconEditProperties::self()
35 35
 
36 36
 KIconEditProperties::KIconEditProperties() : TQObject()
37 37
 {
38
-    KConfig *config = kapp->config();
38
+    TDEConfig *config = kapp->config();
39 39
 
40 40
     config->setGroup( "Appearance" );
41 41
 
@@ -92,7 +92,7 @@ KIconEditProperties::~KIconEditProperties()
92 92
 
93 93
 void KIconEditProperties::save()
94 94
 {
95
-    KConfig *config = kapp->config();
95
+    TDEConfig *config = kapp->config();
96 96
 
97 97
     config->setGroup( "Appearance" );
98 98
 

+ 1
- 1
kmrml/kmrml/kcontrol/kcmkmrml.cpp View File

@@ -44,7 +44,7 @@ typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
44 44
 K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
45 45
 
46 46
 KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
47
-    KCModule(MrmlFactory::instance(), parent, name)
47
+    TDECModule(MrmlFactory::instance(), parent, name)
48 48
 {
49 49
     TDEAboutData* ab = new TDEAboutData(
50 50
         "kcmkmrml",

+ 1
- 1
kmrml/kmrml/kcontrol/kcmkmrml.h View File

@@ -28,7 +28,7 @@ namespace KMrmlConfig
28 28
 {
29 29
     class MainPage;
30 30
 
31
-    class KCMKMrml : public KCModule
31
+    class KCMKMrml : public TDECModule
32 32
     {
33 33
         Q_OBJECT
34 34
   

+ 1
- 1
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -176,7 +176,7 @@ void MainPage::save()
176 176
                                   "kcmkmrml_no_directories_specified" );
177 177
 
178 178
     if ( m_config->sync() )
179
-        KIO::SlaveConfig::self()->reset();
179
+        TDEIO::SlaveConfig::self()->reset();
180 180
 
181 181
     processIndexDirs( removedDirs );
182 182
 }

+ 4
- 4
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -54,13 +54,13 @@ const int DEFAULT_PORT = 12789;
54 54
 
55 55
 Config::Config()
56 56
 {
57
-    m_ownConfig = new KConfig( "kio_mrmlrc", false, false );
57
+    m_ownConfig = new TDEConfig( "kio_mrmlrc", false, false );
58 58
     m_config = m_ownConfig;
59 59
 
60 60
     init();
61 61
 }
62 62
 
63
-Config::Config( KConfig *config )
63
+Config::Config( TDEConfig *config )
64 64
     : m_config( config ),
65 65
       m_ownConfig( 0L )
66 66
 {
@@ -98,7 +98,7 @@ bool Config::sync()
98 98
     // mrmlsearch binary can also use this class)
99 99
     // tell the ioslaves about the new configuration
100 100
 //     if ( notifySlaves )
101
-//         KIO::SlaveConfig::self()->reset();
101
+//         TDEIO::SlaveConfig::self()->reset();
102 102
 }
103 103
 
104 104
 void Config::setDefaultHost( const TQString& host )
@@ -117,7 +117,7 @@ ServerSettings Config::settingsForLocalHost() const
117 117
 
118 118
 ServerSettings Config::settingsForHost( const TQString& host ) const
119 119
 {
120
-    KConfigGroup config( m_config, settingsGroup( host ) );
120
+    TDEConfigGroup config( m_config, settingsGroup( host ) );
121 121
     ServerSettings settings;
122 122
 
123 123
     settings.host = host;

+ 4
- 4
kmrml/kmrml/lib/kmrml_config.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef KMRML_CONFIG_H
20 20
 #define KMRML_CONFIG_H
21 21
 
22
-class KConfig;
22
+class TDEConfig;
23 23
 
24 24
 #include <tqstringlist.h>
25 25
 #include <kurl.h>
@@ -57,7 +57,7 @@ namespace KMrml
57 57
     {
58 58
     public:
59 59
         Config();
60
-        Config( KConfig *config ); // does not take ownership of KConfig
60
+        Config( TDEConfig *config ); // does not take ownership of TDEConfig
61 61
         ~Config();
62 62
 
63 63
         bool sync();
@@ -115,8 +115,8 @@ namespace KMrml
115 115
         TQString m_defaultHost;
116 116
         TQStringList m_hostList;
117 117
 
118
-        KConfig *m_config;
119
-        KConfig *m_ownConfig;
118
+        TDEConfig *m_config;
119
+        TDEConfig *m_ownConfig;
120 120
     };
121 121
 }
122 122
 

+ 10
- 10
kmrml/kmrml/loader.cpp View File

@@ -58,21 +58,21 @@ void Loader::requestDownload( const KURL& url )
58 58
             return;
59 59
     }
60 60
 
61
-    KIO::TransferJob *job = KIO::get( url, false, false );
62
-    KIO::Scheduler::scheduleJob(job);
61
+    TDEIO::TransferJob *job = TDEIO::get( url, false, false );
62
+    TDEIO::Scheduler::scheduleJob(job);
63 63
 
64
-    connect( job , TQT_SIGNAL( data( KIO::Job *, const TQByteArray& )),
65
-             TQT_SLOT( slotData( KIO::Job *, const TQByteArray& )));
66
-    connect( job , TQT_SIGNAL( result( KIO::Job * )),
67
-             TQT_SLOT( slotResult( KIO::Job * )));
64
+    connect( job , TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )),
65
+             TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& )));
66
+    connect( job , TQT_SIGNAL( result( TDEIO::Job * )),
67
+             TQT_SLOT( slotResult( TDEIO::Job * )));
68 68
 
69 69
     Download *d = new Download();
70 70
     m_downloads.insert( job, d );
71 71
 }
72 72
 
73
-void Loader::slotData( KIO::Job *job, const TQByteArray& data )
73
+void Loader::slotData( TDEIO::Job *job, const TQByteArray& data )
74 74
 {
75
-    DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
75
+    DownloadIterator it = m_downloads.find( static_cast<TDEIO::TransferJob*>(job) );
76 76
     if ( it != m_downloads.end() ) {
77 77
         TQBuffer& buffer = it.data()->m_buffer;
78 78
         if ( !buffer.isOpen() )
@@ -86,9 +86,9 @@ void Loader::slotData( KIO::Job *job, const TQByteArray& data )
86 86
     }
87 87
 }
88 88
 
89
-void Loader::slotResult( KIO::Job *job )
89
+void Loader::slotResult( TDEIO::Job *job )
90 90
 {
91
-    KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
91
+    TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>( job );
92 92
 
93 93
     DownloadIterator it = m_downloads.find( tjob );
94 94
     if ( it != m_downloads.end() ) {

+ 4
- 4
kmrml/kmrml/loader.h View File

@@ -57,14 +57,14 @@ signals:
57 57
     void finished( const KURL& url, const TQByteArray& );
58 58
 
59 59
 private slots:
60
-    void slotData( KIO::Job *, const TQByteArray& );
61
-    void slotResult( KIO::Job * );
60
+    void slotData( TDEIO::Job *, const TQByteArray& );
61
+    void slotResult( TDEIO::Job * );
62 62
 
63 63
 private:
64 64
     Loader();
65 65
 
66
-    TQMap<KIO::TransferJob*,Download*> m_downloads;
67
-    typedef TQMapIterator<KIO::TransferJob*,Download*> DownloadIterator;
66
+    TQMap<TDEIO::TransferJob*,Download*> m_downloads;
67
+    typedef TQMapIterator<TDEIO::TransferJob*,Download*> DownloadIterator;
68 68
 
69 69
     static Loader *s_self;
70 70
 

+ 4
- 4
kmrml/kmrml/mrml.cpp View File

@@ -92,7 +92,7 @@ void Mrml::get( const KURL& url )
92 92
 
93 93
     if ( !checkLocalServer( url ) )
94 94
     {
95
-        error( KIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
95
+        error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
96 96
                                             "Aborting the query.") );
97 97
         return;
98 98
     }
@@ -117,7 +117,7 @@ tryConnect:
117 117
             TQString meta = metaData( MrmlShared::mrml_data() );
118 118
             if ( meta.isEmpty() ) {
119 119
                 closeDescriptor();
120
-                error( KIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
120
+                error( TDEIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
121 121
                 return;
122 122
             }
123 123
 
@@ -148,7 +148,7 @@ tryConnect:
148 148
             return;
149 149
         }
150 150
 
151
-        error( KIO::ERR_COULD_NOT_CONNECT,
151
+        error( TDEIO::ERR_COULD_NOT_CONNECT,
152 152
                i18n("Could not connect to GIFT server.") );
153 153
         return;
154 154
     }
@@ -263,5 +263,5 @@ void Mrml::mimetype( const KURL& url )
263 263
         finished();
264 264
     }
265 265
     else
266
-        KIO::TCPSlaveBase::mimetype( url );
266
+        TDEIO::TCPSlaveBase::mimetype( url );
267 267
 }

+ 1
- 1
kmrml/kmrml/mrml.h View File

@@ -26,7 +26,7 @@
26 26
 #include <kmrml_config.h>
27 27
 #include "mrml_shared.h"
28 28
 
29
-class Mrml : public KIO::TCPSlaveBase
29
+class Mrml : public TDEIO::TCPSlaveBase
30 30
 {
31 31
 public:
32 32
     Mrml( const TQCString&, const TQCString& );

+ 18
- 18
kmrml/kmrml/mrml_part.cpp View File

@@ -123,7 +123,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
123 123
     setName( "MRML Part" );
124 124
     m_browser = new Browser( this, "mrml browserextension");
125 125
     setInstance( PartFactory::instance(), true ); // do load plugins :)
126
-    KConfig *config = PartFactory::instance()->config();
126
+    TDEConfig *config = PartFactory::instance()->config();
127 127
     config->setGroup("MRML Settings");
128 128
 
129 129
     TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
@@ -341,10 +341,10 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
341 341
         KURL destURL;
342 342
         destURL.setPath( tmpFile.name() );
343 343
 
344
-        KIO::FileCopyJob *job = KIO::file_copy( *it, destURL, -1,
344
+        TDEIO::FileCopyJob *job = TDEIO::file_copy( *it, destURL, -1,
345 345
                                                 true /* overwrite tmpfile */ );
346
-        connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
347
-                 TQT_SLOT( slotDownloadResult( KIO::Job * ) ));
346
+        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
347
+                 TQT_SLOT( slotDownloadResult( TDEIO::Job * ) ));
348 348
         m_downloadJobs.append( job );
349 349
         // ### should this be only called for one job?
350 350
         emit started( job );
@@ -361,7 +361,7 @@ bool MrmlPart::closeURL()
361 361
     m_view->stopDownloads();
362 362
     m_view->clear();
363 363
 
364
-    TQPtrListIterator<KIO::FileCopyJob> it( m_downloadJobs );
364
+    TQPtrListIterator<TDEIO::FileCopyJob> it( m_downloadJobs );
365 365
     for ( ; it.current(); ++it )
366 366
         it.current()->kill();
367 367
     m_downloadJobs.clear();
@@ -381,18 +381,18 @@ bool MrmlPart::closeURL()
381 381
     return true;
382 382
 }
383 383
 
384
-KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
384
+TDEIO::TransferJob * MrmlPart::transferJob( const KURL& url )
385 385
 {
386
-    KIO::TransferJob *job = KIO::get( url, true, false ); // reload, no gui
386
+    TDEIO::TransferJob *job = TDEIO::get( url, true, false ); // reload, no gui
387 387
     job->setAutoErrorHandlingEnabled( true, m_view );
388
-    connect( job, TQT_SIGNAL( result( KIO::Job * )),
389
-             TQT_SLOT( slotResult( KIO::Job * )));
390
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray& )),
391
-             TQT_SLOT( slotData( KIO::Job *, const TQByteArray& )));
388
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * )),
389
+             TQT_SLOT( slotResult( TDEIO::Job * )));
390
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )),
391
+             TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& )));
392 392
 
393 393
 // ###
394
-//     connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString& )),
395
-//              TQT_SLOT( slotResult( KIO::Job *, const TQString& )));
394
+//     connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString& )),
395
+//              TQT_SLOT( slotResult( TDEIO::Job *, const TQString& )));
396 396
 
397 397
     job->setWindow( widget() );
398 398
     if ( !m_sessionId.isEmpty() )
@@ -405,7 +405,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
405 405
     return job;
406 406
 }
407 407
 
408
-void MrmlPart::slotResult( KIO::Job *job )
408
+void MrmlPart::slotResult( TDEIO::Job *job )
409 409
 {
410 410
     if ( job == m_job )
411 411
         m_job = 0L;
@@ -435,10 +435,10 @@ void MrmlPart::slotResult( KIO::Job *job )
435 435
 }
436 436
 
437 437
 // ### when user cancels download, we crash :(
438
-void MrmlPart::slotDownloadResult( KIO::Job *job )
438
+void MrmlPart::slotDownloadResult( TDEIO::Job *job )
439 439
 {
440
-    assert( job->inherits( "KIO::FileCopyJob" ) );
441
-    KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*>( job );
440
+    assert( job->inherits( "TDEIO::FileCopyJob" ) );
441
+    TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*>( job );
442 442
 
443 443
     if ( !copyJob->error() )
444 444
         m_queryList.append( copyJob->destURL() );
@@ -457,7 +457,7 @@ void MrmlPart::slotDownloadResult( KIO::Job *job )
457 457
 }
458 458
 
459 459
 // mrml-document in the bytearray
460
-void MrmlPart::slotData( KIO::Job *, const TQByteArray& data )
460
+void MrmlPart::slotData( TDEIO::Job *, const TQByteArray& data )
461 461
 {
462 462
     if ( data.isEmpty() )
463 463
         return;

+ 7
- 7
kmrml/kmrml/mrml_part.h View File

@@ -38,7 +38,7 @@ class TDEAboutData;
38 38
 class KComboBox;
39 39
 class KIntNumInput;
40 40
 
41
-namespace KIO {
41
+namespace TDEIO {
42 42
     class FileCopyJob;
43 43
     class TransferJob;
44 44
 }
@@ -94,10 +94,10 @@ private slots:
94 94
     void slotSetStatusBar( const KURL& url ) { slotSetStatusBar( url.prettyURL() ); }
95 95
     void slotHostComboActivated( const TQString& );
96 96
 
97
-    void slotResult( KIO::Job * );
98
-    void slotData( KIO::Job *, const TQByteArray& );
97
+    void slotResult( TDEIO::Job * );
98
+    void slotData( TDEIO::Job *, const TQByteArray& );
99 99
 
100
-    void slotDownloadResult( KIO::Job * );
100
+    void slotDownloadResult( TDEIO::Job * );
101 101
 
102 102
     void slotConfigureAlgorithm();
103 103
     void slotApplyAlgoConfig();
@@ -111,7 +111,7 @@ private:
111 111
     void parseMrml( TQDomDocument& doc );
112 112
     void parseQueryResult( TQDomElement& );
113 113
     void enableExtensionActions( const KURL& url, bool enable );
114
-    KIO::TransferJob * transferJob( const KURL& url );
114
+    TDEIO::TransferJob * transferJob( const KURL& url );
115 115
 
116 116
     void initHostCombo();
117 117
     void enableServerDependentWidgets( bool enable );
@@ -121,7 +121,7 @@ private:
121 121
     void contactServer( const KURL& url );
122 122
     void downloadReferenceFiles( const KURL::List& downloadList );
123 123
 
124
-    KIO::TransferJob *m_job;
124
+    TDEIO::TransferJob *m_job;
125 125
     MrmlView *m_view;
126 126
     Config m_config;
127 127
     KIntNumInput * m_resultSizeInput;
@@ -134,7 +134,7 @@ private:
134 134
     AlgorithmDialog *m_algoConfig;
135 135
     KComboBox *m_hostCombo;
136 136
 
137
-    TQPtrList<KIO::FileCopyJob> m_downloadJobs;
137
+    TQPtrList<TDEIO::FileCopyJob> m_downloadJobs;
138 138
     TQStringList m_tempFiles;
139 139
 
140 140
     TQString m_sessionId;

+ 4
- 4
kolourpaint/kpcommandhistory.cpp View File

@@ -413,8 +413,8 @@ void kpCommandHistoryBase::readConfig ()
413 413
 #if DEBUG_KP_COMMAND_HISTORY
414 414
     kdDebug () << "kpCommandHistoryBase::readConfig()" << endl;
415 415
 #endif
416
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
417
-    KConfigBase *cfg = cfgGroupSaver.config ();
416
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
417
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
418 418
 
419 419
     setUndoMinLimit (cfg->readNumEntry (kpSettingUndoMinLimit, undoMinLimit ()));
420 420
     setUndoMaxLimit (cfg->readNumEntry (kpSettingUndoMaxLimit, undoMaxLimit ()));
@@ -430,8 +430,8 @@ void kpCommandHistoryBase::writeConfig ()
430 430
 #if DEBUG_KP_COMMAND_HISTORY
431 431
     kdDebug () << "kpCommandHistoryBase::writeConfig()" << endl;
432 432
 #endif
433
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
434
-    KConfigBase *cfg = cfgGroupSaver.config ();
433
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupUndoRedo);
434
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
435 435
 
436 436
     cfg->writeEntry (kpSettingUndoMinLimit, undoMinLimit ());
437 437
     cfg->writeEntry (kpSettingUndoMaxLimit, undoMaxLimit ());

+ 9
- 9
kolourpaint/kpdocument.cpp View File

@@ -247,7 +247,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
247 247
 
248 248
 
249 249
     TQString tempFile;
250
-    if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, parent))
250
+    if (url.isEmpty () || !TDEIO::NetAccess::download (url, tempFile, parent))
251 251
     {
252 252
         if (!suppressDoesntExistDialog)
253 253
         {
@@ -262,7 +262,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
262 262
 
263 263
     TQImage image;
264 264
 
265
-    // sync: remember to "KIO::NetAccess::removeTempFile (tempFile)" in all exit paths
265
+    // sync: remember to "TDEIO::NetAccess::removeTempFile (tempFile)" in all exit paths
266 266
     {
267 267
         TQString detectedMimeType = KImageIO::mimeType (tempFile);
268 268
         if (saveOptions)
@@ -280,13 +280,13 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
280 280
             KMessageBox::sorry (parent,
281 281
                                 i18n ("Could not open \"%1\" - unknown mimetype.")
282 282
                                     .arg (kpDocument::prettyFilenameForURL (url)));
283
-            KIO::NetAccess::removeTempFile (tempFile);
283
+            TDEIO::NetAccess::removeTempFile (tempFile);
284 284
             return TQPixmap ();
285 285
         }
286 286
 
287 287
 
288 288
         image = TQImage (tempFile);
289
-        KIO::NetAccess::removeTempFile (tempFile);
289
+        TDEIO::NetAccess::removeTempFile (tempFile);
290 290
     }
291 291
 
292 292
 
@@ -394,7 +394,7 @@ bool kpDocument::open (const KURL &url, bool newDocSameNameIfNotExist)
394 394
     {
395 395
         if (!url.isEmpty () &&
396 396
             // not just a permission error?
397
-            !KIO::NetAccess::exists (url, true/*open*/, m_mainWindow))
397
+            !TDEIO::NetAccess::exists (url, true/*open*/, m_mainWindow))
398 398
         {
399 399
             openNew (url);
400 400
         }
@@ -619,7 +619,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
619 619
                                    bool lossyPrompt,
620 620
                                    TQWidget *parent)
621 621
 {
622
-    // TODO: Use KIO::NetAccess:mostLocalURL() for accessing home:/ (and other
622
+    // TODO: Use TDEIO::NetAccess:mostLocalURL() for accessing home:/ (and other
623 623
     //       such local URLs) for efficiency and because only local writes
624 624
     //       are atomic.
625 625
 #if DEBUG_KP_DOCUMENT
@@ -632,7 +632,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
632 632
     metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
633 633
 #endif
634 634
 
635
-    if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
635
+    if (overwritePrompt && TDEIO::NetAccess::exists (url, false/*write*/, parent))
636 636
     {
637 637
         int result = KMessageBox::warningContinueCancel (parent,
638 638
             i18n ("A document called \"%1\" already exists.\n"
@@ -773,7 +773,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
773 773
         // TODO: No one seems to know how to do this atomically
774 774
         //       [http://lists.kde.org/?l=kde-core-devel&m=117845162728484&w=2].
775 775
         //       At least, fish:// (ssh) is definitely not atomic.
776
-        if (!KIO::NetAccess::upload (filename, url, parent))
776
+        if (!TDEIO::NetAccess::upload (filename, url, parent))
777 777
         {
778 778
         #if DEBUG_KP_DOCUMENT
779 779
             kdDebug () << "\treturning false because could not upload" << endl;
@@ -849,7 +849,7 @@ bool kpDocument::isFromURL (bool checkURLStillExists) const
849 849
         return true;
850 850
 
851 851
     return (!m_url.isEmpty () &&
852
-            KIO::NetAccess::exists (m_url, true/*open*/, m_mainWindow));
852
+            TDEIO::NetAccess::exists (m_url, true/*open*/, m_mainWindow));
853 853
 }
854 854
 
855 855
 

+ 12
- 12
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -243,14 +243,14 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
243 243
 
244 244
 
245 245
 // public static
246
-TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
246
+TQString kpDocumentSaveOptions::defaultMimeType (TDEConfigBase *config)
247 247
 {
248 248
     return config->readEntry (kpSettingForcedMimeType,
249 249
                               TQString::fromLatin1 ("image/png"));
250 250
 }
251 251
 
252 252
 // public static
253
-void kpDocumentSaveOptions::saveDefaultMimeType (KConfigBase *config,
253
+void kpDocumentSaveOptions::saveDefaultMimeType (TDEConfigBase *config,
254 254
                                                  const TQString &mimeType)
255 255
 {
256 256
     config->writeEntry (kpSettingForcedMimeType, mimeType);
@@ -258,7 +258,7 @@ void kpDocumentSaveOptions::saveDefaultMimeType (KConfigBase *config,
258 258
 
259 259
 
260 260
 // public static
261
-int kpDocumentSaveOptions::defaultColorDepth (KConfigBase *config)
261
+int kpDocumentSaveOptions::defaultColorDepth (TDEConfigBase *config)
262 262
 {
263 263
     int colorDepth =
264 264
         config->readNumEntry (kpSettingForcedColorDepth, -1);
@@ -273,27 +273,27 @@ int kpDocumentSaveOptions::defaultColorDepth (KConfigBase *config)
273 273
 }
274 274
 
275 275
 // public static
276
-void kpDocumentSaveOptions::saveDefaultColorDepth (KConfigBase *config, int colorDepth)
276
+void kpDocumentSaveOptions::saveDefaultColorDepth (TDEConfigBase *config, int colorDepth)
277 277
 {
278 278
     config->writeEntry (kpSettingForcedColorDepth, colorDepth);
279 279
 }
280 280
 
281 281
 
282 282
 // public static
283
-int kpDocumentSaveOptions::defaultDither (KConfigBase *config)
283
+int kpDocumentSaveOptions::defaultDither (TDEConfigBase *config)
284 284
 {
285 285
     return config->readBoolEntry (kpSettingForcedDither, initialDither ());
286 286
 }
287 287
 
288 288
 // public static
289
-void kpDocumentSaveOptions::saveDefaultDither (KConfigBase *config, bool dither)
289
+void kpDocumentSaveOptions::saveDefaultDither (TDEConfigBase *config, bool dither)
290 290
 {
291 291
     config->writeEntry (kpSettingForcedDither, dither);
292 292
 }
293 293
 
294 294
 
295 295
 // public static
296
-int kpDocumentSaveOptions::defaultQuality (KConfigBase *config)
296
+int kpDocumentSaveOptions::defaultQuality (TDEConfigBase *config)
297 297
 {
298 298
     int val = config->readNumEntry (kpSettingForcedQuality, -1);
299 299
     if (qualityIsInvalid (val))
@@ -303,14 +303,14 @@ int kpDocumentSaveOptions::defaultQuality (KConfigBase *config)
303 303
 }
304 304
 
305 305
 // public static
306
-void kpDocumentSaveOptions::saveDefaultQuality (KConfigBase *config, int quality)
306
+void kpDocumentSaveOptions::saveDefaultQuality (TDEConfigBase *config, int quality)
307 307
 {
308 308
     config->writeEntry (kpSettingForcedQuality, quality);
309 309
 }
310 310
 
311 311
 
312 312
 // public static
313
-kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (KConfigBase *config)
313
+kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (TDEConfigBase *config)
314 314
 {
315 315
     kpDocumentSaveOptions saveOptions;
316 316
     saveOptions.setMimeType (defaultMimeType (config));
@@ -326,7 +326,7 @@ kpDocumentSaveOptions kpDocumentSaveOptions::defaultDocumentSaveOptions (KConfig
326 326
 }
327 327
 
328 328
 // public static
329
-bool kpDocumentSaveOptions::saveDefaultDifferences (KConfigBase *config,
329
+bool kpDocumentSaveOptions::saveDefaultDifferences (TDEConfigBase *config,
330 330
                                                     const kpDocumentSaveOptions &oldDocInfo,
331 331
                                                     const kpDocumentSaveOptions &newDocInfo)
332 332
 {
@@ -371,9 +371,9 @@ static TQStringList mimeTypesSupportingProperty (const TQString &property,
371 371
 {
372 372
     TQStringList mimeTypeList;
373 373
 
374
-    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
374
+    TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
375 375
                                      kpSettingsGroupMimeTypeProperties);
376
-    KConfigBase *cfg = cfgGroupSaver.config ();
376
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
377 377
 
378 378
     if (cfg->hasKey (property))
379 379
     {

+ 12
- 12
kolourpaint/kpdocumentsaveoptions.h View File

@@ -33,7 +33,7 @@
33 33
 class TQPixmap;
34 34
 class TQString;
35 35
 
36
-class KConfigBase;
36
+class TDEConfigBase;
37 37
 
38 38
 
39 39
 class kpDocumentSaveOptions
@@ -84,24 +84,24 @@ public:
84 84
 
85 85
 
86 86
     // (All assume that <config>'s group has been set)
87
-    // (None of them call KConfigBase::reparseConfig() nor KConfigBase::sync())
87
+    // (None of them call TDEConfigBase::reparseConfig() nor TDEConfigBase::sync())
88 88
 
89
-    static TQString defaultMimeType (KConfigBase *config);
90
-    static void saveDefaultMimeType (KConfigBase *config, const TQString &mimeType);
89
+    static TQString defaultMimeType (TDEConfigBase *config);
90
+    static void saveDefaultMimeType (TDEConfigBase *config, const TQString &mimeType);
91 91
 
92
-    static int defaultColorDepth (KConfigBase *config);
93
-    static void saveDefaultColorDepth (KConfigBase *config, int colorDepth);
92
+    static int defaultColorDepth (TDEConfigBase *config);
93
+    static void saveDefaultColorDepth (TDEConfigBase *config, int colorDepth);
94 94
 
95
-    static int defaultDither (KConfigBase *config);
96
-    static void saveDefaultDither (KConfigBase *config, bool dither);
95
+    static int defaultDither (TDEConfigBase *config);
96
+    static void saveDefaultDither (TDEConfigBase *config, bool dither);
97 97
 
98
-    static int defaultQuality (KConfigBase *config);
99
-    static void saveDefaultQuality (KConfigBase *config, int quality);
98
+    static int defaultQuality (TDEConfigBase *config);
99
+    static void saveDefaultQuality (TDEConfigBase *config, int quality);
100 100
 
101 101
 
102
-    static kpDocumentSaveOptions defaultDocumentSaveOptions (KConfigBase *config);
102
+    static kpDocumentSaveOptions defaultDocumentSaveOptions (TDEConfigBase *config);
103 103
     // (returns true if it encountered a difference (and saved it to <config>))
104
-    static bool saveDefaultDifferences (KConfigBase *config,
104
+    static bool saveDefaultDifferences (TDEConfigBase *config,
105 105
                                         const kpDocumentSaveOptions &oldDocInfo,
106 106
                                         const kpDocumentSaveOptions &newDocInfo);
107 107
 

+ 6
- 6
kolourpaint/kpdocumentsaveoptionswidget.cpp View File

@@ -742,8 +742,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
742 742
                  this, TQT_SLOT (hidePreview ()));
743 743
 
744 744
 
745
-        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
746
-        KConfigBase *cfg = cfgGroupSaver.config ();
745
+        TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
746
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
747 747
 
748 748
         if (cfg->hasKey (kpSettingPreviewSaveUpdateDelay))
749 749
         {
@@ -769,8 +769,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
769 769
         #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
770 770
             kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
771 771
         #endif
772
-            KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
773
-            KConfigBase *cfg = cfgGroupSaver.config ();
772
+            TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
773
+            TDEConfigBase *cfg = cfgGroupSaver.config ();
774 774
 
775 775
             m_previewDialogLastRelativeGeometry = cfg->readRectEntry (
776 776
                 kpSettingPreviewSaveGeometry);
@@ -845,8 +845,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
845 845
     {
846 846
         m_updatePreviewDialogLastRelativeGeometryTimer->stop ();
847 847
 
848
-        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
849
-        KConfigBase *cfg = cfgGroupSaver.config ();
848
+        TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
849
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
850 850
 
851 851
         cfg->writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry);
852 852
         cfg->sync ();

+ 11
- 11
kolourpaint/kpmainwindow.cpp View File

@@ -103,8 +103,8 @@ double kpMainWindow::configColorSimilarity () const
103 103
 // public
104 104
 void kpMainWindow::configSetColorSimilarity (double val)
105 105
 {
106
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
107
-    KConfigBase *cfg = cfgGroupSaver.config ();
106
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
107
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
108 108
 
109 109
     cfg->writeEntry (kpSettingColorSimilarity, m_configColorSimilarity = val);
110 110
     cfg->sync ();
@@ -118,8 +118,8 @@ void kpMainWindow::readGeneralSettings ()
118 118
     kdDebug () << "\tkpMainWindow(" << name () << ")::readGeneralSettings()" << endl;
119 119
 #endif
120 120
 
121
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
122
-    KConfigBase *cfg = cfgGroupSaver.config ();
121
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
122
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
123 123
 
124 124
     m_configFirstTime = cfg->readBoolEntry (kpSettingFirstTime, true);
125 125
     m_configShowGrid = cfg->readBoolEntry (kpSettingShowGrid, false);
@@ -147,8 +147,8 @@ void kpMainWindow::readThumbnailSettings ()
147 147
     kdDebug () << "\tkpMainWindow(" << name () << ")::readThumbnailSettings()" << endl;
148 148
 #endif
149 149
 
150
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
151
-    KConfigBase *cfg = cfgGroupSaver.config ();
150
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
151
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
152 152
 
153 153
     m_configThumbnailShown = cfg->readBoolEntry (kpSettingThumbnailShown, false);
154 154
     m_configThumbnailGeometry = cfg->readRectEntry (kpSettingThumbnailGeometry);
@@ -206,7 +206,7 @@ void kpMainWindow::init ()
206 206
     // read config
207 207
     //
208 208
 
209
-    // KConfig::readEntry() does not actually reread from disk, hence doesn't
209
+    // TDEConfig::readEntry() does not actually reread from disk, hence doesn't
210 210
     // realise what other processes have done e.g. Settings / Show Path
211 211
     kapp->config ()->reparseConfiguration ();
212 212
 #if DEBUG_KP_MAIN_WINDOW
@@ -298,8 +298,8 @@ void kpMainWindow::init ()
298 298
         m_toolToolBar->setBarPos (KToolBar::Left);
299 299
         m_colorToolBar->setBarPos (KToolBar::Bottom);
300 300
 
301
-        KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
302
-        KConfigBase *cfg = cfgGroupSaver.config ();
301
+        TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
302
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
303 303
 
304 304
         cfg->writeEntry (kpSettingFirstTime, m_configFirstTime = false);
305 305
         cfg->sync ();
@@ -312,7 +312,7 @@ void kpMainWindow::init ()
312 312
 
313 313
 
314 314
 // private virtual [base KMainWindow]
315
-void kpMainWindow::readProperties (KConfig *cfg)
315
+void kpMainWindow::readProperties (TDEConfig *cfg)
316 316
 {
317 317
 #if DEBUG_KP_MAIN_WINDOW
318 318
     kdDebug () << "kpMainWindow<" << this << ">::readProperties()" << endl;
@@ -366,7 +366,7 @@ void kpMainWindow::readProperties (KConfig *cfg)
366 366
 // private virtual [base KMainWindow]
367 367
 // WARNING: KMainWindow API Doc says "No user interaction is allowed
368 368
 //          in this function!"
369
-void kpMainWindow::saveProperties (KConfig *cfg)
369
+void kpMainWindow::saveProperties (TDEConfig *cfg)
370 370
 {
371 371
 #if DEBUG_KP_MAIN_WINDOW
372 372
     kdDebug () << "kpMainWindow<" << this << ">::saveProperties()" << endl;

+ 2
- 2
kolourpaint/kpmainwindow.h View File

@@ -124,11 +124,11 @@ private:
124 124
     // (only called for restoring a previous session e.g. starting KDE with
125 125
     //  a previously saved session; it's not called on normal KolourPaint
126 126
     //  startup)
127
-    virtual void readProperties (KConfig *cfg);
127
+    virtual void readProperties (TDEConfig *cfg);
128 128
     // (only called for saving the current session e.g. logging out of KDE
129 129
     //  with the KolourPaint window open; it's not called on normal KolourPaint
130 130
     //  exit)
131
-    virtual void saveProperties (KConfig *cfg);
131
+    virtual void saveProperties (TDEConfig *cfg);
132 132
 
133 133
 public:
134 134
     ~kpMainWindow ();

+ 15
- 15
kolourpaint/kpmainwindow_file.cpp View File

@@ -146,9 +146,9 @@ void kpMainWindow::addRecentURL (const KURL &url)
146 146
         return;
147 147
 
148 148
 
149
-    KConfig *cfg = kapp->config ();
149
+    TDEConfig *cfg = kapp->config ();
150 150
 
151
-    // KConfig::readEntry() does not actually reread from disk, hence doesn't
151
+    // TDEConfig::readEntry() does not actually reread from disk, hence doesn't
152 152
     // realise what other processes have done e.g. Settings / Show Path
153 153
     cfg->reparseConfiguration ();
154 154
 
@@ -230,12 +230,12 @@ void kpMainWindow::slotNew ()
230 230
 // private
231 231
 TQSize kpMainWindow::defaultDocSize () const
232 232
 {
233
-    // KConfig::readEntry() does not actually reread from disk, hence doesn't
233
+    // TDEConfig::readEntry() does not actually reread from disk, hence doesn't
234 234
     // realise what other processes have done e.g. Settings / Show Path
235 235
     kapp->config ()->reparseConfiguration ();
236 236
 
237
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
238
-    KConfigBase *cfg = cfgGroupSaver.config ();
237
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
238
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
239 239
 
240 240
     TQSize docSize = cfg->readSizeEntry (kpSettingLastDocSize);
241 241
 
@@ -261,8 +261,8 @@ void kpMainWindow::saveDefaultDocSize (const TQSize &size)
261 261
     kdDebug () << "\tCONFIG: saving Last Doc Size = " << size << endl;
262 262
 #endif
263 263
 
264
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
265
-    KConfigBase *cfg = cfgGroupSaver.config ();
264
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
265
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
266 266
 
267 267
     cfg->writeEntry (kpSettingLastDocSize, size);
268 268
     cfg->sync ();
@@ -599,7 +599,7 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
599 599
 
600 600
     bool reparsedConfiguration = false;
601 601
 
602
-    // KConfig::readEntry() does not actually reread from disk, hence doesn't
602
+    // TDEConfig::readEntry() does not actually reread from disk, hence doesn't
603 603
     // realise what other processes have done e.g. Settings / Show Path
604 604
     // so reparseConfiguration() must be called
605 605
 #define SETUP_READ_CFG()                                                          \
@@ -609,8 +609,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
609 609
         reparsedConfiguration = true;                                             \
610 610
     }                                                                             \
611 611
                                                                                   \
612
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);    \
613
-    KConfigBase *cfg = cfgGroupSaver.config ();
612
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);    \
613
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
614 614
 
615 615
 
616 616
     if (chosenSaveOptions)
@@ -715,8 +715,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
715 715
         newSaveOptions.printDebug ("\tnewSaveOptions");
716 716
     #endif
717 717
 
718
-        KConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);
719
-        KConfigBase *cfg = cfgGroupSaver.config ();
718
+        TDEConfigGroupSaver cfgGroupSaver (kapp->config (), forcedSaveOptionsGroup);
719
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
720 720
 
721 721
         // Save options user forced - probably want to use them in future
722 722
         kpDocumentSaveOptions::saveDefaultDifferences (cfg,
@@ -921,7 +921,7 @@ bool kpMainWindow::slotReload ()
921 921
 
922 922
     // If it's _supposed to_ come from a URL or it exists
923 923
     if (m_document->isFromURL (false/*don't bother checking exists*/) ||
924
-        (!oldURL.isEmpty () && KIO::NetAccess::exists (oldURL, true/*open*/, this)))
924
+        (!oldURL.isEmpty () && TDEIO::NetAccess::exists (oldURL, true/*open*/, this)))
925 925
     {
926 926
     #if DEBUG_KP_MAIN_WINDOW
927 927
         kdDebug () << "kpMainWindow::slotReload() reloading from disk!" << endl;
@@ -997,9 +997,9 @@ static bool shouldPrintImageCenteredOnPage ()
997 997
 #endif
998 998
     bool ret;
999 999
 
1000
-    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
1000
+    TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
1001 1001
                                      kpSettingsGroupGeneral);
1002
-    KConfigBase *cfg = cfgGroupSaver.config ();
1002
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
1003 1003
 
1004 1004
     if (cfg->hasKey (kpSettingPrintImageCenteredOnPage))
1005 1005
     {

+ 2
- 2
kolourpaint/kpmainwindow_help.cpp View File

@@ -73,8 +73,8 @@ void kpMainWindow::enableHelpMenuDocumentActions (bool /*enable*/)
73 73
 // SYNC: tdebase/twin/twinbindings.cpp
74 74
 static TQString printScreenShortcutString ()
75 75
 {
76
-    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
77
-    KConfigBase *cfg = cfgGroupSaver.config ();
76
+    TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
77
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
78 78
 
79 79
     // TODO: i18n() entry name?  twinbindings.cpp seems to but it doesn't
80 80
     //       make sense.

+ 4
- 4
kolourpaint/kpmainwindow_image.cpp View File

@@ -317,8 +317,8 @@ void kpMainWindow::slotResizeScale ()
317 317
     {
318 318
         d->m_resizeScaleDialogLastKeepAspect = dialog.keepAspectRatio ();
319 319
 
320
-        KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
321
-        KConfigBase *cfg = cfgGroupSaver.config ();
320
+        TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
321
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
322 322
 
323 323
         cfg->writeEntry (kpSettingResizeScaleLastKeepAspect,
324 324
                          d->m_resizeScaleDialogLastKeepAspect);
@@ -464,8 +464,8 @@ void kpMainWindow::slotMoreEffects ()
464 464
     {
465 465
         d->m_moreEffectsDialogLastEffect = dialog.selectedEffect ();
466 466
 
467
-        KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
468
-        KConfigBase *cfg = cfgGroupSaver.config ();
467
+        TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
468
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
469 469
 
470 470
         cfg->writeEntry (kpSettingMoreEffectsLastEffect,
471 471
                          d->m_moreEffectsDialogLastEffect);

+ 2
- 2
kolourpaint/kpmainwindow_settings.cpp View File

@@ -116,8 +116,8 @@ void kpMainWindow::slotShowPathToggled ()
116 116
     slotUpdateCaption ();
117 117
 
118 118
 
119
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
120
-    KConfigBase *cfg = cfgGroupSaver.config ();
119
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
120
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
121 121
 
122 122
     cfg->writeEntry (kpSettingShowPath, m_configShowPath);
123 123
     cfg->sync ();

+ 14
- 14
kolourpaint/kpmainwindow_text.cpp View File

@@ -77,8 +77,8 @@ void kpMainWindow::setupTextToolBarActions ()
77 77
 // private
78 78
 void kpMainWindow::readAndApplyTextSettings ()
79 79
 {
80
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
81
-    KConfigBase *cfg = cfgGroupSaver.config ();
80
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
81
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
82 82
 
83 83
     m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
84 84
     m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
@@ -141,8 +141,8 @@ void kpMainWindow::slotTextFontFamilyChanged ()
141 141
     if (m_mainView)
142 142
         m_mainView->setFocus ();
143 143
 
144
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
145
-    KConfigBase *cfg = cfgGroupSaver.config ();
144
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
145
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
146 146
     cfg->writeEntry (kpSettingFontFamily, m_actionTextFontFamily->font ());
147 147
     cfg->sync ();
148 148
 
@@ -174,8 +174,8 @@ void kpMainWindow::slotTextFontSizeChanged ()
174 174
     if (m_mainView)
175 175
         m_mainView->setFocus ();
176 176
 
177
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
178
-    KConfigBase *cfg = cfgGroupSaver.config ();
177
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
178
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
179 179
     cfg->writeEntry (kpSettingFontSize, m_actionTextFontSize->fontSize ());
180 180
     cfg->sync ();
181 181
 
@@ -199,8 +199,8 @@ void kpMainWindow::slotTextBoldChanged ()
199 199
     if (m_toolText && m_toolText->hasBegun ())
200 200
         m_toolText->slotBoldChanged (m_actionTextBold->isChecked ());
201 201
 
202
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
203
-    KConfigBase *cfg = cfgGroupSaver.config ();
202
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
203
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
204 204
     cfg->writeEntry (kpSettingBold, m_actionTextBold->isChecked ());
205 205
     cfg->sync ();
206 206
 }
@@ -222,8 +222,8 @@ void kpMainWindow::slotTextItalicChanged ()
222 222
     if (m_toolText && m_toolText->hasBegun ())
223 223
         m_toolText->slotItalicChanged (m_actionTextItalic->isChecked ());
224 224
 
225
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
226
-    KConfigBase *cfg = cfgGroupSaver.config ();
225
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
226
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
227 227
     cfg->writeEntry (kpSettingItalic, m_actionTextItalic->isChecked ());
228 228
     cfg->sync ();
229 229
 }
@@ -245,8 +245,8 @@ void kpMainWindow::slotTextUnderlineChanged ()
245 245
     if (m_toolText && m_toolText->hasBegun ())
246 246
         m_toolText->slotUnderlineChanged (m_actionTextUnderline->isChecked ());
247 247
 
248
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
249
-    KConfigBase *cfg = cfgGroupSaver.config ();
248
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
249
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
250 250
     cfg->writeEntry (kpSettingUnderline, m_actionTextUnderline->isChecked ());
251 251
     cfg->sync ();
252 252
 }
@@ -268,8 +268,8 @@ void kpMainWindow::slotTextStrikeThruChanged ()
268 268
     if (m_toolText && m_toolText->hasBegun ())
269 269
         m_toolText->slotStrikeThruChanged (m_actionTextStrikeThru->isChecked ());
270 270
 
271
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
272
-    KConfigBase *cfg = cfgGroupSaver.config ();
271
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
272
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
273 273
     cfg->writeEntry (kpSettingStrikeThru, m_actionTextStrikeThru->isChecked ());
274 274
     cfg->sync ();
275 275
 }

+ 4
- 4
kolourpaint/kpmainwindow_tools.cpp View File

@@ -392,8 +392,8 @@ void kpMainWindow::slotToolSelected (kpTool *tool)
392 392
 // private
393 393
 void kpMainWindow::readLastTool ()
394 394
 {
395
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
396
-    KConfigBase *cfg = cfgGroupSaver.config ();
395
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
396
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
397 397
 
398 398
     m_lastToolNumber = cfg->readNumEntry (kpSettingLastTool, -1);
399 399
 }
@@ -424,8 +424,8 @@ void kpMainWindow::saveLastTool ()
424 424
         return;
425 425
 
426 426
 
427
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
428
-    KConfigBase *cfg = cfgGroupSaver.config ();
427
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
428
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
429 429
 
430 430
     cfg->writeEntry (kpSettingLastTool, number);
431 431
     cfg->sync ();

+ 10
- 10
kolourpaint/kpmainwindow_view.cpp View File

@@ -729,8 +729,8 @@ void kpMainWindow::slotShowGridToggled ()
729 729
     updateMainViewGrid ();
730 730
 
731 731
 
732
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
733
-    KConfigBase *cfg = cfgGroupSaver.config ();
732
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
733
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
734 734
 
735 735
     cfg->writeEntry (kpSettingShowGrid, m_configShowGrid = m_actionShowGrid->isChecked ());
736 736
     cfg->sync ();
@@ -853,8 +853,8 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
853 853
                 << endl;
854 854
 #endif
855 855
 
856
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
857
-    KConfigBase *cfg = cfgGroupSaver.config ();
856
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
857
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
858 858
 
859 859
     cfg->writeEntry (kpSettingThumbnailGeometry, m_configThumbnailGeometry);
860 860
     cfg->sync ();
@@ -869,8 +869,8 @@ void kpMainWindow::slotShowThumbnailToggled ()
869 869
 
870 870
     m_configThumbnailShown = m_actionShowThumbnail->isChecked ();
871 871
 
872
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
873
-    KConfigBase *cfg = cfgGroupSaver.config ();
872
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
873
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
874 874
 
875 875
     cfg->writeEntry (kpSettingThumbnailShown, m_configThumbnailShown);
876 876
     cfg->sync ();
@@ -904,8 +904,8 @@ void kpMainWindow::slotZoomedThumbnailToggled ()
904 904
 
905 905
     m_configZoomedThumbnail = m_actionZoomedThumbnail->isChecked ();
906 906
 
907
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
908
-    KConfigBase *cfg = cfgGroupSaver.config ();
907
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
908
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
909 909
 
910 910
     cfg->writeEntry (kpSettingThumbnailZoomed, m_configZoomedThumbnail);
911 911
     cfg->sync ();
@@ -923,8 +923,8 @@ void kpMainWindow::slotThumbnailShowRectangleToggled ()
923 923
 
924 924
     d->m_configThumbnailShowRectangle = d->m_actionShowThumbnailRectangle->isChecked ();
925 925
 
926
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
927
-    KConfigBase *cfg = cfgGroupSaver.config ();
926
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupThumbnail);
927
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
928 928
 
929 929
     cfg->writeEntry (kpSettingThumbnailShowRectangle, d->m_configThumbnailShowRectangle);
930 930
     cfg->sync ();

+ 4
- 4
kolourpaint/pixmapfx/kpeffectflatten.cpp View File

@@ -137,8 +137,8 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
137 137
 {
138 138
     if (!s_lastColor1.isValid () || !s_lastColor2.isValid ())
139 139
     {
140
-        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
141
-        KConfigBase *cfg = cfgGroupSaver.config ();
140
+        TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
141
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
142 142
 
143 143
         s_lastColor1 = cfg->readColorEntry (kpSettingFlattenEffectColor1);
144 144
         if (!s_lastColor1.isValid ())
@@ -183,8 +183,8 @@ kpEffectFlattenWidget::~kpEffectFlattenWidget ()
183 183
     s_lastColor2 = color2 ();
184 184
 
185 185
 
186
-    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
187
-    KConfigBase *cfg = cfgGroupSaver.config ();
186
+    TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
187
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
188 188
 
189 189
     cfg->writeEntry (kpSettingFlattenEffectColor1, s_lastColor1);
190 190
     cfg->writeEntry (kpSettingFlattenEffectColor2, s_lastColor2);

+ 2
- 2
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -492,9 +492,9 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image,
492 492
 
493 493
         int configDitherIfNumColorsGreaterThan = 323;
494 494
 
495
-        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
495
+        TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
496 496
                                          kpSettingsGroupGeneral);
497
-        KConfigBase *cfg = cfgGroupSaver.config ();
497
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
498 498
 
499 499
         if (cfg->hasKey (kpSettingDitherOnOpen))
500 500
         {

+ 2
- 2
kolourpaint/widgets/kptooltoolbar.cpp View File

@@ -175,9 +175,9 @@ int kpToolToolBar::defaultIconSize ()
175 175
 #endif
176 176
 
177 177
 
178
-    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
178
+    TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
179 179
                                      kpSettingsGroupTools);
180
-    KConfigBase *cfg = cfgGroupSaver.config ();
180
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
181 181
 
182 182
     if (cfg->hasKey (kpSettingToolBoxIconSize))
183 183
     {

+ 4
- 4
kolourpaint/widgets/kptoolwidgetbase.cpp View File

@@ -172,8 +172,8 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
172 172
 
173 173
     if (name ())
174 174
     {
175
-        KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
176
-        KConfigBase *cfg = cfgGroupSaver.config ();
175
+        TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
176
+        TDEConfigBase *cfg = cfgGroupSaver.config ();
177 177
 
178 178
         TQString nameString = TQString::fromLatin1 (name ());
179 179
 
@@ -215,8 +215,8 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
215 215
     if (!name ())
216 216
         return;
217 217
 
218
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
219
-    KConfigBase *cfg = cfgGroupSaver.config ();
218
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
219
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
220 220
 
221 221
     TQString nameString = TQString::fromLatin1 (name ());
222 222
     cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);

+ 1
- 1
kooka/CHANGES View File

@@ -17,7 +17,7 @@ scanned with about 150 dpi.
17 17
 
18 18
 * Reworked the ocr integration: Nice start- and finish-dialog,
19 19
   animated status image, opening a text editor with the result text
20
-  via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig.
20
+  via mime mechanism of KDE (KRun). OCR-Parameter get stored via TDEConfig.
21 21
   OCR may be performed on the entire image or the selection.
22 22
 
23 23
 * Reworked the save assistant: New layout and fully KDE2-Compliant.

+ 10
- 10
kooka/img_saver.cpp View File

@@ -269,11 +269,11 @@ void ImgSaver::createDir( const TQString& dir )
269 269
 {
270 270
    KURL url( dir );
271 271
 
272
-   if( ! KIO::NetAccess::exists(url, false, 0) )
272
+   if( ! TDEIO::NetAccess::exists(url, false, 0) )
273 273
    {
274 274
       kdDebug(28000) << "Wrn: Directory <" << dir << "> does not exist -> try to create  !" << endl;
275 275
       // if( mkdir( TQFile::encodeName( dir ), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH ) != 0 )
276
-      if( KIO::mkdir( KURL(dir)))
276
+      if( TDEIO::mkdir( KURL(dir)))
277 277
       {
278 278
         KMessageBox::sorry(0, i18n("The folder\n%1\n does not exist and could not be created;\n"
279 279
                         "please check the permissions.").arg(dir));
@@ -335,7 +335,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image )
335 335
    kdDebug(28000) << "saveImage: Directory is " << directory << endl;
336 336
    TQString filename = createFilename( format );
337 337
 
338
-   KConfig *konf = TDEGlobal::config ();
338
+   TDEConfig *konf = TDEGlobal::config ();
339 339
    konf->setGroup( OP_FILE_GROUP );
340 340
 
341 341
    if( konf->readBoolEntry( OP_ASK_FILENAME, false ) )
@@ -425,7 +425,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image, const KURL& filename, const TQS
425 425
 TQString ImgSaver::findFormat( picType type )
426 426
 {
427 427
    TQString format;
428
-   KConfig *konf = TDEGlobal::config ();
428
+   TDEConfig *konf = TDEGlobal::config ();
429 429
    konf->setGroup( OP_FILE_GROUP );
430 430
 
431 431
    if( type == PT_THUMBNAIL )
@@ -552,7 +552,7 @@ bool ImgSaver::isRememberedFormat( picType type, TQString format ) const
552 552
 
553 553
 TQString ImgSaver::getFormatForType( picType type ) const
554 554
 {
555
-   KConfig *konf = TDEGlobal::config ();
555
+   TDEConfig *konf = TDEGlobal::config ();
556 556
    TQ_CHECK_PTR( konf );
557 557
    konf->setGroup( OP_FILE_GROUP );
558 558
 
@@ -582,7 +582,7 @@ TQString ImgSaver::getFormatForType( picType type ) const
582 582
 
583 583
 void ImgSaver::storeFormatForType( picType type, TQString format, bool ask )
584 584
 {
585
-   KConfig *konf = TDEGlobal::config ();
585
+   TDEConfig *konf = TDEGlobal::config ();
586 586
    TQ_CHECK_PTR( konf );
587 587
    konf->setGroup( OP_FILE_GROUP );
588 588
 
@@ -691,7 +691,7 @@ ImgSaveStat ImgSaver::save( TQImage *image, const TQString &filename,
691 691
 void ImgSaver::readConfig( void )
692 692
 {
693 693
 
694
-   KConfig *konf = TDEGlobal::config ();
694
+   TDEConfig *konf = TDEGlobal::config ();
695 695
    TQ_CHECK_PTR( konf );
696 696
    konf->setGroup( OP_FILE_GROUP );
697 697
    ask_for_format = konf->readBoolEntry( OP_FILE_ASK_FORMAT, true );
@@ -794,13 +794,13 @@ bool ImgSaver::renameImage( const KURL& fromUrl, KURL& toUrl, bool askExt,  TQWi
794 794
 
795 795
    bool success = false;
796 796
 
797
-   if( KIO::NetAccess::exists( targetUrl, false,0 ) )
797
+   if( TDEIO::NetAccess::exists( targetUrl, false,0 ) )
798 798
    {
799 799
       kdDebug(28000)<< "Target already exists - can not copy" << endl;
800 800
    }
801 801
    else
802 802
    {
803
-      if( KIO::file_move(fromUrl, targetUrl) )
803
+      if( TDEIO::file_move(fromUrl, targetUrl) )
804 804
       {
805 805
 	 success = true;
806 806
       }
@@ -886,7 +886,7 @@ bool ImgSaver::copyImage( const KURL& fromUrl, const KURL& toUrl, TQWidget *over
886 886
        }
887 887
    }
888 888
 
889
-   KIO::Job *copyjob = KIO::copy( fromUrl, targetUrl, false );
889
+   TDEIO::Job *copyjob = TDEIO::copy( fromUrl, targetUrl, false );
890 890
 
891 891
    return( copyjob ? true : false );
892 892
 }

+ 9
- 9
kooka/kocrbase.cpp View File

@@ -81,8 +81,8 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
81 81
     kdDebug(28000) << "OCR Base Dialog!" << endl;
82 82
     // Layout-Boxes
83 83
 
84
-    KConfig *konf = TDEGlobal::config ();
85
-    KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
84
+    TDEConfig *konf = TDEGlobal::config ();
85
+    TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
86 86
     m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_KSPELL, true);
87 87
 
88 88
     /* Connect signals which disable the fields and store the configuration */
@@ -237,16 +237,16 @@ void KOCRBase::introduceImage( KookaImage* img)
237 237
 
238 238
     /* Start to create a preview job for the thumb */
239 239
     KURL::List li(img->url());
240
-    KIO::Job *m_job = KIO::filePreview(li, m_previewSize.width(),
240
+    TDEIO::Job *m_job = TDEIO::filePreview(li, m_previewSize.width(),
241 241
                                        m_previewSize.height());
242 242
 
243 243
     if( m_job )
244 244
     {
245
-        connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
246
-                 this, TQT_SLOT( slPreviewResult( KIO::Job * )));
245
+        connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
246
+                 this, TQT_SLOT( slPreviewResult( TDEIO::Job * )));
247 247
         connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
248 248
                  TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) ));
249
-         /* KIO::Jo result is called in any way: Success, Failed, Error,
249
+         /* TDEIO::Jo result is called in any way: Success, Failed, Error,
250 250
           * thus connecting the failed is not really necessary.
251 251
           */
252 252
     }
@@ -289,7 +289,7 @@ void KOCRBase::introduceImage( KookaImage* img)
289 289
     m_metaBox->show();
290 290
 }
291 291
 
292
-void KOCRBase::slPreviewResult(KIO::Job *job )
292
+void KOCRBase::slPreviewResult(TDEIO::Job *job )
293 293
 {
294 294
     // nothing
295 295
     if( job && job->error() > 0 )
@@ -359,8 +359,8 @@ void KOCRBase::slWantSpellcheck( bool wantIt )
359 359
     }
360 360
     m_userWantsSpellCheck = wantIt;
361 361
 
362
-    KConfig *konf = TDEGlobal::config ();
363
-    KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
362
+    TDEConfig *konf = TDEGlobal::config ();
363
+    TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
364 364
     konf->writeEntry( CFG_WANT_KSPELL, wantIt );
365 365
 }
366 366
 

+ 1
- 1
kooka/kocrbase.h View File

@@ -134,7 +134,7 @@ protected slots:
134 134
     virtual void slWantSpellcheck( bool wantIt );
135 135
 
136 136
 private slots:
137
-    virtual void slPreviewResult( KIO::Job* );
137
+    virtual void slPreviewResult( TDEIO::Job* );
138 138
     virtual void slGotPreview( const KFileItem*, const TQPixmap& );
139 139
 
140 140
 private:

+ 2
- 2
kooka/kocrgocr.cpp View File

@@ -93,7 +93,7 @@ EngineError KGOCRDialog::setupGui()
93 93
     TQVBox *page = ocrPage();
94 94
     TQ_CHECK_PTR( page );
95 95
 
96
-    KConfig *conf = TDEGlobal::config ();
96
+    TDEConfig *conf = TDEGlobal::config ();
97 97
     conf->setGroup( CFG_GROUP_OCR_DIA );
98 98
 
99 99
     //Qt::Horizontal line
@@ -179,7 +179,7 @@ KGOCRDialog::~KGOCRDialog()
179 179
 
180 180
 void KGOCRDialog::writeConfig( void )
181 181
 {
182
-   KConfig *conf = TDEGlobal::config ();
182
+   TDEConfig *conf = TDEGlobal::config ();
183 183
    conf->setGroup( CFG_GROUP_OCR_DIA );
184 184
 
185 185
    conf->writeEntry( CFG_GOCR_BINARY, TQString(getOCRCmd()));

+ 4
- 4
kooka/kocrkadmos.cpp View File

@@ -236,8 +236,8 @@ EngineError KadmosDialog::findClassifierPath()
236 236
     KStandardDirs stdDir;
237 237
     EngineError err = ENG_OK;
238 238
 
239
-    KConfig *conf = TDEGlobal::config ();
240
-    KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
239
+    TDEConfig *conf = TDEGlobal::config ();
240
+    TDEConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
241 241
 
242 242
     m_customClassifierPath = conf->readPathEntry( CFG_KADMOS_CLASSIFIER_PATH );
243 243
 #if 0
@@ -341,8 +341,8 @@ void KadmosDialog::slFontChanged( int id )
341 341
 {
342 342
     m_cbLang->clear();
343 343
 
344
-    KConfig *conf = TDEGlobal::config ();
345
-    KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
344
+    TDEConfig *conf = TDEGlobal::config ();
345
+    TDEConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
346 346
 
347 347
 
348 348
 

+ 1
- 1
kooka/kocrkadmos.h View File

@@ -41,7 +41,7 @@
41 41
 class KScanCombo;
42 42
 class TQWidget;
43 43
 class TQButtonGroup;
44
-class KConfig;
44
+class TDEConfig;
45 45
 class TQCheckBox;
46 46
 class KSpellConfig;
47 47
 class TQRadioButton;

+ 2
- 2
kooka/kocrocrad.cpp View File

@@ -104,7 +104,7 @@ EngineError ocradDialog::setupGui()
104 104
     TQVBox *page = ocrPage();
105 105
     TQ_CHECK_PTR( page );
106 106
 
107
-    KConfig *conf = TDEGlobal::config ();
107
+    TDEConfig *conf = TDEGlobal::config ();
108 108
     conf->setGroup( CFG_GROUP_OCR_DIA );
109 109
 
110 110
     //Qt::Horizontal line
@@ -177,7 +177,7 @@ ocradDialog::~ocradDialog()
177 177
 
178 178
 void ocradDialog::writeConfig( void )
179 179
 {
180
-   KConfig *conf = TDEGlobal::config ();
180
+   TDEConfig *conf = TDEGlobal::config ();
181 181
    conf->setGroup( CFG_GROUP_OCR_DIA );
182 182
 
183 183
    conf->writeEntry( CFG_OCRAD_BINARY, TQString(getOCRCmd()));

+ 4
- 4
kooka/kooka.cpp View File

@@ -75,7 +75,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
75 75
     setXMLFile( "kookaui.rc", true );
76 76
 
77 77
     setAcceptDrops(false); // Waba: Not (yet?) supported
78
-    KConfig *konf = TDEGlobal::config ();
78
+    TDEConfig *konf = TDEGlobal::config ();
79 79
     readDockConfig ( konf, DOCK_SIZES );
80 80
 
81 81
     // then, setup our actions
@@ -109,7 +109,7 @@ void Kooka::createMyGUI( KParts::Part *part )
109 109
 
110 110
 Kooka::~Kooka()
111 111
 {
112
-   KConfig *konf = TDEGlobal::config ();
112
+   TDEConfig *konf = TDEGlobal::config ();
113 113
    m_view->slCloseScanDevice();
114 114
    writeDockConfig ( konf, DOCK_SIZES );
115 115
    delete m_printer;
@@ -271,7 +271,7 @@ actionCollection());
271 271
 }
272 272
 
273 273
 
274
-void Kooka::saveProperties(KConfig *config)
274
+void Kooka::saveProperties(TDEConfig *config)
275 275
 {
276 276
     // the 'config' object points to the session managed
277 277
     // config file.  anything you write here will be available
@@ -285,7 +285,7 @@ void Kooka::saveProperties(KConfig *config)
285 285
    m_view->saveProperties( config );
286 286
 }
287 287
 
288
-void Kooka::readProperties(KConfig *config)
288
+void Kooka::readProperties(TDEConfig *config)
289 289
 {
290 290
    (void) config;
291 291
     // the 'config' object points to the session managed

+ 3
- 3
kooka/kooka.h View File

@@ -84,14 +84,14 @@ protected:
84 84
      * This function is called when it is time for the app to save its
85 85
      * properties for session management purposes.
86 86
      */
87
-    void saveProperties(KConfig *);
87
+    void saveProperties(TDEConfig *);
88 88
 
89 89
     /**
90
-     * This function is called when this app is restored.  The KConfig
90
+     * This function is called when this app is restored.  The TDEConfig
91 91
      * object points to the session management config file that was saved
92 92
      * with @ref saveProperties
93 93
      */
94
-    void readProperties(KConfig *);
94
+    void readProperties(TDEConfig *);
95 95
 
96 96
 
97 97
 private slots:

+ 1
- 1
kooka/kookapref.cpp View File

@@ -200,7 +200,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
200 200
 {
201 201
 
202 202
     /* First check the config files for an entry */
203
-    KConfig *cfg = TDEGlobal::config();
203
+    TDEConfig *cfg = TDEGlobal::config();
204 204
     cfg->setGroup(CFG_GROUP_OCR_DIA);
205 205
     TQString res = cfg->readPathEntry( configKey /* CFG_GOCR_BINARY */, "notFound" );
206 206
 

+ 2
- 2
kooka/kookapref.h View File

@@ -29,7 +29,7 @@
29 29
 #include <kdialogbase.h>
30 30
 #include <tqframe.h>
31 31
 
32
-class KConfig;
32
+class TDEConfig;
33 33
 class TQLabel;
34 34
 class KIntNumInput;
35 35
 class KColorButton;
@@ -78,7 +78,7 @@ private:
78 78
     TQCheckBox *cbSkipFormatAsk;
79 79
     TQCheckBox *cbFilenameAsk;
80 80
     TQCheckBox *cbShowScannerSelection;
81
-    KConfig   *konf;
81
+    TDEConfig   *konf;
82 82
     TQCheckBox *cbReadStartupImage;
83 83
 
84 84
     KIntNumInput *m_thumbWidth;

+ 2
- 2
kooka/kookaview.cpp View File

@@ -438,7 +438,7 @@ void KookaView::loadStartupImage( void )
438 438
    kdDebug( 28000) << "Starting to load startup image" << endl;
439 439
 
440 440
    /* Now set the configured stuff */
441
-   KConfig *konf = TDEGlobal::config ();
441
+   TDEConfig *konf = TDEGlobal::config ();
442 442
    if( konf )
443 443
    {
444 444
       konf->setGroup(GROUP_STARTUP);
@@ -939,7 +939,7 @@ void KookaView::updateCurrImage( TQImage& img )
939 939
 }
940 940
 
941 941
 
942
-void KookaView::saveProperties(KConfig *config)
942
+void KookaView::saveProperties(TDEConfig *config)
943 943
 {
944 944
    kdDebug(28000) << "Saving Properties for KookaView !" << endl;
945 945
    config->setGroup( GROUP_STARTUP );

+ 2
- 2
kooka/kookaview.h View File

@@ -48,7 +48,7 @@
48 48
 class KDockWidget;
49 49
 class TQPainter;
50 50
 class KSANEOCR;
51
-class KConfig;
51
+class TDEConfig;
52 52
 class KPrinter;
53 53
 class KComboBox;
54 54
 class KAction;
@@ -153,7 +153,7 @@ public slots:
153 153
     void startOCR( KookaImage* );
154 154
 
155 155
     void  slCloseScanDevice();
156
-    void saveProperties( KConfig* );
156
+    void saveProperties( TDEConfig* );
157 157
 
158 158
     /**
159 159
      * slot to select the scanner device. Does all the work with selection

+ 4
- 4
kooka/ksaneocr.cpp View File

@@ -68,7 +68,7 @@
68 68
  * thread save unfortunately. See slotKadmosResult-comments for more information
69 69
  */
70 70
 
71
-KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
71
+KSANEOCR::KSANEOCR( TQWidget*, TDEConfig *cfg ):
72 72
     m_ocrProcessDia(0L),
73 73
     daemon(0L),
74 74
     visibleOCRRunning(false),
@@ -85,7 +85,7 @@ KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
85 85
     m_applyFilter(false),
86 86
     m_unlinkORF(true)
87 87
 {
88
-    KConfig *konf = TDEGlobal::config ();
88
+    TDEConfig *konf = TDEGlobal::config ();
89 89
     m_ocrEngine = OCRAD;
90 90
     m_img = 0L;
91 91
     m_tmpFile = 0L;
@@ -403,8 +403,8 @@ void KSANEOCR::startOCRAD( )
403 403
     *daemon << TQString("-l");
404 404
     *daemon << TQString::number( ocrDia->layoutDetectionMode());
405 405
 
406
-    KConfig *konf = TDEGlobal::config ();
407
-    KConfigGroupSaver( konf, CFG_GROUP_OCRAD );
406
+    TDEConfig *konf = TDEGlobal::config ();
407
+    TDEConfigGroupSaver( konf, CFG_GROUP_OCRAD );
408 408
 
409 409
     TQString format = konf->readEntry( CFG_OCRAD_FORMAT, "utf8");
410 410
     *daemon << TQString("-F");

+ 2
- 2
kooka/ksaneocr.h View File

@@ -59,7 +59,7 @@ class TQStringList;
59 59
 class KSpell;
60 60
 class KSpellConfig;
61 61
 class ImageCanvas;
62
-class KConfig;
62
+class TDEConfig;
63 63
 // class ocrWord;
64 64
 // class ocrPage;
65 65
 
@@ -79,7 +79,7 @@ class KSANEOCR : public TQObject
79 79
 public:
80 80
     enum OCREngines{ GOCR, OCRAD, KADMOS };
81 81
 
82
-    KSANEOCR( TQWidget*, KConfig *);
82
+    KSANEOCR( TQWidget*, TDEConfig *);
83 83
     ~KSANEOCR();
84 84
 
85 85
     bool startOCRVisible( TQWidget* parent=0);

+ 6
- 6
kooka/scanpackager.cpp View File

@@ -255,7 +255,7 @@ void ScanPackager::slotDecorate( KFileTreeViewItem* item )
255 255
 	 item->setPixmap( 0, m_floppyPixmap );
256 256
 	 if ( kfi )
257 257
 	 {
258
-	    item->setText(1, KIO::convertSize( kfi->size() ));
258
+	    item->setText(1, TDEIO::convertSize( kfi->size() ));
259 259
 	 }
260