Browse Source

Rename KInstance and KAboutData to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
5fc6f26e12
100 changed files with 182 additions and 182 deletions
  1. 1
    1
      akregator/src/aboutdata.cpp
  2. 1
    1
      akregator/src/aboutdata.h
  3. 3
    3
      akregator/src/akregator_part.cpp
  4. 3
    3
      akregator/src/akregator_part.h
  5. 1
    1
      akregator/src/librss/testlibrss.cpp
  6. 1
    1
      akregator/src/notificationmanager.cpp
  7. 2
    2
      akregator/src/notificationmanager.h
  8. 1
    1
      certmanager/aboutdata.cpp
  9. 1
    1
      certmanager/aboutdata.h
  10. 1
    1
      certmanager/kwatchgnupg/aboutdata.cpp
  11. 1
    1
      certmanager/kwatchgnupg/aboutdata.h
  12. 1
    1
      certmanager/lib/tests/test_cryptoconfig.cpp
  13. 1
    1
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  14. 1
    1
      certmanager/lib/tests/test_jobs.cpp
  15. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  16. 1
    1
      certmanager/lib/tests/test_keylister.cpp
  17. 1
    1
      certmanager/lib/tests/test_keyselectiondialog.cpp
  18. 1
    1
      certmanager/lib/tests/test_verify.cpp
  19. 1
    1
      kabc/frontend/main.cpp
  20. 1
    1
      kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
  21. 1
    1
      kaddressbook/interfaces/xxport.cpp
  22. 3
    3
      kaddressbook/kabcore.cpp
  23. 2
    2
      kaddressbook/kabcore.h
  24. 1
    1
      kaddressbook/kaddressbook_part.cpp
  25. 3
    3
      kaddressbook/kaddressbook_part.h
  26. 2
    2
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  27. 2
    2
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  28. 2
    2
      kalarm/kalarmd/admain.cpp
  29. 2
    2
      kalarm/main.cpp
  30. 2
    2
      kandy/src/main.cpp
  31. 6
    6
      karm/karm_part.cpp
  32. 5
    5
      karm/karm_part.h
  33. 2
    2
      karm/main.cpp
  34. 1
    1
      kioslaves/imap4/imap4.cc
  35. 1
    1
      kioslaves/mbox/mbox.cc
  36. 1
    1
      kioslaves/opengroupware/opengroupware.cpp
  37. 1
    1
      kioslaves/sieve/sieve.cpp
  38. 1
    1
      kitchensync/src/main.cpp
  39. 3
    3
      kitchensync/src/mainwidget.cpp
  40. 2
    2
      kitchensync/src/mainwidget.h
  41. 1
    1
      kitchensync/src/part.cpp
  42. 2
    2
      kitchensync/src/part.h
  43. 1
    1
      kmail/aboutdata.cpp
  44. 1
    1
      kmail/aboutdata.h
  45. 1
    1
      kmail/dcoptest.cpp
  46. 1
    1
      kmail/kmail_part.cpp
  47. 3
    3
      kmail/kmail_part.h
  48. 4
    4
      kmail/kmkernel.h
  49. 1
    1
      kmail/kmstartup.cpp
  50. 1
    1
      kmail/recipientseditortest.cpp
  51. 2
    2
      kmailcvt/main.cpp
  52. 1
    1
      kmobile/kioslave/kio_mobile.cpp
  53. 2
    2
      kmobile/main.cpp
  54. 2
    2
      knode/aboutdata.cpp
  55. 1
    1
      knode/aboutdata.h
  56. 2
    2
      knode/knglobals.h
  57. 1
    1
      knode/knode_part.cpp
  58. 3
    3
      knode/knode_part.h
  59. 1
    1
      knotes/ChangeLog
  60. 2
    2
      knotes/main.cpp
  61. 3
    3
      kode/kodemain.cpp
  62. 2
    2
      kode/kwsdl/kung/main.cpp
  63. 2
    2
      kode/kwsdl/main.cpp
  64. 1
    1
      kode/kwsdl/tests/google/main.cc
  65. 3
    3
      kode/kxml_compiler/kxml_compiler.cpp
  66. 2
    2
      konsolekalendar/main.cpp
  67. 2
    2
      kontact/interfaces/plugin.cpp
  68. 2
    2
      kontact/interfaces/plugin.h
  69. 1
    1
      kontact/plugins/akregator/akregator_plugin.h
  70. 1
    1
      kontact/plugins/kaddressbook/kaddressbook_plugin.h
  71. 1
    1
      kontact/plugins/karm/karm_plugin.h
  72. 1
    1
      kontact/plugins/kitchensync/kitchensync_plugin.h
  73. 2
    2
      kontact/plugins/kmail/kcmkmailsummary.cpp
  74. 1
    1
      kontact/plugins/knotes/knotes_part.cpp
  75. 1
    1
      kontact/plugins/knotes/knotes_part_p.h
  76. 3
    3
      kontact/plugins/knotes/knotes_plugin.cpp
  77. 2
    2
      kontact/plugins/knotes/knotes_plugin.h
  78. 2
    2
      kontact/plugins/korganizer/kcmkorgsummary.cpp
  79. 3
    3
      kontact/plugins/kpilot/kpilot_plugin.cpp
  80. 2
    2
      kontact/plugins/kpilot/kpilot_plugin.h
  81. 3
    3
      kontact/plugins/newsticker/kcmkontactknt.cpp
  82. 2
    2
      kontact/plugins/newsticker/kcmkontactknt.h
  83. 3
    3
      kontact/plugins/specialdates/kcmsdsummary.cpp
  84. 2
    2
      kontact/plugins/specialdates/kcmsdsummary.h
  85. 3
    3
      kontact/plugins/specialdates/specialdates_plugin.cpp
  86. 2
    2
      kontact/plugins/specialdates/specialdates_plugin.h
  87. 2
    2
      kontact/plugins/summary/kcmkontactsummary.cpp
  88. 2
    2
      kontact/plugins/summary/summaryview_part.cpp
  89. 1
    1
      kontact/plugins/summary/summaryview_part.h
  90. 3
    3
      kontact/plugins/summary/summaryview_plugin.cpp
  91. 2
    2
      kontact/plugins/summary/summaryview_plugin.h
  92. 1
    1
      kontact/plugins/test/test_part.cpp
  93. 3
    3
      kontact/plugins/weather/weather_plugin.cpp
  94. 2
    2
      kontact/plugins/weather/weather_plugin.h
  95. 2
    2
      kontact/src/aboutdialog.cpp
  96. 3
    3
      kontact/src/aboutdialog.h
  97. 3
    3
      kontact/src/kcmkontact.cpp
  98. 2
    2
      kontact/src/kcmkontact.h
  99. 3
    3
      kontact/src/main.cpp
  100. 0
    0
      korganizer/aboutdata.cpp

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

@@ -29,7 +29,7 @@
29 29
 namespace Akregator {
30 30
 
31 31
 AboutData::AboutData()
32
-    : KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
32
+    : TDEAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
33 33
                  License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), 0,
34 34
                      "http://akregator.kde.org/")
35 35
 {

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

@@ -34,7 +34,7 @@ namespace Akregator {
34 34
 /**
35 35
 @author Teemu Rytilahti
36 36
 */
37
-class KDE_EXPORT AboutData : public KAboutData
37
+class KDE_EXPORT AboutData : public TDEAboutData
38 38
 {
39 39
 public:
40 40
     AboutData();

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

@@ -766,14 +766,14 @@ void Part::addFeed()
766 766
     m_view->slotFeedAdd();
767 767
 }
768 768
 
769
-KAboutData *Part::createAboutData()
769
+TDEAboutData *Part::createAboutData()
770 770
 {
771 771
     return new Akregator::AboutData;
772 772
 }
773 773
 
774 774
 void Part::showKNotifyOptions()
775 775
 {
776
-    KAboutData* about = new Akregator::AboutData;
776
+    TDEAboutData* about = new Akregator::AboutData;
777 777
     KNotifyDialog::configure(m_view, "akregator_knotify_config", about);
778 778
     delete about;
779 779
 }
@@ -934,7 +934,7 @@ bool Part::tryToLock(const TQString& backendName)
934 934
         appName = "akregator";
935 935
 
936 936
     TQString programName;
937
-    const KAboutData *about = kapp->aboutData();
937
+    const TDEAboutData *about = kapp->aboutData();
938 938
     if ( about )
939 939
         programName = about->programName();
940 940
     if ( programName.isEmpty() )

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

@@ -37,7 +37,7 @@
37 37
 class TQDomDocument;
38 38
 class TQTimer;
39 39
 
40
-class KAboutData;
40
+class TDEAboutData;
41 41
 class KConfig;
42 42
 class KURL;
43 43
 
@@ -88,8 +88,8 @@ namespace Akregator
88 88
 	        /** Destructor. */
89 89
             virtual ~Part();
90 90
 
91
-            /** Create KAboutData for this KPart. */
92
-            static KAboutData *createAboutData();
91
+            /** Create TDEAboutData for this KPart. */
92
+            static TDEAboutData *createAboutData();
93 93
 
94 94
             /**
95 95
              Opens feedlist

+ 1
- 1
akregator/src/librss/testlibrss.cpp View File

@@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
58 58
 
59 59
 int main( int argc, char **argv )
60 60
 {
61
-	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
61
+	TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
62 62
 	TDECmdLineArgs::init( argc, argv, &aboutData );
63 63
     TDECmdLineArgs::addCmdLineOptions( options );
64 64
 	TDEApplication app;

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

@@ -52,7 +52,7 @@ NotificationManager::~NotificationManager()
52 52
     m_self = 0;
53 53
 }
54 54
 
55
-void NotificationManager::setWidget(TQWidget* widget, KInstance* inst)
55
+void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst)
56 56
 {
57 57
     m_widget = widget;
58 58
     m_instance = inst != NULL ? inst : KGlobal::instance();

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

@@ -44,7 +44,7 @@ class NotificationManager : public TQObject
44 44
         ~NotificationManager();
45 45
 
46 46
         /** the widget used for notification, normally either the mainwindow or the tray icon */
47
-        void setWidget(TQWidget* widget, KInstance* inst=0);
47
+        void setWidget(TQWidget* widget, TDEInstance* inst=0);
48 48
         
49 49
     public slots:
50 50
 
@@ -74,7 +74,7 @@ class NotificationManager : public TQObject
74 74
         bool m_running;
75 75
         bool m_addedInLastInterval;
76 76
         TQWidget* m_widget;
77
-        KInstance* m_instance;
77
+        TDEInstance* m_instance;
78 78
 
79 79
         TQValueList<Article> m_articles;
80 80
 

+ 1
- 1
certmanager/aboutdata.cpp View File

@@ -76,7 +76,7 @@ static const about_data credits[] = {
76 76
 
77 77
 
78 78
 AboutData::AboutData()
79
-  : KAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
79
+  : TDEAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
80 80
 		kleopatra_version, description, License_GPL,
81 81
 		"(c) 2002 Steffen Hansen, Jesper Pedersen,\n"
82 82
 		"Kalle Dalheimer, Klar\xC3\xA4lvdalens Datakonsult AB\n\n"

+ 1
- 1
certmanager/aboutdata.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <kaboutdata.h>
37 37
 
38
-class AboutData : public KAboutData {
38
+class AboutData : public TDEAboutData {
39 39
 public:
40 40
   AboutData();
41 41
 };

+ 1
- 1
certmanager/kwatchgnupg/aboutdata.cpp View File

@@ -56,7 +56,7 @@ static const about_data credits[] = {
56 56
 #endif
57 57
 
58 58
 AboutData::AboutData()
59
-  : KAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
59
+  : TDEAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
60 60
 		kwatchgnupg_version, description, License_GPL,
61 61
 		"(c) 2004 Klar\xC3\xA4lvdalens Datakonsult AB\n" )
62 62
 {

+ 1
- 1
certmanager/kwatchgnupg/aboutdata.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <kaboutdata.h>
37 37
 
38
-class AboutData : public KAboutData {
38
+class AboutData : public TDEAboutData {
39 39
 public:
40 40
   AboutData();
41 41
 };

+ 1
- 1
certmanager/lib/tests/test_cryptoconfig.cpp View File

@@ -42,7 +42,7 @@ using namespace std;
42 42
 
43 43
 int main( int argc, char** argv ) {
44 44
 
45
-  KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
45
+  TDEAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
46 46
   TDECmdLineArgs::init( argc, argv, &aboutData );
47 47
   TDEApplication app( false, false );
48 48
 

+ 1
- 1
certmanager/lib/tests/test_gnupgprocessbase.cpp View File

@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
119 119
     kdDebug() << "Need at least two arguments" << endl;
120 120
     return 1;
121 121
   }
122
-  KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
122
+  TDEAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
123 123
   TDECmdLineArgs::init( &aboutData );
124 124
   TDEApplication app;
125 125
 

+ 1
- 1
certmanager/lib/tests/test_jobs.cpp View File

@@ -100,7 +100,7 @@ int main( int argc, char** argv ) {
100 100
     protocol = argv[1];
101 101
     argc = 1; // hide from KDE
102 102
   }
103
-  KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
103
+  TDEAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
104 104
   TDECmdLineArgs::init( argc, argv, &aboutData );
105 105
   TDEApplication app;
106 106
 

+ 1
- 1
certmanager/lib/tests/test_keygen.cpp View File

@@ -146,7 +146,7 @@ int main( int argc, char** argv ) {
146 146
     protocol = argv[1];
147 147
     argc = 1; // hide from KDE
148 148
   }
149
-  KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
149
+  TDEAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
150 150
   TDECmdLineArgs::init( argc, argv, &aboutData );
151 151
   TDEApplication app;
152 152
 

+ 1
- 1
certmanager/lib/tests/test_keylister.cpp View File

@@ -130,7 +130,7 @@ void CertListView::slotStart() {
130 130
 
131 131
 int main( int argc, char** argv ) {
132 132
 
133
-  KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
133
+  TDEAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
134 134
   TDECmdLineArgs::init( argc, argv, &aboutData );
135 135
   TDEApplication app;
136 136
 

+ 1
- 1
certmanager/lib/tests/test_keyselectiondialog.cpp View File

@@ -44,7 +44,7 @@
44 44
 #include <vector>
45 45
 
46 46
 int main( int argc, char ** argv ) {
47
-  KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
47
+  TDEAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
48 48
   TDECmdLineArgs::init( argc, argv, &aboutData );
49 49
   TDEApplication app;
50 50
 

+ 1
- 1
certmanager/lib/tests/test_verify.cpp View File

@@ -53,7 +53,7 @@ int main( int argc, char **argv )
53 53
   setenv("LC_ALL", "C", 1);
54 54
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1);
55 55
 
56
-  KAboutData aboutData( "test_verify", "verify job test", "0.1" );
56
+  TDEAboutData aboutData( "test_verify", "verify job test", "0.1" );
57 57
   TDECmdLineArgs::init( argc, argv, &aboutData );
58 58
   TDEApplication app( false, false );
59 59
 

+ 1
- 1
kabc/frontend/main.cpp View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 int main( int argc, char ** argv )
10 10
 {
11
-  KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
11
+  TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
12 12
   TDECmdLineArgs::init(argc,argv,&aboutData);
13 13
 
14 14
   TDEApplication app;

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

@@ -72,7 +72,7 @@ int main( int argc, char **argv )
72 72
 {
73 73
   TDEApplication::disableAutoDcopRegistration();
74 74
 
75
-  KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
75
+  TDEAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
76 76
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
77 77
 
78 78
   TDECmdLineArgs::init( argc, argv, &aboutData );

+ 1
- 1
kaddressbook/interfaces/xxport.cpp View File

@@ -45,7 +45,7 @@ XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
45 45
   : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
46 46
     d( new XXPortPrivate )
47 47
 {
48
-  setInstance( new KInstance( "kaddressbook" ) );
48
+  setInstance( new TDEInstance( "kaddressbook" ) );
49 49
 
50 50
   d->mExportMapper = new TQSignalMapper( this );
51 51
   d->mImportMapper = new TQSignalMapper( this );

+ 3
- 3
kaddressbook/kabcore.cpp View File

@@ -310,11 +310,11 @@ TQWidget *KABCore::widget() const
310 310
   return mWidget;
311 311
 }
312 312
 
313
-KAboutData *KABCore::createAboutData()
313
+TDEAboutData *KABCore::createAboutData()
314 314
 {
315
-  KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
315
+  TDEAboutData *about = new TDEAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
316 316
                                       "3.5.13", I18N_NOOP( "The TDE Address Book" ),
317
-                                      KAboutData::License_GPL_V2,
317
+                                      TDEAboutData::License_GPL_V2,
318 318
                                       I18N_NOOP( "(c) 2008-2010, The Trinity Team\n(c) 1997-2005, The KDE PIM Team" ) );
319 319
   about->addAuthor( "Timothy Pearson", I18N_NOOP( "Current maintainer" ), "kb9vqf@pearsoncomputing.net" );
320 320
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );

+ 2
- 2
kaddressbook/kabcore.h View File

@@ -46,7 +46,7 @@ class CategoryEditDialog;
46 46
 class CategorySelectDialog;
47 47
 }
48 48
 
49
-class KAboutData;
49
+class TDEAboutData;
50 50
 class KAction;
51 51
 class KActionCollection;
52 52
 class KConfig;
@@ -138,7 +138,7 @@ class KDE_EXPORT KABCore : public KAB::Core
138 138
      */
139 139
     TQWidget *widget() const;
140 140
 
141
-    static KAboutData *createAboutData();
141
+    static TDEAboutData *createAboutData();
142 142
 
143 143
     void setStatusBar( KStatusBar *statusBar );
144 144
 

+ 1
- 1
kaddressbook/kaddressbook_part.cpp View File

@@ -77,7 +77,7 @@ KAddressbookPart::~KAddressbookPart()
77 77
   closeURL();
78 78
 }
79 79
 
80
-KAboutData *KAddressbookPart::createAboutData()
80
+TDEAboutData *KAddressbookPart::createAboutData()
81 81
 {
82 82
   return KABCore::createAboutData();
83 83
 }

+ 3
- 3
kaddressbook/kaddressbook_part.h View File

@@ -29,8 +29,8 @@
29 29
 
30 30
 #include "kaddressbookiface.h"
31 31
 
32
-class KAboutData;
33
-class KInstance;
32
+class TDEAboutData;
33
+class TDEInstance;
34 34
 
35 35
 class KABCore;
36 36
 
@@ -44,7 +44,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
44 44
                       TQObject *parent, const char *name, const TQStringList& );
45 45
     virtual ~KAddressbookPart();
46 46
 
47
-    static KAboutData *createAboutData();
47
+    static TDEAboutData *createAboutData();
48 48
 
49 49
     virtual void saveToProfile( const TQString& path ) const;
50 50
     virtual void loadProfile( const TQString& path );

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

@@ -51,9 +51,9 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
51 51
 
52 52
   load();
53 53
 
54
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ),
54
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabconfig" ),
55 55
                                       I18N_NOOP( "KAddressBook Configure Dialog" ),
56
-                                      0, 0, KAboutData::License_GPL,
56
+                                      0, 0, TDEAboutData::License_GPL,
57 57
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
58 58
 
59 59
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

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

@@ -52,9 +52,9 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
52 52
 
53 53
   load();
54 54
 
55
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabldapconfig" ),
55
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabldapconfig" ),
56 56
                                       I18N_NOOP( "KAB LDAP Configure Dialog" ),
57
-                                      0, 0, KAboutData::License_GPL,
57
+                                      0, 0, TDEAboutData::License_GPL,
58 58
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
59 59
 
60 60
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 2
- 2
kalarm/kalarmd/admain.cpp View File

@@ -39,8 +39,8 @@ static const KCmdLineOptions options[] =
39 39
 
40 40
 int main(int argc, char** argv)
41 41
 {
42
-	KAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"),
43
-	                     DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), KAboutData::License_GPL,
42
+	TDEAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"),
43
+	                     DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), TDEAboutData::License_GPL,
44 44
 	                     "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", 0,
45 45
 	                     "http://www.astrojar.org.uk/kalarm");
46 46
 	aboutData.addAuthor("David Jarvie", I18N_NOOP("Maintainer"), "software@astrojar.org.uk");

+ 2
- 2
kalarm/main.cpp View File

@@ -107,9 +107,9 @@ static KCmdLineOptions options[] =
107 107
 
108 108
 int main(int argc, char *argv[])
109 109
 {
110
-	KAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION,
110
+	TDEAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION,
111 111
 		I18N_NOOP("Personal alarm message, command and email scheduler for TDE"),
112
-		KAboutData::License_GPL,
112
+		TDEAboutData::License_GPL,
113 113
 		"Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm");
114 114
 	aboutData.addAuthor("David Jarvie", 0, "software@astrojar.org.uk");
115 115
 

+ 2
- 2
kandy/src/main.cpp View File

@@ -87,8 +87,8 @@ void initModem(Modem *modem)
87 87
 
88 88
 int main(int argc, char **argv)
89 89
 {
90
-  KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
91
-                   KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
90
+  TDEAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
91
+                   TDEAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
92 92
                    "http://kandy.kde.org/");
93 93
   about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
94 94
   about.addAuthor( "Heiko Falk", 0, "hf2@ls12.cs.uni-dortmund.de" );

+ 6
- 6
karm/karm_part.cpp View File

@@ -367,12 +367,12 @@ void karmPart::fileSaveAs()
367 367
 
368 368
 
369 369
 // It's usually safe to leave the factory code alone.. with the
370
-// notable exception of the KAboutData data
370
+// notable exception of the TDEAboutData data
371 371
 #include <kaboutdata.h>
372 372
 #include <klocale.h>
373 373
 
374
-KInstance*  karmPartFactory::s_instance = 0L;
375
-KAboutData* karmPartFactory::s_about = 0L;
374
+TDEInstance*  karmPartFactory::s_instance = 0L;
375
+TDEAboutData* karmPartFactory::s_about = 0L;
376 376
 
377 377
 karmPartFactory::karmPartFactory()
378 378
     : KParts::Factory()
@@ -401,13 +401,13 @@ KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const c
401 401
     return obj;
402 402
 }
403 403
 
404
-KInstance* karmPartFactory::instance()
404
+TDEInstance* karmPartFactory::instance()
405 405
 {
406 406
     if( !s_instance )
407 407
     {
408
-        s_about = new KAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
408
+        s_about = new TDEAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
409 409
         s_about->addAuthor("Thorsten Staerk", 0, "thorsten@staerk.de");
410
-        s_instance = new KInstance(s_about);
410
+        s_instance = new TDEInstance(s_about);
411 411
     }
412 412
     return s_instance;
413 413
 }

+ 5
- 5
karm/karm_part.h View File

@@ -116,8 +116,8 @@ protected slots:
116 116
     void startNewSession(); 
117 117
 };
118 118
 
119
-class KInstance;
120
-class KAboutData;
119
+class TDEInstance;
120
+class TDEAboutData;
121 121
 
122 122
 class karmPartFactory : public KParts::Factory
123 123
 {
@@ -129,11 +129,11 @@ public:
129 129
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
130 130
                                             TQObject *parent, const char *name,
131 131
                                             const char *classname, const TQStringList &args );
132
-    static KInstance* instance();
132
+    static TDEInstance* instance();
133 133
  
134 134
 private:
135
-    static KInstance* s_instance;
136
-    static KAboutData* s_about;
135
+    static TDEInstance* s_instance;
136
+    static TDEAboutData* s_about;
137 137
 };
138 138
 
139 139
 #endif // _KARMPART_H_

+ 2
- 2
karm/main.cpp View File

@@ -27,8 +27,8 @@ static const KCmdLineOptions options[] =
27 27
 
28 28
 int main( int argc, char *argv[] )
29 29
 {
30
-  KAboutData aboutData( "karm", I18N_NOOP("KArm"),
31
-      KARM_VERSION, description, KAboutData::License_GPL,
30
+  TDEAboutData aboutData( "karm", I18N_NOOP("KArm"),
31
+      KARM_VERSION, description, TDEAboutData::License_GPL,
32 32
       "(c) 1997-2004, KDE PIM Developers" );
33 33
 
34 34
   aboutData.addAuthor( "Mark Bucciarelli", I18N_NOOP( "Current Maintainer" ),

+ 1
- 1
kioslaves/imap4/imap4.cc View File

@@ -109,7 +109,7 @@ kdemain (int argc, char **argv)
109 109
 {
110 110
   kdDebug(7116) << "IMAP4::kdemain" << endl;
111 111
 
112
-  KInstance instance ("kio_imap4");
112
+  TDEInstance instance ("kio_imap4");
113 113
   if (argc != 4)
114 114
   {
115 115
     fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n");

+ 1
- 1
kioslaves/mbox/mbox.cc View File

@@ -43,7 +43,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
43 43
 int kdemain( int argc, char * argv[] )
44 44
 {
45 45
 	KLocale::setMainCatalogue("tdelibs");
46
-	KInstance instance("kio_mbox");
46
+	TDEInstance instance("kio_mbox");
47 47
 	(void) KGlobal::locale();
48 48
 
49 49
 	if (argc != 4) {

+ 1
- 1
kioslaves/opengroupware/opengroupware.cpp View File

@@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv );
69 69
 
70 70
 int kdemain( int argc, char **argv )
71 71
 {
72
-  KInstance instance( "kio_OpenGroupware" );
72
+  TDEInstance instance( "kio_OpenGroupware" );
73 73
   
74 74
   kdDebug(7000) << "Starting kio_OpenGroupware(pid:  " << getpid() << ")" << endl;
75 75
   

+ 1
- 1
kioslaves/sieve/sieve.cpp View File

@@ -82,7 +82,7 @@ extern "C"
82 82
 {
83 83
 	KDE_EXPORT int kdemain(int argc, char **argv)
84 84
 	{
85
-		KInstance instance("kio_sieve" );
85
+		TDEInstance instance("kio_sieve" );
86 86
 
87 87
 		ksDebug() << "*** Starting kio_sieve " << endl;
88 88
 

+ 1
- 1
kitchensync/src/main.cpp View File

@@ -34,7 +34,7 @@ static KCmdLineOptions options[] =
34 34
 
35 35
 int main( int argc, char **argv )
36 36
 {
37
-  KAboutData *about = MainWidget::aboutData();
37
+  TDEAboutData *about = MainWidget::aboutData();
38 38
 
39 39
   TDECmdLineArgs::init( argc, argv, about );
40 40
   TDECmdLineArgs::addCmdLineOptions( options );

+ 3
- 3
kitchensync/src/mainwidget.cpp View File

@@ -72,11 +72,11 @@ KXMLGUIClient *MainWidget::guiClient() const
72 72
   return mGUIClient;
73 73
 }
74 74
 
75
-KAboutData *MainWidget::aboutData()
75
+TDEAboutData *MainWidget::aboutData()
76 76
 {
77
-  KAboutData *about = new KAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
77
+  TDEAboutData *about = new TDEAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
78 78
                                       "0.1", I18N_NOOP( "The TDE Syncing Application" ),
79
-                                      KAboutData::License_GPL_V2,
79
+                                      TDEAboutData::License_GPL_V2,
80 80
                                       I18N_NOOP( "(c) 2005, The KDE PIM Team" ) );
81 81
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer" ), "tokoe@kde.org" );
82 82
   about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

+ 2
- 2
kitchensync/src/mainwidget.h View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <tqwidget.h>
27 27
 
28
-class KAboutData;
28
+class TDEAboutData;
29 29
 class KAction;
30 30
 class KXMLGUIClient;
31 31
 class GroupView;
@@ -45,7 +45,7 @@ class KDE_EXPORT MainWidget : public TQWidget
45 45
     ~MainWidget();
46 46
 
47 47
     virtual KXMLGUIClient *guiClient() const;
48
-    static KAboutData *aboutData();
48
+    static TDEAboutData *aboutData();
49 49
 
50 50
   public slots:
51 51
     void addGroup();

+ 1
- 1
kitchensync/src/part.cpp View File

@@ -58,7 +58,7 @@ KitchenSyncPart::~KitchenSyncPart()
58 58
   closeURL();
59 59
 }
60 60
 
61
-KAboutData *KitchenSyncPart::createAboutData()
61
+TDEAboutData *KitchenSyncPart::createAboutData()
62 62
 {
63 63
   return MainWidget::aboutData();
64 64
 }

+ 2
- 2
kitchensync/src/part.h View File

@@ -25,7 +25,7 @@
25 25
 #include <kparts/factory.h>
26 26
 #include <kparts/part.h>
27 27
 
28
-class KAboutData;
28
+class TDEAboutData;
29 29
 
30 30
 class KitchenSyncPart: public KParts::ReadOnlyPart
31 31
 {
@@ -37,7 +37,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
37 37
                      TQObject *parent, const char *name, const TQStringList& );
38 38
     virtual ~KitchenSyncPart();
39 39
 
40
-    static KAboutData *createAboutData();
40
+    static TDEAboutData *createAboutData();
41 41
 
42 42
     virtual void exit();
43 43
     virtual bool openURL( const KURL &url );

+ 1
- 1
kmail/aboutdata.cpp View File

@@ -209,7 +209,7 @@ namespace KMail {
209 209
   };
210 210
 
211 211
   AboutData::AboutData()
212
-    : KAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
212
+    : TDEAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
213 213
                   I18N_NOOP("TDE Email Client"), License_GPL,
214 214
                   I18N_NOOP("(c) 1997-2008, The KMail developers"), 0,
215 215
                   "http://kontact.kde.org/kmail/" )

+ 1
- 1
kmail/aboutdata.h View File

@@ -37,7 +37,7 @@
37 37
 
38 38
 namespace KMail {
39 39
 
40
-  class KDE_EXPORT AboutData : public KAboutData {
40
+  class KDE_EXPORT AboutData : public TDEAboutData {
41 41
   public:
42 42
     AboutData();
43 43
     ~AboutData();

+ 1
- 1
kmail/dcoptest.cpp View File

@@ -15,7 +15,7 @@ int main(int argc,char **argv)
15 15
 {
16 16
   kdDebug(5006) << "Test KMail DCOP interface." << endl;
17 17
 
18
-  KAboutData aboutData( "testKMailDCOP",
18
+  TDEAboutData aboutData( "testKMailDCOP",
19 19
    "Test for KMail DCOP interface", "0.0" );
20 20
   TDECmdLineArgs::init(argc, argv, &aboutData);
21 21
   TDEApplication app;

+ 1
- 1
kmail/kmail_part.cpp View File

@@ -165,7 +165,7 @@ KMailPart::~KMailPart()
165 165
   KMail::cleanup(); // pid file (see kmstartup.cpp)
166 166
 }
167 167
 
168
-KAboutData *KMailPart::createAboutData()
168
+TDEAboutData *KMailPart::createAboutData()
169 169
 {
170 170
   return new KMail::AboutData();
171 171
 }

+ 3
- 3
kmail/kmail_part.h View File

@@ -37,8 +37,8 @@
37 37
 #include <tqwidget.h>
38 38
 #include <tdepimmacros.h>
39 39
 
40
-class KInstance;
41
-class KAboutData;
40
+class TDEInstance;
41
+class TDEAboutData;
42 42
 class KMailStatusBarExtension;
43 43
 class KMKernel;
44 44
 class KMMainWidget;
@@ -60,7 +60,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
60 60
 
61 61
     TQWidget* parentWidget() const;
62 62
 
63
-    static KAboutData *createAboutData();
63
+    static TDEAboutData *createAboutData();
64 64
 
65 65
   public slots:
66 66
     virtual void save() { /*TODO*/ }

+ 4
- 4
kmail/kmkernel.h View File

@@ -59,7 +59,7 @@ namespace KPIM {
59 59
 class KMKernel;
60 60
 class KProcess;
61 61
 class KProgressDialog;
62
-class KInstance;
62
+class TDEInstance;
63 63
 class TQTimer;
64 64
 class KProgress;
65 65
 class KPassivePopup;
@@ -291,8 +291,8 @@ public:
291 291
    */
292 292
   KMFolder* findFolderById( const TQString& idString );
293 293
 
294
-  KInstance *xmlGuiInstance() { return mXmlGuiInstance; }
295
-  void setXmlGuiInstance( KInstance *instance ) { mXmlGuiInstance = instance; }
294
+  TDEInstance *xmlGuiInstance() { return mXmlGuiInstance; }
295
+  void setXmlGuiInstance( TDEInstance *instance ) { mXmlGuiInstance = instance; }
296 296
 
297 297
   KMFolder *inboxFolder() { return the_inboxFolder; }
298 298
   KMFolder *outboxFolder() { return the_outboxFolder; }
@@ -489,7 +489,7 @@ private:
489 489
   static KMKernel *mySelf;
490 490
   KSharedConfig::Ptr mConfig;
491 491
   TQTextCodec *netCodec;
492
-  KInstance* mXmlGuiInstance;
492
+  TDEInstance* mXmlGuiInstance;
493 493
   ConfigureDialog *mConfigureDialog;
494 494
 
495 495
   TQTimer *mBackgroundTasksTimer;

+ 1
- 1
kmail/kmstartup.cpp View File

@@ -142,7 +142,7 @@ void lockOrDie() {
142 142
     appName = "kmail";
143 143
 
144 144
   TQString programName;
145
-  const KAboutData *about = kapp->aboutData();
145
+  const TDEAboutData *about = kapp->aboutData();
146 146
   if ( about )
147 147
     programName = about->programName();
148 148
   if ( programName.isEmpty() )

+ 1
- 1
kmail/recipientseditortest.cpp View File

@@ -90,7 +90,7 @@ void Composer::slotClose()
90 90
 
91 91
 int main( int argc, char **argv )
92 92
 {
93
-  KAboutData aboutData( "testrecipienteditor",
93
+  TDEAboutData aboutData( "testrecipienteditor",
94 94
    "Test Recipient Editor", "0.1" );
95 95
   TDECmdLineArgs::init( argc, argv, &aboutData );
96 96
 

+ 2
- 2
kmailcvt/main.cpp View File

@@ -30,8 +30,8 @@ int main(int argc, char *argv[])
30 30
 {
31 31
   KLocale::setMainCatalogue("kmailcvt");
32 32
 
33
-  KAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"),
34
-    "3", I18N_NOOP("KMail Import Filters"), KAboutData::License_GPL_V2,
33
+  TDEAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"),
34
+    "3", I18N_NOOP("KMail Import Filters"), TDEAboutData::License_GPL_V2,
35 35
     I18N_NOOP("(c) 2000-2005, The KMailCVT developers"));
36 36
   aboutData.addAuthor("Hans Dijkema",I18N_NOOP("Original author"), "kmailcvt@hum.org");
37 37
   aboutData.addAuthor("Danny Kukawka", I18N_NOOP("Maintainer & New filters"), "danny.kukawka@web.de");

+ 1
- 1
kmobile/kioslave/kio_mobile.cpp View File

@@ -47,7 +47,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
47 47
  */
48 48
 int kdemain(int argc, char **argv)
49 49
 {
50
-  KInstance instance( "kio_mobile" );
50
+  TDEInstance instance( "kio_mobile" );
51 51
 
52 52
   PRINT_DEBUG << "Starting " << getpid() << endl;
53 53
 

+ 2
- 2
kmobile/main.cpp View File

@@ -37,8 +37,8 @@ static KCmdLineOptions options[] =
37 37
 
38 38
 int main(int argc, char **argv)
39 39
 {
40
-    KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
41
-                     KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org");
40
+    TDEAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
41
+                     TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org");
42 42
     about.addAuthor( "Helge Deller", 0, "deller@kde.org" );
43 43
     TDECmdLineArgs::init(argc, argv, &about);
44 44
     TDECmdLineArgs::addCmdLineOptions(options);

+ 2
- 2
knode/aboutdata.cpp View File

@@ -42,11 +42,11 @@ namespace KNode
42 42
   };
43 43
 
44 44
   AboutData::AboutData()
45
-    : KAboutData( "knode",
45
+    : TDEAboutData( "knode",
46 46
                   I18N_NOOP("KNode"),
47 47
                   KNODE_VERSION,
48 48
                   I18N_NOOP("A newsreader for TDE"),
49
-                  KAboutData::License_GPL,
49
+                  TDEAboutData::License_GPL,
50 50
                   I18N_NOOP("Copyright (c) 1999-2005 the KNode authors"),
51 51
                   0,
52 52
                   "http://knode.sourceforge.net/" )

+ 1
- 1
knode/aboutdata.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 namespace KNode
24 24
 {
25
-  class KDE_EXPORT AboutData : public KAboutData
25
+  class KDE_EXPORT AboutData : public TDEAboutData
26 26
   {
27 27
   public:
28 28
     AboutData();

+ 2
- 2
knode/knglobals.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include <tdepimmacros.h>
24 24
 
25
-class KInstance;
25
+class TDEInstance;
26 26
 class KNConfigManager;
27 27
 class KNNetAccess;
28 28
 class KNProgress;
@@ -63,7 +63,7 @@ class KDE_EXPORT KNGlobals {
63 63
     KNArticleFactory      *artFactory;
64 64
     Kpgp::Module          *pgp;
65 65
     KConfig               *config();
66
-    KInstance             *instance;
66
+    TDEInstance             *instance;
67 67
 
68 68
     KNConfigManager       *configManager();
69 69
     KNNetAccess           *netAccess();

+ 1
- 1
knode/knode_part.cpp View File

@@ -94,7 +94,7 @@ KNodePart::~KNodePart()
94 94
   mainWidget->prepareShutdown();
95 95
 }
96 96
 
97
-KAboutData *KNodePart::createAboutData()
97
+TDEAboutData *KNodePart::createAboutData()
98 98
 {
99 99
   return new KNode::AboutData();
100 100
 }

+ 3
- 3
knode/knode_part.h View File

@@ -33,8 +33,8 @@
33 33
 
34 34
 #include <tqwidget.h>
35 35
 
36
-class KInstance;
37
-class KAboutData;
36
+class TDEInstance;
37
+class TDEAboutData;
38 38
 
39 39
 class ActionManager;
40 40
 class KNMainWidget;
@@ -50,7 +50,7 @@ class KNodePart: public KParts::ReadOnlyPart
50 50
 
51 51
     TQWidget* parentWidget() const;
52 52
 
53
-    static KAboutData *createAboutData();
53
+    static TDEAboutData *createAboutData();
54 54
 
55 55
   protected:
56 56
     virtual bool openFile();

+ 1
- 1
knotes/ChangeLog View File

@@ -816,7 +816,7 @@ ChangeLog for KNotes
816 816
 
817 817
 2000/01/30  Charles Samuels <charles@kde.org>
818 818
 
819
-    This is my daily huge commit for KAboutData.  There are also patches for
819
+    This is my daily huge commit for TDEAboutData.  There are also patches for
820 820
     TDECmdLineArgs (so it works).  Ktop is really doing bad folks.
821 821
 
822 822
 2000/01/03  Espen Sand <espen@kde.org>

+ 2
- 2
knotes/main.cpp View File

@@ -90,12 +90,12 @@ int main( int argc, char* argv[] )
90 90
 {
91 91
     TQString version = TQString::number( KNOTES_VERSION );
92 92
 
93
-    KAboutData aboutData(
93
+    TDEAboutData aboutData(
94 94
           "knotes",
95 95
           I18N_NOOP("KNotes"),
96 96
           version.latin1(),
97 97
           I18N_NOOP( "TDE Notes" ),
98
-          KAboutData::License_GPL,
98
+          TDEAboutData::License_GPL,
99 99
           I18N_NOOP("(c) 1997-2006, The KNotes Developers")
100 100
     );
101 101
 

+ 3
- 3
kode/kodemain.cpp View File

@@ -415,7 +415,7 @@ int create( TDECmdLineArgs *args )
415 415
     main.addArgument( "char **argv" );
416 416
 
417 417
     code.clear();
418
-    code += "KAboutData aboutData(\"test\",\"Test\",\"0.1\");";
418
+    code += "TDEAboutData aboutData(\"test\",\"Test\",\"0.1\");";
419 419
     code += "TDECmdLineArgs::init(argc,argv,&aboutData);";
420 420
     code += "TDECmdLineArgs::addCmdLineOptions( options );";
421 421
     code += "";
@@ -490,7 +490,7 @@ int create( TDECmdLineArgs *args )
490 490
     
491 491
     code.clear();
492 492
 
493
-    code += "KInstance instance( \"kio_" + protocol + "\" );";
493
+    code += "TDEInstance instance( \"kio_" + protocol + "\" );";
494 494
     code += "";
495 495
     code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid:  \" << getpid() << \")\" << endl;";
496 496
     code += "";
@@ -609,7 +609,7 @@ int create( TDECmdLineArgs *args )
609 609
 
610 610
 int main(int argc,char **argv)
611 611
 {
612
-  KAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" );
612
+  TDEAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" );
613 613
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
614 614
 
615 615
   TDECmdLineArgs::init( argc, argv, &aboutData );

+ 2
- 2
kode/kwsdl/kung/main.cpp View File

@@ -37,9 +37,9 @@ static const KCmdLineOptions options[] =
37 37
 
38 38
 int main( int argc, char **argv )
39 39
 {
40
-  KAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1",
40
+  TDEAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1",
41 41
                         I18N_NOOP( "TDE WSDL Interpreter" ),
42
-                        KAboutData::License_LGPL );
42
+                        TDEAboutData::License_LGPL );
43 43
 
44 44
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
45 45
 

+ 2
- 2
kode/kwsdl/main.cpp View File

@@ -43,9 +43,9 @@ static const KCmdLineOptions options[] =
43 43
 
44 44
 int main( int argc, char **argv )
45 45
 {
46
-  KAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1",
46
+  TDEAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1",
47 47
                         I18N_NOOP( "TDE WSDL Compiler" ),
48
-                        KAboutData::License_LGPL );
48
+                        TDEAboutData::License_LGPL );
49 49
 
50 50
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
51 51
 

+ 1
- 1
kode/kwsdl/tests/google/main.cc View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 int main( int argc, char **argv )
9 9
 {
10
-  KAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", KAboutData::License_GPL );
10
+  TDEAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", TDEAboutData::License_GPL );
11 11
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
12 12
 
13 13
   TDECmdLineArgs::init( argc, argv, &aboutData );

+ 3
- 3
kode/kxml_compiler/kxml_compiler.cpp View File

@@ -57,14 +57,14 @@ static const KCmdLineOptions options[] =
57 57
 
58 58
 int main( int argc, char **argv )
59 59
 {
60
-  KAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1",
61
-  	I18N_NOOP("TDE XML Compiler") , KAboutData::License_LGPL );
60
+  TDEAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1",
61
+  	I18N_NOOP("TDE XML Compiler") , TDEAboutData::License_LGPL );
62 62
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
63 63
 
64 64
   TDECmdLineArgs::init( argc, argv, &aboutData );
65 65
   TDECmdLineArgs::addCmdLineOptions( options );
66 66
 
67
-  KInstance app( &aboutData );
67
+  TDEInstance app( &aboutData );
68 68
 
69 69
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
70 70
 

+ 2
- 2
konsolekalendar/main.cpp View File

@@ -167,12 +167,12 @@ static KCmdLineOptions options[] =
167 167
 
168 168
 int main( int argc, char *argv[] )
169 169
 {
170
-  KAboutData aboutData(
170
+  TDEAboutData aboutData(
171 171
     progName,                        // internal program name
172 172
     I18N_NOOP( progDisplay ),        // displayable program name.
173 173
     progVersion,                     // version string
174 174
     I18N_NOOP( progDesc ),           // short porgram description
175
-    KAboutData::License_GPL,         // license type
175
+    TDEAboutData::License_GPL,         // license type
176 176
     "(c) 2002-2005, Tuukka Pasanen and Allen Winter", // copyright statement
177 177
     0,                               // any free form text
178 178
     progURL,                         // program home page address

+ 2
- 2
kontact/interfaces/plugin.cpp View File

@@ -126,11 +126,11 @@ KParts::ReadOnlyPart *Plugin::loadPart()
126 126
   return core()->createPart( d->partLibraryName );
127 127
 }
128 128
 
129
-const KAboutData *Plugin::aboutData()
129
+const TDEAboutData *Plugin::aboutData()
130 130
 {
131 131
   kdDebug(5601) << "Plugin::aboutData(): libname: " << d->partLibraryName << endl;
132 132
 
133
-  const KInstance *instance =
133
+  const TDEInstance *instance =
134 134
     KParts::Factory::partInstanceFromLibrary( d->partLibraryName );
135 135
 
136 136
   if ( instance ) {

+ 2
- 2
kontact/interfaces/plugin.h View File

@@ -32,7 +32,7 @@
32 32
 class TQStringList;
33 33
 class DCOPClient;
34 34
 class DCOPObject;
35
-class KAboutData;
35
+class TDEAboutData;
36 36
 class KAction;
37 37
 class KConfig;
38 38
 class TQWidget;
@@ -142,7 +142,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
142 142
       Reimplement this method if you want to add your credits to the Kontact
143 143
       about dialog.
144 144
     */
145
-    virtual const KAboutData *aboutData();
145
+    virtual const TDEAboutData *aboutData();
146 146
 
147 147
     /**
148 148
       You can use this method if you need to access the current part. You can be

+ 1
- 1
kontact/plugins/akregator/akregator_plugin.h View File

@@ -33,7 +33,7 @@
33 33
 #include "akregator_partiface_stub.h"
34 34
 #include <uniqueapphandler.h>
35 35
 
36
-class KAboutData;
36
+class TDEAboutData;
37 37
 
38 38
 namespace Akregator {
39 39
 

+ 1
- 1
kontact/plugins/kaddressbook/kaddressbook_plugin.h View File

@@ -32,7 +32,7 @@
32 32
 #include "plugin.h"
33 33
 #include <uniqueapphandler.h>
34 34
 
35
-class KAboutData;
35
+class TDEAboutData;
36 36
 
37 37
 class KABUniqueAppHandler : public Kontact::UniqueAppHandler
38 38
 {

+ 1
- 1
kontact/plugins/karm/karm_plugin.h View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "plugin.h"
34 34
 
35
-class KAboutData;
35
+class TDEAboutData;
36 36
 
37 37
 class KarmPlugin : public Kontact::Plugin
38 38
 {

+ 1
- 1
kontact/plugins/kitchensync/kitchensync_plugin.h View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 #include "plugin.h"
32 32
 
33
-class KAboutData;
33
+class TDEAboutData;
34 34
 
35 35
 class KitchenSyncPlugin : public Kontact::Plugin
36 36
 {

+ 2
- 2
kontact/plugins/kmail/kcmkmailsummary.cpp View File

@@ -59,9 +59,9 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
59 59
 
60 60
   load();
61 61
 
62
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkmailsummary" ),
62
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkmailsummary" ),
63 63
                                       I18N_NOOP( "Mail Summary Configuration Dialog" ),
64
-                                      0, 0, KAboutData::License_GPL,
64
+                                      0, 0, TDEAboutData::License_GPL,
65 65
                                       I18N_NOOP( "(c) 2004 Tobias Koenig" ) );
66 66
 
67 67
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 1
- 1
kontact/plugins/knotes/knotes_part.cpp View File

@@ -47,7 +47,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
47 47
 {
48 48
   mNoteList.setAutoDelete( true );
49 49
 
50
-  setInstance( new KInstance( "knotes" ) );
50
+  setInstance( new TDEInstance( "knotes" ) );
51 51
 
52 52
   // create the actions
53 53
   new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),

+ 1
- 1
kontact/plugins/knotes/knotes_part_p.h View File

@@ -125,7 +125,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
125 125
       // this dialog is modal to prevent one from editing the same note twice in two
126 126
       // different windows
127 127
 
128
-      setInstance( new KInstance( "knotes" ) ); // TODO: hm, memleak??
128
+      setInstance( new TDEInstance( "knotes" ) ); // TODO: hm, memleak??
129 129
       setXMLFile( "knotesui.rc" );
130 130
       actionCollection()->setWidget( this );
131 131
 

+ 3
- 3
kontact/plugins/knotes/knotes_plugin.cpp View File

@@ -64,12 +64,12 @@ Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget )
64 64
   return new KNotesSummaryWidget( this, parentWidget );
65 65
 }
66 66
 
67
-const KAboutData *KNotesPlugin::aboutData()
67
+const TDEAboutData *KNotesPlugin::aboutData()
68 68
 {
69 69
   if ( !mAboutData ) {
70
-    mAboutData = new KAboutData( "knotes", I18N_NOOP( "Notes Management" ),
70
+    mAboutData = new TDEAboutData( "knotes", I18N_NOOP( "Notes Management" ),
71 71
                                  "0.5", I18N_NOOP( "Notes Management" ),
72
-                                  KAboutData::License_GPL_V2,
72
+                                  TDEAboutData::License_GPL_V2,
73 73
                                   "(c) 2003-2004 The Kontact developers" );
74 74
     mAboutData->addAuthor( "Michael Brade", "Current Maintainer", "brade@kde.org" );
75 75
     mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/knotes/knotes_plugin.h View File

@@ -42,7 +42,7 @@ class KNotesPlugin : public Kontact::Plugin
42 42
 
43 43
     int weight() const { return 600; }
44 44
 
45
-    const KAboutData *aboutData();
45
+    const TDEAboutData *aboutData();
46 46
 
47 47
   protected:
48 48
     KParts::ReadOnlyPart* createPart();
@@ -52,7 +52,7 @@ class KNotesPlugin : public Kontact::Plugin
52 52
     void slotSyncNotes();
53 53
 
54 54
   private:
55
-    KAboutData *mAboutData;
55
+    TDEAboutData *mAboutData;
56 56
 };
57 57
 
58 58
 #endif

+ 2
- 2
kontact/plugins/korganizer/kcmkorgsummary.cpp View File

@@ -64,9 +64,9 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
64 64
 
65 65
   load();
66 66
 
67
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkorgsummary" ),
67
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkorgsummary" ),
68 68
                                       I18N_NOOP( "Schedule Configuration Dialog" ),
69
-                                      0, 0, KAboutData::License_GPL,
69
+                                      0, 0, TDEAboutData::License_GPL,
70 70
                                       I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) );
71 71
 
72 72
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 3
- 3
kontact/plugins/kpilot/kpilot_plugin.cpp View File

@@ -48,13 +48,13 @@ Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget )
48 48
   return new SummaryWidget( parentWidget );
49 49
 }
50 50
 
51
-const KAboutData *KPilotPlugin::aboutData()
51
+const TDEAboutData *KPilotPlugin::aboutData()
52 52
 {
53 53
   if ( !mAboutData ) {
54
-	mAboutData = new KAboutData("kpilotplugin", I18N_NOOP("KPilot Information"),
54
+	mAboutData = new TDEAboutData("kpilotplugin", I18N_NOOP("KPilot Information"),
55 55
 		KPILOT_VERSION,
56 56
 		I18N_NOOP("KPilot - HotSync software for TDE\n\n"),
57
-		KAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer");
57
+		TDEAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer");
58 58
 	mAboutData->addAuthor("Reinhold Kainhofer",
59 59
 		I18N_NOOP("Plugin Developer"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
60 60
 	mAboutData->addAuthor("Dan Pilone",

+ 2
- 2
kontact/plugins/kpilot/kpilot_plugin.h View File

@@ -38,12 +38,12 @@ class KPilotPlugin : public Kontact::Plugin
38 38
     virtual bool showInSideBar() const { return false; }
39 39
 //    virtual TQStringList configModules() const;
40 40
 
41
-    const KAboutData *aboutData();
41
+    const TDEAboutData *aboutData();
42 42
 
43 43
   protected:
44 44
     virtual KParts::ReadOnlyPart *createPart() { return 0; }
45 45
   private:
46
-    KAboutData *mAboutData;
46
+    TDEAboutData *mAboutData;
47 47
 };
48 48
 
49 49
 #endif

+ 3
- 3
kontact/plugins/newsticker/kcmkontactknt.cpp View File

@@ -437,11 +437,11 @@ void KCMKontactKNT::defaults()
437 437
 {
438 438
 }
439 439
 
440
-const KAboutData* KCMKontactKNT::aboutData() const
440
+const TDEAboutData* KCMKontactKNT::aboutData() const
441 441
 {
442
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkontactknt" ),
442
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkontactknt" ),
443 443
                                       I18N_NOOP( "Newsticker Configuration Dialog" ),
444
-                                      0, 0, KAboutData::License_GPL,
444
+                                      0, 0, TDEAboutData::License_GPL,
445 445
                                       I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) );
446 446
 
447 447
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/newsticker/kcmkontactknt.h View File

@@ -29,7 +29,7 @@
29 29
 class TQListViewItem;
30 30
 class TQSpinxBox;
31 31
 
32
-class KAboutData;
32
+class TDEAboutData;
33 33
 class KListView;
34 34
 class KPushButton;
35 35
 
@@ -46,7 +46,7 @@ class KCMKontactKNT : public KCModule
46 46
     virtual void load();
47 47
     virtual void save();
48 48
     virtual void defaults();
49
-    virtual const KAboutData* aboutData() const;
49
+    virtual const TDEAboutData* aboutData() const;
50 50
 
51 51
   private slots:
52 52
     void addNews();

+ 3
- 3
kontact/plugins/specialdates/kcmsdsummary.cpp View File

@@ -232,11 +232,11 @@ void KCMSDSummary::defaults()
232 232
   emit changed( true );
233 233
 }
234 234
 
235
-const KAboutData* KCMSDSummary::aboutData() const
235
+const TDEAboutData* KCMSDSummary::aboutData() const
236 236
 {
237
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmsdsummary" ),
237
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmsdsummary" ),
238 238
                                       I18N_NOOP( "Special Dates Configuration Dialog" ),
239
-                                      0, 0, KAboutData::License_GPL,
239
+                                      0, 0, TDEAboutData::License_GPL,
240 240
                                       I18N_NOOP( "(c) 2004 Tobias Koenig" ) );
241 241
 
242 242
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/specialdates/kcmsdsummary.h View File

@@ -31,7 +31,7 @@ class TQButtonGroup;
31 31
 class TQCheckBox;
32 32
 class TQSpinBox;
33 33
 
34
-class KAboutData;
34
+class TDEAboutData;
35 35
 
36 36
 class KCMSDSummary : public KCModule
37 37
 {
@@ -44,7 +44,7 @@ class KCMSDSummary : public KCModule
44 44
     virtual void load();
45 45
     virtual void save();
46 46
     virtual void defaults();
47
-    virtual const KAboutData* aboutData() const;
47
+    virtual const TDEAboutData* aboutData() const;
48 48
 
49 49
   private slots:
50 50
     void modified();

+ 3
- 3
kontact/plugins/specialdates/specialdates_plugin.cpp View File

@@ -54,14 +54,14 @@ Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidge
54 54
   return new SDSummaryWidget( this, parentWidget );
55 55
 }
56 56
 
57
-const KAboutData *SpecialdatesPlugin::aboutData()
57
+const TDEAboutData *SpecialdatesPlugin::aboutData()
58 58
 {
59 59
   if ( !mAboutData ) {
60
-    mAboutData = new KAboutData( "specialdates",
60
+    mAboutData = new TDEAboutData( "specialdates",
61 61
                                  I18N_NOOP( "Special Dates Summary" ),
62 62
                                  "1.0",
63 63
                                  I18N_NOOP( "Kontact Special Dates Summary" ),
64
-                                 KAboutData::License_LGPL,
64
+                                 TDEAboutData::License_LGPL,
65 65
                                  I18N_NOOP( "(c) 2004-2005 The KDE PIM Team" ) );
66 66
     mAboutData->addAuthor( "Allen Winter", "Current Maintainer", "winter@kde.org" );
67 67
     mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/specialdates/specialdates_plugin.h View File

@@ -37,7 +37,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
37 37
 
38 38
     int weight() const { return 310; }
39 39
 
40
-    const KAboutData *aboutData();
40
+    const TDEAboutData *aboutData();
41 41
 
42 42
     virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
43 43
 
@@ -45,7 +45,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
45 45
     virtual KParts::ReadOnlyPart *createPart() { return false; }
46 46
 
47 47
   private:
48
-    KAboutData *mAboutData;
48
+    TDEAboutData *mAboutData;
49 49
 
50 50
 };
51 51
 

+ 2
- 2
kontact/plugins/summary/kcmkontactsummary.cpp View File

@@ -107,9 +107,9 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
107 107
            this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
108 108
   load();
109 109
 
110
-  KAboutData *about = new KAboutData( I18N_NOOP( "kontactsummary" ),
110
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ),
111 111
                                       I18N_NOOP( "TDE Kontact Summary" ),
112
-                                      0, 0, KAboutData::License_GPL,
112
+                                      0, 0, TDEAboutData::License_GPL,
113 113
                                       I18N_NOOP( "(c), 2004 Tobias Koenig" ) );
114 114
 
115 115
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/summary/summaryview_part.cpp View File

@@ -66,12 +66,12 @@ namespace Kontact
66 66
 }
67 67
 
68 68
 SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
69
-                                  const KAboutData *aboutData,
69
+                                  const TDEAboutData *aboutData,
70 70
                                   TQObject *parent, const char *name )
71 71
   : KParts::ReadOnlyPart( parent, name ),
72 72
     mCore( core ), mFrame( 0 ), mConfigAction( 0 )
73 73
 {
74
-  setInstance( new KInstance( aboutData ) );
74
+  setInstance( new TDEInstance( aboutData ) );
75 75
 
76 76
   loadLayout();
77 77
 

+ 1
- 1
kontact/plugins/summary/summaryview_part.h View File

@@ -56,7 +56,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
56 56
 
57 57
   public:
58 58
     SummaryViewPart( Kontact::Core *core, const char *widgetName,
59
-                     const KAboutData *aboutData,
59
+                     const TDEAboutData *aboutData,
60 60
                      TQObject *parent = 0, const char *name = 0 );
61 61
     ~SummaryViewPart();
62 62
 

+ 3
- 3
kontact/plugins/summary/summaryview_plugin.cpp View File

@@ -106,13 +106,13 @@ KParts::ReadOnlyPart *SummaryView::createPart()
106 106
   return mPart;
107 107
 }
108 108
 
109
-const KAboutData *SummaryView::aboutData()
109
+const TDEAboutData *SummaryView::aboutData()
110 110
 {
111 111
   if ( !mAboutData ) {
112
-    mAboutData = new KAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"),
112
+    mAboutData = new TDEAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"),
113 113
                                  "1.1",
114 114
                                  I18N_NOOP("Kontact Summary View"),
115
-                                 KAboutData::License_LGPL,
115
+                                 TDEAboutData::License_LGPL,
116 116
                                  I18N_NOOP("(c) 2003 The Kontact developers" ) );
117 117
     mAboutData->addAuthor( "Sven Lueppken", "", "sven@kde.org" );
118 118
     mAboutData->addAuthor( "Cornelius Schumacher", "", "schumacher@kde.org" );

+ 2
- 2
kontact/plugins/summary/summaryview_plugin.h View File

@@ -43,7 +43,7 @@ class SummaryView : public Kontact::Plugin
43 43
 
44 44
     int weight() const { return 100; }
45 45
 
46
-    const KAboutData *aboutData();
46
+    const TDEAboutData *aboutData();
47 47
 
48 48
   protected:
49 49
     virtual KParts::ReadOnlyPart* createPart();
@@ -55,7 +55,7 @@ class SummaryView : public Kontact::Plugin
55 55
     void fillSyncActionSubEntries();
56 56
 
57 57
   private:
58
-    KAboutData *mAboutData;
58
+    TDEAboutData *mAboutData;
59 59
     SummaryViewPart *mPart;
60 60
     KSelectAction *mSyncAction; 
61 61
 };

+ 1
- 1
kontact/plugins/test/test_part.cpp View File

@@ -44,7 +44,7 @@
44 44
 TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
45 45
   : KParts::ReadOnlyPart(parent, name)
46 46
 {
47
-  setInstance( new KInstance("testpart") ); // ## memleak
47
+  setInstance( new TDEInstance("testpart") ); // ## memleak
48 48
   m_edit = new TQTextEdit;
49 49
   setWidget(m_edit);
50 50
   setXMLFile("testpartui.rc");

+ 3
- 3
kontact/plugins/weather/weather_plugin.cpp View File

@@ -42,13 +42,13 @@ Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget )
42 42
   return new SummaryWidget( parentWidget );
43 43
 }
44 44
 
45
-const KAboutData *WeatherPlugin::aboutData()
45
+const TDEAboutData *WeatherPlugin::aboutData()
46 46
 {
47 47
   if ( !mAboutData ) {
48
-    mAboutData = new KAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ),
48
+    mAboutData = new TDEAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ),
49 49
                                  "0.1",
50 50
                                  I18N_NOOP( "Weather Information" ),
51
-                                 KAboutData::License_GPL_V2,
51
+                                 TDEAboutData::License_GPL_V2,
52 52
                                  "(c) 2003 The Kontact developers" );
53 53
     mAboutData->addAuthor( "Ian Reinhart Geiser", "", "geiseri@kde.org" );
54 54
     mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );

+ 2
- 2
kontact/plugins/weather/weather_plugin.h View File

@@ -33,12 +33,12 @@ class WeatherPlugin : public Kontact::Plugin
33 33
 
34 34
     virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
35 35
 
36
-    const KAboutData *aboutData();
36
+    const TDEAboutData *aboutData();
37 37
 
38 38
   protected:
39 39
     virtual KParts::ReadOnlyPart *createPart() { return 0; }
40 40
   private:
41
-    KAboutData *mAboutData;
41
+    TDEAboutData *mAboutData;
42 42
 };
43 43
 
44 44
 #endif

+ 2
- 2
kontact/src/aboutdialog.cpp View File

@@ -63,7 +63,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
63 63
 }
64 64
 
65 65
 void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
66
-                                const KAboutData *about )
66
+                                const TDEAboutData *about )
67 67
 {
68 68
   TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
69 69
                                                     KIcon::Desktop, 48 );
@@ -155,7 +155,7 @@ TQString AboutDialog::formatPerson( const TQString &name, const TQString &email
155 155
   return text;
156 156
 }
157 157
 
158
-void AboutDialog::addLicenseText( const KAboutData *about )
158
+void AboutDialog::addLicenseText( const TDEAboutData *about )
159 159
 {
160 160
   if ( !about || about->license().isEmpty() )
161 161
     return;

+ 3
- 3
kontact/src/aboutdialog.h View File

@@ -25,7 +25,7 @@
25 25
 #define KONTACT_ABOUTDIALOG_H
26 26
 
27 27
 #include <kdialogbase.h>
28
-class KAboutData;
28
+class TDEAboutData;
29 29
 namespace Kontact {
30 30
 
31 31
 class Core;
@@ -43,9 +43,9 @@ class AboutDialog : public KDialogBase
43 43
     void addAboutPlugin( Kontact::Plugin *plugin );
44 44
 
45 45
     void addAboutData( const TQString &title, const TQString &icon,
46
-                       const KAboutData *about );
46
+                       const TDEAboutData *about );
47 47
 
48
-    void addLicenseText( const KAboutData *about );
48
+    void addLicenseText( const TDEAboutData *about );
49 49
 
50 50
     TQString formatPerson( const TQString &name, const TQString &email );
51 51
 

+ 3
- 3
kontact/src/kcmkontact.cpp View File

@@ -86,11 +86,11 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name )
86 86
   load();
87 87
 }
88 88
 
89
-const KAboutData* KcmKontact::aboutData() const
89
+const TDEAboutData* KcmKontact::aboutData() const
90 90
 {
91
-  KAboutData *about = new KAboutData( I18N_NOOP( "kontactconfig" ),
91
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactconfig" ),
92 92
                                       I18N_NOOP( "TDE Kontact" ),
93
-                                      0, 0, KAboutData::License_GPL,
93
+                                      0, 0, TDEAboutData::License_GPL,
94 94
                                       I18N_NOOP( "(c), 2003 Cornelius Schumacher" ) );
95 95
 
96 96
   about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

+ 2
- 2
kontact/src/kcmkontact.h View File

@@ -33,7 +33,7 @@ class TQGroupBox;
33 33
 class TQComboBox;
34 34
 class TQListViewItem;
35 35
 
36
-class KAboutData;
36
+class TDEAboutData;
37 37
 class KListView;
38 38
 
39 39
 class KcmKontact : public KPrefsModule
@@ -44,7 +44,7 @@ class KcmKontact : public KPrefsModule
44 44
   public:
45 45
     KcmKontact( TQWidget *parent = 0, const char *name = 0 );
46 46
 
47
-    virtual const KAboutData* aboutData() const;
47
+    virtual const TDEAboutData* aboutData() const;
48 48
 };
49 49
 
50 50
 class PluginSelection : public KPrefsWid

+ 3
- 3
kontact/src/main.cpp View File

@@ -74,7 +74,7 @@ class KontactApp : public KUniqueApplication {
74 74
 
75 75
 static void listPlugins()
76 76
 {
77
-  KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
77
+  TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
78 78
   KTrader::OfferList offers = KTrader::self()->query(
79 79
     TQString::fromLatin1( "Kontact/Plugin" ),
80 80
     TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
@@ -144,8 +144,8 @@ int KontactApp::newInstance()
144 144
 
145 145
 int main( int argc, char **argv )
146 146
 {
147
-  KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
148
-                    KAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
147
+  TDEAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
148
+                    TDEAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
149 149
   about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" );
150 150
   about.addAuthor( "Don Sanders", 0, "sanders@kde.org" );
151 151
   about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

+ 0
- 0
korganizer/aboutdata.cpp View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save