Browse Source

Rename KInstance and KAboutData to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
b19ddece21
100 changed files with 211 additions and 211 deletions
  1. 1
    1
      DEBUG
  2. 1
    1
      KDE2PORTING.html
  3. 1
    1
      arts/kde/kconverttest.cc
  4. 1
    1
      arts/kde/kiotest.cc
  5. 1
    1
      arts/kde/kiotestslow.cc
  6. 2
    2
      arts/kde/mcop-dcop/kmcop.cpp
  7. 2
    2
      arts/knotify/knotify.cpp
  8. 2
    2
      arts/message/artsmessage.cc
  9. 1
    1
      interfaces/terminal/test/main.cc
  10. 1
    1
      kabc/kab2kabc.cpp
  11. 1
    1
      kabc/tests/bigread.cpp
  12. 1
    1
      kabc/tests/bigwrite.cpp
  13. 1
    1
      kabc/tests/kabcargl.cpp
  14. 1
    1
      kabc/tests/testaddressee.cpp
  15. 1
    1
      kabc/tests/testaddresseelist.cpp
  16. 1
    1
      kabc/tests/testaddressfmt.cpp
  17. 1
    1
      kabc/tests/testaddresslineedit.cpp
  18. 1
    1
      kabc/tests/testdb.cpp
  19. 1
    1
      kabc/tests/testdistlist.cpp
  20. 1
    1
      kabc/tests/testkabc.cpp
  21. 1
    1
      kabc/tests/testkabcdlg.cpp
  22. 1
    1
      kabc/tests/testlock.cpp
  23. 1
    1
      kabc/vcard/testwrite.cpp
  24. 1
    1
      kabc/vcardparser/testread.cpp
  25. 1
    1
      kabc/vcardparser/testwrite.cpp
  26. 1
    1
      kate/part/katefactory.cpp
  27. 3
    3
      kate/part/katefactory.h
  28. 1
    1
      kate/plugins/kdatatool/kate_kdatatool.cpp
  29. 3
    3
      kcert/kcertpart.cc
  30. 3
    3
      kcert/kcertpart.h
  31. 2
    2
      kcmshell/main.cpp
  32. 3
    3
      kconf_update/kconf_update.cpp
  33. 2
    2
      kded/kbuildsycoca.cpp
  34. 2
    2
      kded/kde-menu.cpp
  35. 2
    2
      kded/kded.cpp
  36. 3
    3
      kded/khostname.cpp
  37. 1
    1
      kdewidgets/kde.widgets
  38. 2
    2
      kdewidgets/makekdewidgets.cpp
  39. 1
    1
      kdewidgets/tests/test.widgets
  40. 1
    1
      kdoctools/main.cpp
  41. 1
    1
      kdoctools/main_ghelp.cpp
  42. 2
    2
      kdoctools/meinproc.cpp
  43. 1
    1
      kdoctools/xslt.cpp
  44. 1
    1
      kdoctools/xslt.h
  45. 1
    1
      khtml/ecma/kjs_debugwin.cpp
  46. 1
    1
      khtml/ecma/kjs_debugwin.h
  47. 4
    4
      khtml/java/kjavaappletviewer.cpp
  48. 5
    5
      khtml/java/kjavaappletviewer.h
  49. 7
    7
      khtml/khtml_factory.cpp
  50. 5
    5
      khtml/khtml_factory.h
  51. 2
    2
      khtml/khtmlimage.cpp
  52. 3
    3
      khtml/khtmlimage.h
  53. 3
    3
      khtml/kmultipart/kmultipart.cpp
  54. 2
    2
      khtml/kmultipart/kmultipart.h
  55. 1
    1
      kinit/kdostartupconfig.cpp
  56. 3
    3
      kinit/kinit.cpp
  57. 2
    2
      kio/kfile/knotifydialog.cpp
  58. 5
    5
      kio/kfile/knotifydialog.h
  59. 1
    1
      kio/kio/dataprotocol.cpp
  60. 3
    3
      kio/kio/kdatatool.cpp
  61. 8
    8
      kio/kio/kdatatool.h
  62. 8
    8
      kio/kio/kscan.h
  63. 2
    2
      kio/kioexec/main.cpp
  64. 2
    2
      kio/misc/kfile/fileprops.cpp
  65. 1
    1
      kio/misc/kpac/proxyscout.cpp
  66. 2
    2
      kio/misc/kpac/proxyscout.h
  67. 2
    2
      kio/misc/ksendbugmail/main.cpp
  68. 2
    2
      kio/misc/uiserver.cpp
  69. 1
    1
      kio/tests/kfiltertest.cpp
  70. 1
    1
      kio/tests/kiopassdlgtest.cpp
  71. 1
    1
      kio/tests/kmfitest.cpp
  72. 1
    1
      kio/tests/kmimemagictest.cpp
  73. 1
    1
      kio/tests/kmimetypetest.cpp
  74. 1
    1
      kio/tests/kpropsdlgtest.cpp
  75. 1
    1
      kio/tests/kprotocolinfotest.cpp
  76. 1
    1
      kio/tests/ktartest.cpp
  77. 1
    1
      kio/tests/kurifiltertest.cpp
  78. 1
    1
      kio/tests/kziptest.cpp
  79. 1
    1
      kioslave/file/file.cc
  80. 1
    1
      kioslave/ftp/ftp.cc
  81. 1
    1
      kioslave/http/http.cc
  82. 1
    1
      kioslave/http/http_cache_cleaner.cpp
  83. 1
    1
      kioslave/http/kcookiejar/main.cpp
  84. 2
    2
      kioslave/http/kcookiejar/tests/kcookiejartest.cpp
  85. 1
    1
      kioslave/iso/iso.cpp
  86. 1
    1
      knewstuff/ghns.cpp
  87. 1
    1
      knewstuff/khotnewstuff.cpp
  88. 1
    1
      knewstuff/testnewstuff.cpp
  89. 2
    2
      kparts/factory.cpp
  90. 4
    4
      kparts/factory.h
  91. 17
    17
      kparts/genericfactory.h
  92. 3
    3
      kparts/part.cpp
  93. 7
    7
      kparts/part.h
  94. 1
    1
      kparts/partmanager.cpp
  95. 2
    2
      kparts/partmanager.h
  96. 6
    6
      kparts/plugin.cpp
  97. 6
    6
      kparts/plugin.h
  98. 2
    2
      kparts/tests/notepad.cpp
  99. 2
    2
      kparts/tests/notepad.h
  100. 0
    0
      kparts/tests/parts.cpp

+ 1
- 1
DEBUG View File

@@ -82,7 +82,7 @@ are interested in and verify that we have found the correct source line:
82 82
 218     TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
83 83
 219       QApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
84 84
 220                     GUIenabled ),
85
-221       KInstance( TDECmdLineArgs::about),
85
+221       TDEInstance( TDECmdLineArgs::about),
86 86
 222       d (new TDEApplicationPrivate)
87 87
 223     {
88 88
 224         if (!GUIenabled)

+ 1
- 1
KDE2PORTING.html View File

@@ -168,7 +168,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
168 168
   TDECmdLineArgs itself will add the command line options supported by Qt 
169 169
   and TDEApplication.<P>
170 170
 
171
-  You can also use the KAboutData class to specify name, description and 
171
+  You can also use the TDEAboutData class to specify name, description and 
172 172
   version.<P>
173 173
 
174 174
   In return for this information you can query TDECmdLineArgs whether an 

+ 1
- 1
arts/kde/kconverttest.cc View File

@@ -55,7 +55,7 @@ void KConvertTest::slotRawStreamFinished()
55 55
 
56 56
 int main(int argc, char **argv)
57 57
 {
58
-	KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
58
+	TDEAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
59 59
 							  
60 60
 	TDECmdLineArgs::init(argc, argv, &aboutData);
61 61
 	TDECmdLineArgs::addCmdLineOptions(options); 	

+ 1
- 1
arts/kde/kiotest.cc View File

@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
20 20
 
21 21
 int main(int argc, char **argv)
22 22
 {
23
-	KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
23
+	TDEAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
24 24
 							  
25 25
 	TDECmdLineArgs::init(argc,argv,&aboutData);
26 26
 	TDECmdLineArgs::addCmdLineOptions(options); 	

+ 1
- 1
arts/kde/kiotestslow.cc View File

@@ -88,7 +88,7 @@ static KCmdLineOptions options[] =
88 88
 
89 89
 int main(int argc, char **argv)
90 90
 {
91
-	KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
91
+	TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
92 92
 							  
93 93
 	TDECmdLineArgs::init(argc,argv,&aboutData);
94 94
 	TDECmdLineArgs::addCmdLineOptions(options); 	

+ 2
- 2
arts/kde/mcop-dcop/kmcop.cpp View File

@@ -48,9 +48,9 @@ public:
48 48
 
49 49
 int main(int argc, char **argv)
50 50
 {
51
-    KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
51
+    TDEAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
52 52
                          "0.1", I18N_NOOP("TDE MCOP-DCOP Bridge"),
53
-                         KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
53
+                         TDEAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
54 54
     aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");
55 55
 
56 56
     TDECmdLineArgs::init(argc, argv, &aboutdata);

+ 2
- 2
arts/knotify/knotify.cpp View File

@@ -105,9 +105,9 @@ extern "C"{
105 105
 
106 106
 KDE_EXPORT int kdemain(int argc, char **argv)
107 107
 {
108
-    KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
108
+    TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
109 109
                          "3.0", I18N_NOOP("TDE Notification Server"),
110
-                         KAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
110
+                         TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
111 111
     aboutdata.addAuthor("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org");
112 112
     aboutdata.addAuthor("Christian Esken",0,"esken@kde.org");
113 113
     aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de");

+ 2
- 2
arts/message/artsmessage.cc View File

@@ -51,9 +51,9 @@ static KCmdLineOptions options[] =
51 51
 	  KCmdLineLastOption // End of options.
52 52
   };
53 53
 
54
-KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
54
+TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
55 55
 					 I18N_NOOP("Utility to display aRts error messages"),
56
-					 KAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
56
+					 TDEAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
57 57
 
58 58
 int main(int argc, char **argv) {
59 59
 	aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");

+ 1
- 1
interfaces/terminal/test/main.cc View File

@@ -33,7 +33,7 @@ Win::Win()
33 33
 
34 34
 int main( int argc, char** argv )
35 35
 {
36
-    KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
36
+    TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
37 37
     TDECmdLineArgs::init( argc, argv, about );
38 38
     TDEApplication a;
39 39
     Win* win = new Win();

+ 1
- 1
kabc/kab2kabc.cpp View File

@@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
432 432
 
433 433
 int main( int argc, char **argv )
434 434
 {
435
-  KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
435
+  TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
436 436
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
437 437
 
438 438
   TDECmdLineArgs::init( argc, argv, &aboutData );

+ 1
- 1
kabc/tests/bigread.cpp View File

@@ -17,7 +17,7 @@ using namespace KABC;
17 17
 
18 18
 int main(int argc,char **argv)
19 19
 {
20
-  KAboutData aboutData("bigread","BigReadKabc","0.1");
20
+  TDEAboutData aboutData("bigread","BigReadKabc","0.1");
21 21
   TDECmdLineArgs::init(argc,argv,&aboutData);
22 22
 
23 23
   TDEApplication app( false, false );

+ 1
- 1
kabc/tests/bigwrite.cpp View File

@@ -14,7 +14,7 @@ using namespace KABC;
14 14
 
15 15
 int main(int argc,char **argv)
16 16
 {
17
-  KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
17
+  TDEAboutData aboutData("bigwrite","BigWriteKabc","0.1");
18 18
   TDECmdLineArgs::init(argc,argv,&aboutData);
19 19
 
20 20
   TDEApplication app( false, false );

+ 1
- 1
kabc/tests/kabcargl.cpp View File

@@ -35,7 +35,7 @@ using namespace KABC;
35 35
 
36 36
 int main(int argc,char **argv)
37 37
 {
38
-  KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
38
+  TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
39 39
   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
40 40
 
41 41
   TDECmdLineArgs::init(argc,argv,&aboutData);

+ 1
- 1
kabc/tests/testaddressee.cpp View File

@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
22 22
 
23 23
 int main(int argc,char **argv)
24 24
 {
25
-  KAboutData aboutData("testaddressee","TestAddressee","0.1");
25
+  TDEAboutData aboutData("testaddressee","TestAddressee","0.1");
26 26
   TDECmdLineArgs::init(argc, argv, &aboutData);
27 27
   TDECmdLineArgs::addCmdLineOptions(options);
28 28
 

+ 1
- 1
kabc/tests/testaddresseelist.cpp View File

@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
19 19
 
20 20
 int main(int /*argc*/,char /* **argv*/)
21 21
 {
22
-/*  KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
22
+/*  TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
23 23
   TDECmdLineArgs::init(argc, argv, &aboutData);
24 24
   TDECmdLineArgs::addCmdLineOptions(options);
25 25
 

+ 1
- 1
kabc/tests/testaddressfmt.cpp View File

@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
19 19
 
20 20
 int main(int argc,char **argv)
21 21
 {
22
-  KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
22
+  TDEAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
23 23
   TDECmdLineArgs::init(argc, argv, &aboutData);
24 24
   TDECmdLineArgs::addCmdLineOptions(options);
25 25
 

+ 1
- 1
kabc/tests/testaddresslineedit.cpp View File

@@ -10,7 +10,7 @@ using namespace KABC;
10 10
 
11 11
 int main( int argc,char **argv )
12 12
 {
13
-  KAboutData aboutData( "testaddresslineedit",
13
+  TDEAboutData aboutData( "testaddresslineedit",
14 14
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
15 15
   TDECmdLineArgs::init( argc, argv, &aboutData );
16 16
 

+ 1
- 1
kabc/tests/testdb.cpp View File

@@ -12,7 +12,7 @@ using namespace KABC;
12 12
 
13 13
 int main(int argc,char **argv)
14 14
 {
15
-  KAboutData aboutData("testdb","TestKabcDB","0.1");
15
+  TDEAboutData aboutData("testdb","TestKabcDB","0.1");
16 16
   TDECmdLineArgs::init(argc,argv,&aboutData);
17 17
 
18 18
 //  TDEApplication app( false, false );

+ 1
- 1
kabc/tests/testdistlist.cpp View File

@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
22 22
 
23 23
 int main(int argc,char **argv)
24 24
 {
25
-  KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
25
+  TDEAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
26 26
   TDECmdLineArgs::init(argc,argv,&aboutData);
27 27
   TDECmdLineArgs::addCmdLineOptions( options );
28 28
 

+ 1
- 1
kabc/tests/testkabc.cpp View File

@@ -20,7 +20,7 @@ using namespace KABC;
20 20
 
21 21
 int main(int argc,char **argv)
22 22
 {
23
-    KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
23
+    TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
24 24
     TDECmdLineArgs::init(argc, argv, &aboutData);
25 25
 
26 26
     TDEApplication app( false, false );

+ 1
- 1
kabc/tests/testkabcdlg.cpp View File

@@ -18,7 +18,7 @@ static const KCmdLineOptions options[] =
18 18
 
19 19
 int main(int argc,char **argv)
20 20
 {
21
-  KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
21
+  TDEAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
22 22
   TDECmdLineArgs::init(argc,argv,&aboutData);
23 23
   TDECmdLineArgs::addCmdLineOptions( options );
24 24
 

+ 1
- 1
kabc/tests/testlock.cpp View File

@@ -165,7 +165,7 @@ static const KCmdLineOptions options[] =
165 165
 
166 166
 int main(int argc,char **argv)
167 167
 {
168
-  KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
168
+  TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
169 169
   TDECmdLineArgs::init(argc,argv,&aboutData);
170 170
   TDECmdLineArgs::addCmdLineOptions( options );
171 171
 

+ 1
- 1
kabc/vcard/testwrite.cpp View File

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

+ 1
- 1
kabc/vcardparser/testread.cpp View File

@@ -44,7 +44,7 @@ int main( int argc, char **argv )
44 44
 {
45 45
   TDEApplication::disableAutoDcopRegistration();
46 46
 
47
-  KAboutData aboutData( "testread", "vCard test reader", "0.1" );
47
+  TDEAboutData aboutData( "testread", "vCard test reader", "0.1" );
48 48
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
49 49
 
50 50
   TDECmdLineArgs::init( argc, argv, &aboutData );

+ 1
- 1
kabc/vcardparser/testwrite.cpp View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 int main( int argc, char **argv )
37 37
 {
38
-  KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
38
+  TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
39 39
 
40 40
   TDECmdLineArgs::init( argc, argv, &aboutData );
41 41
 

+ 1
- 1
kate/part/katefactory.cpp View File

@@ -68,7 +68,7 @@ KateFactory *KateFactory::s_self = 0;
68 68
 
69 69
 KateFactory::KateFactory ()
70 70
  : m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION,
71
-             I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
71
+             I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
72 72
              I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
73 73
  , m_instance (&m_aboutData)
74 74
  , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))

+ 3
- 3
kate/part/katefactory.h View File

@@ -87,7 +87,7 @@ class KateFactory
87 87
      * public accessor to the instance
88 88
      * @return instance
89 89
      */
90
-    inline KInstance *instance () { return &m_instance; };
90
+    inline TDEInstance *instance () { return &m_instance; };
91 91
 
92 92
     /**
93 93
      * register document at the factory
@@ -221,12 +221,12 @@ class KateFactory
221 221
     /**
222 222
      * about data (authors and more)
223 223
      */
224
-    KAboutData m_aboutData;
224
+    TDEAboutData m_aboutData;
225 225
 
226 226
     /**
227 227
      * our kinstance
228 228
      */
229
-    KInstance m_instance;
229
+    TDEInstance m_instance;
230 230
 
231 231
     /**
232 232
      * registered docs

+ 1
- 1
kate/plugins/kdatatool/kate_kdatatool.cpp View File

@@ -157,7 +157,7 @@ void KDataToolPluginView::aboutToShow()
157 157
 		}
158 158
 	}
159 159
 
160
-	KInstance *inst=instance();
160
+	TDEInstance *inst=instance();
161 161
 
162 162
 	TQValueList<KDataToolInfo> tools;
163 163
 	tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );

+ 3
- 3
kcert/kcertpart.cc View File

@@ -131,7 +131,7 @@ KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
131 131
                      TQObject *parent, const char *name,
132 132
 		     const TQStringList & /*args*/ ) 
133 133
           : KParts::ReadWritePart(parent, name) {
134
-KInstance *instance = new KInstance("KCertPart");
134
+TDEInstance *instance = new TDEInstance("KCertPart");
135 135
 TQGridLayout *grid;
136 136
 setInstance(instance);
137 137
 
@@ -874,9 +874,9 @@ KMessageBox::information(_frame, i18n("Certificates have been successfully impor
874 874
 }
875 875
 
876 876
 
877
-KAboutData *KCertPart::createAboutData()
877
+TDEAboutData *KCertPart::createAboutData()
878 878
 {
879
-    return new KAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
879
+    return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
880 880
 }
881 881
 
882 882
 #include "kcertpart.moc"

+ 3
- 3
kcert/kcertpart.h View File

@@ -40,7 +40,7 @@ class KSSLPKCS12;
40 40
 class KSSLCertificate;
41 41
 class TQTabWidget;
42 42
 class TQMultiLineEdit;
43
-class KAboutData;
43
+class TDEAboutData;
44 44
 class TQGridLayout;
45 45
 
46 46
 
@@ -75,7 +75,7 @@ public:
75 75
 
76 76
   virtual void setReadWrite(bool readwrite);
77 77
 
78
-  static KAboutData *createAboutData();
78
+  static TDEAboutData *createAboutData();
79 79
 
80 80
 protected slots:
81 81
   void slotChain(int c);
@@ -115,7 +115,7 @@ protected:
115 115
 
116 116
 
117 117
   // The rest
118
-  KInstance *_instance;
118
+  TDEInstance *_instance;
119 119
   TQButton *_import, *_save, *_done, *_launch, *_importAll;
120 120
   // Store the pointer to the current item
121 121
   KSSLPKCS12 *_p12;

+ 2
- 2
kcmshell/main.cpp View File

@@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)
198 198
 
199 199
 extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
200 200
 {
201
-    KAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
201
+    TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
202 202
                           0,
203 203
                           I18N_NOOP("A tool to start single TDE control modules"),
204
-                          KAboutData::License_GPL,
204
+                          TDEAboutData::License_GPL,
205 205
                           I18N_NOOP("(c) 1999-2004, The KDE Developers") );
206 206
 
207 207
     aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org");

+ 3
- 3
kconf_update/kconf_update.cpp View File

@@ -940,10 +940,10 @@ void KonfUpdate::resetOptions()
940 940
 
941 941
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
942 942
 {
943
-   KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
943
+   TDEAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
944 944
                         "1.0.2",
945 945
                         I18N_NOOP("TDE Tool for updating user configuration files"),
946
-                        KAboutData::License_GPL,
946
+                        TDEAboutData::License_GPL,
947 947
                         "(c) 2001, Waldo Bastian");
948 948
 
949 949
    aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org");
@@ -951,7 +951,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
951 951
    TDECmdLineArgs::init(argc, argv, &aboutData);
952 952
    TDECmdLineArgs::addCmdLineOptions(options);
953 953
 
954
-   KInstance instance(&aboutData);
954
+   TDEInstance instance(&aboutData);
955 955
 
956 956
    KonfUpdate konfUpdate;
957 957
 

+ 2
- 2
kded/kbuildsycoca.cpp View File

@@ -718,9 +718,9 @@ public:
718 718
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
719 719
 {
720 720
    KLocale::setMainCatalogue("tdelibs");
721
-   KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
721
+   TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
722 722
                 I18N_NOOP("Rebuilds the system configuration cache."),
723
-                KAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
723
+                TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
724 724
    d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org");
725 725
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
726 726
 

+ 2
- 2
kded/kde-menu.cpp View File

@@ -113,9 +113,9 @@ int main(int argc, char **argv)
113 113
    "The --highlight option can be used to visually indicate to the user where\n"
114 114
    "in the TDE menu a specific application is located.");
115 115
    
116
-   KAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
116
+   TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
117 117
                 description,
118
-                KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
118
+                TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
119 119
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
120 120
 
121 121
    TDECmdLineArgs::init(argc, argv, &d);

+ 2
- 2
kded/kded.cpp View File

@@ -872,7 +872,7 @@ public:
872 872
 
873 873
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
874 874
 {
875
-     KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
875
+     TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
876 876
         "$Id$",
877 877
         I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));
878 878
 
@@ -904,7 +904,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
904 904
         }
905 905
      }
906 906
 
907
-     KInstance *instance = new KInstance(&aboutData);
907
+     TDEInstance *instance = new TDEInstance(&aboutData);
908 908
      KConfig *config = instance->config(); // Enable translations.
909 909
 
910 910
      if (args->isSet("check"))

+ 3
- 3
kded/khostname.cpp View File

@@ -366,15 +366,15 @@ void KHostName::changeSessionManager()
366 366
 int main(int argc, char **argv)
367 367
 {
368 368
    KLocale::setMainCatalogue("tdelibs");
369
-   KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
369
+   TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
370 370
                 I18N_NOOP("Informs TDE about a change in hostname"),
371
-                KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
371
+                TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian");
372 372
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
373 373
 
374 374
    TDECmdLineArgs::init(argc, argv, &d);
375 375
    TDECmdLineArgs::addCmdLineOptions(options);
376 376
 
377
-   KInstance k(&d);
377
+   TDEInstance k(&d);
378 378
 
379 379
    KHostName hn;
380 380
 

+ 1
- 1
kdewidgets/kde.widgets View File

@@ -1,7 +1,7 @@
1 1
 [Global]
2 2
 PluginName=KDEWidgets
3 3
 Includes=kinstance.h,classpreviews.h
4
-Init=new KInstance("kdewidgets");
4
+Init=new TDEInstance("kdewidgets");
5 5
 
6 6
 [KActiveLabel]
7 7
 ToolTip=Active Label (KDE)

+ 2
- 2
kdewidgets/makekdewidgets.cpp View File

@@ -124,9 +124,9 @@ static void buildFile( TQTextStream &stream, const TQString& group, const TQStri
124 124
 static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
125 125
 
126 126
 int main( int argc, char **argv ) {
127
-    new KInstance( "makekdewidgets" );
127
+    new TDEInstance( "makekdewidgets" );
128 128
 
129
-    KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
129
+    TDEAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
130 130
     about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
131 131
     TDECmdLineArgs::init( argc, argv, &about );
132 132
     TDECmdLineArgs::addCmdLineOptions( options );

+ 1
- 1
kdewidgets/tests/test.widgets View File

@@ -1,7 +1,7 @@
1 1
 [Global]
2 2
 PluginName=KDEWidgets
3 3
 Includes=kinstance.h,classpreviews.h
4
-Init=new KInstance("kdewidgets");
4
+Init=new TDEInstance("kdewidgets");
5 5
 
6 6
 [KActiveLabel]
7 7
 ToolTip=Active Label (KDE)

+ 1
- 1
kdoctools/main.cpp View File

@@ -25,7 +25,7 @@ extern "C"
25 25
 {
26 26
     KDE_EXPORT int kdemain( int argc, char **argv )
27 27
     {
28
-        KInstance instance( "kio_help" );
28
+        TDEInstance instance( "kio_help" );
29 29
         fillInstance(instance);
30 30
         (void)instance.config(); // we need this one to make sure system globals are read
31 31
 

+ 1
- 1
kdoctools/main_ghelp.cpp View File

@@ -25,7 +25,7 @@ extern "C"
25 25
 {
26 26
     KDE_EXPORT int kdemain( int argc, char **argv )
27 27
     {
28
-        KInstance instance( "kio_ghelp" );
28
+        TDEInstance instance( "kio_ghelp" );
29 29
         fillInstance(instance);
30 30
         (void)instance.config(); // we need this one to make sure system globals are read
31 31
 

+ 2
- 2
kdoctools/meinproc.cpp View File

@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
91 91
 
92 92
     // xsltSetGenericDebugFunc(stderr, NULL);
93 93
 
94
-    KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
94
+    TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
95 95
 	"$Revision$",
96 96
 	I18N_NOOP("TDE Translator for XML"));
97 97
 
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
99 99
     TDECmdLineArgs::addCmdLineOptions( options );
100 100
 
101 101
     KLocale::setMainCatalogue("kio_help");
102
-    KInstance ins("meinproc");
102
+    TDEInstance ins("meinproc");
103 103
     KGlobal::locale();
104 104
 
105 105
 

+ 1
- 1
kdoctools/xslt.cpp View File

@@ -179,7 +179,7 @@ TQString splitOut(const TQString &parsed, int index)
179 179
     return filedata;
180 180
 }
181 181
 
182
-void fillInstance(KInstance &ins, const TQString &srcdir) {
182
+void fillInstance(TDEInstance &ins, const TQString &srcdir) {
183 183
     TQString catalogs;
184 184
 
185 185
     if ( srcdir.isEmpty() ) {

+ 1
- 1
kdoctools/xslt.h View File

@@ -7,7 +7,7 @@
7 7
 TQString transform(const TQString &file, const TQString& stylesheet,
8 8
                   const TQValueVector<const char *> &params = TQValueVector<const char *>());
9 9
 TQString splitOut(const TQString &parsed, int index);
10
-void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null );
10
+void fillInstance(TDEInstance &ins, const TQString &srcdir = TQString::null );
11 11
 bool saveToCache( const TQString &contents, const TQString &filename );
12 12
 TQString lookForCache( const TQString &filename );
13 13
 TQCString fromUnicode( const TQString &data );

+ 1
- 1
khtml/ecma/kjs_debugwin.cpp View File

@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
347 347
 }
348 348
 //-------------------------------------------------------------------------
349 349
 KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
350
-  : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger")
350
+  : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
351 351
 {
352 352
   m_breakpoints = 0;
353 353
   m_breakpointCount = 0;

+ 1
- 1
khtml/ecma/kjs_debugwin.h View File

@@ -157,7 +157,7 @@ namespace KJS {
157 157
    *
158 158
    * There is only one debug window per program. This can be obtained by calling #instance
159 159
    */
160
-  class KJSDebugWin : public KMainWindow, public Debugger, public KInstance
160
+  class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
161 161
   {
162 162
     Q_OBJECT
163 163
     friend class SourceDisplay;

+ 4
- 4
khtml/java/kjavaappletviewer.cpp View File

@@ -48,10 +48,10 @@
48 48
 
49 49
 K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
50 50
 
51
-KInstance *KJavaAppletViewerFactory::s_instance = 0;
51
+TDEInstance *KJavaAppletViewerFactory::s_instance = 0;
52 52
 
53 53
 KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
54
-    s_instance = new KInstance ("kjava");
54
+    s_instance = new TDEInstance ("kjava");
55 55
 }
56 56
 
57 57
 KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
447 447
     m_browserextension->infoMessage(msg);
448 448
 }
449 449
 
450
-KAboutData* KJavaAppletViewer::createAboutData () {
451
-    return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
450
+TDEAboutData* KJavaAppletViewer::createAboutData () {
451
+    return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
452 452
 }
453 453
 
454 454
 //---------------------------------------------------------------------

+ 5
- 5
khtml/java/kjavaappletviewer.h View File

@@ -39,8 +39,8 @@ class TQTable;
39 39
 class TQLabel;
40 40
 class KJavaProcess;
41 41
 class KJavaAppletViewer;
42
-class KAboutData;
43
-class KInstance;
42
+class TDEAboutData;
43
+class TDEInstance;
44 44
 class KConfig;
45 45
 class CoverWidget;
46 46
 
@@ -86,7 +86,7 @@ public:
86 86
               TQObject * parent, const char * name, const TQStringList &args);
87 87
     ~KJavaAppletViewer ();
88 88
     CoverWidget * view () const { return m_view; }
89
-    static KAboutData* createAboutData ();
89
+    static TDEAboutData* createAboutData ();
90 90
 
91 91
     KJavaAppletViewerBrowserExtension * browserextension() const
92 92
         { return m_browserextension; }
@@ -126,9 +126,9 @@ public:
126 126
         (TQWidget *wparent, const char *wname,
127 127
          TQObject *parent, const char *name,
128 128
          const char *className, const TQStringList &args);
129
-    static KInstance * instance () { return s_instance; }
129
+    static TDEInstance * instance () { return s_instance; }
130 130
 private:
131
-    static KInstance * s_instance;
131
+    static TDEInstance * s_instance;
132 132
 };
133 133
 
134 134
 class AppletParameterDialog : public KDialogBase {

+ 7
- 7
khtml/khtml_factory.cpp View File

@@ -58,8 +58,8 @@ extern "C" KDE_EXPORT void *init_libkhtml()
58 58
 
59 59
 KHTMLFactory *KHTMLFactory::s_self = 0;
60 60
 unsigned long int KHTMLFactory::s_refcnt = 0;
61
-KInstance *KHTMLFactory::s_instance = 0;
62
-KAboutData *KHTMLFactory::s_about = 0;
61
+TDEInstance *KHTMLFactory::s_instance = 0;
62
+TDEAboutData *KHTMLFactory::s_about = 0;
63 63
 KHTMLSettings *KHTMLFactory::s_settings = 0;
64 64
 TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
65 65
 TQString *KHTMLSettings::avFamilies = 0;
@@ -119,7 +119,7 @@ void KHTMLFactory::ref()
119 119
         // we can't use a staticdeleter here, because that would mean
120 120
         // that the factory gets deleted from within a qPostRoutine, called
121 121
         // from the TQApplication destructor. That however is too late, because
122
-        // we want to destruct a KInstance object, which involves destructing
122
+        // we want to destruct a TDEInstance object, which involves destructing
123 123
         // a KConfig object, which might call KGlobal::dirs() (in sync()) which
124 124
         // probably is not going to work ;-)
125 125
         // well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
@@ -168,15 +168,15 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part )
168 168
     }
169 169
 }
170 170
 
171
-KInstance *KHTMLFactory::instance()
171
+TDEInstance *KHTMLFactory::instance()
172 172
 {
173 173
   assert( s_self );
174 174
 
175 175
   if ( !s_instance )
176 176
   {
177
-    s_about = new KAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
177
+    s_about = new TDEAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
178 178
                               I18N_NOOP( "Embeddable HTML component" ),
179
-                              KAboutData::License_LGPL );
179
+                              TDEAboutData::License_LGPL );
180 180
     s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
181 181
     s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
182 182
     s_about->addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -187,7 +187,7 @@ KInstance *KHTMLFactory::instance()
187 187
     s_about->addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
188 188
     s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" );
189 189
 
190
-    s_instance = new KInstance( s_about );
190
+    s_instance = new TDEInstance( s_about );
191 191
   }
192 192
 
193 193
   return s_instance;

+ 5
- 5
khtml/khtml_factory.h View File

@@ -25,8 +25,8 @@
25 25
 #include <tqptrlist.h>
26 26
 #include <kurl.h>
27 27
 
28
-class KInstance;
29
-class KAboutData;
28
+class TDEInstance;
29
+class TDEAboutData;
30 30
 class HistoryProvider;
31 31
 class KHTMLSettings;
32 32
 class KHTMLPart;
@@ -52,7 +52,7 @@ public:
52 52
 
53 53
   static TQPtrList<KHTMLPart> *partList() { return s_parts; }
54 54
 
55
-  static KInstance *instance();
55
+  static TDEInstance *instance();
56 56
 
57 57
   static KHTMLSettings *defaultHTMLSettings();
58 58
 
@@ -67,8 +67,8 @@ protected:
67 67
 private:
68 68
   static unsigned long s_refcnt;
69 69
   static KHTMLFactory *s_self;
70
-  static KInstance *s_instance;
71
-  static KAboutData *s_about;
70
+  static TDEInstance *s_instance;
71
+  static TDEAboutData *s_about;
72 72
   static KHTMLSettings *s_settings;
73 73
   static TQPtrList<KHTMLPart> *s_parts;
74 74
 };

+ 2
- 2
khtml/khtmlimage.cpp View File

@@ -36,11 +36,11 @@
36 36
 
37 37
 K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
38 38
 
39
-KInstance *KHTMLImageFactory::s_instance = 0;
39
+TDEInstance *KHTMLImageFactory::s_instance = 0;
40 40
 
41 41
 KHTMLImageFactory::KHTMLImageFactory()
42 42
 {
43
-    s_instance = new KInstance( "khtmlimage" );
43
+    s_instance = new TDEInstance( "khtmlimage" );
44 44
 }
45 45
 
46 46
 KHTMLImageFactory::~KHTMLImageFactory()

+ 3
- 3
khtml/khtmlimage.h View File

@@ -27,7 +27,7 @@
27 27
 #include "misc/loader_client.h"
28 28
 
29 29
 class KHTMLPart;
30
-class KInstance;
30
+class TDEInstance;
31 31
 
32 32
 namespace khtml
33 33
 {
@@ -48,10 +48,10 @@ public:
48 48
                                             TQObject *parent, const char *name,
49 49
                                             const char *className, const TQStringList &args );
50 50
 
51
-    static KInstance *instance() { return s_instance; }
51
+    static TDEInstance *instance() { return s_instance; }
52 52
 
53 53
 private:
54
-    static KInstance *s_instance;
54
+    static TDEInstance *s_instance;
55 55
 };
56 56
 
57 57
 /**

+ 3
- 3
khtml/kmultipart/kmultipart.cpp View File

@@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
571 571
     emit m_extension->infoMessage( str );
572 572
 }
573 573
 
574
-KAboutData* KMultiPart::createAboutData()
574
+TDEAboutData* KMultiPart::createAboutData()
575 575
 {
576
-    KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
576
+    TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
577 577
                                              "0.1",
578 578
                                             I18N_NOOP( "Embeddable component for multipart/mixed" ),
579
-                                             KAboutData::License_GPL,
579
+                                             TDEAboutData::License_GPL,
580 580
                                              "(c) 2001, David Faure <david@mandrakesoft.com>");
581 581
     return aboutData;
582 582
 }

+ 2
- 2
khtml/kmultipart/kmultipart.h View File

@@ -29,7 +29,7 @@
29 29
 #include <tqdatetime.h>
30 30
 
31 31
 class KHTMLPart;
32
-class KInstance;
32
+class TDEInstance;
33 33
 class KTempFile;
34 34
 class KLineParser;
35 35
 
@@ -49,7 +49,7 @@ public:
49 49
 
50 50
     virtual bool closeURL();
51 51
 
52
-    static KAboutData* createAboutData();
52
+    static TDEAboutData* createAboutData();
53 53
 
54 54
 protected:
55 55
     virtual void guiActivateEvent( KParts::GUIActivateEvent *e );

+ 1
- 1
kinit/kdostartupconfig.cpp View File

@@ -62,7 +62,7 @@ TQString get_entry( TQString* ll )
62 62
 
63 63
 int main()
64 64
     {
65
-    KInstance inst( "kdostartupconfig" );
65
+    TDEInstance inst( "kdostartupconfig" );
66 66
     kdDebug() << "Running kdostartupconfig." << endl;
67 67
     TQString keysname = locateLocal( "config", "startupconfigkeys" );
68 68
     TQFile keys( keysname );

+ 3
- 3
kinit/kinit.cpp View File

@@ -113,7 +113,7 @@ static Display *X11display = 0;
113 113
 static int X11_startup_notify_fd = -1;
114 114
 static Display *X11_startup_notify_display = 0;
115 115
 #endif
116
-static const KInstance *s_instance = 0;
116
+static const TDEInstance *s_instance = 0;
117 117
 #define MAX_SOCK_FILE 255
118 118
 static char sock_file[MAX_SOCK_FILE];
119 119
 static char sock_file_old[MAX_SOCK_FILE];
@@ -1752,14 +1752,14 @@ int main(int argc, char **argv, char **envp)
1752 1752
       setsid();
1753 1753
 
1754 1754
    /** Create our instance **/
1755
-   s_instance = new KInstance("tdeinit");
1755
+   s_instance = new TDEInstance("tdeinit");
1756 1756
 
1757 1757
    /** Prepare to change process name **/
1758 1758
    tdeinit_initsetproctitle(argc, argv, envp);
1759 1759
    tdeinit_library_path();
1760 1760
    // Don't make our instance the global instance
1761 1761
    // (do it only after tdeinit_library_path, that one indirectly uses KConfig,
1762
-   // which seems to be buggy and always use KGlobal instead of the maching KInstance)
1762
+   // which seems to be buggy and always use KGlobal instead of the maching TDEInstance)
1763 1763
    KGlobal::_instance = 0L;
1764 1764
    // don't change envvars before tdeinit_initsetproctitle()
1765 1765
    unsetenv("LD_BIND_NOW");

+ 2
- 2
kio/kfile/knotifydialog.cpp View File

@@ -152,14 +152,14 @@ namespace KNotify
152 152
 
153 153
 
154 154
 int KNotifyDialog::configure( TQWidget *parent, const char *name,
155
-                              const KAboutData *aboutData )
155
+                              const TDEAboutData *aboutData )
156 156
 {
157 157
     KNotifyDialog dialog( parent, name, true, aboutData );
158 158
     return dialog.exec();
159 159
 }
160 160
 
161 161
 KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
162
-                              const KAboutData *aboutData )
162
+                              const TDEAboutData *aboutData )
163 163
     : KDialogBase(parent, name, modal, i18n("Notification Settings"),
164 164
                   Ok | Apply | Cancel | Default, Ok, true )
165 165
 {

+ 5
- 5
kio/kfile/knotifydialog.h View File

@@ -63,14 +63,14 @@ public:
63 63
      * @param parent The parent widget for the dialog
64 64
      * @param name The widget name
65 65
      * @param modal If true, this will be a modal dialog, otherwise non-modal.
66
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
66
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
67 67
      *                  will be used to find the KNotify events (in the eventsrc file).
68 68
      *                  Set this to 0L if you want to add all events yourself with
69 69
      * addApplicationEvents().
70 70
      */
71 71
     KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
72 72
                    bool modal = true,
73
-                   const KAboutData *aboutData =
73
+                   const TDEAboutData *aboutData =
74 74
                    KGlobal::instance()->aboutData() );
75 75
     /**
76 76
      * Destroys the KNotifyDialog
@@ -82,13 +82,13 @@ public:
82 82
      *
83 83
      * @param parent The parent widget for the dialog
84 84
      * @param name The widget name
85
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
85
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
86 86
      *                  will be used to find the KNotify events (in the eventsrc file).
87 87
      * @see exec for the return values.
88 88
      * @return The value of TQDialog::exec()
89 89
      */
90 90
     static int configure( TQWidget *parent = 0, const char *name = 0,
91
-                          const KAboutData *aboutData = KGlobal::instance()->aboutData() );
91
+                          const TDEAboutData *aboutData = KGlobal::instance()->aboutData() );
92 92
 
93 93
     /**
94 94
      * With this method, you can add the KNotify events of one eventsrc
@@ -96,7 +96,7 @@ public:
96 96
      * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
97 97
      * Successive calls with a different @p appName will add them.
98 98
      * @param appName The application's name, i.e. the name passed to the 
99
-     *                TDEApplication constructor or KAboutData.
99
+     *                TDEApplication constructor or TDEAboutData.
100 100
      * @see clearApplicationEvents()
101 101
      */
102 102
     virtual void addApplicationEvents( const char *appName );

+ 1
- 1
kio/kio/dataprotocol.cpp View File

@@ -47,7 +47,7 @@ using namespace KIO;
47 47
 extern "C" {
48 48
 
49 49
   int kdemain( int argc, char **argv ) {
50
-    KInstance instance( "kio_data" );
50
+    TDEInstance instance( "kio_data" );
51 51
 
52 52
     kdDebug(7101) << "*** Starting kio_data " << endl;
53 53
 

+ 3
- 3
kio/kio/kdatatool.cpp View File

@@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
42 42
     m_service = 0;
43 43
 }
44 44
 
45
-KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance )
45
+KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
46 46
 {
47 47
     m_service = service;
48 48
     m_instance = instance;
@@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
159 159
     return m_service;
160 160
 }
161 161
 
162
-TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance )
162
+TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance )
163 163
 {
164 164
     TQValueList<KDataToolInfo> lst;
165 165
 
@@ -271,7 +271,7 @@ KDataTool::KDataTool( TQObject* parent, const char* name )
271 271
 {
272 272
 }
273 273
 
274
-KInstance* KDataTool::instance() const
274
+TDEInstance* KDataTool::instance() const
275 275
 {
276 276
    return m_instance;
277 277
 }

+ 8
- 8
kio/kio/kdatatool.h View File

@@ -30,7 +30,7 @@
30 30
 class KDataTool;
31 31
 class TQPixmap;
32 32
 class TQStringList;
33
-class KInstance;
33
+class TDEInstance;
34 34
 
35 35
 // If you're only looking at implementing a data-tool, skip directly to the last
36 36
 // class definition, KDataTool.
@@ -56,7 +56,7 @@ public:
56 56
      * @param service the corresponding service
57 57
      * @param instance the instance to use
58 58
      */
59
-    KDataToolInfo( const KService::Ptr& service, KInstance* instance );
59
+    KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
60 60
     /**
61 61
      * Copy constructor.
62 62
      */
@@ -154,7 +154,7 @@ public:
154 154
      * The instance of the service.
155 155
      * @return the instance
156 156
      */
157
-    KInstance* instance() const { return m_instance; }
157
+    TDEInstance* instance() const { return m_instance; }
158 158
 
159 159
     /**
160 160
      * A DataToolInfo may be invalid if the KService passed to its constructor does
@@ -171,11 +171,11 @@ public:
171 171
      * and also used if the tool wants to read its configuration in the app's config file).
172 172
      * @return the list of results
173 173
      */
174
-    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, KInstance * instance );
174
+    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, TDEInstance * instance );
175 175
 
176 176
 private:
177 177
     KService::Ptr m_service;
178
-    KInstance* m_instance;
178
+    TDEInstance* m_instance;
179 179
 private:
180 180
     class KDataToolInfoPrivate* d;
181 181
 };
@@ -267,14 +267,14 @@ public:
267 267
     /**
268 268
      * @internal. Do not use under any circumstance (including bad weather).
269 269
      */
270
-    void setInstance( KInstance* instance ) { m_instance = instance; }
270
+    void setInstance( TDEInstance* instance ) { m_instance = instance; }
271 271
 
272 272
     /**
273 273
      * Returns the instance of the part that created this tool.
274 274
      * Usually used if the tool wants to read its configuration in the app's config file.
275 275
      * @return the instance of the part that created this tool.
276 276
      */
277
-    KInstance* instance() const;
277
+    TDEInstance* instance() const;
278 278
 
279 279
     /**
280 280
      * Interface for 'running' this tool.
@@ -292,7 +292,7 @@ public:
292 292
     virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;
293 293
 
294 294
 private:
295
-    KInstance * m_instance;
295
+    TDEInstance * m_instance;
296 296
 protected:
297 297
     virtual void virtual_hook( int id, void* data );
298 298
 private:

+ 8
- 8
kio/kio/kscan.h View File

@@ -213,17 +213,17 @@ protected:
213 213
      */
214 214
     void setName( const TQCString& instanceName ) {
215 215
 	delete m_instance;
216
-	m_instance = new KInstance( instanceName );
216
+	m_instance = new TDEInstance( instanceName );
217 217
     }
218 218
 
219 219
     /**
220 220
      * Returns the instance.
221
-     * @return the KInstance
221
+     * @return the TDEInstance
222 222
      */
223
-    KInstance *instance() const { return m_instance; }
223
+    TDEInstance *instance() const { return m_instance; }
224 224
 
225 225
 private:
226
-    KInstance *m_instance;
226
+    TDEInstance *m_instance;
227 227
 protected:
228 228
     virtual void virtual_hook( int id, void* data );
229 229
 private:
@@ -349,17 +349,17 @@ protected:
349 349
      */
350 350
     void setName( const TQCString& instanceName ) {
351 351
 	delete m_instance;
352
-	m_instance = new KInstance( instanceName );
352
+	m_instance = new TDEInstance( instanceName );
353 353
     }
354 354
 
355 355
     /**
356 356
      * Returns the instance.
357
-     * @return the KInstance
357
+     * @return the TDEInstance
358 358
      */
359
-    KInstance *instance() const { return m_instance; }
359
+    TDEInstance *instance() const { return m_instance; }
360 360
 
361 361
 private:
362
-    KInstance *m_instance;
362
+    TDEInstance *m_instance;
363 363
 protected:
364 364
     virtual void virtual_hook( int id, void* data );
365 365
 private:

+ 2
- 2
kio/kioexec/main.cpp View File

@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()
271 271
 
272 272
 int main( int argc, char **argv )
273 273
 {
274
-    KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
275
-        VERSION, description, KAboutData::License_GPL,
274
+    TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
275
+        VERSION, description, TDEAboutData::License_GPL,
276 276
         "(c) 1998-2000,2003 The KFM/Konqueror Developers");
277 277
     aboutData.addAuthor("David Faure",0, "faure@kde.org");
278 278
     aboutData.addAuthor("Stephan Kulow",0, "coolo@kde.org");

+ 2
- 2
kio/misc/kfile/fileprops.cpp View File

@@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
406 406
 
407 407
 int main( int argc, char **argv )
408 408
 {
409
-    KAboutData about(
409
+    TDEAboutData about(
410 410
 	  "kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
411 411
 	  I18N_NOOP("A commandline tool to read and modify metadata of files." ),
412
-	  KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
412
+	  TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
413 413
 	  0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
414 414
 	  "pfeiffer@kde.org" );
415 415
 

+ 1
- 1
kio/misc/kpac/proxyscout.cpp View File

@@ -41,7 +41,7 @@ namespace KPAC
41 41
 
42 42
     ProxyScout::ProxyScout( const TQCString& name )
43 43
         : KDEDModule( name ),
44
-          m_instance( new KInstance( "proxyscout" ) ),
44
+          m_instance( new TDEInstance( "proxyscout" ) ),
45 45
           m_downloader( 0 ),
46 46
           m_script( 0 ),
47 47
           m_suspendTime( 0 )

+ 2
- 2
kio/misc/kpac/proxyscout.h View File

@@ -29,7 +29,7 @@
29 29
 #include <time.h>
30 30
 
31 31
 class DCOPClientTransaction;
32
-class KInstance;
32
+class TDEInstance;
33 33
 
34 34
 namespace KPAC
35 35
 {
@@ -56,7 +56,7 @@ namespace KPAC
56 56
         bool startDownload();
57 57
         TQString handleRequest( const KURL& url );
58 58
 
59
-        KInstance* m_instance;
59
+        TDEInstance* m_instance;
60 60
         Downloader* m_downloader;
61 61
         Script* m_script;
62 62
 

+ 2
- 2
kio/misc/ksendbugmail/main.cpp View File

@@ -59,9 +59,9 @@ void BugMailer::slotSend() {
59 59
 int main(int argc, char **argv) {
60 60
 
61 61
     KLocale::setMainCatalogue("tdelibs");
62
-    KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
62
+    TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
63 63
                  I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
64
-                 KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
64
+                 TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
65 65
     d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
66 66
 
67 67
     TDECmdLineArgs::init(argc, argv, &d);

+ 2
- 2
kio/misc/uiserver.cpp View File

@@ -1380,9 +1380,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
1380 1380
     KLocale::setMainCatalogue("tdelibs");
1381 1381
     //  GS 5/2001 - I changed the name to "TDE" to make it look better
1382 1382
     //              in the titles of dialogs which are displayed.
1383
-    KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
1383
+    TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
1384 1384
                          "0.8", I18N_NOOP("TDE Progress Information UI Server"),
1385
-                         KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
1385
+                         TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
1386 1386
     // Who's the maintainer ? :)
1387 1387
     aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
1388 1388
     aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");

+ 1
- 1
kio/tests/kfiltertest.cpp View File

@@ -88,7 +88,7 @@ void test_textstream(  const TQString & fileName )
88 88
 
89 89
 int main()
90 90
 {
91
-    KInstance instance("kfiltertest");
91
+    TDEInstance instance("kfiltertest");
92 92
 
93 93
     char currentdir[PATH_MAX+1];
94 94
     getcwd( currentdir, PATH_MAX );

+ 1
- 1
kio/tests/kiopassdlgtest.cpp View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 int main ( int argc, char** argv )
10 10
 {
11
-    KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
11
+    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
12 12
     TDECmdLineArgs::init(argc, argv, &aboutData);
13 13
     TDEApplication app;
14 14
 

+ 1
- 1
kio/tests/kmfitest.cpp View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 int main (int argc, char **argv)
10 10
 {
11
-	KInstance ins("kmfitest");
11
+	TDEInstance ins("kmfitest");
12 12
 
13 13
 	if (argc < 2) {
14 14
 		printf("usage: %s <file>\n", argv[0]);

+ 1
- 1
kio/tests/kmimemagictest.cpp View File

@@ -30,7 +30,7 @@ int main( int argc, char** argv )
30 30
              "Usage : ./kmimemagictest file\n");
31 31
       return 1;
32 32
   }
33
-  KInstance blah("kmimemagictest");
33
+  TDEInstance blah("kmimemagictest");
34 34
 
35 35
   TQString file = TQString::fromLocal8Bit( argv[1] );
36 36
 

+ 1
- 1
kio/tests/kmimetypetest.cpp View File

@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
38 38
 
39 39
 int main( int argc, char** argv )
40 40
 {
41
-  KInstance blah("kmimetypetest");
41
+  TDEInstance blah("kmimetypetest");
42 42
 
43 43
   // Obviously those tests will need to be fixed if we ever change the name of the icons
44 44
   // but at least they unit-test KMimeType::iconForURL.

+ 1
- 1
kio/tests/kpropsdlgtest.cpp View File

@@ -13,7 +13,7 @@ static KCmdLineOptions options[] =
13 13
 
14 14
 int main ( int argc, char** argv )
15 15
 {
16
-    KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
16
+    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
17 17
     TDECmdLineArgs::init(argc, argv, &aboutData);
18 18
     TDECmdLineArgs::addCmdLineOptions( options );
19 19
 

+ 1
- 1
kio/tests/kprotocolinfotest.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <assert.h>
27 27
 
28 28
 int main(int argc, char **argv) {
29
-    KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
29
+    TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
30 30
                         "1.0");
31 31
 
32 32
     TDECmdLineArgs::init(argc, argv, &aboutData);

+ 1
- 1
kio/tests/ktartest.cpp View File

@@ -50,7 +50,7 @@ int main( int argc, char** argv )
50 50
  " ./ktartest iodevice /path/to/existing_file.tar.gz   tests KArchiveFile::device()\n");
51 51
     return 1;
52 52
   }
53
-  KInstance instance("ktartest");
53
+  TDEInstance instance("ktartest");
54 54
   TQString command = argv[1];
55 55
   if ( command == "list" )
56 56
   {

+ 1
- 1
kio/tests/kurifiltertest.cpp View File

@@ -158,7 +158,7 @@ int main(int argc, char **argv)
158 158
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
159 159
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
160 160
 
161
-    KAboutData aboutData(appName, programName, version, description);
161
+    TDEAboutData aboutData(appName, programName, version, description);
162 162
     TDECmdLineArgs::init(argc, argv, &aboutData);
163 163
     TDECmdLineArgs::addCmdLineOptions( options );
164 164
 

+ 1
- 1
kio/tests/kziptest.cpp View File

@@ -98,7 +98,7 @@ int main( int argc, char** argv )
98 98
  " ./kziptest iodevice /path/to/existing_file.zip   tests KArchiveFile::device()\n");
99 99
     return 1;
100 100
   }
101
-  KInstance instance("kziptest");
101
+  TDEInstance instance("kziptest");
102 102
   TQString command = argv[1];
103 103
   if ( command == "list" )
104 104
   {

+ 1
- 1
kioslave/file/file.cc View File

@@ -113,7 +113,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
113 113
 int kdemain( int argc, char **argv )
114 114
 {
115 115
   KLocale::setMainCatalogue("tdelibs");
116
-  KInstance instance( "kio_file" );
116
+  TDEInstance instance( "kio_file" );
117 117
   ( void ) KGlobal::locale();
118 118
 
119 119
   kdDebug(7101) << "Starting " << getpid() << endl;

+ 1
- 1
kioslave/ftp/ftp.cc View File

@@ -140,7 +140,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
140 140
 int kdemain( int argc, char **argv )
141 141
 {
142 142
   KLocale::setMainCatalogue("tdelibs");
143
-  KInstance instance( "kio_ftp" );
143
+  TDEInstance instance( "kio_ftp" );
144 144
   ( void ) KGlobal::locale();
145 145
 
146 146
   kdDebug(7102) << "Starting " << getpid() << endl;

+ 1
- 1
kioslave/http/http.cc View File

@@ -99,7 +99,7 @@ extern "C" {
99 99
 int kdemain( int argc, char **argv )
100 100
 {
101 101
   KLocale::setMainCatalogue("tdelibs");
102
-  KInstance instance( "kio_http" );
102
+  TDEInstance instance( "kio_http" );
103 103
   ( void ) KGlobal::locale();
104 104
 
105 105
   if (argc != 4)

+ 1
- 1
kioslave/http/http_cache_cleaner.cpp View File

@@ -200,7 +200,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
200 200
 
201 201
    bool deleteAll = args->isSet("clear-all");
202 202
 
203
-   KInstance ins( appName );
203
+   TDEInstance ins( appName );
204 204
 
205 205
    if (!deleteAll)
206 206
    {

+ 1
- 1
kioslave/http/kcookiejar/main.cpp View File

@@ -48,7 +48,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
48 48
 
49 49
    TDECmdLineArgs::addCmdLineOptions( options );
50 50
 
51
-   KInstance a("kcookiejar");
51
+   TDEInstance a("kcookiejar");
52 52
    
53 53
    kapp->dcopClient()->attach();
54 54
 

+ 2
- 2
kioslave/http/kcookiejar/tests/kcookiejartest.cpp View File

@@ -249,12 +249,12 @@ int main(int argc, char *argv[])
249 249
    lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
250 250
    nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
251 251
 
252
-   KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
252
+   TDEAboutData about("kcookietest", "kcookietest", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian");
253 253
    TDECmdLineArgs::init( argc, argv, &about);
254 254
 
255 255
    TDECmdLineArgs::addCmdLineOptions( options );
256 256
 
257
-   KInstance a("kcookietest");
257
+   TDEInstance a("kcookietest");
258 258
    
259 259
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
260 260
    if (args->count() != 1)

+ 1
- 1
kioslave/iso/iso.cpp View File

@@ -60,7 +60,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
60 60
 
61 61
 int kdemain( int argc, char **argv )
62 62
 {
63
-  KInstance instance( "kio_iso" );
63
+  TDEInstance instance( "kio_iso" );
64 64
 
65 65
   kdDebug()   << "Starting " << getpid() << endl;
66 66
 

+ 1
- 1
knewstuff/ghns.cpp View File

@@ -78,7 +78,7 @@ void GhnsWidget::downloadWallpapers()
78 78
 
79 79
 int main(int argc,char **argv)
80 80
 {
81
-  KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
81
+  TDEAboutData aboutData("ghns","Get Hot New Stuff","0.1");
82 82
   TDECmdLineArgs::init(argc,argv,&aboutData);
83 83
 
84 84
   TDEApplication app;

+ 1
- 1
knewstuff/khotnewstuff.cpp View File

@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =
35 35
 
36 36
 int main(int argc, char **argv)
37 37
 {
38
-	KAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
38
+	TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
39 39
 	TDECmdLineArgs *args;
40 40
 
41 41
 	TDECmdLineArgs::init(argc, argv, &about);

+ 1
- 1
knewstuff/testnewstuff.cpp View File

@@ -107,7 +107,7 @@ void MyWidget::upload()
107 107
 
108 108
 int main(int argc,char **argv)
109 109
 {
110
-  KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
110
+  TDEAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
111 111
   TDECmdLineArgs::init(argc,argv,&aboutData);
112 112
 
113 113
   TDEApplication app;

+ 2
- 2
kparts/factory.cpp View File

@@ -47,7 +47,7 @@ Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObj
47 47
     return part;
48 48
 }
49 49
 
50
-const KInstance *Factory::partInstance()
50
+const TDEInstance *Factory::partInstance()
51 51
 {
52 52
     QueryInstanceParams params;
53 53
     params.instance = 0;
@@ -55,7 +55,7 @@ const KInstance *Factory::partInstance()
55 55
     return params.instance;
56 56
 }
57 57
 
58
-const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
58
+const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
59 59
 {
60 60
     KLibrary *library = KLibLoader::self()->library( libraryName );
61 61
     if ( !library )

+ 4
- 4
kparts/factory.h View File

@@ -75,12 +75,12 @@ public:
75 75
 
76 76
      /**
77 77
       * If you have a part contained in a shared library you might want to query
78
-      * for meta-information like the about-data, or the KInstance in general.
78
+      * for meta-information like the about-data, or the TDEInstance in general.
79 79
       * If the part is exported using KParts::GenericFactory then this method will
80 80
       * return the instance that belongs to the part without the need to instantiate
81 81
       * the part component.
82 82
       */
83
-     const KInstance *partInstance();
83
+     const TDEInstance *partInstance();
84 84
 
85 85
      /**
86 86
       * A convenience method for partInstance() that takes care of retrieving
@@ -88,7 +88,7 @@ public:
88 88
       *
89 89
       * @param libraryName name of the library to query the instance from
90 90
       */
91
-     static const KInstance *partInstanceFromLibrary( const TQCString &libraryName );
91
+     static const TDEInstance *partInstanceFromLibrary( const TQCString &libraryName );
92 92
 
93 93
 protected:
94 94
 
@@ -129,7 +129,7 @@ protected:
129 129
     enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
130 130
     struct QueryInstanceParams
131 131
     {
132
-        const KInstance *instance;
132
+        const TDEInstance *instance;
133 133
     };
134 134
 };
135 135
 

+ 17
- 17
kparts/genericfactory.h View File

@@ -32,13 +32,13 @@ namespace KParts
32 32
             s_self = 0;
33 33
         }
34 34
 
35
-        static KInstance *instance();
36
-        static KAboutData *aboutData();
35
+        static TDEInstance *instance();
36
+        static TDEAboutData *aboutData();
37 37
 
38 38
     protected:
39
-        virtual KInstance *createInstance()
39
+        virtual TDEInstance *createInstance()
40 40
         {
41
-            return new KInstance( aboutData() );
41
+            return new TDEInstance( aboutData() );
42 42
         }
43 43
 
44 44
         virtual void virtual_hook( int id, void *data )
@@ -54,30 +54,30 @@ namespace KParts
54 54
 
55 55
     private:
56 56
         static GenericFactoryBase<T> *s_self;
57
-        static KInstance *s_instance;
58
-        static KAboutData *s_aboutData;
57
+        static TDEInstance *s_instance;
58
+        static TDEAboutData *s_aboutData;
59 59
     };
60 60
 
61 61
     /**
62 62
      * A template for a KParts::Factory implementation. It implements the pure virtual
63 63
      * createPartObject method by instantiating the template argument when requested
64
-     * through the className field. In addition it is a container for a part's KInstance
65
-     * object, by providing a static KInstance *instance() method.
64
+     * through the className field. In addition it is a container for a part's TDEInstance
65
+     * object, by providing a static TDEInstance *instance() method.
66 66
      *
67 67
      * The template argument has to inherit from KParts::Part and has to implement two methods:
68 68
      *  1) There needs to be a public constructor with the following signature:
69 69
      *         MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
70 70
      *
71
-     *  2) It needs to provide one static method to create a KAboutData object per
71
+     *  2) It needs to provide one static method to create a TDEAboutData object per
72 72
      *     request, holding information about the component's name, its authors, license, etc.
73 73
      *     The signature of that static method has to be
74
-     *         KAboutData *createAboutData()
74
+     *         TDEAboutData *createAboutData()
75 75
      *
76
-     * The template will take care of memory management of the KInstance and the KAboutData object,
76
+     * The template will take care of memory management of the TDEInstance and the TDEAboutData object,
77 77
      * meaning ownership of what createAboutData returns is passed to the caller (this template) .
78 78
      *
79 79
      * For advanced use you can also inherit from the template and re-implement additionally the
80
-     * virtual KInstance *createInstance() method, for example in case you want to extend the
80
+     * virtual TDEInstance *createInstance() method, for example in case you want to extend the
81 81
      * paths of your instance's KStandardDirs object.
82 82
      *
83 83
      * If a KParts::ReadOnlyPart is requested through this factory and the template argument
@@ -159,26 +159,26 @@ namespace KParts
159 159
      * @internal
160 160
      */
161 161
     template <class T>
162
-    KInstance *GenericFactoryBase<T>::s_instance = 0;
162
+    TDEInstance *GenericFactoryBase<T>::s_instance = 0;
163 163
 
164 164
     /**
165 165
      * @internal
166 166
      */
167 167
     template <class T>
168
-    KAboutData *GenericFactoryBase<T>::s_aboutData = 0;
168
+    TDEAboutData *GenericFactoryBase<T>::s_aboutData = 0;
169 169
 
170 170
     /**
171 171
      * @internal
172 172
      */
173 173
     template <class T>
174
-    KInstance *GenericFactoryBase<T>::instance()
174
+    TDEInstance *GenericFactoryBase<T>::instance()
175 175
     {
176 176
         if ( !s_instance )
177 177
         {
178 178
             if ( s_self )
179 179
                 s_instance = s_self->createInstance();
180 180
             else
181
-                s_instance = new KInstance( aboutData() );
181
+                s_instance = new TDEInstance( aboutData() );
182 182
         }
183 183
         return s_instance;
184 184
     }
@@ -187,7 +187,7 @@ namespace KParts
187 187
      * @internal
188 188
      */
189 189
     template <class T>
190
-    KAboutData *GenericFactoryBase<T>::aboutData()
190
+    TDEAboutData *GenericFactoryBase<T>::aboutData()
191 191
     {
192 192
         if ( !s_aboutData )
193 193
             s_aboutData = T::createAboutData();

+ 3
- 3
kparts/part.cpp View File

@@ -102,12 +102,12 @@ TQObject *PartBase::partObject() const
102 102
   return m_obj;
103 103
 }
104 104
 
105
-void PartBase::setInstance( KInstance *inst )
105
+void PartBase::setInstance( TDEInstance *inst )
106 106
 {
107 107
   setInstance( inst, true );
108 108
 }
109 109
 
110
-void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
110
+void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
111 111
 {
112 112
   KXMLGUIClient::setInstance( inst );
113 113
   KGlobal::locale()->insertCatalogue( inst->instanceName() );
@@ -119,7 +119,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
119 119
     loadPlugins( m_obj, this, instance() );
120 120
 }
121 121
 
122
-void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance )
122
+void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance )
123 123
 {
124 124
   if( d->m_pluginLoadingMode != DoNotLoadPlugins )
125 125
     Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins );

+ 7
- 7
kparts/part.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <kxmlguiclient.h>
29 29
 
30
-class KInstance;
30
+class TDEInstance;
31 31
 class TQWidget;
32 32
 class KAction;
33 33
 class KActionCollection;
@@ -79,24 +79,24 @@ public:
79 79
 
80 80
 protected:
81 81
   /**
82
-   * Set the instance ( KInstance) for this part.
82
+   * Set the instance ( TDEInstance) for this part.
83 83
    *
84 84
    * Call this *first* in the inherited class constructor,
85 85
    * because it loads the i18n catalogues.
86 86
    */
87
-  virtual void setInstance( KInstance *instance );
87
+  virtual void setInstance( TDEInstance *instance );
88 88
 
89 89
   /**
90
-   * Set the instance ( KInstance) for this part.
90
+   * Set the instance ( TDEInstance) for this part.
91 91
    *
92 92
    * Call this *first* in the inherited class constructor,
93 93
    * because it loads the i18n catalogues.
94 94
    */
95
-  virtual void setInstance( KInstance *instance, bool loadPlugins );
95
+  virtual void setInstance( TDEInstance *instance, bool loadPlugins );
96 96
 
97 97
   /**
98 98
    * We have three different policies, whether to load new plugins or not. The
99
-   * value in the KConfig object of the KInstance object always overrides
99
+   * value in the KConfig object of the TDEInstance object always overrides
100 100
    * LoadPlugins and LoadPluginsIfEnabled.
101 101
    */
102 102
   enum PluginLoadingMode {
@@ -140,7 +140,7 @@ protected:
140 140
    * }
141 141
    * \endcode
142 142
    */
143
-  void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance );
143
+  void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance );
144 144
 
145 145
   /**
146 146
    * For a KParts::Part: call this before setInstance().

+ 1
- 1
kparts/partmanager.cpp View File

@@ -486,7 +486,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
486 486
   emit activePartChanged( d->m_activePart );
487 487
 }
488 488
 
489
-void PartManager::setActiveInstance( KInstance * instance )
489
+void PartManager::setActiveInstance( TDEInstance * instance )
490 490
 {
491 491
   // It's a separate method to allow redefining this behavior
492 492
   KGlobal::_activeInstance = instance;

+ 2
- 2
kparts/partmanager.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <tdelibs_export.h>
29 29
 
30
-class KInstance;
30
+class TDEInstance;
31 31
 
32 32
 namespace KParts
33 33
 {
@@ -256,7 +256,7 @@ protected:
256 256
    * The active instance is used by KBugReport and KAboutDialog.
257 257
    * Override if you really need to - usually you don't need to.
258 258
    */
259
-  virtual void setActiveInstance( KInstance * instance );
259
+  virtual void setActiveInstance( TDEInstance * instance );
260 260
 
261 261
 protected slots:
262 262
   /**

+ 6
- 6
kparts/plugin.cpp View File

@@ -45,7 +45,7 @@ class Plugin::PluginPrivate
45 45
 public:
46 46
     PluginPrivate() : m_parentInstance( 0 ) {}
47 47
 
48
-    const KInstance *m_parentInstance;
48
+    const TDEInstance *m_parentInstance;
49 49
     TQString m_library; // filename of the library
50 50
 };
51 51
 
@@ -86,7 +86,7 @@ TQString Plugin::localXMLFile() const
86 86
 }
87 87
 
88 88
 //static
89
-TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance )
89
+TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const TDEInstance * instance )
90 90
 {
91 91
   if ( !instance )
92 92
     kdError(1000) << "No instance ???" << endl;
@@ -138,12 +138,12 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
138 138
   return plugins;
139 139
 }
140 140
 
141
-void Plugin::loadPlugins( TQObject *parent, const KInstance *instance )
141
+void Plugin::loadPlugins( TQObject *parent, const TDEInstance *instance )
142 142
 {
143 143
   loadPlugins( parent, pluginInfos( instance ), instance );
144 144
 }
145 145
 
146
-void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance *instance )
146
+void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance *instance )
147 147
 {
148 148
    TQValueList<PluginInfo>::ConstIterator pIt = pluginInfos.begin();
149 149
    TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
@@ -218,13 +218,13 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library )
218 218
   return false;
219 219
 }
220 220
 
221
-void Plugin::setInstance( KInstance *instance )
221
+void Plugin::setInstance( TDEInstance *instance )
222 222
 {
223 223
     KGlobal::locale()->insertCatalogue( instance->instanceName() );
224 224
     KXMLGUIClient::setInstance( instance );
225 225
 }
226 226
 
227
-void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault )
227
+void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault )
228 228
 {
229 229
     KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
230 230
     TQValueList<PluginInfo> plugins = pluginInfos( instance );

+ 6
- 6
kparts/plugin.h View File

@@ -24,7 +24,7 @@
24 24
 #include <kaction.h>
25 25
 #include <kxmlguiclient.h>
26 26
 
27
-class KInstance;
27
+class TDEInstance;
28 28
 
29 29
 namespace KParts
30 30
 {
@@ -86,7 +86,7 @@ public:
86 86
      * It is recommended to use the last loadPlugins method instead,
87 87
      * to support enabling and disabling of plugins.
88 88
      */
89
-    static void loadPlugins( TQObject *parent, const KInstance * instance );
89
+    static void loadPlugins( TQObject *parent, const TDEInstance * instance );
90 90
 
91 91
     /**
92 92
      * Load the plugin libraries specified by the list @p docs and make the
@@ -104,7 +104,7 @@ public:
104 104
      * It is recommended to use the last loadPlugins method instead,
105 105
      * to support enabling and disabling of plugins.
106 106
      */
107
-    static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance * instance );
107
+    static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance * instance );
108 108
 
109 109
     /**
110 110
      * Load the plugin libraries for the given @p instance, make the
@@ -140,7 +140,7 @@ public:
140 140
      * }
141 141
      * \endcode
142 142
      */
143
-    static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault = true );
143
+    static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault = true );
144 144
 
145 145
     /**
146 146
      * Returns a list of plugin objects loaded for @p parent. This
@@ -156,7 +156,7 @@ protected:
156 156
      *
157 157
      * @return A list of TQDomDocument s, containing the parsed xml documents returned by plugins.
158 158
      */
159
-    static TQValueList<Plugin::PluginInfo> pluginInfos( const KInstance * instance );
159
+    static TQValueList<Plugin::PluginInfo> pluginInfos( const TDEInstance * instance );
160 160
 
161 161
     /**
162 162
      * @internal
@@ -164,7 +164,7 @@ protected:
164 164
      */
165 165
     static Plugin* loadPlugin( TQObject * parent, const char* libname );
166 166
 
167
-    virtual void setInstance( KInstance *instance );
167
+    virtual void setInstance( TDEInstance *instance );
168 168
 
169 169
 private:
170 170
     static bool hasPlugin( TQObject* parent, const TQString& library );

+ 2
- 2
kparts/tests/notepad.cpp View File

@@ -46,9 +46,9 @@ void NotepadPart::setReadWrite( bool rw )
46 46
     ReadWritePart::setReadWrite( rw );
47 47
 }
48 48
 
49
-KAboutData* NotepadPart::createAboutData()
49
+TDEAboutData* NotepadPart::createAboutData()
50 50
 {
51
-  return new KAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
51
+  return new TDEAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
52 52
 }
53 53
 
54 54
 bool NotepadPart::openFile()

+ 2
- 2
kparts/tests/notepad.h View File

@@ -5,7 +5,7 @@
5 5
 #include <kparts/genericfactory.h>
6 6
 #include <kparts/part.h>
7 7
 
8
-class KAboutData;
8
+class TDEAboutData;
9 9
 class TQMultiLineEdit;
10 10
 
11 11
 /**
@@ -24,7 +24,7 @@ public:
24 24
 
25 25
   virtual void setReadWrite( bool rw );
26 26
 
27
-  static KAboutData* createAboutData();
27
+  static TDEAboutData* createAboutData();
28 28
 
29 29
 protected:
30 30
   virtual bool openFile();

+ 0
- 0
kparts/tests/parts.cpp View File


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

Loading…
Cancel
Save