Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
86d8364ac7
100 changed files with 347 additions and 347 deletions
  1. 12
    12
      akregator/src/akregator_part.cpp
  2. 4
    4
      akregator/src/akregator_part.h
  3. 3
    3
      akregator/src/akregator_view.cpp
  4. 5
    5
      akregator/src/akregator_view.h
  5. 16
    16
      akregator/src/articlefilter.cpp
  6. 21
    21
      akregator/src/articlefilter.h
  7. 2
    2
      akregator/src/articleviewer.cpp
  8. 3
    3
      akregator/src/configdialog.cpp
  9. 3
    3
      akregator/src/configdialog.h
  10. 1
    1
      akregator/src/frame.cpp
  11. 7
    7
      akregator/src/librss/image.cpp
  12. 3
    3
      akregator/src/librss/image.h
  13. 11
    11
      akregator/src/librss/loader.cpp
  14. 4
    4
      akregator/src/librss/loader.h
  15. 2
    2
      akregator/src/mainwindow.cpp
  16. 3
    3
      akregator/src/mainwindow.h
  17. 2
    2
      akregator/src/pageviewer.cpp
  18. 1
    1
      akregator/src/pageviewer.h
  19. 3
    3
      akregator/src/viewer.cpp
  20. 2
    2
      akregator/src/viewer.h
  21. 7
    7
      certmanager/certificatewizardimpl.cpp
  22. 2
    2
      certmanager/certificatewizardimpl.h
  23. 17
    17
      certmanager/certmanager.cpp
  24. 4
    4
      certmanager/certmanager.h
  25. 3
    3
      certmanager/conf/appearanceconfigpage.cpp
  26. 1
    1
      certmanager/conf/appearanceconfigpage.h
  27. 6
    6
      certmanager/conf/appearanceconfigwidget.cpp
  28. 1
    1
      certmanager/conf/appearanceconfigwidget.h
  29. 2
    2
      certmanager/conf/configuredialog.cpp
  30. 4
    4
      certmanager/conf/dirservconfigpage.cpp
  31. 1
    1
      certmanager/conf/dirservconfigpage.h
  32. 3
    3
      certmanager/conf/dnorderconfigpage.cpp
  33. 1
    1
      certmanager/conf/dnorderconfigpage.h
  34. 1
    1
      certmanager/conf/kleopatra_config_appear.desktop
  35. 1
    1
      certmanager/conf/kleopatra_config_dirserv.desktop
  36. 1
    1
      certmanager/conf/kleopatra_config_dnorder.desktop
  37. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  38. 3
    3
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  39. 7
    7
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  40. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  41. 1
    1
      certmanager/lib/cryptplugwrapper.h
  42. 4
    4
      certmanager/lib/kleo/cryptobackendfactory.cpp
  43. 3
    3
      certmanager/lib/kleo/cryptobackendfactory.h
  44. 2
    2
      certmanager/lib/kleo/dn.cpp
  45. 4
    4
      certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
  46. 4
    4
      certmanager/lib/kleo/kconfigbasedkeyfilter.h
  47. 3
    3
      certmanager/lib/kleo/keyfiltermanager.cpp
  48. 1
    1
      certmanager/lib/ui/cryptoconfigmodule.h
  49. 2
    2
      certmanager/lib/ui/keyselectiondialog.cpp
  50. 10
    10
      certmanager/storedtransferjob.cpp
  51. 6
    6
      certmanager/storedtransferjob.h
  52. 1
    1
      kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
  53. 7
    7
      kaddressbook/addresseeconfig.cpp
  54. 2
    2
      kaddressbook/addresseeeditordialog.cpp
  55. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  56. 9
    9
      kaddressbook/common/filter.cpp
  57. 4
    4
      kaddressbook/common/filter.h
  58. 1
    1
      kaddressbook/common/kabprefs.cpp
  59. 1
    1
      kaddressbook/common/kabprefs.h
  60. 2
    2
      kaddressbook/imagewidget.cpp
  61. 2
    2
      kaddressbook/interfaces/configurewidget.cpp
  62. 2
    2
      kaddressbook/interfaces/configurewidget.h
  63. 3
    3
      kaddressbook/interfaces/core.h
  64. 1
    1
      kaddressbook/kabcore.cpp
  65. 3
    3
      kaddressbook/kabcore.h
  66. 2
    2
      kaddressbook/kaddressbookmain.cpp
  67. 3
    3
      kaddressbook/kaddressbookmain.h
  68. 2
    2
      kaddressbook/kaddressbookview.cpp
  69. 5
    5
      kaddressbook/kaddressbookview.h
  70. 4
    4
      kaddressbook/kcmconfigs/addresseewidget.cpp
  71. 1
    1
      kaddressbook/kcmconfigs/extensionconfigdialog.cpp
  72. 2
    2
      kaddressbook/kcmconfigs/extensionconfigdialog.h
  73. 1
    1
      kaddressbook/kcmconfigs/kabconfig.desktop
  74. 2
    2
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  75. 1
    1
      kaddressbook/kcmconfigs/kabcustomfields.desktop
  76. 1
    1
      kaddressbook/kcmconfigs/kabldapconfig.desktop
  77. 2
    2
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  78. 1
    1
      kaddressbook/kcmconfigs/kcmkabconfig.h
  79. 1
    1
      kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
  80. 2
    2
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  81. 1
    1
      kaddressbook/kcmconfigs/kcmkabldapconfig.h
  82. 4
    4
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  83. 3
    3
      kaddressbook/keywidget.cpp
  84. 4
    4
      kaddressbook/ldapsearchdialog.cpp
  85. 1
    1
      kaddressbook/nameeditdialog.cpp
  86. 2
    2
      kaddressbook/printing/detailledstyle.cpp
  87. 2
    2
      kaddressbook/soundwidget.cpp
  88. 2
    2
      kaddressbook/viewconfigurefieldspage.cpp
  89. 2
    2
      kaddressbook/viewconfigurefieldspage.h
  90. 2
    2
      kaddressbook/viewconfigurefilterpage.cpp
  91. 3
    3
      kaddressbook/viewconfigurefilterpage.h
  92. 4
    4
      kaddressbook/viewconfigurewidget.cpp
  93. 4
    4
      kaddressbook/viewconfigurewidget.h
  94. 8
    8
      kaddressbook/viewmanager.cpp
  95. 4
    4
      kaddressbook/views/configurecardviewdialog.cpp
  96. 5
    5
      kaddressbook/views/configurecardviewdialog.h
  97. 4
    4
      kaddressbook/views/configuretableviewdialog.cpp
  98. 5
    5
      kaddressbook/views/configuretableviewdialog.h
  99. 2
    2
      kaddressbook/views/kaddressbookcardview.cpp
  100. 0
    0
      kaddressbook/views/kaddressbookcardview.h

+ 12
- 12
akregator/src/akregator_part.cpp View File

@@ -197,7 +197,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
197 197
     connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
198 198
     connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
199 199
     connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
200
-    connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
200
+    connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*)));
201 201
     connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));
202 202
 
203 203
     // notify the part that this is our internal widget
@@ -308,7 +308,7 @@ Part::~Part()
308 308
     delete m_applyFiltersInterceptor;
309 309
 }
310 310
 
311
-void Part::readProperties(KConfig* config)
311
+void Part::readProperties(TDEConfig* config)
312 312
 {
313 313
     m_backedUpList = false;
314 314
     openStandardFeedList();
@@ -317,7 +317,7 @@ void Part::readProperties(KConfig* config)
317 317
         m_view->readProperties(config);
318 318
 }
319 319
 
320
-void Part::saveProperties(KConfig* config)
320
+void Part::saveProperties(TDEConfig* config)
321 321
 {
322 322
     if (m_view)
323 323
     {
@@ -619,9 +619,9 @@ void Part::importFile(const KURL& url)
619 619
     {
620 620
         isRemote = true;
621 621
 
622
-        if (!KIO::NetAccess::download(url, filename, m_view) )
622
+        if (!TDEIO::NetAccess::download(url, filename, m_view) )
623 623
         {
624
-            KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
624
+            KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
625 625
             return;
626 626
         }
627 627
     }
@@ -640,7 +640,7 @@ void Part::importFile(const KURL& url)
640 640
         KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
641 641
 
642 642
     if (isRemote)
643
-        KIO::NetAccess::removeTempFile(filename);
643
+        TDEIO::NetAccess::removeTempFile(filename);
644 644
 }
645 645
 
646 646
 void Part::exportFile(const KURL& url)
@@ -680,8 +680,8 @@ void Part::exportFile(const KURL& url)
680 680
         stream << m_view->feedListToOPML().toString() << "\n";
681 681
         tmpfile.close();
682 682
 
683
-        if (!KIO::NetAccess::upload(tmpfile.name(), url, m_view))
684
-            KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
683
+        if (!TDEIO::NetAccess::upload(tmpfile.name(), url, m_view))
684
+            KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
685 685
     }
686 686
 }
687 687
 
@@ -780,10 +780,10 @@ void Part::showKNotifyOptions()
780 780
 
781 781
 void Part::showOptions()
782 782
 {
783
-    if ( KConfigDialog::showDialog( "settings" ) )
783
+    if ( TDEConfigDialog::showDialog( "settings" ) )
784 784
         return;
785 785
 
786
-    KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
786
+    TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
787 787
 
788 788
     connect( dialog, TQT_SIGNAL(settingsChanged()),
789 789
              this, TQT_SLOT(slotSettingsChanged()) );
@@ -848,10 +848,10 @@ void Part::initFonts()
848 848
     if (Settings::serifFont().isEmpty())
849 849
         Settings::setSerifFont(fonts[3]);
850 850
 
851
-    KConfig* conf = Settings::self()->config();
851
+    TDEConfig* conf = Settings::self()->config();
852 852
     conf->setGroup("HTML Settings");
853 853
 
854
-    KConfig konq("konquerorrc", true, false);
854
+    TDEConfig konq("konquerorrc", true, false);
855 855
     konq.setGroup("HTML Settings");
856 856
 
857 857
     if (!conf->hasKey("MinimumFontSize"))

+ 4
- 4
akregator/src/akregator_part.h View File

@@ -38,7 +38,7 @@ class TQDomDocument;
38 38
 class TQTimer;
39 39
 
40 40
 class TDEAboutData;
41
-class KConfig;
41
+class TDEConfig;
42 42
 class KURL;
43 43
 
44 44
 namespace Akregator
@@ -117,17 +117,17 @@ namespace Akregator
117 117
             virtual void addFeed();
118 118
 
119 119
             /**
120
-             This method is called when this app is restored.  The KConfig
120
+             This method is called when this app is restored.  The TDEConfig
121 121
              object points to the session management config file that was saved
122 122
              with @ref saveProperties
123 123
              Calls AkregatorView's saveProperties.
124 124
              */
125
-            virtual void readProperties(KConfig* config);
125
+            virtual void readProperties(TDEConfig* config);
126 126
 
127 127
             /** This method is called when it is time for the app to save its
128 128
              properties for session management purposes.
129 129
              Calls AkregatorView's readProperties. */
130
-            virtual void saveProperties(KConfig* config);
130
+            virtual void saveProperties(TDEConfig* config);
131 131
 
132 132
             /** merges a nested part's GUI into the gui of this part
133 133
             @return true iff merging was successful, i.e. the GUI factory was not NULL */

+ 3
- 3
akregator/src/akregator_view.cpp View File

@@ -328,7 +328,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
328 328
     if ( sp2sizes.count() >= m_articleSplitter->sizes().count() )
329 329
         m_articleSplitter->setSizes( sp2sizes );
330 330
 
331
-    KConfig *conf = Settings::self()->config();
331
+    TDEConfig *conf = Settings::self()->config();
332 332
     conf->setGroup("General");
333 333
     if(!conf->readBoolEntry("Disable Introduction", false))
334 334
     {
@@ -1445,7 +1445,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
1445 1445
     }
1446 1446
 }
1447 1447
 
1448
-void View::readProperties(KConfig* config)
1448
+void View::readProperties(TDEConfig* config)
1449 1449
 {
1450 1450
 
1451 1451
     if (!Settings::resetQuickFilterOnNodeChange())
@@ -1474,7 +1474,7 @@ void View::readProperties(KConfig* config)
1474 1474
     }
1475 1475
 }
1476 1476
 
1477
-void View::saveProperties(KConfig* config)
1477
+void View::saveProperties(TDEConfig* config)
1478 1478
 {
1479 1479
     // save filter settings
1480 1480
     config->writeEntry("searchLine", m_searchBar->text());

+ 5
- 5
akregator/src/akregator_view.h View File

@@ -42,7 +42,7 @@ class TQHBox;
42 42
 class TQToolButton;
43 43
 class TQListViewItem;
44 44
 class KComboBox;
45
-class KConfig;
45
+class TDEConfig;
46 46
 class KFileItem;
47 47
 class KLineEdit;
48 48
 class KListView;
@@ -50,7 +50,7 @@ class KListViewItem;
50 50
 class KTabWidget;
51 51
 class Viewer;
52 52
 
53
-namespace KIO {
53
+namespace TDEIO {
54 54
 
55 55
     class Job;
56 56
 }
@@ -124,8 +124,8 @@ namespace Akregator {
124 124
             void addFeedToGroup(const TQString& url, const TQString& group);
125 125
 
126 126
             /** session management **/
127
-            virtual void readProperties(KConfig* config);
128
-            virtual void saveProperties(KConfig* config);
127
+            virtual void readProperties(TDEConfig* config);
128
+            virtual void saveProperties(TDEConfig* config);
129 129
 
130 130
 	         Frame* currentFrame() const { return m_currentFrame; }
131 131
 
@@ -136,7 +136,7 @@ namespace Akregator {
136 136
             void setWindowCaption(const TQString&);
137 137
             void setStatusBarText(const TQString&);
138 138
             void setProgress(int);
139
-            void signalStarted(KIO::Job*);
139
+            void signalStarted(TDEIO::Job*);
140 140
             void signalCompleted();
141 141
             void signalCanceled(const TQString&);
142 142
 

+ 16
- 16
akregator/src/articlefilter.cpp View File

@@ -122,7 +122,7 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
122 122
 
123 123
 }
124 124
 
125
-void Criterion::writeConfig(KConfig* config) const
125
+void Criterion::writeConfig(TDEConfig* config) const
126 126
 {
127 127
     config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
128 128
 
@@ -133,7 +133,7 @@ void Criterion::writeConfig(KConfig* config) const
133 133
     config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
134 134
 }
135 135
 
136
-void Criterion::readConfig(KConfig* config)
136
+void Criterion::readConfig(TDEConfig* config)
137 137
 {
138 138
     m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
139 139
     m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
@@ -267,7 +267,7 @@ bool ArticleMatcher::matches( const Article &a ) const
267 267
     return true;
268 268
 }
269 269
 
270
-void ArticleMatcher::writeConfig(KConfig* config) const
270
+void ArticleMatcher::writeConfig(TDEConfig* config) const
271 271
 {
272 272
     config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
273 273
     
@@ -283,7 +283,7 @@ void ArticleMatcher::writeConfig(KConfig* config) const
283 283
     }
284 284
 }
285 285
 
286
-void ArticleMatcher::readConfig(KConfig* config)
286
+void ArticleMatcher::readConfig(TDEConfig* config)
287 287
 {
288 288
     m_criteria.clear();
289 289
     m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
@@ -406,13 +406,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
406 406
     *this = other;
407 407
 }
408 408
 
409
-void TagMatcher::writeConfig(KConfig* config) const
409
+void TagMatcher::writeConfig(TDEConfig* config) const
410 410
 {
411 411
     config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
412 412
     config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
413 413
 }
414 414
 
415
-void TagMatcher::readConfig(KConfig* config)
415
+void TagMatcher::readConfig(TDEConfig* config)
416 416
 {
417 417
     d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
418 418
 }
@@ -462,13 +462,13 @@ void SetStatusAction::setStatus(int status)
462 462
     m_status = status;
463 463
 }
464 464
 
465
-void SetStatusAction::writeConfig(KConfig* config) const
465
+void SetStatusAction::writeConfig(TDEConfig* config) const
466 466
 {
467 467
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
468 468
     config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
469 469
 }
470 470
 
471
-void SetStatusAction::readConfig(KConfig* config)
471
+void SetStatusAction::readConfig(TDEConfig* config)
472 472
 {
473 473
     m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
474 474
 }
@@ -579,7 +579,7 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
579 579
     return *(d->matcher) == *(other.d->matcher) && *(d->action) == *(other.d->action) && d->name == other.d->name;
580 580
 }
581 581
 
582
-void ArticleFilterList::writeConfig(KConfig* config) const
582
+void ArticleFilterList::writeConfig(TDEConfig* config) const
583 583
 {
584 584
     config->setGroup(TQString::fromLatin1("Filters"));
585 585
     config->writeEntry(TQString::fromLatin1("count"), count());
@@ -592,7 +592,7 @@ void ArticleFilterList::writeConfig(KConfig* config) const
592 592
     }
593 593
 }
594 594
 
595
-void ArticleFilterList::readConfig(KConfig* config)
595
+void ArticleFilterList::readConfig(TDEConfig* config)
596 596
 {
597 597
     clear();
598 598
     config->setGroup(TQString::fromLatin1("Filters"));
@@ -607,12 +607,12 @@ void ArticleFilterList::readConfig(KConfig* config)
607 607
 }
608 608
 
609 609
 
610
-void AssignTagAction::readConfig(KConfig* config)
610
+void AssignTagAction::readConfig(TDEConfig* config)
611 611
 {
612 612
     m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
613 613
 }
614 614
 
615
-void AssignTagAction::writeConfig(KConfig* config) const
615
+void AssignTagAction::writeConfig(TDEConfig* config) const
616 616
 {
617 617
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
618 618
     config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
@@ -638,11 +638,11 @@ void AssignTagAction::setTagID(const TQString& tagID)
638 638
     m_tagID = tagID;
639 639
 }
640 640
 
641
-void DeleteAction::readConfig(KConfig* /*config*/)
641
+void DeleteAction::readConfig(TDEConfig* /*config*/)
642 642
 {
643 643
 }
644 644
 
645
-void DeleteAction::writeConfig(KConfig* config) const
645
+void DeleteAction::writeConfig(TDEConfig* config) const
646 646
 {
647 647
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
648 648
 }
@@ -654,7 +654,7 @@ bool DeleteAction::operator==(const AbstractAction& other)
654 654
     return o != 0;
655 655
 }
656 656
 
657
-void ArticleFilter::readConfig(KConfig* config)
657
+void ArticleFilter::readConfig(TDEConfig* config)
658 658
 {
659 659
     delete d->matcher;
660 660
     d->matcher = 0;
@@ -688,7 +688,7 @@ void ArticleFilter::readConfig(KConfig* config)
688 688
         d->action->readConfig(config);
689 689
 }
690 690
 
691
-void ArticleFilter::writeConfig(KConfig* config) const
691
+void ArticleFilter::writeConfig(TDEConfig* config) const
692 692
 {
693 693
     config->writeEntry(TQString::fromLatin1("name"), d->name);
694 694
     config->writeEntry(TQString::fromLatin1("id"), d->id);

+ 21
- 21
akregator/src/articlefilter.h View File

@@ -32,7 +32,7 @@
32 32
 #include <tqvaluelist.h>
33 33
 #include <tqvariant.h>
34 34
 
35
-class KConfig;
35
+class TDEConfig;
36 36
 
37 37
 namespace Akregator {
38 38
 
@@ -77,8 +77,8 @@ class ArticleFilter
77 77
         ArticleFilter& operator=(const ArticleFilter& other);
78 78
         bool operator==(const ArticleFilter& other) const;
79 79
 
80
-        void writeConfig(KConfig* config) const;
81
-        void readConfig(KConfig* config);
80
+        void writeConfig(TDEConfig* config) const;
81
+        void readConfig(TDEConfig* config);
82 82
 
83 83
     private:
84 84
         class ArticleFilterPrivate;
@@ -90,8 +90,8 @@ class ArticleFilterList : public TQValueList<ArticleFilter>
90 90
 {
91 91
 public:
92 92
     
93
-    void writeConfig(KConfig* config) const;
94
-    void readConfig(KConfig* config);
93
+    void writeConfig(TDEConfig* config) const;
94
+    void readConfig(TDEConfig* config);
95 95
 };
96 96
 
97 97
 /** Abstract base class for matchers, a matcher just takes an article and checks whether the article matches some criterion or not. 
@@ -107,8 +107,8 @@ class AbstractMatcher
107 107
 
108 108
         virtual bool matches(const Article& article) const = 0;
109 109
 
110
-        virtual void writeConfig(KConfig* config) const = 0;
111
-        virtual void readConfig(KConfig* config) = 0;
110
+        virtual void writeConfig(TDEConfig* config) const = 0;
111
+        virtual void readConfig(TDEConfig* config) = 0;
112 112
 
113 113
         virtual bool operator==(const AbstractMatcher&) const = 0;
114 114
         virtual bool operator!=(const AbstractMatcher &other) const = 0;
@@ -129,8 +129,8 @@ class TagMatcher : public AbstractMatcher
129 129
 
130 130
         virtual TagMatcher* clone() const;
131 131
 
132
-        virtual void writeConfig(KConfig* config) const;
133
-        virtual void readConfig(KConfig* config);
132
+        virtual void writeConfig(TDEConfig* config) const;
133
+        virtual void readConfig(TDEConfig* config);
134 134
 
135 135
         TagMatcher& operator=(const TagMatcher& other);
136 136
         virtual bool operator==(const AbstractMatcher&) const;
@@ -147,8 +147,8 @@ class AbstractAction
147 147
     public:
148 148
         virtual void exec(Article& article) = 0;
149 149
 
150
-        virtual void writeConfig(KConfig* config) const = 0;
151
-        virtual void readConfig(KConfig* config) = 0;
150
+        virtual void writeConfig(TDEConfig* config) const = 0;
151
+        virtual void readConfig(TDEConfig* config) = 0;
152 152
 
153 153
         virtual AbstractAction* clone() const = 0;
154 154
         virtual bool operator==(const AbstractAction& other) = 0;
@@ -159,8 +159,8 @@ class DeleteAction : public AbstractAction
159 159
     public:
160 160
         virtual void exec(Article& article);
161 161
         
162
-        virtual void writeConfig(KConfig* config) const;
163
-        virtual void readConfig(KConfig* config);
162
+        virtual void writeConfig(TDEConfig* config) const;
163
+        virtual void readConfig(TDEConfig* config);
164 164
 
165 165
         virtual DeleteAction* clone() const { return new DeleteAction; }
166 166
         virtual bool operator==(const AbstractAction& other);
@@ -176,8 +176,8 @@ class SetStatusAction : public AbstractAction
176 176
         int status() const;
177 177
         void setStatus(int status);
178 178
 
179
-        virtual void writeConfig(KConfig* config) const;
180
-        virtual void readConfig(KConfig* config);
179
+        virtual void writeConfig(TDEConfig* config) const;
180
+        virtual void readConfig(TDEConfig* config);
181 181
 
182 182
         virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
183 183
         virtual bool operator==(const AbstractAction& other);
@@ -196,8 +196,8 @@ class AssignTagAction : public AbstractAction
196 196
         const TQString& tagID() const;
197 197
         void setTagID(const TQString& tagID);
198 198
 
199
-        virtual void writeConfig(KConfig* config) const;
200
-        virtual void readConfig(KConfig* config);
199
+        virtual void writeConfig(TDEConfig* config) const;
200
+        virtual void readConfig(TDEConfig* config);
201 201
 
202 202
         virtual AssignTagAction* clone() const { return new AssignTagAction(*this); }
203 203
         virtual bool operator==(const AbstractAction& other);
@@ -236,8 +236,8 @@ class ArticleMatcher : public AbstractMatcher
236 236
         virtual bool operator!=(const AbstractMatcher &other) const;
237 237
         
238 238
         
239
-        virtual void writeConfig(KConfig* config) const;
240
-        virtual void readConfig(KConfig* config);
239
+        virtual void writeConfig(TDEConfig* config) const;
240
+        virtual void readConfig(TDEConfig* config);
241 241
 
242 242
     private:
243 243
 
@@ -280,8 +280,8 @@ class Criterion
280 280
         
281 281
         bool satisfiedBy( const Article &article ) const;
282 282
 
283
-        virtual void writeConfig(KConfig* config) const;
284
-        virtual void readConfig(KConfig* config);
283
+        virtual void writeConfig(TDEConfig* config) const;
284
+        virtual void readConfig(TDEConfig* config);
285 285
 
286 286
         Subject subject() const;
287 287
         Predicate predicate() const;

+ 2
- 2
akregator/src/articleviewer.cpp View File

@@ -484,7 +484,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
484 484
         //TQString url = article.enclosure().url();
485 485
         //TQString type = article.enclosure().type();
486 486
         //int length = article.enclosure().length();
487
-        //TQString lengthStr = KIO::convertSize(length);
487
+        //TQString lengthStr = TDEIO::convertSize(length);
488 488
 
489 489
         //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
490 490
     }
@@ -744,7 +744,7 @@ void ArticleViewer::urlSelected(const TQString &url, int button, int state, cons
744 744
 {
745 745
     if(url == "config:/disable_introduction") {
746 746
         if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) {
747
-            KConfig *conf = Settings::self()->config();
747
+            TDEConfig *conf = Settings::self()->config();
748 748
             conf->setGroup("General");
749 749
             conf->writeEntry("Disable Introduction", "true");
750 750
         }

+ 3
- 3
akregator/src/configdialog.cpp View File

@@ -41,7 +41,7 @@
41 41
 namespace Akregator
42 42
 {
43 43
 
44
-ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
44
+ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : TDEConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
45 45
 {
46 46
     addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
47 47
     addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
@@ -57,7 +57,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton*
57 57
 void ConfigDialog::updateSettings()
58 58
 {
59 59
     Settings::setArchiveBackend(m_settingsAdvanced->selectedFactory());
60
-    KConfigDialog::updateSettings();
60
+    TDEConfigDialog::updateSettings();
61 61
 }
62 62
         
63 63
 void ConfigDialog::updateWidgets()
@@ -67,7 +67,7 @@ void ConfigDialog::updateWidgets()
67 67
     m_settingsAppearance->slider_mediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
68 68
     m_settingsAppearance->lbl_MinimumFontSize->setDisabled(m_config->isImmutable("MinimumFontSize"));
69 69
     m_settingsAppearance->lbl_MediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
70
-    KConfigDialog::updateWidgets();
70
+    TDEConfigDialog::updateWidgets();
71 71
 }
72 72
         
73 73
 ConfigDialog::~ConfigDialog() {}

+ 3
- 3
akregator/src/configdialog.h View File

@@ -32,13 +32,13 @@ namespace Akregator {
32 32
 class SettingsAdvanced;
33 33
 class SettingsAppearance;
34 34
 
35
-class ConfigDialog : public KConfigDialog
35
+class ConfigDialog : public TDEConfigDialog
36 36
 {
37 37
     Q_OBJECT
38 38
   
39 39
     public:
40 40
     
41
-        ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
41
+        ConfigDialog(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
42 42
         
43 43
         virtual ~ConfigDialog();
44 44
 
@@ -49,7 +49,7 @@ class ConfigDialog : public KConfigDialog
49 49
         virtual void updateWidgets();
50 50
 
51 51
     private:
52
-        KConfigSkeleton* m_config;
52
+        TDEConfigSkeleton* m_config;
53 53
         SettingsAdvanced* m_settingsAdvanced;
54 54
         SettingsAppearance* m_settingsAppearance;
55 55
         

+ 1
- 1
akregator/src/frame.cpp View File

@@ -57,7 +57,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
57 57
         if (ext)
58 58
             connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) );
59 59
 
60
-        connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted()));
60
+        connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted()));
61 61
         connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted()));
62 62
         connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&)));
63 63
         connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted()));

+ 7
- 7
akregator/src/librss/image.cpp View File

@@ -32,7 +32,7 @@ struct Image::Private : public Shared
32 32
 	unsigned int height;
33 33
 	unsigned int width;
34 34
 	TQBuffer *pixmapBuffer;
35
-	KIO::Job *job;
35
+	TDEIO::Job *job;
36 36
 };
37 37
 
38 38
 Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
111 111
 	d->pixmapBuffer = new TQBuffer;
112 112
 	d->pixmapBuffer->open(IO_WriteOnly);
113 113
 
114
-	d->job = KIO::get(d->url, false, false);
115
-	connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
116
-	        this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
117
-	connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
114
+	d->job = TDEIO::get(d->url, false, false);
115
+	connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
116
+	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
117
+	connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
118 118
 }
119 119
 
120
-void Image::slotData(KIO::Job *, const TQByteArray &data)
120
+void Image::slotData(TDEIO::Job *, const TQByteArray &data)
121 121
 {
122 122
 	d->pixmapBuffer->writeBlock(data.data(), data.size());
123 123
 }
124 124
 
125
-void Image::slotResult(KIO::Job *job)
125
+void Image::slotResult(TDEIO::Job *job)
126 126
 {
127 127
 	TQPixmap pixmap;
128 128
 	if (!job->error())

+ 3
- 3
akregator/src/librss/image.h View File

@@ -17,7 +17,7 @@
17 17
 
18 18
 class TQDomNode;
19 19
 
20
-namespace KIO
20
+namespace TDEIO
21 21
 {
22 22
    class Job;
23 23
 }
@@ -161,8 +161,8 @@ namespace RSS
161 161
          void gotPixmap(const TQPixmap &pixmap);
162 162
 
163 163
       private slots:
164
-         void slotData(KIO::Job *job, const TQByteArray &data);
165
-         void slotResult(KIO::Job *job);
164
+         void slotData(TDEIO::Job *job, const TQByteArray &data);
165
+         void slotResult(TDEIO::Job *job);
166 166
 
167 167
       private:
168 168
          struct Private;

+ 11
- 11
akregator/src/librss/loader.cpp View File

@@ -52,7 +52,7 @@ class FileRetriever::Private
52 52
 
53 53
    TQBuffer *buffer;
54 54
    int lastError;
55
-   KIO::Job *job;
55
+   TDEIO::Job *job;
56 56
    static KStaticDeleter<TQString> userAgentsd;
57 57
    static TQString* userAgent;
58 58
 };
@@ -103,7 +103,7 @@ void FileRetriever::retrieveData(const KURL &url)
103 103
    if (u.protocol()=="feed")
104 104
        u.setProtocol("http");
105 105
 
106
-   d->job = KIO::get(u, false, false);
106
+   d->job = TDEIO::get(u, false, false);
107 107
    d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");
108 108
 
109 109
    TQString ua = userAgent();
@@ -113,11 +113,11 @@ void FileRetriever::retrieveData(const KURL &url)
113 113
 
114 114
    TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
115 115
 
116
-   connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
117
-                TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
118
-   connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
119
-   connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
120
-                TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
116
+   connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
117
+                TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
118
+   connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
119
+   connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
120
+                TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
121 121
 }
122 122
 
123 123
 void FileRetriever::slotTimeout()
@@ -127,7 +127,7 @@ void FileRetriever::slotTimeout()
127 127
     delete d->buffer;
128 128
     d->buffer = NULL;
129 129
 
130
-    d->lastError = KIO::ERR_SERVER_TIMEOUT;
130
+    d->lastError = TDEIO::ERR_SERVER_TIMEOUT;
131 131
 
132 132
     emit dataRetrieved(TQByteArray(), false);
133 133
 }
@@ -137,12 +137,12 @@ int FileRetriever::errorCode() const
137 137
    return d->lastError;
138 138
 }
139 139
 
140
-void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
140
+void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
141 141
 {
142 142
    d->buffer->writeBlock(data.data(), data.size());
143 143
 }
144 144
 
145
-void FileRetriever::slotResult(KIO::Job *job)
145
+void FileRetriever::slotResult(TDEIO::Job *job)
146 146
 {
147 147
    TQByteArray data = d->buffer->buffer();
148 148
    data.detach();
@@ -154,7 +154,7 @@ void FileRetriever::slotResult(KIO::Job *job)
154 154
    emit dataRetrieved(data, d->lastError == 0);
155 155
 }
156 156
 
157
-void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
157
+void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
158 158
 {
159 159
    emit permanentRedirection(newUrl);
160 160
 }

+ 4
- 4
akregator/src/librss/loader.h View File

@@ -17,7 +17,7 @@ class KURL;
17 17
 
18 18
 #include <tqobject.h>
19 19
 
20
-namespace KIO
20
+namespace TDEIO
21 21
 {
22 22
 	class Job;
23 23
 }
@@ -139,9 +139,9 @@ namespace RSS
139 139
             void slotTimeout();
140 140
 
141 141
 		private slots:
142
-			void slotData(KIO::Job *job, const TQByteArray &data);
143
-			void slotResult(KIO::Job *job);
144
-			void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
142
+			void slotData(TDEIO::Job *job, const TQByteArray &data);
143
+			void slotResult(TDEIO::Job *job);
144
+			void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
145 145
 			                                             const KURL &toUrl);
146 146
 
147 147
 		private:

+ 2
- 2
akregator/src/mainwindow.cpp View File

@@ -163,7 +163,7 @@ void MainWindow::setupActions()
163 163
     KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
164 164
 }
165 165
 
166
-void MainWindow::saveProperties(KConfig* config)
166
+void MainWindow::saveProperties(TDEConfig* config)
167 167
 {
168 168
     if (!m_part)
169 169
         loadPart();
@@ -174,7 +174,7 @@ void MainWindow::saveProperties(KConfig* config)
174 174
     //delete m_part;
175 175
 }
176 176
 
177
-void MainWindow::readProperties(KConfig* config)
177
+void MainWindow::readProperties(TDEConfig* config)
178 178
 {
179 179
     if (!m_part)
180 180
         loadPart();

+ 3
- 3
akregator/src/mainwindow.h View File

@@ -102,14 +102,14 @@ protected:
102 102
      * This method is called when it is time for the app to save its
103 103
      * properties for session management purposes.
104 104
      */
105
-    void saveProperties(KConfig *);
105
+    void saveProperties(TDEConfig *);
106 106
 
107 107
     /**
108
-     * This method is called when this app is restored.  The KConfig
108
+     * This method is called when this app is restored.  The TDEConfig
109 109
      * object points to the session management config file that was saved
110 110
      * with @ref saveProperties
111 111
      */
112
-    void readProperties(KConfig *);
112
+    void readProperties(TDEConfig *);
113 113
     /** 
114 114
      *  Reimplemented to save settings
115 115
      */

+ 2
- 2
akregator/src/pageviewer.cpp View File

@@ -144,7 +144,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
144 144
     connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)),
145 145
             this, TQT_SLOT(slotSetCaption (const TQString &)) );
146 146
 
147
-    connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
147
+    connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
148 148
     connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
149 149
     connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
150 150
 
@@ -337,7 +337,7 @@ void PageViewer::addHistoryEntry(const KURL& url)
337 337
 }
338 338
 
339 339
 // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
340
-void PageViewer::slotStarted( KIO::Job * )
340
+void PageViewer::slotStarted( TDEIO::Job * )
341 341
 {
342 342
     d->stopAction->setEnabled(true);
343 343
 }

+ 1
- 1
akregator/src/pageviewer.h View File

@@ -63,7 +63,7 @@ namespace Akregator
63 63
 
64 64
             virtual void slotPaletteOrFontChanged();
65 65
 
66
-            void slotStarted(KIO::Job *);
66
+            void slotStarted(TDEIO::Job *);
67 67
             void slotCompleted();
68 68
             void slotCancelled(const TQString &errMsg);
69 69
             void slotBackAboutToShow();

+ 3
- 3
akregator/src/viewer.cpp View File

@@ -57,8 +57,8 @@ Viewer::Viewer(TQWidget *parent, const char *name)
57 57
     setStatusMessagesEnabled(true);
58 58
 
59 59
     // change the cursor when loading stuff...
60
-    connect( this, TQT_SIGNAL(started(KIO::Job *)),
61
-             this, TQT_SLOT(slotStarted(KIO::Job *)));
60
+    connect( this, TQT_SIGNAL(started(TDEIO::Job *)),
61
+             this, TQT_SLOT(slotStarted(TDEIO::Job *)));
62 62
     connect( this, TQT_SIGNAL(completed()),
63 63
              this, TQT_SLOT(slotCompleted()));
64 64
 
@@ -256,7 +256,7 @@ void Viewer::slotSaveLinkAs()
256 256
     KParts::BrowserRun::simpleSave(tmp, tmp.fileName());
257 257
 }
258 258
 
259
-void Viewer::slotStarted(KIO::Job *)
259
+void Viewer::slotStarted(TDEIO::Job *)
260 260
 {
261 261
    widget()->setCursor( waitCursor );
262 262
 }

+ 2
- 2
akregator/src/viewer.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 class KURL;
31 31
 
32
-namespace KIO
32
+namespace TDEIO
33 33
 {
34 34
     class MetaData;
35 35
 }
@@ -107,7 +107,7 @@ namespace Akregator
107 107
             virtual void slotSaveLinkAs();
108 108
 
109 109
             /** This changes cursor to wait cursor */
110
-            void slotStarted(KIO::Job *);
110
+            void slotStarted(TDEIO::Job *);
111 111
 
112 112
             /** This reverts cursor back to normal one */
113 113
             void slotCompleted();

+ 7
- 7
certmanager/certificatewizardimpl.cpp View File

@@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* nam
129 129
     connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
130 130
              this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
131 131
 
132
-    const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
132
+    const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
133 133
     caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
134 134
 
135 135
     connect( this, TQT_SIGNAL( helpClicked() ),
@@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage()
337 337
   TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1,
338 338
 				       KDialog::marginHint(), KDialog::spacingHint() );
339 339
 
340
-  KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
340
+  TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
341 341
   TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" );
342 342
   if ( attrOrder.empty() )
343 343
     attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!";
@@ -477,7 +477,7 @@ void CertificateWizardImpl::accept()
477 477
     // Save in file/URL
478 478
     KURL url = saveFileUrl();
479 479
     bool overwrite = false;
480
-    if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) {
480
+    if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) {
481 481
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
482 482
                                                                      this,
483 483
                                                                      i18n( "A file named \"%1\" already exists. "
@@ -488,10 +488,10 @@ void CertificateWizardImpl::accept()
488 488
       overwrite = true;
489 489
     }
490 490
 
491
-    KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
491
+    TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
492 492
     uploadJob->setWindow( this );
493
-    connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
494
-             this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
493
+    connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
494
+             this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
495 495
     // Can't press finish again during the upload
496 496
     setFinishEnabled( finishPage, false );
497 497
   }
@@ -501,7 +501,7 @@ void CertificateWizardImpl::accept()
501 501
    This slot is invoked by the KIO job used in newCertificate
502 502
    to save/upload the certificate, when finished (success or error).
503 503
 */
504
-void CertificateWizardImpl::slotUploadResult( KIO::Job* job )
504
+void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )
505 505
 {
506 506
   if ( job->error() ) {
507 507
     job->showErrorDialog();

+ 2
- 2
certmanager/certificatewizardimpl.h View File

@@ -42,7 +42,7 @@
42 42
 namespace GpgME {
43 43
   class KeyGenerationResult;
44 44
 }
45
-namespace KIO {
45
+namespace TDEIO {
46 46
   class Job;
47 47
 }
48 48
 
@@ -75,7 +75,7 @@ private slots:
75 75
 
76 76
     void slotHelpClicked();
77 77
 
78
-    void slotUploadResult( KIO::Job* );
78
+    void slotUploadResult( TDEIO::Job* );
79 79
 
80 80
 private:
81 81
     void createPersonalDataPage();

+ 17
- 17
certmanager/certmanager.cpp View File

@@ -218,7 +218,7 @@ CertManager::~CertManager() {
218 218
 }
219 219
 
220 220
 void CertManager::readConfig( bool noQueryGiven ) {
221
-  KConfig config( "kleopatrarc" );
221
+  TDEConfig config( "kleopatrarc" );
222 222
   config.setGroup( "Display Options" );
223 223
   mHierarchicalView = config.readBoolEntry( "hierarchicalView", false );
224 224
   if ( noQueryGiven ) {
@@ -227,7 +227,7 @@ void CertManager::readConfig( bool noQueryGiven ) {
227 227
 }
228 228
 
229 229
 void CertManager::writeConfig() {
230
-  KConfig config( "kleopatrarc" );
230
+  TDEConfig config( "kleopatrarc" );
231 231
   config.setGroup( "Display Options" );
232 232
   config.writeEntry( "hierarchicalView", mKeyListView->hierarchical() );
233 233
   config.writeEntry( "startInRemoteMode", mNextFindRemote );
@@ -685,10 +685,10 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
685 685
   // Download the cert
686 686
   KIOext::StoredTransferJob* importJob = KIOext::storedGet( certURL );
687 687
   importJob->setWindow( this );
688
-  connect( importJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotImportResult(KIO::Job*)) );
688
+  connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
689 689
 }
690 690
 
691
-void CertManager::slotImportResult( KIO::Job* job )
691
+void CertManager::slotImportResult( TDEIO::Job* job )
692 692
 {
693 693
   if ( job->error() ) {
694 694
     job->showErrorDialog();
@@ -904,17 +904,17 @@ void CertManager::importCRLFromFile() {
904 904
       KTempFile tempFile;
905 905
       KURL destURL;
906 906
       destURL.setPath( tempFile.name() );
907
-      KIO::Job* copyJob = KIO::file_copy( url, destURL, 0600, true, false );
907
+      TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
908 908
       copyJob->setWindow( this );
909
-      connect( copyJob, TQT_SIGNAL( result( KIO::Job * ) ),
910
-               TQT_SLOT( slotImportCRLJobFinished( KIO::Job * ) ) );
909
+      connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
910
+               TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
911 911
     }
912 912
   }
913 913
 }
914 914
 
915
-void CertManager::slotImportCRLJobFinished( KIO::Job *job )
915
+void CertManager::slotImportCRLJobFinished( TDEIO::Job *job )
916 916
 {
917
-  KIO::FileCopyJob* fcjob = static_cast<KIO::FileCopyJob*>( job );
917
+  TDEIO::FileCopyJob* fcjob = static_cast<TDEIO::FileCopyJob*>( job );
918 918
   TQString tempFilePath = fcjob->destURL().path();
919 919
   if ( job->error() ) {
920 920
     job->showErrorDialog();
@@ -1234,7 +1234,7 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
1234 1234
 // return true if we should proceed, false if we should abort
1235 1235
 static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
1236 1236
 {
1237
-  if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
1237
+  if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
1238 1238
     if ( KMessageBox::Cancel ==
1239 1239
          KMessageBox::warningContinueCancel(
1240 1240
                                             w,
@@ -1269,10 +1269,10 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
1269 1269
   if ( !checkOverwrite( url, overwrite, this ) )
1270 1270
     return;
1271 1271
 
1272
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
1272
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
1273 1273
   uploadJob->setWindow( this );
1274
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
1275
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
1274
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
1275
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
1276 1276
 }
1277 1277
 
1278 1278
 
@@ -1388,13 +1388,13 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
1388 1388
   if ( !checkOverwrite( url, overwrite, this ) )
1389 1389
     return;
1390 1390
 
1391
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
1391
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
1392 1392
   uploadJob->setWindow( this );
1393
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
1394
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
1393
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
1394
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
1395 1395
 }
1396 1396
 
1397
-void CertManager::slotUploadResult( KIO::Job* job )
1397
+void CertManager::slotUploadResult( TDEIO::Job* job )
1398 1398
 {
1399 1399
   if ( job->error() )
1400 1400
     job->showErrorDialog();

+ 4
- 4
certmanager/certmanager.h View File

@@ -51,7 +51,7 @@ namespace Kleo {
51 51
   class Job;
52 52
 }
53 53
 
54
-namespace KIO {
54
+namespace TDEIO {
55 55
   class Job;
56 56
 }
57 57
 class TDEProcess;
@@ -99,11 +99,11 @@ private slots:
99 99
     void slotDeleteCertificate();
100 100
     void slotExportSecretKey();
101 101
     void slotExportCertificate();
102
-    void slotUploadResult( KIO::Job* job );
102
+    void slotUploadResult( TDEIO::Job* job );
103 103
 
104 104
     void slotImportCertFromFile();
105 105
     void slotImportCertFromFile( const KURL & filename );
106
-    void slotImportResult( KIO::Job* );
106
+    void slotImportResult( TDEIO::Job* );
107 107
 
108 108
     void slotCertificateImportResult( const GpgME::ImportResult & result );
109 109
     void slotCertificateDownloadResult( const GpgME::Error & error, const TQByteArray & keyData );
@@ -115,7 +115,7 @@ private slots:
115 115
 
116 116
     void importCRLFromFile();
117 117
     void importCRLFromLDAP();
118
-    void slotImportCRLJobFinished( KIO::Job * );
118
+    void slotImportCRLJobFinished( TDEIO::Job * );
119 119
 
120 120
     void slotDirmngrExited();
121 121
     void slotStderr( TDEProcess*, char*, int );

+ 3
- 3
certmanager/conf/appearanceconfigpage.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <tdepimmacros.h>
40 40
 
41 41
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
42
-    : KCModule( parent, name )
42
+    : TDECModule( parent, name )
43 43
 {
44 44
   TQVBoxLayout* lay = new TQVBoxLayout( this );
45 45
   mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()
70 70
 
71 71
 extern "C"
72 72
 {
73
-  KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
73
+  KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
74 74
   {
75 75
     AppearanceConfigurationPage *page =
76 76
       new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
78 78
   }
79 79
 }
80 80
 
81
-// tdelibs-3.2 didn't have the changed signal in KCModule...
81
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
82 82
 void AppearanceConfigurationPage::slotChanged()
83 83
 {
84 84
   emit changed(true);

+ 1
- 1
certmanager/conf/appearanceconfigpage.h View File

@@ -41,7 +41,7 @@ namespace Kleo {
41 41
 /**
42 42
  * "Appearance" configuration page for kleopatra's configuration dialog
43 43
  */
44
-class AppearanceConfigurationPage : public KCModule {
44
+class AppearanceConfigurationPage : public TDECModule {
45 45
   Q_OBJECT
46 46
   
47 47
 public:

+ 6
- 6
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -66,7 +66,7 @@ using namespace Kleo;
66 66
 class CategoryListViewItem : public TQListViewItem
67 67
 {
68 68
 public:
69
-  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
69
+  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
70 70
     : TQListViewItem( lv, prev ) {
71 71
 
72 72
     setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
85 85
     mDirty = false;
86 86
   }
87 87
 
88
-  void save( KConfigBase& config ) {
88
+  void save( TDEConfigBase& config ) {
89 89
     config.writeEntry( "Name", text( 0 ) );
90 90
     config.writeEntry( "foreground-color", mForegroundColor );
91 91
     config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
235 235
 void AppearanceConfigWidget::load()
236 236
 {
237 237
   categoriesLV->clear();
238
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
238
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
239 239
   if ( !config )
240 240
     return;
241 241
   TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
242 242
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
243
-    KConfigGroup cfg( config, *it );
243
+    TDEConfigGroup cfg( config, *it );
244 244
     (void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
245 245
   }
246 246
 }
247 247
 
248 248
 void AppearanceConfigWidget::save()
249 249
 {
250
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
250
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
251 251
   if ( !config )
252 252
     return;
253 253
   // We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
263 263
   TQListViewItemIterator lvit( categoriesLV );
264 264
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
265 265
     CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
266
-    KConfigGroup cfg( config, *it );
266
+    TDEConfigGroup cfg( config, *it );
267 267
     item->save( cfg );
268 268
   }
269 269
   config->sync();

+ 1
- 1
certmanager/conf/appearanceconfigwidget.h View File

@@ -36,7 +36,7 @@
36 36
 
37 37
 #include "appearanceconfigwidgetbase.h"
38 38
 #include <tqstringlist.h>
39
-class KConfig;
39
+class TDEConfig;
40 40
 
41 41
 namespace Kleo {
42 42
 

+ 2
- 2
certmanager/conf/configuredialog.cpp View File

@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
52 52
   // the KCMultiDialog starts with the size of the first kcm, not
53 53
   // the largest one. This way at least after the first showing of
54 54
   // the largest kcm the size is kept.
55
-  const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
55
+  const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
56 56
   const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
57 57
   const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
58 58
   if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
62 62
 }
63 63
 
64 64
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
65
-  KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
65
+  TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
66 66
   geometry.writeEntry( "ConfigureDialogWidth", width() );
67 67
   geometry.writeEntry( "ConfigureDialogHeight",height() );
68 68
 }

+ 4
- 4
certmanager/conf/dirservconfigpage.cpp View File

@@ -116,7 +116,7 @@ public:
116 116
   }
117 117
 
118 118
 private:
119
-  KConfig mConfig;
119
+  TDEConfig mConfig;
120 120
 };
121 121
 
122 122
 #endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
138 138
 static const char s_addnewservers_entryName[] = "add-servers";
139 139
 
140 140
 DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
141
-    : KCModule( parent, name )
141
+    : TDECModule( parent, name )
142 142
 {
143 143
   mConfig = Kleo::CryptoBackendFactory::instance()->config();
144 144
   TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()
259 259
 
260 260
 extern "C"
261 261
 {
262
-  KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
262
+  KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
263 263
   {
264 264
     DirectoryServicesConfigurationPage *page =
265 265
       new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
267 267
   }
268 268
 }
269 269
 
270
-// tdelibs-3.2 didn't have the changed signal in KCModule...
270
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
271 271
 void DirectoryServicesConfigurationPage::slotChanged()
272 272
 {
273 273
   emit changed(true);

+ 1
- 1
certmanager/conf/dirservconfigpage.h View File

@@ -50,7 +50,7 @@ namespace Kleo {
50 50
  * The user can configure LDAP servers in this page, to be used for listing/fetching
51 51
  * remote certificates in kleopatra.
52 52
  */
53
-class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
53
+class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
54 54
   Q_OBJECT
55 55
   
56 56
 public:

+ 3
- 3
certmanager/conf/dnorderconfigpage.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <tqlayout.h>
40 40
 
41 41
 DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
42
-  : KCModule( parent, name )
42
+  : TDECModule( parent, name )
43 43
 {
44 44
   TQVBoxLayout * vlay = new TQVBoxLayout( this );
45 45
   mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
65 65
   mWidget->defaults();
66 66
 }
67 67
 
68
-// tdelibs-3.2 didn't have the changed signal in KCModule...
68
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
69 69
 void DNOrderConfigPage::slotChanged() {
70 70
   emit changed(true);
71 71
 }
72 72
 
73
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
73
+extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
74 74
     return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
75 75
 }
76 76
 

+ 1
- 1
certmanager/conf/dnorderconfigpage.h View File

@@ -41,7 +41,7 @@ namespace Kleo {
41 41
 /**
42 42
  * "DN Order" configuration page for kleopatra's configuration dialog
43 43
  */
44
-class DNOrderConfigPage : public KCModule {
44
+class DNOrderConfigPage : public TDECModule {
45 45
   Q_OBJECT
46 46
   
47 47
 public:

+ 1
- 1
certmanager/conf/kleopatra_config_appear.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=looknfeel
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kleopatra/configuration-appearance.html
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 1
- 1
certmanager/conf/kleopatra_config_dirserv.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=network
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kleopatra/configuration.html#configuration-directory-services
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 1
- 1
certmanager/conf/kleopatra_config_dnorder.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=looknfeel
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kleopatra/configuration-dn-order.html
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 2
- 2
certmanager/kwatchgnupg/kwatchgnupgconfig.cpp View File

@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
157 157
 
158 158
 void KWatchGnuPGConfig::loadConfig()
159 159
 {
160
-  KConfig* config = kapp->config();
160
+  TDEConfig* config = kapp->config();
161 161
   config->setGroup("WatchGnuPG");
162 162
   mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
163 163
   mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
175 175
 
176 176
 void KWatchGnuPGConfig::saveConfig()
177 177
 {
178
-  KConfig* config = kapp->config();
178
+  TDEConfig* config = kapp->config();
179 179
   config->setGroup("WatchGnuPG");
180 180
   config->writeEntry( "Executable", mExeED->url() );
181 181
   config->writeEntry( "Socket", mSocketED->url() );

+ 3
- 3
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher()
138 138
 						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
139 139
   }
140 140
   mWatcher->clearArguments();
141
-  KConfig* config = kapp->config();
141
+  TDEConfig* config = kapp->config();
142 142
   config->setGroup("WatchGnuPG");
143 143
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
144 144
   *mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
162 162
   if ( !cconfig )
163 163
     return;
164 164
   //Q_ASSERT( cconfig );
165
-  KConfig* config = kapp->config();
165
+  TDEConfig* config = kapp->config();
166 166
   config->setGroup("WatchGnuPG");
167 167
   TQStringList comps = cconfig->componentList();
168 168
   for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
270 270
 
271 271
 void KWatchGnuPGMainWindow::slotReadConfig()
272 272
 {
273
-  KConfig* config = kapp->config();
273
+  TDEConfig* config = kapp->config();
274 274
   config->setGroup("LogWindow");
275 275
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
276 276
 							   ?TQTextEdit::WidgetWidth

+ 7
- 7
certmanager/lib/backends/chiasmus/chiasmusbackend.cpp View File

@@ -197,13 +197,13 @@ namespace {
197 197
 
198 198
     TQVariant value() const { return mValue; }
199 199
 
200
-    void sync( KConfigBase * config ) {
200
+    void sync( TDEConfigBase * config ) {
201 201
       if ( !mDirty )
202 202
         return;
203 203
       mDirty = false;
204 204
       config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue );
205 205
     }
206
-    void read( const KConfigBase * config ) {
206
+    void read( const TDEConfigBase * config ) {
207 207
       mDirty = false;
208 208
       mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() );
209 209
     }
@@ -254,7 +254,7 @@ namespace {
254 254
 
255 255
   class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup {
256 256
     mutable std::map<TQString,ChiasmusConfigEntry*> mCache;
257
-    mutable KConfig * mConfigObject;
257
+    mutable TDEConfig * mConfigObject;
258 258
   public:
259 259
     ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {}
260 260
     ~ChiasmusGeneralGroup() { clear(); delete mConfigObject; }
@@ -271,7 +271,7 @@ namespace {
271 271
     Kleo::CryptoConfigEntry * entry( const TQString & name ) const {
272 272
       if ( ChiasmusConfigEntry * entry = mCache[name] )
273 273
         return entry;
274
-      const KConfigGroup group( configObject(), "Chiasmus" );
274
+      const TDEConfigGroup group( configObject(), "Chiasmus" );
275 275
       for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i )
276 276
         if ( name == kleo_chiasmus_config_entries[i].name ) {
277 277
           ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i );
@@ -282,17 +282,17 @@ namespace {
282 282
     }
283 283
 
284 284
     void sync() {
285
-      KConfigGroup group( configObject(), "Chiasmus" );
285
+      TDEConfigGroup group( configObject(), "Chiasmus" );
286 286
       for ( std::map<TQString,ChiasmusConfigEntry*>::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it )
287 287
         it->second->sync( &group );
288 288
       group.sync();
289 289
       clear();
290 290
     }
291 291
   private:
292
-    KConfig * configObject() const {
292
+    TDEConfig * configObject() const {
293 293
       if ( !mConfigObject )
294 294
         // this is unsafe. We're a lib, used by concurrent apps.
295
-        mConfigObject = new KConfig( "chiasmusbackendrc" );
295
+        mConfigObject = new TDEConfig( "chiasmusbackendrc" );
296 296
       return mConfigObject;
297 297
     }
298 298
     void clear() {

+ 1
- 1
certmanager/lib/cryptplugwrapper.cpp View File

@@ -133,7 +133,7 @@ public:
133 133
     _unknownAttrsHandling = unknownAttrsInfix;
134 134
     _unknownAttrsHandlingChar = "INFIX";
135 135
   }
136
-  DNBeautifier( KConfig* config,
136
+  DNBeautifier( TDEConfig* config,
137 137
                 const TQString& cfgGroup,
138 138
                 const TQString& cfgAttributeOrderEntry,
139 139
                 const TQString& cfgUnknownAttrsEntry,

+ 1
- 1
certmanager/lib/cryptplugwrapper.h View File

@@ -57,7 +57,7 @@
57 57
 #include <tdepimmacros.h>
58 58
 
59 59
 
60
-class KConfigBase;
60
+class TDEConfigBase;
61 61
 class QGpgMECryptoConfig;
62 62
 
63 63
 namespace GpgME {

+ 4
- 4
certmanager/lib/kleo/cryptobackendfactory.cpp View File

@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
178 178
   return new Kleo::BackendConfigWidget( mSelf, parent, name );
179 179
 }
180 180
 
181
-KConfig* Kleo::CryptoBackendFactory::configObject() const {
181
+TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
182 182
   if ( !mConfigObject )
183 183
     // this is unsafe. We're a lib, used by concurrent apps.
184
-    mConfigObject = new KConfig( "libkleopatrarc" );
184
+    mConfigObject = new TDEConfig( "libkleopatrarc" );
185 185
   return mConfigObject;
186 186
 }
187 187
 
@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
195 195
 
196 196
 void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
197 197
   const TQString name = backend ? backend->name() : TQString() ;
198
-  KConfigGroup group( configObject(), "Backends" );
198
+  TDEConfigGroup group( configObject(), "Backends" );
199 199
   group.writeEntry( protocol, name );
200 200
   configObject()->sync();
201 201
   mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {
218 218
 
219 219
 void Kleo::CryptoBackendFactory::readConfig() {
220 220
   mBackends.clear();
221
-  const KConfigGroup group( configObject(), "Backends" );
221
+  const TDEConfigGroup group( configObject(), "Backends" );
222 222
   for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
223 223
     const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
224 224
     mBackends[*it] = backendByName( backend );

+ 3
- 3
certmanager/lib/kleo/cryptobackendfactory.h View File

@@ -46,7 +46,7 @@ namespace Kleo {
46 46
 }
47 47
 
48 48
 class TQString;
49
-class KConfig;
49
+class TDEConfig;
50 50
 
51 51
 namespace Kleo {
52 52
 
@@ -76,7 +76,7 @@ namespace Kleo {
76 76
 
77 77
     Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
78 78
 
79
-    KConfig* configObject() const;
79
+    TDEConfig* configObject() const;
80 80
 
81 81
     // The preferred backend for smime (can be 0) - currently unused
82 82
     //const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {
97 97
 
98 98
   protected:
99 99
     std::vector<CryptoBackend*> mBackendList;
100
-    mutable KConfig* mConfigObject;
100
+    mutable TDEConfig* mConfigObject;
101 101
     typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
102 102
     BackendMap mBackends;
103 103
     typedef std::vector<const char *> ProtocolSet;

+ 2
- 2
certmanager/lib/kleo/dn.cpp View File

@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
484 484
 
485 485
 Kleo::DNAttributeMapper::DNAttributeMapper() {
486 486
   d = new Private();
487
-  const KConfigGroup config( kapp->config(), "DN" );
487
+  const TDEConfigGroup config( kapp->config(), "DN" );
488 488
   d->attributeOrder = config.readListEntry( "AttributeOrder" );
489 489
   if ( d->attributeOrder.empty() )
490 490
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
529 529
   if ( order.empty() )
530 530
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
531 531
 	       std::back_inserter( d->attributeOrder ) );
532
-  KConfigGroup config( kapp->config(), "DN" );
532
+  TDEConfigGroup config( kapp->config(), "DN" );
533 533
   config.writeEntry( "AttributeOrder", order );
534 534
 }
535 535
 

+ 4
- 4
certmanager/lib/kleo/kconfigbasedkeyfilter.cpp View File

@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
67 67
 }
68 68
 
69 69
 
70
-Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
70
+Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
71 71
   : KeyFilter(),
72 72
     mSpecificity( 0 ),
73 73
     mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
151 151
   }
152 152
 }
153 153
 
154
-Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
154
+Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {
155 155
 
156 156
 }
157 157
 
158
-bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
158
+bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
159 159
 #ifdef MATCH
160 160
 #undef MATCH
161 161
 #endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
243 243
   return font;
244 244
 }
245 245
 
246
-TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
246
+TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
247 247
   if ( mUseFullFont )
248 248
     return resizedFont( mFont, f.pointSize(), mStrikeOut );
249 249
   else

+ 4
- 4
certmanager/lib/kleo/kconfigbasedkeyfilter.h View File

@@ -41,14 +41,14 @@
41 41
 
42 42
 #include <gpgmepp/key.h>
43 43
 
44
-class KConfigBase;
44
+class TDEConfigBase;
45 45
 
46 46
 namespace Kleo {
47 47
 
48
-  class KConfigBasedKeyFilter : public KeyFilter {
48
+  class TDEConfigBasedKeyFilter : public KeyFilter {
49 49
   public:
50
-    explicit KConfigBasedKeyFilter( const KConfigBase & config );
51
-    ~KConfigBasedKeyFilter();
50
+    explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
51
+    ~TDEConfigBasedKeyFilter();
52 52
     bool matches( const GpgME::Key & key ) const;
53 53
 
54 54
     unsigned int specificity() const { return mSpecificity; }

+ 3
- 3
certmanager/lib/kleo/keyfiltermanager.cpp View File

@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
104 104
 void Kleo::KeyFilterManager::reload() {
105 105
   d->clear();
106 106
 
107
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
107
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
108 108
   if ( !config )
109 109
     return;
110 110
   const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
111 111
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
112
-    const KConfigGroup cfg( config, *it );
113
-    d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
112
+    const TDEConfigGroup cfg( config, *it );
113
+    d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
114 114
   }
115 115
   std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
116 116
 }

+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.h View File

@@ -43,7 +43,7 @@ namespace Kleo {
43 43
 
44 44
   /**
45 45
    * Crypto Config Module widget, dynamically generated from CryptoConfig
46
-   * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule.
46
+   * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
47 47
    */
48 48
   class CryptoConfigModule : public KJanusWidget {
49 49
     Q_OBJECT

+ 2
- 2
certmanager/lib/ui/keyselectiondialog.cpp View File

@@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
449 449
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
450 450
     TQSize dialogSize( 500, 400 );
451 451
 
452
-    KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
452
+    TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
453 453
     dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
454 454
     resize( dialogSize );
455 455
   }
456 456
 }
457 457
 
458 458
 Kleo::KeySelectionDialog::~KeySelectionDialog() {
459
-  KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
459
+  TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
460 460
   dialogConfig.writeEntry( "Dialog size", size() );
461 461
   dialogConfig.sync();
462 462
 }

+ 10
- 10
certmanager/storedtransferjob.cpp View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include "storedtransferjob.h"
21 21
 
22
-using namespace KIOext;
22
+using namespace TDEIOext;
23 23
 
24 24
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
25 25
 
@@ -27,13 +27,13 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
27 27
                                      const TQByteArray &packedArgs,
28 28
                                      const TQByteArray &_staticData,
29 29
                                      bool showProgressInfo)
30
-    : KIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
30
+    : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
31 31
       m_uploadOffset( 0 )
32 32
 {
33
-    connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
34
-             TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
35
-    connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
36
-             TQT_SLOT( slotDataReq( KIO::Job *, TQByteArray & ) ) );
33
+    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
34
+             TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
35
+    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
36
+             TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
37 37
 }
38 38
 
39 39
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -43,7 +43,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
43 43
     m_data = arr;
44 44
 }
45 45
 
46
-void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
46
+void StoredTransferJob::slotData( TDEIO::Job *, const TQByteArray &data )
47 47
 {
48 48
   // check for end-of-data marker:
49 49
   if ( data.size() == 0 )
@@ -53,7 +53,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
53 53
   memcpy( m_data.data() + oldSize, data.data(), data.size() );
54 54
 }
55 55
 
56
-void StoredTransferJob::slotDataReq( KIO::Job *, TQByteArray &data )
56
+void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
57 57
 {
58 58
   // Inspired from kmail's KMKernel::byteArrayToRemoteFile
59 59
   // send the data in 64 KB chunks
@@ -80,7 +80,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
80 80
 {
81 81
     // Send decoded path and encoded query
82 82
     KIO_ARGS << url;
83
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
83
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
84 84
     if (reload)
85 85
        job->addMetaData("cache", "reload");
86 86
     return job;
@@ -90,7 +90,7 @@ StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int per
90 90
                                 bool overwrite, bool resume, bool showProgressInfo )
91 91
 {
92 92
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
93
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
93
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
94 94
     job->setData( arr );
95 95
     return job;
96 96
 }

+ 6
- 6
certmanager/storedtransferjob.h View File

@@ -23,28 +23,28 @@
23 23
 #include <kio/job.h>
24 24
 
25 25
 // To be moved to KIO?
26
-namespace KIOext {
26
+namespace TDEIOext {
27 27
 
28 28
 /**
29 29
  * StoredTransferJob is a TransferJob (for downloading or uploading data) that
30 30
  * also stores a TQByteArray with the data, making it simpler to use than the
31 31
  * standard TransferJob.
32 32
  *
33
- * For KIO::get it puts the data into the member TQByteArray, so the user
33
+ * For TDEIO::get it puts the data into the member TQByteArray, so the user
34 34
  * of this class can get hold of the whole data at once by calling data()
35 35
  * when the result signal is emitted.
36 36
  * You should only use StoredTransferJob to download data if you cannot
37 37
  * process the data by chunks while it's being downloaded, since storing
38 38
  * everything in a TQByteArray can potentially require a lot of memory.
39 39
  *
40
- * For KIO::put the user of this class simply provides the bytearray from
40
+ * For TDEIO::put the user of this class simply provides the bytearray from
41 41
  * the start, and the job takes care of uploading it.
42 42
  * You should only use StoredTransferJob to upload data if you cannot
43 43
  * provide the in chunks while it's being uploaded, since storing
44 44
  * everything in a TQByteArray can potentially require a lot of memory.
45 45
  *
46 46
  */
47
-class StoredTransferJob : public KIO::TransferJob {
47
+class StoredTransferJob : public TDEIO::TransferJob {
48 48
     Q_OBJECT
49 49
   
50 50
 
@@ -76,8 +76,8 @@ public:
76 76
     TQByteArray data() const { return m_data; }
77 77
 
78 78
 private slots:
79
-    void slotData( KIO::Job *job, const TQByteArray &data );
80
-    void slotDataReq( KIO::Job *job, TQByteArray &data );
79
+    void slotData( TDEIO::Job *job, const TQByteArray &data );
80
+    void slotDataReq( TDEIO::Job *job, TQByteArray &data );
81 81
 private:
82 82
     TQByteArray m_data;
83 83
     int m_uploadOffset;

+ 1
- 1
kabc/kabcdistlistupdater/kabcdistlistupdater.cpp View File

@@ -85,7 +85,7 @@ int main( int argc, char **argv )
85 85
   if ( args->isSet( "disable-autostart" ) ) {
86 86
     kdDebug() << "Disable autostart." << endl;
87 87
 
88
-    KConfig *config = app.config();
88
+    TDEConfig *config = app.config();
89 89
     config->setGroup( "Startup" );
90 90
     config->writeEntry( "EnableAutostart", false );
91 91
   }

+ 7
- 7
kaddressbook/addresseeconfig.cpp View File

@@ -48,7 +48,7 @@ Addressee AddresseeConfig::addressee()
48 48
 
49 49
 void AddresseeConfig::setAutomaticNameParsing( bool value )
50 50
 {
51
-  KConfig config( "kaddressbook_addrconfig" );
51
+  TDEConfig config( "kaddressbook_addrconfig" );
52 52
   config.setGroup( mAddressee.uid() );
53 53
   config.writeEntry( "AutomaticNameParsing", value );
54 54
   config.sync();
@@ -56,7 +56,7 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )
56 56
 
57 57
 bool AddresseeConfig::automaticNameParsing()
58 58
 {
59
-  KConfig config( "kaddressbook_addrconfig" );
59
+  TDEConfig config( "kaddressbook_addrconfig" );
60 60
   config.setGroup( mAddressee.uid() );
61 61
   return config.readBoolEntry( "AutomaticNameParsing",
62 62
                                KABPrefs::instance()->automaticNameParsing() );
@@ -64,7 +64,7 @@ bool AddresseeConfig::automaticNameParsing()
64 64
 
65 65
 void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
66 66
 {
67
-  KConfig config( "kaddressbook_addrconfig" );
67
+  TDEConfig config( "kaddressbook_addrconfig" );
68 68
   config.setGroup( mAddressee.uid() );
69 69
   config.writeEntry( "NoDefaultAddrTypes", types );
70 70
   config.sync();
@@ -72,14 +72,14 @@ void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
72 72
 
73 73
 TQValueList<int> AddresseeConfig::noDefaultAddrTypes() const
74 74
 {
75
-  KConfig config( "kaddressbook_addrconfig" );
75
+  TDEConfig config( "kaddressbook_addrconfig" );
76 76
   config.setGroup( mAddressee.uid() );
77 77
   return config.readIntListEntry( "NoDefaultAddrTypes" );
78 78
 }
79 79
 
80 80
 void AddresseeConfig::setCustomFields( const TQStringList &fields )
81 81
 {
82
-  KConfig config( "kaddressbook_addrconfig" );
82
+  TDEConfig config( "kaddressbook_addrconfig" );
83 83
   config.setGroup( mAddressee.uid() );
84 84
   config.writeEntry( "LocalCustomFields", fields );
85 85
   config.sync();
@@ -87,13 +87,13 @@ void AddresseeConfig::setCustomFields( const TQStringList &fields )
87 87
 
88 88
 TQStringList AddresseeConfig::customFields() const
89 89
 {
90
-  KConfig config( "kaddressbook_addrconfig" );
90
+  TDEConfig config( "kaddressbook_addrconfig" );
91 91
   config.setGroup( mAddressee.uid() );
92 92
   return config.readListEntry( "LocalCustomFields" );
93 93
 }
94 94
 
95 95
 void AddresseeConfig::remove()
96 96
 {
97
-  KConfig config( "kaddressbook_addrconfig" );
97
+  TDEConfig config( "kaddressbook_addrconfig" );
98 98
   config.deleteGroup( mAddressee.uid() );
99 99
 }

+ 2
- 2
kaddressbook/addresseeeditordialog.cpp View File

@@ -60,7 +60,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
60 60
 
61 61
   enableButton( KDialogBase::Apply, false );
62 62
 
63
-  KConfig config( "kaddressbookrc" );
63
+  TDEConfig config( "kaddressbookrc" );
64 64
   config.setGroup( "AddresseeEditor" );
65 65
   TQSize defaultSize( 750, 570 );
66 66
   resize( config.readSizeEntry( "Size", &defaultSize ) );
@@ -70,7 +70,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
70 70
 {
71 71
   kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
72 72
 
73
-  KConfig config( "kaddressbookrc" );
73
+  TDEConfig config( "kaddressbookrc" );
74 74
   config.setGroup( "AddresseeEditor" );
75 75
   config.writeEntry( "Size", size() );
76 76
 

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -519,7 +519,7 @@ void AddresseeEditorWidget::load()
519 519
   mNameEdit->blockSignals( false );
520 520
 
521 521
   if ( mAddressee.formattedName().isEmpty() ) {
522
-    KConfig config( "kaddressbookrc" );
522
+    TDEConfig config( "kaddressbookrc" );
523 523
     config.setGroup( "General" );
524 524
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
525 525
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );

+ 9
- 9
kaddressbook/common/filter.cpp View File

@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
121 121
   return mCategoryList;
122 122
 }
123 123
 
124
-void Filter::save( KConfig *config )
124
+void Filter::save( TDEConfig *config )
125 125
 {
126 126
   config->writeEntry( "Name", mName );
127 127
   config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
129 129
   config->writeEntry( "MatchRule", (int)mMatchRule );
130 130
 }
131 131
 
132
-void Filter::restore( KConfig *config )
132
+void Filter::restore( TDEConfig *config )
133 133
 {
134 134
   mName = config->readEntry( "Name", "<internal error>" );
135 135
   mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
139 139
   mIsEmpty = false;
140 140
 }
141 141
 
142
-void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
142
+void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
143 143
 {
144 144
   {
145
-    KConfigGroupSaver s( config, baseGroup );
145
+    TDEConfigGroupSaver s( config, baseGroup );
146 146
 
147 147
     // remove the old filters
148 148
     uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
155 155
   Filter::List::Iterator iter;
156 156
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
157 157
     if ( !(*iter).mInternal ) {
158
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
158
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
159 159
                                                      .arg( index ) );
160 160
       (*iter).save( config );
161 161
       index++;
162 162
     }
163 163
   }
164 164
 
165
-  KConfigGroupSaver s( config, baseGroup );
165
+  TDEConfigGroupSaver s( config, baseGroup );
166 166
   config->writeEntry( "Count", index );
167 167
 }
168 168
 
169
-Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
169
+Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
170 170
 {
171 171
   Filter::List list;
172 172
   int count = 0;
173 173
   Filter f;
174 174
 
175 175
   {
176
-    KConfigGroupSaver s( config, baseGroup );
176
+    TDEConfigGroupSaver s( config, baseGroup );
177 177
     count = config->readNumEntry( "Count", 0 );
178 178
   }
179 179
 
180 180
   for ( int i = 0; i < count; i++ ) {
181 181
     {
182
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
182
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
183 183
       f.restore( config );
184 184
     }
185 185
 

+ 4
- 4
kaddressbook/common/filter.h View File

@@ -102,12 +102,12 @@ class Filter
102 102
     /**
103 103
       Saves the filter to the config file. The group should already be set.
104 104
      */
105
-    void save( KConfig *config );
105
+    void save( TDEConfig *config );
106 106
 
107 107
     /**
108 108
       Loads the filter from the config file. The group should already be set.
109 109
      */
110
-    void restore( KConfig *config );
110
+    void restore( TDEConfig *config );
111 111
 
112 112
     /**
113 113
       Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
118 118
                        will be append for each filter saved.
119 119
       @param list The list of filters to be saved.
120 120
      */
121
-    static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
121
+    static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );
122 122
 
123 123
     /**
124 124
       Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter
128 128
 
129 129
       @return The list of filters.
130 130
      */
131
-    static Filter::List restore( KConfig *config, const TQString &baseGroup );
131
+    static Filter::List restore( TDEConfig *config, const TQString &baseGroup );
132 132
 
133 133
     /**
134 134
       Sets the filter rule. If the rule is Filter::Matching (default),

+ 1
- 1
kaddressbook/common/kabprefs.cpp View File

@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
33 33
 KABPrefs::KABPrefs()
34 34
   : KABPrefsBase()
35 35
 {
36
-  KConfigSkeleton::setCurrentGroup( "General" );
36
+  TDEConfigSkeleton::setCurrentGroup( "General" );
37 37
 
38 38
   TQStringList defaultMap;
39 39
   defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";

+ 1
- 1
kaddressbook/common/kabprefs.h View File

@@ -28,7 +28,7 @@
28 28
 #include <tdepimmacros.h>
29 29
 #include "kabprefs_base.h"
30 30
 
31
-class KConfig;
31
+class TDEConfig;
32 32
 
33 33
 class KDE_EXPORT KABPrefs : public KABPrefsBase
34 34
 {

+ 2
- 2
kaddressbook/imagewidget.cpp View File

@@ -67,11 +67,11 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
67 67
     image.load( url.path() );
68 68
     picture.setData( image );
69 69
     (*ok) = true;
70
-  } else if ( KIO::NetAccess::download( url, tempFile, mParent ) ) {
70
+  } else if ( TDEIO::NetAccess::download( url, tempFile, mParent ) ) {
71 71
     image.load( tempFile );
72 72
     picture.setData( image );
73 73
     (*ok) = true;
74
-    KIO::NetAccess::removeTempFile( tempFile );
74
+    TDEIO::NetAccess::removeTempFile( tempFile );
75 75
   }
76 76
 
77 77
   if ( !(*ok) ) {

+ 2
- 2
kaddressbook/interfaces/configurewidget.cpp View File

@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
37 37
 {
38 38
 }
39 39
 
40
-void ConfigureWidget::restoreSettings( KConfig* )
40
+void ConfigureWidget::restoreSettings( TDEConfig* )
41 41
 {
42 42
   // should be reimplemented in the views, extensions etc.
43 43
 }
44 44
 
45
-void ConfigureWidget::saveSettings( KConfig* )
45
+void ConfigureWidget::saveSettings( TDEConfig* )
46 46
 {
47 47
   // should be reimplemented in the views, extensions etc.
48 48
 }

+ 2
- 2
kaddressbook/interfaces/configurewidget.h View File

@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
47 47
       values from the config file.
48 48
       Important: Don't change the group of cfg!
49 49
      */
50
-    virtual void restoreSettings( KConfig *cfg );
50
+    virtual void restoreSettings( TDEConfig *cfg );
51 51
 
52 52
     /**
53 53
       This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
55 55
       the GUI to the config file.
56 56
       Important: Don't change the group of cfg!
57 57
      */
58
-    virtual void saveSettings( KConfig *cfg );
58
+    virtual void saveSettings( TDEConfig *cfg );
59 59
 
60 60
 
61 61
     /**

+ 3
- 3
kaddressbook/interfaces/core.h View File

@@ -45,7 +45,7 @@ class Resource;
45 45
 class TQWidget;
46 46
 
47 47
 class KActionCollection;
48
-class KConfig;
48
+class TDEConfig;
49 49
 class KURL;
50 50
 
51 51
 namespace KAB {
@@ -66,9 +66,9 @@ class KDE_EXPORT Core : public TQObject
66 66
     virtual KABC::AddressBook *addressBook() const = 0;
67 67
 
68 68
     /**
69
-      Returns a pointer to the KConfig object of the application.
69
+      Returns a pointer to the TDEConfig object of the application.
70 70
      */
71
-    virtual KConfig *config() const = 0;
71
+    virtual TDEConfig *config() const = 0;
72 72
 
73 73
     /**
74 74
       Returns a pointer to the global KActionCollection object. So

+ 1
- 1
kaddressbook/kabcore.cpp View File

@@ -250,7 +250,7 @@ KABC::AddressBook *KABCore::addressBook() const
250 250
   return mAddressBook;
251 251
 }
252 252
 
253
-KConfig *KABCore::config() const
253
+TDEConfig *KABCore::config() const
254 254
 {
255 255
   return KABPrefs::instance()->config();
256 256
 }

+ 3
- 3
kaddressbook/kabcore.h View File

@@ -49,7 +49,7 @@ class CategorySelectDialog;
49 49
 class TDEAboutData;
50 50
 class KAction;
51 51
 class KActionCollection;
52
-class KConfig;
52
+class TDEConfig;
53 53
 class KPushButton;
54 54
 class KStatusBar;
55 55
 class KToggleAction;
@@ -106,9 +106,9 @@ class KDE_EXPORT KABCore : public KAB::Core
106 106
     KABC::AddressBook *addressBook() const;
107 107
 
108 108
     /**
109
-      Returns a pointer to the KConfig object of the application.
109
+      Returns a pointer to the TDEConfig object of the application.
110 110
      */
111
-    KConfig *config() const;
111
+    TDEConfig *config() const;
112 112
 
113 113
     /**
114 114
       Returns a pointer to the global KActionCollection object. So

+ 2
- 2
kaddressbook/kaddressbookmain.cpp View File

@@ -135,11 +135,11 @@ void KAddressBookMain::syncAllResources()
135 135
   mCore->load();
136 136
 }
137 137
 
138
-void KAddressBookMain::saveProperties( KConfig* )
138
+void KAddressBookMain::saveProperties( TDEConfig* )
139 139
 {
140 140
 }
141 141
 
142
-void KAddressBookMain::readProperties( KConfig* )
142
+void KAddressBookMain::readProperties( TDEConfig* )
143 143
 {
144 144
 }
145 145
 

+ 3
- 3
kaddressbook/kaddressbookmain.h View File

@@ -75,14 +75,14 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
75 75
       This function is called when it is time for the app to save its
76 76
       properties for session management purposes.
77 77
      */
78
-    void saveProperties( KConfig* );
78
+    void saveProperties( TDEConfig* );
79 79
 
80 80
     /**
81
-      This function is called when this app is restored.  The KConfig
81
+      This function is called when this app is restored.  The TDEConfig
82 82
       object points to the session management config file that was saved
83 83
       with @ref saveProperties
84 84
      */
85
-    void readProperties( KConfig* );
85
+    void readProperties( TDEConfig* );
86 86
 
87 87
     virtual bool queryClose();
88 88
 

+ 2
- 2
kaddressbook/kaddressbookview.cpp View File

@@ -53,7 +53,7 @@ KAddressBookView::~KAddressBookView()
53 53
                 << name() << endl;
54 54
 }
55 55
 
56
-void KAddressBookView::readConfig( KConfig *config )
56
+void KAddressBookView::readConfig( TDEConfig *config )
57 57
 {
58 58
   mFieldList = KABC::Field::restoreFields( config, "KABCFields" );
59 59
 
@@ -64,7 +64,7 @@ void KAddressBookView::readConfig( KConfig *config )
64 64
   mDefaultFilterName = config->readEntry( "DefaultFilterName" );
65 65
 }
66 66
 
67
-void KAddressBookView::writeConfig( KConfig* )
67
+void KAddressBookView::writeConfig( TDEConfig* )
68 68
 {
69 69
   // Most of writing the config is handled by the ConfigureViewDialog
70 70
 }

+ 5
- 5
kaddressbook/kaddressbookview.h View File

@@ -36,7 +36,7 @@
36 36
 #include "filter.h"
37 37
 #include "viewconfigurewidget.h"
38 38
 
39
-class KConfig;
39
+class TDEConfig;
40 40
 class KXMLGUIClient;
41 41
 
42 42
 class TQDropEvent;
@@ -80,10 +80,10 @@ class KDE_EXPORT KAddressBookView : public TQWidget
80 80
       If overloaded in the subclass, do not forget to call super class's
81 81
       method.
82 82
 
83
-      @param config The KConfig object to read from. The group will already
83
+      @param config The TDEConfig object to read from. The group will already
84 84
       be set, so do not change the group.
85 85
      */
86
-    virtual void readConfig( KConfig *config );
86
+    virtual void readConfig( TDEConfig *config );
87 87
 
88 88
     /**
89 89
       Called whenever this view should write the config. The view should not
@@ -94,9 +94,9 @@ class KDE_EXPORT KAddressBookView : public TQWidget
94 94
       If overloaded in the subclass, do not forget to call the super class's
95 95
       method.
96 96
      */
97
-    // The KConfig object is unused so we do not document it
97
+    // The TDEConfig object is unused so we do not document it
98 98
     // else doxygen will complain.
99
-    virtual void writeConfig( KConfig * );
99
+    virtual void writeConfig( TDEConfig * );
100 100
 
101 101
     /**
102 102
       Returns a TQString with all the selected email addresses concatenated

+ 4
- 4
kaddressbook/kcmconfigs/addresseewidget.cpp View File

@@ -169,28 +169,28 @@ AddresseeWidget::~AddresseeWidget()
169 169
 
170 170
 void AddresseeWidget::restoreSettings()
171 171
 {
172
-  KConfig config( "kabcrc" );
172
+  TDEConfig config( "kabcrc" );
173 173
   config.setGroup( "General" );
174 174
 
175 175
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
176 176
   mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
177 177
   mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
178 178
 
179
-  KConfig cfg( "kaddressbookrc" );
179
+  TDEConfig cfg( "kaddressbookrc" );
180 180
   cfg.setGroup( "General" );
181 181
   mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
182 182
 }
183 183
 
184 184
 void AddresseeWidget::saveSettings()
185 185
 {
186
-  KConfig config( "kabcrc" );
186
+  TDEConfig config( "kabcrc" );
187 187
   config.setGroup( "General" );
188 188
 
189 189
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
190 190
   config.writeEntry( "Inclusions", mInclusion->nameParts() );
191 191
   config.writeEntry( "Suffixes", mSuffix->nameParts() );
192 192
 
193
-  KConfig cfg( "kaddressbookrc" );
193
+  TDEConfig cfg( "kaddressbookrc" );
194 194
   cfg.setGroup( "General" );
195 195
   cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
196 196
 

+ 1
- 1
kaddressbook/kcmconfigs/extensionconfigdialog.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include "extensionconfigdialog.h"
30 30
 #include "extensionwidget.h"
31 31
 
32
-ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
32
+ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
33 33
                                               TQWidget *parent, const char *name )
34 34
   : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
35 35
                  name, true, true ), mWidget( 0 ), mConfig( config )

+ 2
- 2
kaddressbook/kcmconfigs/extensionconfigdialog.h View File

@@ -38,7 +38,7 @@ class ExtensionConfigDialog : public KDialogBase
38 38
   
39 39
 
40 40
   public:
41
-    ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
41
+    ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
42 42
                            TQWidget *parent, const char *name = 0 );
43 43
     ~ExtensionConfigDialog();
44 44
 
@@ -47,7 +47,7 @@ class ExtensionConfigDialog : public KDialogBase
47 47
 
48 48
   private:
49 49
     KAB::ConfigureWidget *mWidget;
50
-    KConfig *mConfig;
50
+    TDEConfig *mConfig;
51 51
 };
52 52
 
53 53
 #endif

+ 1
- 1
kaddressbook/kcmconfigs/kabconfig.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=kaddressbook
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kaddressbook/preferences.html
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 2
- 2
kaddressbook/kcmconfigs/kabconfigwidget.cpp View File

@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
174 174
   mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
175 175
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
176 176
 
177
-  KConfig config( "kabcrc", false, false );
177
+  TDEConfig config( "kabcrc", false, false );
178 178
   config.setGroup( "General" );
179 179
   mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
180 180
   mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
197 197
 
198 198
   KABPrefs::instance()->writeConfig();
199 199
 
200
-  KConfig config( "kabcrc", false, false );
200
+  TDEConfig config( "kabcrc", false, false );
201 201
   config.setGroup( "General" );
202 202
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
203 203
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );

+ 1
- 1
kaddressbook/kcmconfigs/kabcustomfields.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=dlgedit
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kaddressbook/preferences.html
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 1
- 1
kaddressbook/kcmconfigs/kabldapconfig.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=find
3 3
 Type=Service
4
-ServiceTypes=KCModule
4
+ServiceTypes=TDECModule
5 5
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
6 6
 
7 7
 X-TDE-ModuleType=Library

+ 2
- 2
kaddressbook/kcmconfigs/kcmkabconfig.cpp View File

@@ -35,13 +35,13 @@
35 35
 
36 36
 extern "C"
37 37
 {
38
-  KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
38
+  KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
39 39
     return new KCMKabConfig( parent, "kcmkabconfig" );
40 40
   }
41 41
 }
42 42
 
43 43
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
44
-  : KCModule( parent, name )
44
+  : TDECModule( parent, name )
45 45
 {
46 46
   TQVBoxLayout *layout = new TQVBoxLayout( this );
47 47
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabconfig.h View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 class KABConfigWidget;
30 30
 
31
-class KCMKabConfig : public KCModule
31
+class KCMKabConfig : public TDECModule
32 32
 {
33 33
   Q_OBJECT
34 34
   

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabcustomfields.cpp View File

@@ -33,7 +33,7 @@
33 33
 
34 34
 extern "C"
35 35
 {
36
-  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
36
+  KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
37 37
     return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
38 38
   }
39 39
 }

+ 2
- 2
kaddressbook/kcmconfigs/kcmkabldapconfig.cpp View File

@@ -36,13 +36,13 @@
36 36
 
37 37
 extern "C"
38 38
 {
39
-  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
39
+  KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
40 40
     return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
41 41
   }
42 42
 }
43 43
 
44 44
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
45
-  : KCModule( parent, name )
45
+  : TDECModule( parent, name )
46 46
 {
47 47
   TQVBoxLayout *layout = new TQVBoxLayout( this );
48 48
   mConfigWidget = new LDAPOptionsWidget( this );

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabldapconfig.h View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 class LDAPOptionsWidget;
32 32
 
33
-class KCMKabLdapConfig : public KCModule
33
+class KCMKabLdapConfig : public TDECModule
34 34
 {
35 35
   Q_OBJECT
36 36
   

+ 4
- 4
kaddressbook/kcmconfigs/ldapoptionswidget.cpp View File

@@ -197,8 +197,8 @@ void LDAPOptionsWidget::slotMoveDown()
197 197
 void LDAPOptionsWidget::restoreSettings()
198 198
 {
199 199
   mHostListView->clear();
200
-  KConfig *config = KPIM::LdapSearch::config();
201
-  KConfigGroupSaver saver( config, "LDAP" );
200
+  TDEConfig *config = KPIM::LdapSearch::config();
201
+  TDEConfigGroupSaver saver( config, "LDAP" );