Browse Source

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

Timothy Pearson 6 years ago
parent
commit
3acdcb24db

+ 1
- 1
ChangeLog View File

@@ -587,7 +587,7 @@
587 587
 
588 588
 2001-07-14 Alexander Rawass <alexannika@users.sourceforge.net>
589 589
 
590
-	* KDirTreeMapWindow reads out configuration with KConfig
590
+	* KDirTreeMapWindow reads out configuration with TDEConfig
591 591
 	* Bug: regexps are not working correctly
592 592
 
593 593
 2001-07-13 Alexander Rawass <alexannika@users.sourceforge.net>

+ 4
- 4
kdirstat/kactivitytracker.cpp View File

@@ -22,7 +22,7 @@ KActivityTracker::KActivityTracker( TQObject *		parent,
22 22
 {
23 23
     _id		= id;
24 24
     
25
-    KConfig * config = kapp->config();
25
+    TDEConfig * config = kapp->config();
26 26
     config->setGroup( _id );
27 27
     _sum	= config->readNumEntry( "activityPoints", 0 );
28 28
     _lastSignal = config->readNumEntry( "lastSignal"	, 0 );
@@ -41,7 +41,7 @@ KActivityTracker::setThreshold( long threshold )
41 41
 {
42 42
     _threshold = threshold;
43 43
     
44
-    KConfig * config = kapp->config();
44
+    TDEConfig * config = kapp->config();
45 45
     config->setGroup( _id );
46 46
     config->writeEntry( "threshold", _threshold );
47 47
 
@@ -63,7 +63,7 @@ KActivityTracker::trackActivity( int points )
63 63
 	      << endl;
64 64
 #endif
65 65
 
66
-    KConfig * config = kapp->config();
66
+    TDEConfig * config = kapp->config();
67 67
     config->setGroup( _id );
68 68
     config->writeEntry( "activityPoints", _sum );
69 69
 
@@ -79,7 +79,7 @@ KActivityTracker::checkThreshold()
79 79
 	// kdDebug() << "Activity threshold reached for " << _id << endl;
80 80
 
81 81
 	_lastSignal = _sum;
82
-	KConfig * config = kapp->config();
82
+	TDEConfig * config = kapp->config();
83 83
 	config->setGroup( _id );
84 84
 	config->writeEntry( "lastSignal", _lastSignal );
85 85
 	

+ 2
- 2
kdirstat/kactivitytracker.h View File

@@ -35,9 +35,9 @@ class KActivityTracker: public TQObject
35 35
   
36 36
 public:
37 37
     /**
38
-     * Constructor. The ID is a name for the KConfig object to look in for
38
+     * Constructor. The ID is a name for the TDEConfig object to look in for
39 39
      * accumulated activity points so far. 'initialThreshold' is only used if
40
-     * the application's @ref KConfig object doesn't contain a corresponding
40
+     * the application's @ref TDEConfig object doesn't contain a corresponding
41 41
      * entry yet.
42 42
      **/
43 43
     KActivityTracker( TQObject * 	parent,

+ 4
- 4
kdirstat/kcleanup.cpp View File

@@ -381,8 +381,8 @@ KCleanup::runCommand ( const KFileInfo *	item,
381 381
 void
382 382
 KCleanup::readConfig()
383 383
 {
384
-    KConfig *config = kapp->config();
385
-    KConfigGroupSaver saver( config, _id );
384
+    TDEConfig *config = kapp->config();
385
+    TDEConfigGroupSaver saver( config, _id );
386 386
 
387 387
     bool valid = config->readBoolEntry( "valid", false	);
388 388
 
@@ -412,8 +412,8 @@ KCleanup::readConfig()
412 412
 void
413 413
 KCleanup::saveConfig() const
414 414
 {
415
-    KConfig *config = kapp->config();
416
-    KConfigGroupSaver saver( config, _id );
415
+    TDEConfig *config = kapp->config();
416
+    TDEConfigGroupSaver saver( config, _id );
417 417
 
418 418
     config->writeEntry( "valid",		true			);
419 419
     config->writeEntry( "command",		_command		);

+ 7
- 7
kdirstat/kdirstatapp.cpp View File

@@ -345,7 +345,7 @@ KDirStatApp::openURL( const KURL& url )
345 345
 void KDirStatApp::readMainWinConfig()
346 346
 {
347 347
 
348
-    KConfig * config = kapp->config();
348
+    TDEConfig * config = kapp->config();
349 349
     config->setGroup( "General Options" );
350 350
 
351 351
     // Status settings of the various bars and views
@@ -385,7 +385,7 @@ void KDirStatApp::readMainWinConfig()
385 385
 void
386 386
 KDirStatApp::saveMainWinConfig()
387 387
 {
388
-    KConfig * config = kapp->config();
388
+    TDEConfig * config = kapp->config();
389 389
 
390 390
     config->setGroup( "General Options" );
391 391
 
@@ -403,7 +403,7 @@ KDirStatApp::saveMainWinConfig()
403 403
 
404 404
 
405 405
 void
406
-KDirStatApp::saveProperties( KConfig *config )
406
+KDirStatApp::saveProperties( TDEConfig *config )
407 407
 {
408 408
     (void) config;
409 409
     // TODO
@@ -411,7 +411,7 @@ KDirStatApp::saveProperties( KConfig *config )
411 411
 
412 412
 
413 413
 void
414
-KDirStatApp::readProperties( KConfig *config )
414
+KDirStatApp::readProperties( TDEConfig *config )
415 415
 {
416 416
     (void) config;
417 417
     // TODO
@@ -702,7 +702,7 @@ KDirStatApp::askForFeedback()
702 702
     if ( ! doFeedbackReminder() )
703 703
 	return;
704 704
 
705
-    KConfig * config = kapp->config();
705
+    TDEConfig * config = kapp->config();
706 706
 
707 707
     switch ( KMessageBox::warningYesNoCancel( this,
708 708
 					      i18n( "Now that you know this program for some time,\n"
@@ -745,7 +745,7 @@ KDirStatApp::askForFeedback()
745 745
 void
746 746
 KDirStatApp::feedbackMailSent()
747 747
 {
748
-    KConfig * config = kapp->config();
748
+    TDEConfig * config = kapp->config();
749 749
     config->setGroup( "Feedback" );
750 750
     config->writeEntry( "mailSent", true );
751 751
     config->sync();
@@ -755,7 +755,7 @@ KDirStatApp::feedbackMailSent()
755 755
 bool
756 756
 KDirStatApp::doFeedbackReminder()
757 757
 {
758
-    KConfig * config = kapp->config();
758
+    TDEConfig * config = kapp->config();
759 759
     config->setGroup( "Feedback" );
760 760
 
761 761
     bool mailSent	= config->readBoolEntry( "mailSent", false );

+ 3
- 3
kdirstat/kdirstatapp.h View File

@@ -61,7 +61,7 @@ using namespace KDirStat;
61 61
   *
62 62
   * @see KMainWindow
63 63
   * @see TDEApplication
64
-  * @see KConfig
64
+  * @see TDEConfig
65 65
   *
66 66
   * @author Source Framework Automatically Generated by KDevelop,
67 67
   *	    (c) The KDevelop Team.
@@ -345,7 +345,7 @@ protected:
345 345
      *
346 346
      * @see KTMainWindow#saveProperties
347 347
      **/
348
-    virtual void saveProperties( KConfig * config );
348
+    virtual void saveProperties( TDEConfig * config );
349 349
 
350 350
     /**
351 351
      * Reads session config file and restore application state including the
@@ -354,7 +354,7 @@ protected:
354 354
      *
355 355
      * @see KTMainWindow#readProperties
356 356
      **/
357
-    virtual void readProperties( KConfig * config );
357
+    virtual void readProperties( TDEConfig * config );
358 358
 
359 359
 
360 360
     /**

+ 5
- 5
kdirstat/kdirstatsettings.cpp View File

@@ -740,7 +740,7 @@ KGeneralSettingsPage::~KGeneralSettingsPage()
740 740
 void
741 741
 KGeneralSettingsPage::apply()
742 742
 {
743
-    KConfig * config = kapp->config();
743
+    TDEConfig * config = kapp->config();
744 744
 
745 745
     config->setGroup( "Directory Reading" );
746 746
     config->writeEntry( "CrossFileSystems",	_crossFileSystems->isChecked()		);
@@ -769,7 +769,7 @@ KGeneralSettingsPage::revertToDefaults()
769 769
 void
770 770
 KGeneralSettingsPage::setup()
771 771
 {
772
-    KConfig * config = kapp->config();
772
+    TDEConfig * config = kapp->config();
773 773
     config->setGroup( "Directory Reading" );
774 774
 
775 775
     _crossFileSystems->setChecked	( config->readBoolEntry( "CrossFileSystems"	, false) );
@@ -932,7 +932,7 @@ KTreemapPage::~KTreemapPage()
932 932
 void
933 933
 KTreemapPage::apply()
934 934
 {
935
-    KConfig * config = kapp->config();
935
+    TDEConfig * config = kapp->config();
936 936
 
937 937
     config->setGroup( "Treemaps" );
938 938
 
@@ -982,7 +982,7 @@ KTreemapPage::revertToDefaults()
982 982
 void
983 983
 KTreemapPage::setup()
984 984
 {
985
-    KConfig * config = kapp->config();
985
+    TDEConfig * config = kapp->config();
986 986
     config->setGroup( "Treemaps" );
987 987
 
988 988
     _squarify->setChecked		( config->readBoolEntry( "Squarify"		, true	) );
@@ -1024,7 +1024,7 @@ KTreemapPage::checkEnabledState()
1024 1024
 
1025 1025
 
1026 1026
 TQColor
1027
-KTreemapPage::readColorEntry( KConfig * config, const char * entryName, TQColor defaultColor )
1027
+KTreemapPage::readColorEntry( TDEConfig * config, const char * entryName, TQColor defaultColor )
1028 1028
 {
1029 1029
     return config->readColorEntry( entryName, &defaultColor );
1030 1030
 }

+ 1
- 1
kdirstat/kdirstatsettings.h View File

@@ -699,7 +699,7 @@ namespace KDirStat
699 699
 	/**
700 700
 	 * Convenience method to read a color from 'config'.
701 701
 	 **/
702
-	TQColor readColorEntry( KConfig * 	config,
702
+	TQColor readColorEntry( TDEConfig * 	config,
703 703
 			       const char * 	entryName,
704 704
 			       TQColor 		defaultColor );
705 705
 

+ 17
- 17
kdirstat/kdirtree.cpp View File

@@ -140,7 +140,7 @@ KFileInfo::KFileInfo(  const KFileItem	* fileItem,
140 140
 	_isSparseFile = false;
141 141
     }
142 142
 
143
-    _mtime	 = fileItem->time( KIO::UDS_MODIFICATION_TIME );
143
+    _mtime	 = fileItem->time( TDEIO::UDS_MODIFICATION_TIME );
144 144
 }
145 145
 
146 146
 
@@ -1010,23 +1010,23 @@ KAnyDirReadJob::startReading()
1010 1010
 	kdWarning() << k_funcinfo << "URL malformed: " << _dir->url() << endl;
1011 1011
     }
1012 1012
 
1013
-    _job = KIO::listDir( url,
1013
+    _job = TDEIO::listDir( url,
1014 1014
 			 false );	// showProgressInfo
1015 1015
 
1016
-    connect( _job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
1017
-             this, TQT_SLOT  ( entries( KIO::Job *, const KIO::UDSEntryList& ) ) );
1016
+    connect( _job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
1017
+             this, TQT_SLOT  ( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
1018 1018
 
1019
-    connect( _job, TQT_SIGNAL( result  ( KIO::Job * ) ),
1020
-	     this, TQT_SLOT  ( finished( KIO::Job * ) ) );
1019
+    connect( _job, TQT_SIGNAL( result  ( TDEIO::Job * ) ),
1020
+	     this, TQT_SLOT  ( finished( TDEIO::Job * ) ) );
1021 1021
 
1022
-    connect( _job, TQT_SIGNAL( canceled( KIO::Job * ) ),
1023
-	     this, TQT_SLOT  ( finished( KIO::Job * ) ) );
1022
+    connect( _job, TQT_SIGNAL( canceled( TDEIO::Job * ) ),
1023
+	     this, TQT_SLOT  ( finished( TDEIO::Job * ) ) );
1024 1024
 }
1025 1025
 
1026 1026
 
1027 1027
 void
1028
-KAnyDirReadJob::entries ( KIO::Job *			job,
1029
-			  const KIO::UDSEntryList &	entryList )
1028
+KAnyDirReadJob::entries ( TDEIO::Job *			job,
1029
+			  const TDEIO::UDSEntryList &	entryList )
1030 1030
 {
1031 1031
     NOT_USED( job );
1032 1032
     KURL url( _dir->url() );	// Cache this - it's expensive!
@@ -1036,7 +1036,7 @@ KAnyDirReadJob::entries ( KIO::Job *			job,
1036 1036
 	kdWarning() << k_funcinfo << "URL malformed: " << _dir->url() << endl;
1037 1037
     }
1038 1038
 
1039
-    KIO::UDSEntryListConstIterator it = entryList.begin();
1039
+    TDEIO::UDSEntryListConstIterator it = entryList.begin();
1040 1040
 
1041 1041
     while ( it != entryList.end() )
1042 1042
     {
@@ -1076,7 +1076,7 @@ KAnyDirReadJob::entries ( KIO::Job *			job,
1076 1076
 
1077 1077
 
1078 1078
 void
1079
-KAnyDirReadJob::finished( KIO::Job * job )
1079
+KAnyDirReadJob::finished( TDEIO::Job * job )
1080 1080
 {
1081 1081
     if ( job->error() )
1082 1082
 	_dir->setReadState( KDirError );
@@ -1099,9 +1099,9 @@ KAnyDirReadJob::stat( const KURL & 	url,
1099 1099
 		      KDirTree  * 	tree,
1100 1100
 		      KDirInfo * 	parent )
1101 1101
 {
1102
-    KIO::UDSEntry uds_entry;
1102
+    TDEIO::UDSEntry uds_entry;
1103 1103
 
1104
-    if ( KIO::NetAccess::stat( url, uds_entry, tqApp->mainWidget() ) )	// remote stat() OK?
1104
+    if ( TDEIO::NetAccess::stat( url, uds_entry, tqApp->mainWidget() ) )	// remote stat() OK?
1105 1105
     {
1106 1106
 	KFileItem entry( uds_entry, url,
1107 1107
 			 true,		// determine MIME type on demand
@@ -1128,9 +1128,9 @@ KAnyDirReadJob::stat( const KURL & 	url,
1128 1128
 TQString
1129 1129
 KAnyDirReadJob::owner( KURL url )
1130 1130
 {
1131
-    KIO::UDSEntry uds_entry;
1131
+    TDEIO::UDSEntry uds_entry;
1132 1132
 
1133
-    if ( KIO::NetAccess::stat( url, uds_entry, tqApp->mainWidget() ) )	// remote stat() OK?
1133
+    if ( TDEIO::NetAccess::stat( url, uds_entry, tqApp->mainWidget() ) )	// remote stat() OK?
1134 1134
     {
1135 1135
 	KFileItem entry( uds_entry, url,
1136 1136
 			 true,		// determine MIME type on demand
@@ -1181,7 +1181,7 @@ KDirTree::~KDirTree()
1181 1181
 void
1182 1182
 KDirTree::readConfig()
1183 1183
 {
1184
-    KConfig * config = kapp->config();
1184
+    TDEConfig * config = kapp->config();
1185 1185
     config->setGroup( "Directory Reading" );
1186 1186
 
1187 1187
     _crossFileSystems		= config->readBoolEntry( "CrossFileSystems",     false );

+ 8
- 8
kdirstat/kdirtree.h View File

@@ -81,7 +81,7 @@ namespace KDirStat
81 81
      *
82 82
      * Information about one single directory entry. This is the type of info
83 83
      * typically obtained by stat() / lstat() or similar calls.  Most of this
84
-     * can also be obtained by @ref KIO::KDirListJob, but not all: The device
84
+     * can also be obtained by @ref TDEIO::KDirListJob, but not all: The device
85 85
      * this file resides on is something none of KIO's many classes will tell
86 86
      * (since of course this only makes sense for local files) - yet this had
87 87
      * been _the_ single most requested feature of KDirStat <1.0: Stay on one
@@ -118,7 +118,7 @@ namespace KDirStat
118 118
 		   KDirInfo    *	parent = 0 );
119 119
 
120 120
 	/**
121
-	 * Constructor from a KFileItem, i.e. from a @ref KIO::StatJob
121
+	 * Constructor from a KFileItem, i.e. from a @ref TDEIO::StatJob
122 122
 	 **/
123 123
 	KFileInfo( const KFileItem *	fileItem,
124 124
 		   KDirTree  *		tree,
@@ -610,7 +610,7 @@ namespace KDirStat
610 610
 		  KDirInfo	* parent	= 0 );
611 611
 
612 612
 	/**
613
-	 * Constructor from a KFileItem, i.e. from a @ref KIO::StatJob
613
+	 * Constructor from a KFileItem, i.e. from a @ref TDEIO::StatJob
614 614
 	 **/
615 615
 	KDirInfo( const KFileItem	* fileItem,
616 616
 		  KDirTree		* tree,
@@ -1073,17 +1073,17 @@ namespace KDirStat
1073 1073
 	/**
1074 1074
 	 * Receive directory entries from a KIO job.
1075 1075
 	 **/
1076
-        void entries( KIO::Job *		job,
1077
-		      const KIO::UDSEntryList &	entryList );
1076
+        void entries( TDEIO::Job *		job,
1077
+		      const TDEIO::UDSEntryList &	entryList );
1078 1078
 
1079 1079
 	/**
1080 1080
 	 * KIO job is finished.
1081 1081
 	 **/
1082
-	void finished( KIO::Job * job );
1082
+	void finished( TDEIO::Job * job );
1083 1083
 
1084 1084
     protected:
1085 1085
 
1086
-	KIO::ListJob *	_job;
1086
+	TDEIO::ListJob *	_job;
1087 1087
     };
1088 1088
 
1089 1089
 
@@ -1366,7 +1366,7 @@ namespace KDirStat
1366 1366
         void timeSlicedRead();
1367 1367
 
1368 1368
 	/**
1369
-	 * Read some parameters from the global @ref KConfig object.
1369
+	 * Read some parameters from the global @ref TDEConfig object.
1370 1370
 	 **/
1371 1371
 	void readConfig();
1372 1372
 

+ 4
- 4
kdirstat/kdirtreeview.cpp View File

@@ -852,8 +852,8 @@ KDirTreeView::popupContextInfo( const TQPoint &	pos,
852 852
 void
853 853
 KDirTreeView::readConfig()
854 854
 {
855
-    KConfig *config = kapp->config();
856
-    KConfigGroupSaver saver( config, "Tree Colors" );
855
+    TDEConfig *config = kapp->config();
856
+    TDEConfigGroupSaver saver( config, "Tree Colors" );
857 857
     _usedFillColors = config->readNumEntry( "usedFillColors", -1 );
858 858
 
859 859
     if ( _usedFillColors < 0 )
@@ -887,8 +887,8 @@ KDirTreeView::readConfig()
887 887
 void
888 888
 KDirTreeView::saveConfig() const
889 889
 {
890
-    KConfig *config = kapp->config();
891
-    KConfigGroupSaver saver( config, "Tree Colors" );
890
+    TDEConfig *config = kapp->config();
891
+    TDEConfigGroupSaver saver( config, "Tree Colors" );
892 892
 
893 893
     config->writeEntry( "usedFillColors", _usedFillColors );
894 894
 

+ 2
- 2
kdirstat/ktreemapview.cpp View File

@@ -115,7 +115,7 @@ KTreemapView::deleteAllItems( TQCanvas * canvas )
115 115
 void
116 116
 KTreemapView::readConfig()
117 117
 {
118
-    KConfig * config = kapp->config();
118
+    TDEConfig * config = kapp->config();
119 119
     config->setGroup( "Treemaps" );
120 120
 
121 121
     _ambientLight	= config->readNumEntry( "AmbientLight"		,  DefaultAmbientLight );
@@ -148,7 +148,7 @@ KTreemapView::readConfig()
148 148
 
149 149
 
150 150
 TQColor
151
-KTreemapView::readColorEntry( KConfig * config, const char * entryName, TQColor defaultColor )
151
+KTreemapView::readColorEntry( TDEConfig * config, const char * entryName, TQColor defaultColor )
152 152
 {
153 153
     return config->readColorEntry( entryName, &defaultColor );
154 154
 }

+ 3
- 3
kdirstat/ktreemapview.h View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 
34 34
 class TQMouseEvent;
35
-class KConfig;
35
+class TDEConfig;
36 36
 
37 37
 namespace KDirStat
38 38
 {
@@ -168,7 +168,7 @@ namespace KDirStat
168 168
 	void deleteNotify( KFileInfo * node );
169 169
 
170 170
 	/**
171
-	 * Read some parameters from the global @ref KConfig object.
171
+	 * Read some parameters from the global @ref TDEConfig object.
172 172
 	 **/
173 173
 	void readConfig();
174 174
 
@@ -373,7 +373,7 @@ namespace KDirStat
373 373
 	/**
374 374
 	 * Convenience method to read a color from 'config'.
375 375
 	 **/
376
-	TQColor readColorEntry( KConfig * 	config,
376
+	TQColor readColorEntry( TDEConfig * 	config,
377 377
 			       const char * 	entryName,
378 378
 			       TQColor 		defaultColor );
379 379
 

Loading…
Cancel
Save