Browse Source

Rename KInstance and KAboutData to avoid conflicts with KDE4

tags/r14.0.0
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:
218 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
219 QApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
220 GUIenabled ),
221 KInstance( TDECmdLineArgs::about),
221 TDEInstance( TDECmdLineArgs::about),
222 d (new TDEApplicationPrivate)
223 {
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>
TDECmdLineArgs itself will add the command line options supported by Qt
and TDEApplication.<P>

You can also use the KAboutData class to specify name, description and
You can also use the TDEAboutData class to specify name, description and
version.<P>

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()

int main(int argc, char **argv)
{
KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
TDEAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

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

@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =

int main(int argc, char **argv)
{
KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
TDEAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

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

@@ -88,7 +88,7 @@ static KCmdLineOptions options[] =

int main(int argc, char **argv)
{
KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

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

@@ -48,9 +48,9 @@ public:

int main(int argc, char **argv)
{
KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
TDEAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
"0.1", I18N_NOOP("TDE MCOP-DCOP Bridge"),
KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
TDEAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");

TDECmdLineArgs::init(argc, argv, &aboutdata);

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

@@ -105,9 +105,9 @@ extern "C"{

KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
"3.0", I18N_NOOP("TDE Notification Server"),
KAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
aboutdata.addAuthor("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org");
aboutdata.addAuthor("Christian Esken",0,"esken@kde.org");
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[] =
KCmdLineLastOption // End of options.
};

KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
I18N_NOOP("Utility to display aRts error messages"),
KAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
TDEAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");

int main(int argc, char **argv) {
aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");

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

@@ -33,7 +33,7 @@ Win::Win()

int main( int argc, char** argv )
{
KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
TDECmdLineArgs::init( argc, argv, about );
TDEApplication a;
Win* win = new Win();

+ 1
- 1
kabc/kab2kabc.cpp View File

@@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )

int main( int argc, char **argv )
{
KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

TDECmdLineArgs::init( argc, argv, &aboutData );

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

@@ -17,7 +17,7 @@ using namespace KABC;

int main(int argc,char **argv)
{
KAboutData aboutData("bigread","BigReadKabc","0.1");
TDEAboutData aboutData("bigread","BigReadKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

TDEApplication app( false, false );

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

@@ -14,7 +14,7 @@ using namespace KABC;

int main(int argc,char **argv)
{
KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
TDEAboutData aboutData("bigwrite","BigWriteKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

TDEApplication app( false, false );

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

@@ -35,7 +35,7 @@ using namespace KABC;

int main(int argc,char **argv)
{
KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");

TDECmdLineArgs::init(argc,argv,&aboutData);

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

@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =

int main(int argc,char **argv)
{
KAboutData aboutData("testaddressee","TestAddressee","0.1");
TDEAboutData aboutData("testaddressee","TestAddressee","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);


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

@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =

int main(int /*argc*/,char /* **argv*/)
{
/* KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
/* TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);


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

@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =

int main(int argc,char **argv)
{
KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
TDEAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);


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

@@ -10,7 +10,7 @@ using namespace KABC;

int main( int argc,char **argv )
{
KAboutData aboutData( "testaddresslineedit",
TDEAboutData aboutData( "testaddresslineedit",
I18N_NOOP( "Test Address LineEdit" ), "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );


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

@@ -12,7 +12,7 @@ using namespace KABC;

int main(int argc,char **argv)
{
KAboutData aboutData("testdb","TestKabcDB","0.1");
TDEAboutData aboutData("testdb","TestKabcDB","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

// TDEApplication app( false, false );

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

@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =

int main(int argc,char **argv)
{
KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
TDEAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );


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

@@ -20,7 +20,7 @@ using namespace KABC;

int main(int argc,char **argv)
{
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);

TDEApplication app( false, false );

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

@@ -18,7 +18,7 @@ static const KCmdLineOptions options[] =

int main(int argc,char **argv)
{
KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
TDEAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );


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

@@ -165,7 +165,7 @@ static const KCmdLineOptions options[] =

int main(int argc,char **argv)
{
KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );


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

@@ -8,7 +8,7 @@

int main(int argc,char **argv)
{
KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
TDEAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

TDEApplication app;

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

@@ -44,7 +44,7 @@ int main( int argc, char **argv )
{
TDEApplication::disableAutoDcopRegistration();

KAboutData aboutData( "testread", "vCard test reader", "0.1" );
TDEAboutData aboutData( "testread", "vCard test reader", "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

TDECmdLineArgs::init( argc, argv, &aboutData );

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

@@ -35,7 +35,7 @@

int main( int argc, char **argv )
{
KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );

TDECmdLineArgs::init( argc, argv, &aboutData );


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

@@ -68,7 +68,7 @@ KateFactory *KateFactory::s_self = 0;

KateFactory::KateFactory ()
: m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION,
I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
, m_instance (&m_aboutData)
, m_plugins (KTrader::self()->query("KTextEditor/Plugin"))

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

@@ -87,7 +87,7 @@ class KateFactory
* public accessor to the instance
* @return instance
*/
inline KInstance *instance () { return &m_instance; };
inline TDEInstance *instance () { return &m_instance; };

/**
* register document at the factory
@@ -221,12 +221,12 @@ class KateFactory
/**
* about data (authors and more)
*/
KAboutData m_aboutData;
TDEAboutData m_aboutData;

/**
* our kinstance
*/
KInstance m_instance;
TDEInstance m_instance;

/**
* registered docs

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

@@ -157,7 +157,7 @@ void KDataToolPluginView::aboutToShow()
}
}

KInstance *inst=instance();
TDEInstance *inst=instance();

TQValueList<KDataToolInfo> tools;
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,
TQObject *parent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadWritePart(parent, name) {
KInstance *instance = new KInstance("KCertPart");
TDEInstance *instance = new TDEInstance("KCertPart");
TQGridLayout *grid;
setInstance(instance);

@@ -874,9 +874,9 @@ KMessageBox::information(_frame, i18n("Certificates have been successfully impor
}


KAboutData *KCertPart::createAboutData()
TDEAboutData *KCertPart::createAboutData()
{
return new KAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
}

#include "kcertpart.moc"

+ 3
- 3
kcert/kcertpart.h View File

@@ -40,7 +40,7 @@ class KSSLPKCS12;
class KSSLCertificate;
class TQTabWidget;
class TQMultiLineEdit;
class KAboutData;
class TDEAboutData;
class TQGridLayout;


@@ -75,7 +75,7 @@ public:

virtual void setReadWrite(bool readwrite);

static KAboutData *createAboutData();
static TDEAboutData *createAboutData();

protected slots:
void slotChain(int c);
@@ -115,7 +115,7 @@ protected:


// The rest
KInstance *_instance;
TDEInstance *_instance;
TQButton *_import, *_save, *_done, *_launch, *_importAll;
// Store the pointer to the current item
KSSLPKCS12 *_p12;

+ 2
- 2
kcmshell/main.cpp View File

@@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)

extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
{
KAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
0,
I18N_NOOP("A tool to start single TDE control modules"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2004, The KDE Developers") );

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()

extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
TDEAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
"1.0.2",
I18N_NOOP("TDE Tool for updating user configuration files"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2001, Waldo Bastian");

aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org");
@@ -951,7 +951,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KInstance instance(&aboutData);
TDEInstance instance(&aboutData);

KonfUpdate konfUpdate;


+ 2
- 2
kded/kbuildsycoca.cpp View File

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


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

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

TDECmdLineArgs::init(argc, argv, &d);

+ 2
- 2
kded/kded.cpp View File

@@ -872,7 +872,7 @@ public:

extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
"$Id$",
I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));

@@ -904,7 +904,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
}
}

KInstance *instance = new KInstance(&aboutData);
TDEInstance *instance = new TDEInstance(&aboutData);
KConfig *config = instance->config(); // Enable translations.

if (args->isSet("check"))

+ 3
- 3
kded/khostname.cpp View File

@@ -366,15 +366,15 @@ void KHostName::changeSessionManager()
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
I18N_NOOP("Informs TDE about a change in hostname"),
KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian");
d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");

TDECmdLineArgs::init(argc, argv, &d);
TDECmdLineArgs::addCmdLineOptions(options);

KInstance k(&d);
TDEInstance k(&d);

KHostName hn;


+ 1
- 1
kdewidgets/kde.widgets View File

@@ -1,7 +1,7 @@
[Global]
PluginName=KDEWidgets
Includes=kinstance.h,classpreviews.h
Init=new KInstance("kdewidgets");
Init=new TDEInstance("kdewidgets");

[KActiveLabel]
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
static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );

int main( int argc, char **argv ) {
new KInstance( "makekdewidgets" );
new TDEInstance( "makekdewidgets" );

KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
TDEAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options );

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

@@ -1,7 +1,7 @@
[Global]
PluginName=KDEWidgets
Includes=kinstance.h,classpreviews.h
Init=new KInstance("kdewidgets");
Init=new TDEInstance("kdewidgets");

[KActiveLabel]
ToolTip=Active Label (KDE)

+ 1
- 1
kdoctools/main.cpp View File

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


+ 1
- 1
kdoctools/main_ghelp.cpp View File

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


+ 2
- 2
kdoctools/meinproc.cpp View File

@@ -91,7 +91,7 @@ int main(int argc, char **argv) {

// xsltSetGenericDebugFunc(stderr, NULL);

KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
"$Revision$",
I18N_NOOP("TDE Translator for XML"));

@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::addCmdLineOptions( options );

KLocale::setMainCatalogue("kio_help");
KInstance ins("meinproc");
TDEInstance ins("meinproc");
KGlobal::locale();



+ 1
- 1
kdoctools/xslt.cpp View File

@@ -179,7 +179,7 @@ TQString splitOut(const TQString &parsed, int index)
return filedata;
}

void fillInstance(KInstance &ins, const TQString &srcdir) {
void fillInstance(TDEInstance &ins, const TQString &srcdir) {
TQString catalogs;

if ( srcdir.isEmpty() ) {

+ 1
- 1
kdoctools/xslt.h View File

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

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

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

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

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

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

@@ -48,10 +48,10 @@

K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)

KInstance *KJavaAppletViewerFactory::s_instance = 0;
TDEInstance *KJavaAppletViewerFactory::s_instance = 0;

KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
s_instance = new KInstance ("kjava");
s_instance = new TDEInstance ("kjava");
}

KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
m_browserextension->infoMessage(msg);
}

KAboutData* KJavaAppletViewer::createAboutData () {
return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
TDEAboutData* KJavaAppletViewer::createAboutData () {
return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
}

//---------------------------------------------------------------------

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

@@ -39,8 +39,8 @@ class TQTable;
class TQLabel;
class KJavaProcess;
class KJavaAppletViewer;
class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;
class KConfig;
class CoverWidget;

@@ -86,7 +86,7 @@ public:
TQObject * parent, const char * name, const TQStringList &args);
~KJavaAppletViewer ();
CoverWidget * view () const { return m_view; }
static KAboutData* createAboutData ();
static TDEAboutData* createAboutData ();

KJavaAppletViewerBrowserExtension * browserextension() const
{ return m_browserextension; }
@@ -126,9 +126,9 @@ public:
(TQWidget *wparent, const char *wname,
TQObject *parent, const char *name,
const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; }
static TDEInstance * instance () { return s_instance; }
private:
static KInstance * s_instance;
static TDEInstance * s_instance;
};

class AppletParameterDialog : public KDialogBase {

+ 7
- 7
khtml/khtml_factory.cpp View File

@@ -58,8 +58,8 @@ extern "C" KDE_EXPORT void *init_libkhtml()

KHTMLFactory *KHTMLFactory::s_self = 0;
unsigned long int KHTMLFactory::s_refcnt = 0;
KInstance *KHTMLFactory::s_instance = 0;
KAboutData *KHTMLFactory::s_about = 0;
TDEInstance *KHTMLFactory::s_instance = 0;
TDEAboutData *KHTMLFactory::s_about = 0;
KHTMLSettings *KHTMLFactory::s_settings = 0;
TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
TQString *KHTMLSettings::avFamilies = 0;
@@ -119,7 +119,7 @@ void KHTMLFactory::ref()
// we can't use a staticdeleter here, because that would mean
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
// we want to destruct a KInstance object, which involves destructing
// we want to destruct a TDEInstance object, which involves destructing
// a KConfig object, which might call KGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// 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 )
}
}

KInstance *KHTMLFactory::instance()
TDEInstance *KHTMLFactory::instance()
{
assert( s_self );

if ( !s_instance )
{
s_about = new KAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
s_about = new TDEAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
I18N_NOOP( "Embeddable HTML component" ),
KAboutData::License_LGPL );
TDEAboutData::License_LGPL );
s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
s_about->addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -187,7 +187,7 @@ KInstance *KHTMLFactory::instance()
s_about->addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" );

s_instance = new KInstance( s_about );
s_instance = new TDEInstance( s_about );
}

return s_instance;

+ 5
- 5
khtml/khtml_factory.h View File

@@ -25,8 +25,8 @@
#include <tqptrlist.h>
#include <kurl.h>

class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;
class HistoryProvider;
class KHTMLSettings;
class KHTMLPart;
@@ -52,7 +52,7 @@ public:

static TQPtrList<KHTMLPart> *partList() { return s_parts; }

static KInstance *instance();
static TDEInstance *instance();

static KHTMLSettings *defaultHTMLSettings();

@@ -67,8 +67,8 @@ protected:
private:
static unsigned long s_refcnt;
static KHTMLFactory *s_self;
static KInstance *s_instance;
static KAboutData *s_about;
static TDEInstance *s_instance;
static TDEAboutData *s_about;
static KHTMLSettings *s_settings;
static TQPtrList<KHTMLPart> *s_parts;
};

+ 2
- 2
khtml/khtmlimage.cpp View File

@@ -36,11 +36,11 @@

K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )

KInstance *KHTMLImageFactory::s_instance = 0;
TDEInstance *KHTMLImageFactory::s_instance = 0;

KHTMLImageFactory::KHTMLImageFactory()
{
s_instance = new KInstance( "khtmlimage" );
s_instance = new TDEInstance( "khtmlimage" );
}

KHTMLImageFactory::~KHTMLImageFactory()

+ 3
- 3
khtml/khtmlimage.h View File

@@ -27,7 +27,7 @@
#include "misc/loader_client.h"

class KHTMLPart;
class KInstance;
class TDEInstance;

namespace khtml
{
@@ -48,10 +48,10 @@ public:
TQObject *parent, const char *name,
const char *className, const TQStringList &args );

static KInstance *instance() { return s_instance; }
static TDEInstance *instance() { return s_instance; }

private:
static KInstance *s_instance;
static TDEInstance *s_instance;
};

/**

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

@@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
emit m_extension->infoMessage( str );
}

KAboutData* KMultiPart::createAboutData()
TDEAboutData* KMultiPart::createAboutData()
{
KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
"0.1",
I18N_NOOP( "Embeddable component for multipart/mixed" ),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2001, David Faure <david@mandrakesoft.com>");
return aboutData;
}

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

@@ -29,7 +29,7 @@
#include <tqdatetime.h>

class KHTMLPart;
class KInstance;
class TDEInstance;
class KTempFile;
class KLineParser;

@@ -49,7 +49,7 @@ public:

virtual bool closeURL();

static KAboutData* createAboutData();
static TDEAboutData* createAboutData();

protected:
virtual void guiActivateEvent( KParts::GUIActivateEvent *e );

+ 1
- 1
kinit/kdostartupconfig.cpp View File

@@ -62,7 +62,7 @@ TQString get_entry( TQString* ll )

int main()
{
KInstance inst( "kdostartupconfig" );
TDEInstance inst( "kdostartupconfig" );
kdDebug() << "Running kdostartupconfig." << endl;
TQString keysname = locateLocal( "config", "startupconfigkeys" );
TQFile keys( keysname );

+ 3
- 3
kinit/kinit.cpp View File

@@ -113,7 +113,7 @@ static Display *X11display = 0;
static int X11_startup_notify_fd = -1;
static Display *X11_startup_notify_display = 0;
#endif
static const KInstance *s_instance = 0;
static const TDEInstance *s_instance = 0;
#define MAX_SOCK_FILE 255
static char sock_file[MAX_SOCK_FILE];
static char sock_file_old[MAX_SOCK_FILE];
@@ -1752,14 +1752,14 @@ int main(int argc, char **argv, char **envp)
setsid();

/** Create our instance **/
s_instance = new KInstance("tdeinit");
s_instance = new TDEInstance("tdeinit");

/** Prepare to change process name **/
tdeinit_initsetproctitle(argc, argv, envp);
tdeinit_library_path();
// Don't make our instance the global instance
// (do it only after tdeinit_library_path, that one indirectly uses KConfig,
// which seems to be buggy and always use KGlobal instead of the maching KInstance)
// which seems to be buggy and always use KGlobal instead of the maching TDEInstance)
KGlobal::_instance = 0L;
// don't change envvars before tdeinit_initsetproctitle()
unsetenv("LD_BIND_NOW");

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

@@ -152,14 +152,14 @@ namespace KNotify


int KNotifyDialog::configure( TQWidget *parent, const char *name,
const KAboutData *aboutData )
const TDEAboutData *aboutData )
{
KNotifyDialog dialog( parent, name, true, aboutData );
return dialog.exec();
}

KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
const KAboutData *aboutData )
const TDEAboutData *aboutData )
: KDialogBase(parent, name, modal, i18n("Notification Settings"),
Ok | Apply | Cancel | Default, Ok, true )
{

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

@@ -63,14 +63,14 @@ public:
* @param parent The parent widget for the dialog
* @param name The widget name
* @param modal If true, this will be a modal dialog, otherwise non-modal.
* @param aboutData A pointer to a KAboutData object. KAboutData::appName()
* @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
* will be used to find the KNotify events (in the eventsrc file).
* Set this to 0L if you want to add all events yourself with
* addApplicationEvents().
*/
KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
bool modal = true,
const KAboutData *aboutData =
const TDEAboutData *aboutData =
KGlobal::instance()->aboutData() );
/**
* Destroys the KNotifyDialog
@@ -82,13 +82,13 @@ public:
*
* @param parent The parent widget for the dialog
* @param name The widget name
* @param aboutData A pointer to a KAboutData object. KAboutData::appName()
* @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
* will be used to find the KNotify events (in the eventsrc file).
* @see exec for the return values.
* @return The value of TQDialog::exec()
*/
static int configure( TQWidget *parent = 0, const char *name = 0,
const KAboutData *aboutData = KGlobal::instance()->aboutData() );
const TDEAboutData *aboutData = KGlobal::instance()->aboutData() );

/**
* With this method, you can add the KNotify events of one eventsrc
@@ -96,7 +96,7 @@ public:
* KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
* Successive calls with a different @p appName will add them.
* @param appName The application's name, i.e. the name passed to the
* TDEApplication constructor or KAboutData.
* TDEApplication constructor or TDEAboutData.
* @see clearApplicationEvents()
*/
virtual void addApplicationEvents( const char *appName );

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

@@ -47,7 +47,7 @@ using namespace KIO;
extern "C" {

int kdemain( int argc, char **argv ) {
KInstance instance( "kio_data" );
TDEInstance instance( "kio_data" );

kdDebug(7101) << "*** Starting kio_data " << endl;


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

@@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
m_service = 0;
}

KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance )
KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
{
m_service = service;
m_instance = instance;
@@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
return m_service;
}

TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance )
TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance )
{
TQValueList<KDataToolInfo> lst;

@@ -271,7 +271,7 @@ KDataTool::KDataTool( TQObject* parent, const char* name )
{
}

KInstance* KDataTool::instance() const
TDEInstance* KDataTool::instance() const
{
return m_instance;
}

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

@@ -30,7 +30,7 @@
class KDataTool;
class TQPixmap;
class TQStringList;
class KInstance;
class TDEInstance;

// If you're only looking at implementing a data-tool, skip directly to the last
// class definition, KDataTool.
@@ -56,7 +56,7 @@ public:
* @param service the corresponding service
* @param instance the instance to use
*/
KDataToolInfo( const KService::Ptr& service, KInstance* instance );
KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
/**
* Copy constructor.
*/
@@ -154,7 +154,7 @@ public:
* The instance of the service.
* @return the instance
*/
KInstance* instance() const { return m_instance; }
TDEInstance* instance() const { return m_instance; }

/**
* A DataToolInfo may be invalid if the KService passed to its constructor does
@@ -171,11 +171,11 @@ public:
* and also used if the tool wants to read its configuration in the app's config file).
* @return the list of results
*/
static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, KInstance * instance );
static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, TDEInstance * instance );

private:
KService::Ptr m_service;
KInstance* m_instance;
TDEInstance* m_instance;
private:
class KDataToolInfoPrivate* d;
};
@@ -267,14 +267,14 @@ public:
/**
* @internal. Do not use under any circumstance (including bad weather).
*/
void setInstance( KInstance* instance ) { m_instance = instance; }
void setInstance( TDEInstance* instance ) { m_instance = instance; }

/**
* Returns the instance of the part that created this tool.
* Usually used if the tool wants to read its configuration in the app's config file.
* @return the instance of the part that created this tool.
*/
KInstance* instance() const;
TDEInstance* instance() const;

/**
* Interface for 'running' this tool.
@@ -292,7 +292,7 @@ public:
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;

private:
KInstance * m_instance;
TDEInstance * m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:

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

@@ -213,17 +213,17 @@ protected:
*/
void setName( const TQCString& instanceName ) {
delete m_instance;
m_instance = new KInstance( instanceName );
m_instance = new TDEInstance( instanceName );
}

/**
* Returns the instance.
* @return the KInstance
* @return the TDEInstance
*/
KInstance *instance() const { return m_instance; }
TDEInstance *instance() const { return m_instance; }

private:
KInstance *m_instance;
TDEInstance *m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:
@@ -349,17 +349,17 @@ protected:
*/
void setName( const TQCString& instanceName ) {
delete m_instance;
m_instance = new KInstance( instanceName );
m_instance = new TDEInstance( instanceName );
}

/**
* Returns the instance.
* @return the KInstance
* @return the TDEInstance
*/
KInstance *instance() const { return m_instance; }
TDEInstance *instance() const { return m_instance; }

private:
KInstance *m_instance;
TDEInstance *m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:

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

@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()

int main( int argc, char **argv )
{
KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 1998-2000,2003 The KFM/Konqueror Developers");
aboutData.addAuthor("David Faure",0, "faure@kde.org");
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,

int main( int argc, char **argv )
{
KAboutData about(
TDEAboutData about(
"kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
I18N_NOOP("A commandline tool to read and modify metadata of files." ),
KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
"pfeiffer@kde.org" );


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

@@ -41,7 +41,7 @@ namespace KPAC

ProxyScout::ProxyScout( const TQCString& name )
: KDEDModule( name ),
m_instance( new KInstance( "proxyscout" ) ),
m_instance( new TDEInstance( "proxyscout" ) ),
m_downloader( 0 ),
m_script( 0 ),
m_suspendTime( 0 )

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

@@ -29,7 +29,7 @@
#include <time.h>

class DCOPClientTransaction;
class KInstance;
class TDEInstance;

namespace KPAC
{
@@ -56,7 +56,7 @@ namespace KPAC
bool startDownload();
TQString handleRequest( const KURL& url );

KInstance* m_instance;
TDEInstance* m_instance;
Downloader* m_downloader;
Script* m_script;


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

@@ -59,9 +59,9 @@ void BugMailer::slotSend() {
int main(int argc, char **argv) {

KLocale::setMainCatalogue("tdelibs");
KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");

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)
KLocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed.
KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
"0.8", I18N_NOOP("TDE Progress Information UI Server"),
KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
// Who's the maintainer ? :)
aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
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 )

int main()
{
KInstance instance("kfiltertest");
TDEInstance instance("kfiltertest");

char currentdir[PATH_MAX+1];
getcwd( currentdir, PATH_MAX );

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

@@ -8,7 +8,7 @@

int main ( int argc, char** argv )
{
KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app;


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

@@ -8,7 +8,7 @@

int main (int argc, char **argv)
{
KInstance ins("kmfitest");
TDEInstance ins("kmfitest");

if (argc < 2) {
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 )
"Usage : ./kmimemagictest file\n");
return 1;
}
KInstance blah("kmimemagictest");
TDEInstance blah("kmimemagictest");

TQString file = TQString::fromLocal8Bit( argv[1] );


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

@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )

int main( int argc, char** argv )
{
KInstance blah("kmimetypetest");
TDEInstance blah("kmimetypetest");

// Obviously those tests will need to be fixed if we ever change the name of the icons
// but at least they unit-test KMimeType::iconForURL.

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

@@ -13,7 +13,7 @@ static KCmdLineOptions options[] =

int main ( int argc, char** argv )
{
KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );


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

@@ -26,7 +26,7 @@
#include <assert.h>

int main(int argc, char **argv) {
KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
"1.0");

TDECmdLineArgs::init(argc, argv, &aboutData);

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

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

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

@@ -158,7 +158,7 @@ int main(int argc, char **argv)
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

KAboutData aboutData(appName, programName, version, description);
TDEAboutData aboutData(appName, programName, version, description);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );


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

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

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

@@ -113,7 +113,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_file" );
TDEInstance instance( "kio_file" );
( void ) KGlobal::locale();

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); }
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_ftp" );
TDEInstance instance( "kio_ftp" );
( void ) KGlobal::locale();

kdDebug(7102) << "Starting " << getpid() << endl;

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

@@ -99,7 +99,7 @@ extern "C" {
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_http" );
TDEInstance instance( "kio_http" );
( void ) KGlobal::locale();

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)

bool deleteAll = args->isSet("clear-all");

KInstance ins( appName );
TDEInstance ins( appName );

if (!deleteAll)
{

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

@@ -48,7 +48,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])

TDECmdLineArgs::addCmdLineOptions( options );

KInstance a("kcookiejar");
TDEInstance a("kcookiejar");
kapp->dcopClient()->attach();


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

@@ -249,12 +249,12 @@ int main(int argc, char *argv[])
lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());

KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
TDEAboutData about("kcookietest", "kcookietest", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian");
TDECmdLineArgs::init( argc, argv, &about);

TDECmdLineArgs::addCmdLineOptions( options );

KInstance a("kcookietest");
TDEInstance a("kcookietest");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
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); }

int kdemain( int argc, char **argv )
{
KInstance instance( "kio_iso" );
TDEInstance instance( "kio_iso" );

kdDebug() << "Starting " << getpid() << endl;


+ 1
- 1
knewstuff/ghns.cpp View File

@@ -78,7 +78,7 @@ void GhnsWidget::downloadWallpapers()

int main(int argc,char **argv)
{
KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
TDEAboutData aboutData("ghns","Get Hot New Stuff","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

TDEApplication app;

+ 1
- 1
knewstuff/khotnewstuff.cpp View File

@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =

int main(int argc, char **argv)
{
KAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
TDECmdLineArgs *args;

TDECmdLineArgs::init(argc, argv, &about);

+ 1
- 1
knewstuff/testnewstuff.cpp View File

@@ -107,7 +107,7 @@ void MyWidget::upload()

int main(int argc,char **argv)
{
KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
TDEAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

TDEApplication app;

+ 2
- 2
kparts/factory.cpp View File

@@ -47,7 +47,7 @@ Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObj
return part;
}

const KInstance *Factory::partInstance()
const TDEInstance *Factory::partInstance()
{
QueryInstanceParams params;
params.instance = 0;
@@ -55,7 +55,7 @@ const KInstance *Factory::partInstance()
return params.instance;
}

const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
{
KLibrary *library = KLibLoader::self()->library( libraryName );
if ( !library )

+ 4
- 4
kparts/factory.h View File

@@ -75,12 +75,12 @@ public:

/**
* If you have a part contained in a shared library you might want to query
* for meta-information like the about-data, or the KInstance in general.
* for meta-information like the about-data, or the TDEInstance in general.
* If the part is exported using KParts::GenericFactory then this method will
* return the instance that belongs to the part without the need to instantiate
* the part component.
*/
const KInstance *partInstance();
const TDEInstance *partInstance();

/**
* A convenience method for partInstance() that takes care of retrieving
@@ -88,7 +88,7 @@ public:
*
* @param libraryName name of the library to query the instance from
*/
static const KInstance *partInstanceFromLibrary( const TQCString &libraryName );
static const TDEInstance *partInstanceFromLibrary( const TQCString &libraryName );

protected:

@@ -129,7 +129,7 @@ protected:
enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
struct QueryInstanceParams
{
const KInstance *instance;
const TDEInstance *instance;
};
};


+ 17
- 17
kparts/genericfactory.h View File

@@ -32,13 +32,13 @@ namespace KParts
s_self = 0;
}

static KInstance *instance();
static KAboutData *aboutData();
static TDEInstance *instance();
static TDEAboutData *aboutData();

protected:
virtual KInstance *createInstance()
virtual TDEInstance *createInstance()
{
return new KInstance( aboutData() );
return new TDEInstance( aboutData() );
}

virtual void virtual_hook( int id, void *data )
@@ -54,30 +54,30 @@ namespace KParts

private:
static GenericFactoryBase<T> *s_self;
static KInstance *s_instance;
static KAboutData *s_aboutData;
static TDEInstance *s_instance;
static TDEAboutData *s_aboutData;
};

/**
* A template for a KParts::Factory implementation. It implements the pure virtual
* createPartObject method by instantiating the template argument when requested
* through the className field. In addition it is a container for a part's KInstance
* object, by providing a static KInstance *instance() method.
* through the className field. In addition it is a container for a part's TDEInstance
* object, by providing a static TDEInstance *instance() method.
*
* The template argument has to inherit from KParts::Part and has to implement two methods:
* 1) There needs to be a public constructor with the following signature:
* MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
*
* 2) It needs to provide one static method to create a KAboutData object per
* 2) It needs to provide one static method to create a TDEAboutData object per
* request, holding information about the component's name, its authors, license, etc.
* The signature of that static method has to be
* KAboutData *createAboutData()
* TDEAboutData *createAboutData()
*
* The template will take care of memory management of the KInstance and the KAboutData object,
* The template will take care of memory management of the TDEInstance and the TDEAboutData object,
* meaning ownership of what createAboutData returns is passed to the caller (this template) .
*
* For advanced use you can also inherit from the template and re-implement additionally the
* virtual KInstance *createInstance() method, for example in case you want to extend the
* virtual TDEInstance *createInstance() method, for example in case you want to extend the
* paths of your instance's KStandardDirs object.
*
* If a KParts::ReadOnlyPart is requested through this factory and the template argument
@@ -159,26 +159,26 @@ namespace KParts
* @internal
*/
template <class T>
KInstance *GenericFactoryBase<T>::s_instance = 0;
TDEInstance *GenericFactoryBase<T>::s_instance = 0;

/**
* @internal
*/
template <class T>
KAboutData *GenericFactoryBase<T>::s_aboutData = 0;
TDEAboutData *GenericFactoryBase<T>::s_aboutData = 0;

/**
* @internal
*/
template <class T>
KInstance *GenericFactoryBase<T>::instance()
TDEInstance *GenericFactoryBase<T>::instance()
{
if ( !s_instance )
{
if ( s_self )
s_instance = s_self->createInstance();
else
s_instance = new KInstance( aboutData() );
s_instance = new TDEInstance( aboutData() );
}
return s_instance;
}
@@ -187,7 +187,7 @@ namespace KParts
* @internal
*/
template <class T>
KAboutData *GenericFactoryBase<T>::aboutData()
TDEAboutData *GenericFactoryBase<T>::aboutData()
{
if ( !s_aboutData )
s_aboutData = T::createAboutData();

+ 3
- 3
kparts/part.cpp View File

@@ -102,12 +102,12 @@ TQObject *PartBase::partObject() const
return m_obj;
}

void PartBase::setInstance( KInstance *inst )
void PartBase::setInstance( TDEInstance *inst )
{
setInstance( inst, true );
}

void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
{
KXMLGUIClient::setInstance( inst );
KGlobal::locale()->insertCatalogue( inst->instanceName() );
@@ -119,7 +119,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
loadPlugins( m_obj, this, instance() );
}

void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance )
void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance )
{
if( d->m_pluginLoadingMode != DoNotLoadPlugins )
Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins );

+ 7
- 7
kparts/part.h View File

@@ -27,7 +27,7 @@

#include <kxmlguiclient.h>

class KInstance;
class TDEInstance;
class TQWidget;
class KAction;
class KActionCollection;
@@ -79,24 +79,24 @@ public:

protected:
/**
* Set the instance ( KInstance) for this part.
* Set the instance ( TDEInstance) for this part.
*
* Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues.
*/
virtual void setInstance( KInstance *instance );
virtual void setInstance( TDEInstance *instance );

/**
* Set the instance ( KInstance) for this part.
* Set the instance ( TDEInstance) for this part.
*
* Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues.
*/
virtual void setInstance( KInstance *instance, bool loadPlugins );
virtual void setInstance( TDEInstance *instance, bool loadPlugins );

/**
* We have three different policies, whether to load new plugins or not. The
* value in the KConfig object of the KInstance object always overrides
* value in the KConfig object of the TDEInstance object always overrides
* LoadPlugins and LoadPluginsIfEnabled.
*/
enum PluginLoadingMode {
@@ -140,7 +140,7 @@ protected:
* }
* \endcode
*/
void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance );
void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance );

/**
* 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 )
emit activePartChanged( d->m_activePart );
}

void PartManager::setActiveInstance( KInstance * instance )
void PartManager::setActiveInstance( TDEInstance * instance )
{
// It's a separate method to allow redefining this behavior
KGlobal::_activeInstance = instance;

+ 2
- 2
kparts/partmanager.h View File

@@ -27,7 +27,7 @@

#include <tdelibs_export.h>

class KInstance;
class TDEInstance;

namespace KParts
{
@@ -256,7 +256,7 @@ protected:
* The active instance is used by KBugReport and KAboutDialog.
* Override if you really need to - usually you don't need to.
*/
virtual void setActiveInstance( KInstance * instance );
virtual void setActiveInstance( TDEInstance * instance );

protected slots:
/**

+ 6
- 6
kparts/plugin.cpp View File

@@ -45,7 +45,7 @@ class Plugin::PluginPrivate
public:
PluginPrivate() : m_parentInstance( 0 ) {}

const KInstance *m_parentInstance;
const TDEInstance *m_parentInstance;
TQString m_library; // filename of the library
};

@@ -86,7 +86,7 @@ TQString Plugin::localXMLFile() const
}

//static
TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance )
TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const TDEInstance * instance )
{
if ( !instance )
kdError(1000) << "No instance ???" << endl;
@@ -138,12 +138,12 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
return plugins;
}

void Plugin::loadPlugins( TQObject *parent, const KInstance *instance )
void Plugin::loadPlugins( TQObject *parent, const TDEInstance *instance )
{
loadPlugins( parent, pluginInfos( instance ), instance );
}

void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance *instance )
void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance *instance )
{
TQValueList<PluginInfo>::ConstIterator pIt = pluginInfos.begin();
TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
@@ -218,13 +218,13 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library )
return false;
}

void Plugin::setInstance( KInstance *instance )
void Plugin::setInstance( TDEInstance *instance )
{
KGlobal::locale()->insertCatalogue( instance->instanceName() );
KXMLGUIClient::setInstance( instance );
}

void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault )
void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault )
{
KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
TQValueList<PluginInfo> plugins = pluginInfos( instance );

+ 6
- 6
kparts/plugin.h View File

@@ -24,7 +24,7 @@
#include <kaction.h>
#include <kxmlguiclient.h>

class KInstance;
class TDEInstance;

namespace KParts
{
@@ -86,7 +86,7 @@ public:
* It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins.
*/
static void loadPlugins( TQObject *parent, const KInstance * instance );
static void loadPlugins( TQObject *parent, const TDEInstance * instance );

/**
* Load the plugin libraries specified by the list @p docs and make the
@@ -104,7 +104,7 @@ public:
* It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins.
*/
static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance * instance );
static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance * instance );

/**
* Load the plugin libraries for the given @p instance, make the
@@ -140,7 +140,7 @@ public:
* }
* \endcode
*/
static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault = true );
static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault = true );

/**
* Returns a list of plugin objects loaded for @p parent. This
@@ -156,7 +156,7 @@ protected:
*
* @return A list of TQDomDocument s, containing the parsed xml documents returned by plugins.
*/
static TQValueList<Plugin::PluginInfo> pluginInfos( const KInstance * instance );
static TQValueList<Plugin::PluginInfo> pluginInfos( const TDEInstance * instance );

/**
* @internal
@@ -164,7 +164,7 @@ protected:
*/
static Plugin* loadPlugin( TQObject * parent, const char* libname );

virtual void setInstance( KInstance *instance );
virtual void setInstance( TDEInstance *instance );

private:
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 )
ReadWritePart::setReadWrite( rw );
}

KAboutData* NotepadPart::createAboutData()
TDEAboutData* NotepadPart::createAboutData()
{
return new KAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
return new TDEAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
}

bool NotepadPart::openFile()

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

@@ -5,7 +5,7 @@
#include <kparts/genericfactory.h>
#include <kparts/part.h>

class KAboutData;
class TDEAboutData;
class TQMultiLineEdit;

/**
@@ -24,7 +24,7 @@ public:

virtual void setReadWrite( bool rw );

static KAboutData* createAboutData();
static TDEAboutData* createAboutData();

protected:
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