Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/16/head
Timothy Pearson 12 years ago
parent e729c6d549
commit b19ddece21

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

@ -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 TDECmdLineArgs itself will add the command line options supported by Qt
and TDEApplication.<P> 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> version.<P>
In return for this information you can query TDECmdLineArgs whether an In return for this information you can query TDECmdLineArgs whether an

@ -55,7 +55,7 @@ void KConvertTest::slotRawStreamFinished()
int main(int argc, char **argv) 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::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) 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::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -88,7 +88,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) 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::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -48,9 +48,9 @@ public:
int main(int argc, char **argv) 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"), "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"); aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");
TDECmdLineArgs::init(argc, argv, &aboutdata); TDECmdLineArgs::init(argc, argv, &aboutdata);

@ -105,9 +105,9 @@ extern "C"{
KDE_EXPORT int kdemain(int argc, char **argv) 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"), "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("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org");
aboutdata.addAuthor("Christian Esken",0,"esken@kde.org"); aboutdata.addAuthor("Christian Esken",0,"esken@kde.org");
aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de"); aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de");

@ -51,9 +51,9 @@ static KCmdLineOptions options[] =
KCmdLineLastOption // End of 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"), 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) { int main(int argc, char **argv) {
aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org"); aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");

@ -33,7 +33,7 @@ Win::Win()
int main( int argc, char** argv ) 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 ); TDECmdLineArgs::init( argc, argv, about );
TDEApplication a; TDEApplication a;
Win* win = new Win(); Win* win = new Win();

@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
int main( int argc, char **argv ) 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" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

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

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

@ -35,7 +35,7 @@ using namespace KABC;
int main(int argc,char **argv) 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"); aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);

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

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

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

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

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

@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv) 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::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -20,7 +20,7 @@ using namespace KABC;
int main(int argc,char **argv) 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); TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app( false, false ); TDEApplication app( false, false );

@ -18,7 +18,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv) 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::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -165,7 +165,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv) 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::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -8,7 +8,7 @@
int main(int argc,char **argv) 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); TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app; TDEApplication app;

@ -44,7 +44,7 @@ int main( int argc, char **argv )
{ {
TDEApplication::disableAutoDcopRegistration(); 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" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -35,7 +35,7 @@
int main( int argc, char **argv ) 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 ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -68,7 +68,7 @@ KateFactory *KateFactory::s_self = 0;
KateFactory::KateFactory () KateFactory::KateFactory ()
: m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION, : 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") I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
, m_instance (&m_aboutData) , m_instance (&m_aboutData)
, m_plugins (KTrader::self()->query("KTextEditor/Plugin")) , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))

@ -87,7 +87,7 @@ class KateFactory
* public accessor to the instance * public accessor to the instance
* @return instance * @return instance
*/ */
inline KInstance *instance () { return &m_instance; }; inline TDEInstance *instance () { return &m_instance; };
/** /**
* register document at the factory * register document at the factory
@ -221,12 +221,12 @@ class KateFactory
/** /**
* about data (authors and more) * about data (authors and more)
*/ */
KAboutData m_aboutData; TDEAboutData m_aboutData;
/** /**
* our kinstance * our kinstance
*/ */
KInstance m_instance; TDEInstance m_instance;
/** /**
* registered docs * registered docs

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

@ -131,7 +131,7 @@ KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const TQStringList & /*args*/ ) const TQStringList & /*args*/ )
: KParts::ReadWritePart(parent, name) { : KParts::ReadWritePart(parent, name) {
KInstance *instance = new KInstance("KCertPart"); TDEInstance *instance = new TDEInstance("KCertPart");
TQGridLayout *grid; TQGridLayout *grid;
setInstance(instance); 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" #include "kcertpart.moc"

@ -40,7 +40,7 @@ class KSSLPKCS12;
class KSSLCertificate; class KSSLCertificate;
class TQTabWidget; class TQTabWidget;
class TQMultiLineEdit; class TQMultiLineEdit;
class KAboutData; class TDEAboutData;
class TQGridLayout; class TQGridLayout;
@ -75,7 +75,7 @@ public:
virtual void setReadWrite(bool readwrite); virtual void setReadWrite(bool readwrite);
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
protected slots: protected slots:
void slotChain(int c); void slotChain(int c);
@ -115,7 +115,7 @@ protected:
// The rest // The rest
KInstance *_instance; TDEInstance *_instance;
TQButton *_import, *_save, *_done, *_launch, *_importAll; TQButton *_import, *_save, *_done, *_launch, *_importAll;
// Store the pointer to the current item // Store the pointer to the current item
KSSLPKCS12 *_p12; KSSLPKCS12 *_p12;

@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)
extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) 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, 0,
I18N_NOOP("A tool to start single TDE control modules"), I18N_NOOP("A tool to start single TDE control modules"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2004, The KDE Developers") ); I18N_NOOP("(c) 1999-2004, The KDE Developers") );
aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org"); aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org");

@ -940,10 +940,10 @@ void KonfUpdate::resetOptions()
extern "C" KDE_EXPORT int kdemain(int argc, char **argv) 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", "1.0.2",
I18N_NOOP("TDE Tool for updating user configuration files"), I18N_NOOP("TDE Tool for updating user configuration files"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2001, Waldo Bastian"); "(c) 2001, Waldo Bastian");
aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org"); 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::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KInstance instance(&aboutData); TDEInstance instance(&aboutData);
KonfUpdate konfUpdate; KonfUpdate konfUpdate;

@ -718,9 +718,9 @@ public:
extern "C" KDE_EXPORT int kdemain(int argc, char **argv) extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion, TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
I18N_NOOP("Rebuilds the system configuration cache."), 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("David Faure", I18N_NOOP("Author"), "faure@kde.org");
d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");

@ -113,9 +113,9 @@ int main(int argc, char **argv)
"The --highlight option can be used to visually indicate to the user where\n" "The --highlight option can be used to visually indicate to the user where\n"
"in the TDE menu a specific application is located."); "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, 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"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::init(argc, argv, &d);

@ -872,7 +872,7 @@ public:
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) 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$", "$Id$",
I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed")); 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. KConfig *config = instance->config(); // Enable translations.
if (args->isSet("check")) if (args->isSet("check"))

@ -366,15 +366,15 @@ void KHostName::changeSessionManager()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("tdelibs"); 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"), 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"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::init(argc, argv, &d);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KInstance k(&d); TDEInstance k(&d);
KHostName hn; KHostName hn;

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

@ -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 ); static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
int main( int argc, char **argv ) { 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" ); about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
TDECmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

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

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

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

@ -91,7 +91,7 @@ int main(int argc, char **argv) {
// xsltSetGenericDebugFunc(stderr, NULL); // xsltSetGenericDebugFunc(stderr, NULL);
KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ), TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
"$Revision$", "$Revision$",
I18N_NOOP("TDE Translator for XML")); I18N_NOOP("TDE Translator for XML"));
@ -99,7 +99,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KLocale::setMainCatalogue("kio_help"); KLocale::setMainCatalogue("kio_help");
KInstance ins("meinproc"); TDEInstance ins("meinproc");
KGlobal::locale(); KGlobal::locale();

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

@ -7,7 +7,7 @@
TQString transform(const TQString &file, const TQString& stylesheet, TQString transform(const TQString &file, const TQString& stylesheet,
const TQValueVector<const char *> &params = TQValueVector<const char *>()); const TQValueVector<const char *> &params = TQValueVector<const char *>());
TQString splitOut(const TQString &parsed, int index); 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 ); bool saveToCache( const TQString &contents, const TQString &filename );
TQString lookForCache( const TQString &filename ); TQString lookForCache( const TQString &filename );
TQCString fromUnicode( const TQString &data ); TQCString fromUnicode( const TQString &data );

@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) 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_breakpoints = 0;
m_breakpointCount = 0; m_breakpointCount = 0;

@ -157,7 +157,7 @@ namespace KJS {
* *
* There is only one debug window per program. This can be obtained by calling #instance * 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 Q_OBJECT
friend class SourceDisplay; friend class SourceDisplay;

@ -48,10 +48,10 @@
K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory) K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
KInstance *KJavaAppletViewerFactory::s_instance = 0; TDEInstance *KJavaAppletViewerFactory::s_instance = 0;
KJavaAppletViewerFactory::KJavaAppletViewerFactory () { KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
s_instance = new KInstance ("kjava"); s_instance = new TDEInstance ("kjava");
} }
KJavaAppletViewerFactory::~KJavaAppletViewerFactory () { KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
m_browserextension->infoMessage(msg); m_browserextension->infoMessage(msg);
} }
KAboutData* KJavaAppletViewer::createAboutData () { TDEAboutData* KJavaAppletViewer::createAboutData () {
return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0"); return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------

@ -39,8 +39,8 @@ class TQTable;
class TQLabel; class TQLabel;
class KJavaProcess; class KJavaProcess;
class KJavaAppletViewer; class KJavaAppletViewer;
class KAboutData; class TDEAboutData;
class KInstance; class TDEInstance;
class KConfig; class KConfig;
class CoverWidget; class CoverWidget;
@ -86,7 +86,7 @@ public:
TQObject * parent, const char * name, const TQStringList &args); TQObject * parent, const char * name, const TQStringList &args);
~KJavaAppletViewer (); ~KJavaAppletViewer ();
CoverWidget * view () const { return m_view; } CoverWidget * view () const { return m_view; }
static KAboutData* createAboutData (); static TDEAboutData* createAboutData ();
KJavaAppletViewerBrowserExtension * browserextension() const KJavaAppletViewerBrowserExtension * browserextension() const
{ return m_browserextension; } { return m_browserextension; }
@ -126,9 +126,9 @@ public:
(TQWidget *wparent, const char *wname, (TQWidget *wparent, const char *wname,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *className, const TQStringList &args); const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; } static TDEInstance * instance () { return s_instance; }
private: private:
static KInstance * s_instance; static TDEInstance * s_instance;
}; };
class AppletParameterDialog : public KDialogBase { class AppletParameterDialog : public KDialogBase {

@ -58,8 +58,8 @@ extern "C" KDE_EXPORT void *init_libkhtml()
KHTMLFactory *KHTMLFactory::s_self = 0; KHTMLFactory *KHTMLFactory::s_self = 0;
unsigned long int KHTMLFactory::s_refcnt = 0; unsigned long int KHTMLFactory::s_refcnt = 0;
KInstance *KHTMLFactory::s_instance = 0; TDEInstance *KHTMLFactory::s_instance = 0;
KAboutData *KHTMLFactory::s_about = 0; TDEAboutData *KHTMLFactory::s_about = 0;
KHTMLSettings *KHTMLFactory::s_settings = 0; KHTMLSettings *KHTMLFactory::s_settings = 0;
TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0; TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
TQString *KHTMLSettings::avFamilies = 0; TQString *KHTMLSettings::avFamilies = 0;
@ -119,7 +119,7 @@ void KHTMLFactory::ref()
// we can't use a staticdeleter here, because that would mean // we can't use a staticdeleter here, because that would mean
// that the factory gets deleted from within a qPostRoutine, called // that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because // 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 // a KConfig object, which might call KGlobal::dirs() (in sync()) which
// probably is not going to work ;-) // probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the // 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 ); assert( s_self );
if ( !s_instance ) 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" ), I18N_NOOP( "Embeddable HTML component" ),
KAboutData::License_LGPL ); TDEAboutData::License_LGPL );
s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" ); s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" ); s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
s_about->addAuthor( "Waldo Bastian", 0, "bastian@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( "Simon Hausmann", 0, "hausmann@kde.org" );
s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" ); 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; return s_instance;

@ -25,8 +25,8 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kurl.h> #include <kurl.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class HistoryProvider; class HistoryProvider;
class KHTMLSettings; class KHTMLSettings;
class KHTMLPart; class KHTMLPart;
@ -52,7 +52,7 @@ public:
static TQPtrList<KHTMLPart> *partList() { return s_parts; } static TQPtrList<KHTMLPart> *partList() { return s_parts; }
static KInstance *instance(); static TDEInstance *instance();
static KHTMLSettings *defaultHTMLSettings(); static KHTMLSettings *defaultHTMLSettings();
@ -67,8 +67,8 @@ protected:
private: private:
static unsigned long s_refcnt; static unsigned long s_refcnt;
static KHTMLFactory *s_self; static KHTMLFactory *s_self;
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
static KHTMLSettings *s_settings; static KHTMLSettings *s_settings;
static TQPtrList<KHTMLPart> *s_parts; static TQPtrList<KHTMLPart> *s_parts;
}; };

@ -36,11 +36,11 @@
K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory ) 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() KHTMLImageFactory::KHTMLImageFactory()
{ {
s_instance = new KInstance( "khtmlimage" ); s_instance = new TDEInstance( "khtmlimage" );
} }
KHTMLImageFactory::~KHTMLImageFactory() KHTMLImageFactory::~KHTMLImageFactory()

@ -27,7 +27,7 @@
#include "misc/loader_client.h" #include "misc/loader_client.h"
class KHTMLPart; class KHTMLPart;
class KInstance; class TDEInstance;
namespace khtml namespace khtml
{ {
@ -48,10 +48,10 @@ public:
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *className, const TQStringList &args ); const char *className, const TQStringList &args );
static KInstance *instance() { return s_instance; } static TDEInstance *instance() { return s_instance; }
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
}; };
/** /**

@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
emit m_extension->infoMessage( str ); 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", "0.1",
I18N_NOOP( "Embeddable component for multipart/mixed" ), I18N_NOOP( "Embeddable component for multipart/mixed" ),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2001, David Faure <david@mandrakesoft.com>"); "(c) 2001, David Faure <david@mandrakesoft.com>");
return aboutData; return aboutData;
} }

@ -29,7 +29,7 @@
#include <tqdatetime.h> #include <tqdatetime.h>
class KHTMLPart; class KHTMLPart;
class KInstance; class TDEInstance;
class KTempFile; class KTempFile;
class KLineParser; class KLineParser;
@ -49,7 +49,7 @@ public:
virtual bool closeURL(); virtual bool closeURL();
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
protected: protected:
virtual void guiActivateEvent( KParts::GUIActivateEvent *e ); virtual void guiActivateEvent( KParts::GUIActivateEvent *e );

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

@ -113,7 +113,7 @@ static Display *X11display = 0;
static int X11_startup_notify_fd = -1; static int X11_startup_notify_fd = -1;
static Display *X11_startup_notify_display = 0; static Display *X11_startup_notify_display = 0;
#endif #endif
static const KInstance *s_instance = 0; static const TDEInstance *s_instance = 0;
#define MAX_SOCK_FILE 255 #define MAX_SOCK_FILE 255
static char sock_file[MAX_SOCK_FILE]; static char sock_file[MAX_SOCK_FILE];
static char sock_file_old[MAX_SOCK_FILE]; static char sock_file_old[MAX_SOCK_FILE];
@ -1752,14 +1752,14 @@ int main(int argc, char **argv, char **envp)
setsid(); setsid();
/** Create our instance **/ /** Create our instance **/
s_instance = new KInstance("tdeinit"); s_instance = new TDEInstance("tdeinit");
/** Prepare to change process name **/ /** Prepare to change process name **/
tdeinit_initsetproctitle(argc, argv, envp); tdeinit_initsetproctitle(argc, argv, envp);
tdeinit_library_path(); tdeinit_library_path();
// Don't make our instance the global instance // Don't make our instance the global instance
// (do it only after tdeinit_library_path, that one indirectly uses KConfig, // (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; KGlobal::_instance = 0L;
// don't change envvars before tdeinit_initsetproctitle() // don't change envvars before tdeinit_initsetproctitle()
unsetenv("LD_BIND_NOW"); unsetenv("LD_BIND_NOW");

@ -152,14 +152,14 @@ namespace KNotify
int KNotifyDialog::configure( TQWidget *parent, const char *name, int KNotifyDialog::configure( TQWidget *parent, const char *name,
const KAboutData *aboutData ) const TDEAboutData *aboutData )
{ {
KNotifyDialog dialog( parent, name, true, aboutData ); KNotifyDialog dialog( parent, name, true, aboutData );
return dialog.exec(); return dialog.exec();
} }
KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal, KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
const KAboutData *aboutData ) const TDEAboutData *aboutData )
: KDialogBase(parent, name, modal, i18n("Notification Settings"), : KDialogBase(parent, name, modal, i18n("Notification Settings"),
Ok | Apply | Cancel | Default, Ok, true ) Ok | Apply | Cancel | Default, Ok, true )
{ {

@ -63,14 +63,14 @@ public:
* @param parent The parent widget for the dialog * @param parent The parent widget for the dialog
* @param name The widget name * @param name The widget name
* @param modal If true, this will be a modal dialog, otherwise non-modal. * @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). * 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 * Set this to 0L if you want to add all events yourself with
* addApplicationEvents(). * addApplicationEvents().
*/ */
KNotifyDialog( TQWidget *parent = 0, const char *name = 0, KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
bool modal = true, bool modal = true,
const KAboutData *aboutData = const TDEAboutData *aboutData =
KGlobal::instance()->aboutData() ); KGlobal::instance()->aboutData() );
/** /**
* Destroys the KNotifyDialog * Destroys the KNotifyDialog
@ -82,13 +82,13 @@ public:
* *
* @param parent The parent widget for the dialog * @param parent The parent widget for the dialog
* @param name The widget name * @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). * will be used to find the KNotify events (in the eventsrc file).
* @see exec for the return values. * @see exec for the return values.
* @return The value of TQDialog::exec() * @return The value of TQDialog::exec()
*/ */
static int configure( TQWidget *parent = 0, const char *name = 0, 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 * 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). * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
* Successive calls with a different @p appName will add them. * Successive calls with a different @p appName will add them.
* @param appName The application's name, i.e. the name passed to the * @param appName The application's name, i.e. the name passed to the
* TDEApplication constructor or KAboutData. * TDEApplication constructor or TDEAboutData.
* @see clearApplicationEvents() * @see clearApplicationEvents()
*/ */
virtual void addApplicationEvents( const char *appName ); virtual void addApplicationEvents( const char *appName );

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

@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
m_service = 0; m_service = 0;
} }
KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance ) KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
{ {
m_service = service; m_service = service;
m_instance = instance; m_instance = instance;
@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
return m_service; 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; 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; return m_instance;
} }

@ -30,7 +30,7 @@
class KDataTool; class KDataTool;
class TQPixmap; class TQPixmap;
class TQStringList; class TQStringList;
class KInstance; class TDEInstance;
// If you're only looking at implementing a data-tool, skip directly to the last // If you're only looking at implementing a data-tool, skip directly to the last
// class definition, KDataTool. // class definition, KDataTool.
@ -56,7 +56,7 @@ public:
* @param service the corresponding service * @param service the corresponding service
* @param instance the instance to use * @param instance the instance to use
*/ */
KDataToolInfo( const KService::Ptr& service, KInstance* instance ); KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
/** /**
* Copy constructor. * Copy constructor.
*/ */
@ -154,7 +154,7 @@ public:
* The instance of the service. * The instance of the service.
* @return the instance * @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 * 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). * and also used if the tool wants to read its configuration in the app's config file).
* @return the list of results * @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: private:
KService::Ptr m_service; KService::Ptr m_service;
KInstance* m_instance; TDEInstance* m_instance;
private: private:
class KDataToolInfoPrivate* d; class KDataToolInfoPrivate* d;
}; };
@ -267,14 +267,14 @@ public:
/** /**
* @internal. Do not use under any circumstance (including bad weather). * @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. * 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. * 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. * @return the instance of the part that created this tool.
*/ */
KInstance* instance() const; TDEInstance* instance() const;
/** /**
* Interface for 'running' this tool. * 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; virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;
private: private:
KInstance * m_instance; TDEInstance * m_instance;
protected: protected:
virtual void virtual_hook( int id, void* data ); virtual void virtual_hook( int id, void* data );
private: private:

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

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

@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData about( TDEAboutData about(
"kfile", I18N_NOOP( "kfile" ), KFILEVERSION, "kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
I18N_NOOP("A commandline tool to read and modify metadata of files." ), 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/", 0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
"pfeiffer@kde.org" ); "pfeiffer@kde.org" );

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

@ -29,7 +29,7 @@
#include <time.h> #include <time.h>
class DCOPClientTransaction; class DCOPClientTransaction;
class KInstance; class TDEInstance;
namespace KPAC namespace KPAC
{ {
@ -56,7 +56,7 @@ namespace KPAC
bool startDownload(); bool startDownload();
TQString handleRequest( const KURL& url ); TQString handleRequest( const KURL& url );
KInstance* m_instance; TDEInstance* m_instance;
Downloader* m_downloader; Downloader* m_downloader;
Script* m_script; Script* m_script;

@ -59,9 +59,9 @@ void BugMailer::slotSend() {
int main(int argc, char **argv) { int main(int argc, char **argv) {
KLocale::setMainCatalogue("tdelibs"); 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"), 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"); d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::init(argc, argv, &d);

@ -1380,9 +1380,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better // GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed. // 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"), "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 ? :) // Who's the maintainer ? :)
aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org"); aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk"); aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");

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

@ -8,7 +8,7 @@
int main ( int argc, char** argv ) 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); TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app; TDEApplication app;

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

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

@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
int main( int argc, char** argv ) 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 // 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. // but at least they unit-test KMimeType::iconForURL.

@ -13,7 +13,7 @@ static KCmdLineOptions options[] =
int main ( int argc, char** argv ) 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::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

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

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

@ -158,7 +158,7 @@ int main(int argc, char **argv)
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup 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::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

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

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

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

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

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

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

@ -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()); 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()); 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::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KInstance a("kcookietest"); TDEInstance a("kcookietest");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() != 1) if (args->count() != 1)

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

@ -78,7 +78,7 @@ void GhnsWidget::downloadWallpapers()
int main(int argc,char **argv) 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); TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app; TDEApplication app;

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

@ -107,7 +107,7 @@ void MyWidget::upload()
int main(int argc,char **argv) 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); TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app; TDEApplication app;

@ -47,7 +47,7 @@ Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObj
return part; return part;
} }
const KInstance *Factory::partInstance() const TDEInstance *Factory::partInstance()
{ {
QueryInstanceParams params; QueryInstanceParams params;
params.instance = 0; params.instance = 0;
@ -55,7 +55,7 @@ const KInstance *Factory::partInstance()
return params.instance; return params.instance;
} }
const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName ) const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
{ {
KLibrary *library = KLibLoader::self()->library( libraryName ); KLibrary *library = KLibLoader::self()->library( libraryName );
if ( !library ) if ( !library )

@ -75,12 +75,12 @@ public:
/** /**
* If you have a part contained in a shared library you might want to query * 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 * 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 * return the instance that belongs to the part without the need to instantiate
* the part component. * the part component.
*/ */
const KInstance *partInstance(); const TDEInstance *partInstance();
/** /**
* A convenience method for partInstance() that takes care of retrieving * 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 * @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: protected:
@ -129,7 +129,7 @@ protected:
enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 }; enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
struct QueryInstanceParams struct QueryInstanceParams
{ {
const KInstance *instance; const TDEInstance *instance;
}; };
}; };

@ -32,13 +32,13 @@ namespace KParts
s_self = 0; s_self = 0;
} }
static KInstance *instance(); static TDEInstance *instance();
static KAboutData *aboutData(); static TDEAboutData *aboutData();
protected: protected:
virtual KInstance *createInstance() virtual TDEInstance *createInstance()
{ {
return new KInstance( aboutData() ); return new TDEInstance( aboutData() );
} }
virtual void virtual_hook( int id, void *data ) virtual void virtual_hook( int id, void *data )
@ -54,30 +54,30 @@ namespace KParts
private: private:
static GenericFactoryBase<T> *s_self; static GenericFactoryBase<T> *s_self;
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_aboutData; static TDEAboutData *s_aboutData;
}; };
/** /**
* A template for a KParts::Factory implementation. It implements the pure virtual * A template for a KParts::Factory implementation. It implements the pure virtual
* createPartObject method by instantiating the template argument when requested * createPartObject method by instantiating the template argument when requested
* through the className field. In addition it is a container for a part's KInstance * through the className field. In addition it is a container for a part's TDEInstance
* object, by providing a static KInstance *instance() method. * object, by providing a static TDEInstance *instance() method.
* *
* The template argument has to inherit from KParts::Part and has to implement two methods: * 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: * 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 ) * 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. * request, holding information about the component's name, its authors, license, etc.
* The signature of that static method has to be * 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) . * 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 * 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. * paths of your instance's KStandardDirs object.
* *
* If a KParts::ReadOnlyPart is requested through this factory and the template argument * If a KParts::ReadOnlyPart is requested through this factory and the template argument
@ -159,26 +159,26 @@ namespace KParts
* @internal * @internal
*/ */
template <class T> template <class T>
KInstance *GenericFactoryBase<T>::s_instance = 0; TDEInstance *GenericFactoryBase<T>::s_instance = 0;
/** /**
* @internal * @internal
*/ */
template <class T> template <class T>
KAboutData *GenericFactoryBase<T>::s_aboutData = 0; TDEAboutData *GenericFactoryBase<T>::s_aboutData = 0;
/** /**
* @internal * @internal
*/ */
template <class T> template <class T>
KInstance *GenericFactoryBase<T>::instance() TDEInstance *GenericFactoryBase<T>::instance()
{ {
if ( !s_instance ) if ( !s_instance )
{ {
if ( s_self ) if ( s_self )
s_instance = s_self->createInstance(); s_instance = s_self->createInstance();
else else
s_instance = new KInstance( aboutData() ); s_instance = new TDEInstance( aboutData() );
} }
return s_instance; return s_instance;
} }
@ -187,7 +187,7 @@ namespace KParts
* @internal * @internal
*/ */
template <class T> template <class T>
KAboutData *GenericFactoryBase<T>::aboutData() TDEAboutData *GenericFactoryBase<T>::aboutData()
{ {
if ( !s_aboutData ) if ( !s_aboutData )
s_aboutData = T::createAboutData(); s_aboutData = T::createAboutData();

@ -102,12 +102,12 @@ TQObject *PartBase::partObject() const
return m_obj; return m_obj;
} }
void PartBase::setInstance( KInstance *inst ) void PartBase::setInstance( TDEInstance *inst )
{ {
setInstance( inst, true ); setInstance( inst, true );
} }
void PartBase::setInstance( KInstance *inst, bool bLoadPlugins ) void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
{ {
KXMLGUIClient::setInstance( inst ); KXMLGUIClient::setInstance( inst );
KGlobal::locale()->insertCatalogue( inst->instanceName() ); KGlobal::locale()->insertCatalogue( inst->instanceName() );
@ -119,7 +119,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
loadPlugins( m_obj, this, instance() ); 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 ) if( d->m_pluginLoadingMode != DoNotLoadPlugins )
Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins ); Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins );

@ -27,7 +27,7 @@
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
class KInstance; class TDEInstance;
class TQWidget; class TQWidget;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
@ -79,24 +79,24 @@ public:
protected: protected:
/** /**
* Set the instance ( KInstance) for this part. * Set the instance ( TDEInstance) for this part.
* *
* Call this *first* in the inherited class constructor, * Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues. * 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, * Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues. * 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 * 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. * LoadPlugins and LoadPluginsIfEnabled.
*/ */
enum PluginLoadingMode { enum PluginLoadingMode {
@ -140,7 +140,7 @@ protected:
* } * }
* \endcode * \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(). * For a KParts::Part: call this before setInstance().

@ -486,7 +486,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
emit activePartChanged( d->m_activePart ); 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 // It's a separate method to allow redefining this behavior
KGlobal::_activeInstance = instance; KGlobal::_activeInstance = instance;

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

@ -45,7 +45,7 @@ class Plugin::PluginPrivate
public: public:
PluginPrivate() : m_parentInstance( 0 ) {} PluginPrivate() : m_parentInstance( 0 ) {}
const KInstance *m_parentInstance; const TDEInstance *m_parentInstance;
TQString m_library; // filename of the library TQString m_library; // filename of the library
}; };
@ -86,7 +86,7 @@ TQString Plugin::localXMLFile() const
} }
//static //static
TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance ) TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const TDEInstance * instance )
{ {
if ( !instance ) if ( !instance )
kdError(1000) << "No instance ???" << endl; kdError(1000) << "No instance ???" << endl;
@ -138,12 +138,12 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
return plugins; return plugins;
} }
void Plugin::loadPlugins( TQObject *parent, const KInstance *instance ) void Plugin::loadPlugins( TQObject *parent, const TDEInstance *instance )
{ {
loadPlugins( parent, pluginInfos( instance ), 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 pIt = pluginInfos.begin();
TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end(); TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
@ -218,13 +218,13 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library )
return false; return false;
} }
void Plugin::setInstance( KInstance *instance ) void Plugin::setInstance( TDEInstance *instance )
{ {
KGlobal::locale()->insertCatalogue( instance->instanceName() ); KGlobal::locale()->insertCatalogue( instance->instanceName() );
KXMLGUIClient::setInstance( instance ); 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" ); KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
TQValueList<PluginInfo> plugins = pluginInfos( instance ); TQValueList<PluginInfo> plugins = pluginInfos( instance );

@ -24,7 +24,7 @@
#include <kaction.h> #include <kaction.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
class KInstance; class TDEInstance;
namespace KParts namespace KParts
{ {
@ -86,7 +86,7 @@ public:
* It is recommended to use the last loadPlugins method instead, * It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins. * 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 * 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, * It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins. * 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 * Load the plugin libraries for the given @p instance, make the
@ -140,7 +140,7 @@ public:
* } * }
* \endcode * \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 * 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. * @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 * @internal
@ -164,7 +164,7 @@ protected:
*/ */
static Plugin* loadPlugin( TQObject * parent, const char* libname ); static Plugin* loadPlugin( TQObject * parent, const char* libname );
virtual void setInstance( KInstance *instance ); virtual void setInstance( TDEInstance *instance );
private: private:
static bool hasPlugin( TQObject* parent, const TQString& library ); static bool hasPlugin( TQObject* parent, const TQString& library );

@ -46,9 +46,9 @@ void NotepadPart::setReadWrite( bool rw )
ReadWritePart::setReadWrite( 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() bool NotepadPart::openFile()

@ -5,7 +5,7 @@
#include <kparts/genericfactory.h> #include <kparts/genericfactory.h>
#include <kparts/part.h> #include <kparts/part.h>
class KAboutData; class TDEAboutData;
class TQMultiLineEdit; class TQMultiLineEdit;
/** /**
@ -24,7 +24,7 @@ public:
virtual void setReadWrite( bool rw ); virtual void setReadWrite( bool rw );
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
protected: protected:
virtual bool openFile(); virtual bool openFile();

@ -21,7 +21,7 @@
Part1::Part1( TQObject *parent, TQWidget * parentWidget ) Part1::Part1( TQObject *parent, TQWidget * parentWidget )
: KParts::ReadOnlyPart( parent, "Part1" ) : KParts::ReadOnlyPart( parent, "Part1" )
{ {
m_instance = new KInstance( "kpartstestpart" ); m_instance = new TDEInstance( "kpartstestpart" );
setInstance( m_instance ); setInstance( m_instance );
m_edit = new TQMultiLineEdit( parentWidget ); m_edit = new TQMultiLineEdit( parentWidget );
setWidget( m_edit ); setWidget( m_edit );
@ -59,7 +59,7 @@ bool Part1::openFile()
Part2::Part2( TQObject *parent, TQWidget * parentWidget ) Part2::Part2( TQObject *parent, TQWidget * parentWidget )
: KParts::Part( parent, "Part2" ) : KParts::Part( parent, "Part2" )
{ {
m_instance = new KInstance( "part2" ); m_instance = new TDEInstance( "part2" );
setInstance( m_instance ); setInstance( m_instance );
TQWidget * w = new TQWidget( parentWidget, "Part2Widget" ); TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
setWidget( w ); setWidget( w );

@ -21,7 +21,7 @@ protected:
protected: protected:
TQMultiLineEdit * m_edit; TQMultiLineEdit * m_edit;
KInstance *m_instance; TDEInstance *m_instance;
}; };
class Part2 : public KParts::Part class Part2 : public KParts::Part
@ -37,7 +37,7 @@ protected:
// (i.e. in a part manager) // (i.e. in a part manager)
// There is a default impl for ReadOnlyPart... // There is a default impl for ReadOnlyPart...
virtual void guiActivateEvent( KParts::GUIActivateEvent * ); virtual void guiActivateEvent( KParts::GUIActivateEvent * );
KInstance *m_instance; TDEInstance *m_instance;
}; };
#endif #endif

@ -40,10 +40,10 @@ KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQString
layout->addWidget( mConfigPage ); layout->addWidget( mConfigPage );
connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
setButtons( Help | Apply ); setButtons( Help | Apply );
KAboutData *about = TDEAboutData *about =
new KAboutData( I18N_NOOP( "kcmkresources" ), new TDEAboutData( I18N_NOOP( "kcmkresources" ),
I18N_NOOP( "TDE Resources configuration module" ), I18N_NOOP( "TDE Resources configuration module" ),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
I18N_NOOP( "(c) 2003 Tobias Koenig" ) ); I18N_NOOP( "(c) 2003 Tobias Koenig" ) );
about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

@ -29,7 +29,7 @@ class TestSubResource : public TestResource
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "testresources", "Kresource Test", "0" ); TDEAboutData aboutData( "testresources", "Kresource Test", "0" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app; TDEApplication app;

@ -48,10 +48,10 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KInstance instance("modrunner"); TDEInstance instance("modrunner");
KAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description, TDEAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description,
KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
"Jeroen.Wijnhout@kdemail.net"); "Jeroen.Wijnhout@kdemail.net");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -147,8 +147,8 @@ SampleTest - 1 test passed, 1 test failed
* *
* int main( int argc, char** argv ) * int main( int argc, char** argv )
* { * {
* KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, * TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
* KAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider"); * TDEAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
* *
* TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::init(argc, argv, &about);
* TDECmdLineArgs::addCmdLineOptions( options ); * TDECmdLineArgs::addCmdLineOptions( options );

@ -182,7 +182,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
d->btnRootMode->setEnabled( false ); d->btnRootMode->setEnabled( false );
setQuickHelp( mod->quickHelp() ); setQuickHelp( mod->quickHelp() );
setAboutData( const_cast<KAboutData*>(mod->aboutData()) ); setAboutData( const_cast<TDEAboutData*>(mod->aboutData()) );
} }

@ -586,12 +586,12 @@ TQString KCModuleProxy::quickHelp() const
} }
} }
const KAboutData * KCModuleProxy::aboutData() const const TDEAboutData * KCModuleProxy::aboutData() const
{ {
if( !d->rootMode ) if( !d->rootMode )
return realModule() ? realModule()->aboutData() : 0; return realModule() ? realModule()->aboutData() : 0;
else else
/* This needs fixing, perhaps cache a KAboutData copy /* This needs fixing, perhaps cache a TDEAboutData copy
* while in root mode? */ * while in root mode? */
return 0; return 0;
@ -614,7 +614,7 @@ bool KCModuleProxy::useRootOnlyMsg() const
return realModule() ? realModule()->useRootOnlyMsg() : true; return realModule() ? realModule()->useRootOnlyMsg() : true;
} }
KInstance * KCModuleProxy::instance() const TDEInstance * KCModuleProxy::instance() const
{ {
return realModule() ? realModule()->instance() : 0; return realModule() ? realModule()->instance() : 0;
} }

@ -27,10 +27,10 @@
#include <kservice.h> #include <kservice.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
class KAboutData; class TDEAboutData;
class KCModule; class KCModule;
class KCModuleInfo; class KCModuleInfo;
class KInstance; class TDEInstance;
class KProcess; class KProcess;
/** /**
@ -155,7 +155,7 @@ public:
/** /**
* @return the module's aboutData() * @return the module's aboutData()
*/ */
const KAboutData * aboutData() const; const TDEAboutData * aboutData() const;
/** /**
* @return what buttons the module * @return what buttons the module
@ -181,11 +181,11 @@ public:
// this one's available via moduleInfo()-> and realModule()-> // this one's available via moduleInfo()-> and realModule()->
/** /**
* Returns the embedded KCModule's KInstance. * Returns the embedded KCModule's TDEInstance.
* @return The module's KInstance. * @return The module's TDEInstance.
* @deprecated * @deprecated
*/ */
KInstance * instance() const; TDEInstance * instance() const;
//KDE4 remove. There's a limit for convenience functions, //KDE4 remove. There's a limit for convenience functions,
// this one's available via realModule() // this one's available via realModule()

@ -133,7 +133,7 @@ class KUTILS_EXPORT KPluginInfo
/** /**
* @return A list of KPluginInfo objects for the KParts plugins of an * @return A list of KPluginInfo objects for the KParts plugins of an
* instance. You only need the name of the instance not a pointer to the * instance. You only need the name of the instance not a pointer to the
* KInstance object. * TDEInstance object.
*/ */
static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null ); static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null );

@ -618,7 +618,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
d->pswidgets += w; d->pswidgets += w;
} }
void KPluginSelector::addPlugins( const KInstance * instance, const TQString & void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
catname, const TQString & category, KConfig * config ) catname, const TQString & category, KConfig * config )
{ {
if ( !config ) if ( !config )

@ -25,7 +25,7 @@
#include <tdelibs_export.h> #include <tdelibs_export.h>
class KInstance; class TDEInstance;
class KPluginInfo; class KPluginInfo;
class TQWidgetStack; class TQWidgetStack;
class KConfig; class KConfig;
@ -78,7 +78,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
* The information about the plugins will be loaded from the * The information about the plugins will be loaded from the
* share/apps/&lt;instancename&gt;/kpartplugins directory. * share/apps/&lt;instancename&gt;/kpartplugins directory.
* *
* @param instanceName The name of the KInstance of the plugin's parent. * @param instanceName The name of the TDEInstance of the plugin's parent.
* @param catname The translated name of the category. This is the * @param catname The translated name of the category. This is the
* name that is shown in the TabWidget if there is * name that is shown in the TabWidget if there is
* more than one category. * more than one category.
@ -107,7 +107,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
* Add a list of KParts plugins. Convenience method for the one above. * Add a list of KParts plugins. Convenience method for the one above.
* If not set explicitely, @p config is set to instance->config(). * If not set explicitely, @p config is set to instance->config().
*/ */
void addPlugins( const KInstance * instance, void addPlugins( const TDEInstance * instance,
const TQString & catname = TQString::null, const TQString & catname = TQString::null,
const TQString & category = TQString::null, const TQString & category = TQString::null,
KConfig * config = 0 ); KConfig * config = 0 );

@ -124,7 +124,7 @@ Some explanation for those keys:
use all modules that set X-TDE-ParentApp to use all modules that set X-TDE-ParentApp to
KGlobal::instance()->instanceName(). It KGlobal::instance()->instanceName(). It
should be pretty easy to find out what name that is: look at the first should be pretty easy to find out what name that is: look at the first
argument to the KAboutData ctor. argument to the TDEAboutData ctor.
- X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever) - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever)
this config page belongs to. Normally there is only one component. this config page belongs to. Normally there is only one component.
It is used for two things: It is used for two things:

@ -58,10 +58,10 @@ Dispatcher::~Dispatcher()
//delete d; //delete d;
} }
void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const char * slot ) void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, const char * slot )
{ {
assert( instance != 0 ); assert( instance != 0 );
// keep the KInstance around and call // keep the TDEInstance around and call
// instance->config()->reparseConfiguration when the app should reparse // instance->config()->reparseConfiguration when the app should reparse
TQCString instanceName = instance->instanceName(); TQCString instanceName = instance->instanceName();
kdDebug( 701 ) << k_funcinfo << instanceName << endl; kdDebug( 701 ) << k_funcinfo << instanceName << endl;
@ -88,7 +88,7 @@ KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
kdDebug( 701 ) << k_funcinfo << endl; kdDebug( 701 ) << k_funcinfo << endl;
if( m_instanceInfo.contains( instanceName ) ) if( m_instanceInfo.contains( instanceName ) )
{ {
KInstance * inst = m_instanceInfo[ instanceName ].instance; TDEInstance * inst = m_instanceInfo[ instanceName ].instance;
if( inst ) if( inst )
return inst->config(); return inst->config();
} }
@ -145,7 +145,7 @@ void Dispatcher::unregisterInstance( TQObject * obj )
} }
} }
//X KInstance * Dispatcher::instanceForName( const TQCString & instanceName ) //X TDEInstance * Dispatcher::instanceForName( const TQCString & instanceName )
//X { //X {
//X return m_instanceInfo[ instanceName ].instance; //X return m_instanceInfo[ instanceName ].instance;
//X } //X }

@ -28,7 +28,7 @@ class TQCString;
class TQSignal; class TQSignal;
class TQStrList; class TQStrList;
template<class T> class KStaticDeleter; template<class T> class KStaticDeleter;
class KInstance; class TDEInstance;
class KConfig; class KConfig;
namespace KSettings namespace KSettings
@ -61,17 +61,17 @@ class KUTILS_EXPORT Dispatcher : public TQObject
/** /**
* Register a slot to be called when the configuration for the instance * Register a slot to be called when the configuration for the instance
* has changed. @p instance is the KInstance object * has changed. @p instance is the TDEInstance object
* that is passed to KGenericFactory (if it is used). You can query * that is passed to KGenericFactory (if it is used). You can query
* it with KGenericFactory<YourClassName>::instance(). * it with KGenericFactory<YourClassName>::instance().
* instance->instanceName() is also the same name that is put into the * instance->instanceName() is also the same name that is put into the
* .desktop file of the KCMs for the X-TDE-ParentComponents. * .desktop file of the KCMs for the X-TDE-ParentComponents.
* *
* @param instance The KInstance object * @param instance The TDEInstance object
* @param recv The object that should receive the signal * @param recv The object that should receive the signal
* @param slot The slot to be called: TQT_SLOT( slotName() ) * @param slot The slot to be called: TQT_SLOT( slotName() )
*/ */
void registerInstance( KInstance * instance, TQObject * recv, const char * slot ); void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
/** /**
* @return the KConfig object that belongs to the instanceName * @return the KConfig object that belongs to the instanceName
@ -85,10 +85,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
TQStrList instanceNames() const; TQStrList instanceNames() const;
//X /** //X /**
//X * @return The KInstance object belonging to the instance name you pass //X * @return The TDEInstance object belonging to the instance name you pass
//X * (only works for registered instances of course). //X * (only works for registered instances of course).
//X */ //X */
//X KInstance * instanceForName( const TQCString & instanceName ); //X TDEInstance * instanceForName( const TQCString & instanceName );
public slots: public slots:
/** /**
@ -116,7 +116,7 @@ class KUTILS_EXPORT Dispatcher : public TQObject
static Dispatcher * m_self; static Dispatcher * m_self;
struct InstanceInfo { struct InstanceInfo {
KInstance * instance; TDEInstance * instance;
TQSignal * signal; TQSignal * signal;
int count; int count;
}; };

@ -46,7 +46,7 @@ class PluginPage::PluginPagePrivate
connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
} }
PluginPage::PluginPage( KInstance * instance, TQWidget * parent, const TQStringList & args ) PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args ) : KCModule( instance, parent, args )
, d( new PluginPagePrivate ) , d( new PluginPagePrivate )
{ {

@ -84,7 +84,7 @@ class KUTILS_EXPORT PluginPage : public KCModule
* Standart KCModule constructor. Automatically creates the the * Standart KCModule constructor. Automatically creates the the
* KPluginSelector widget. * KPluginSelector widget.
*/ */
PluginPage( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
~PluginPage(); ~PluginPage();

@ -43,7 +43,7 @@ void WalletReceiver::walletOpened( bool got )
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kwalletasync", "kwalletasync", "version" ); TDEAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletasync" ); TDEApplication app( "kwalletasync" );

@ -65,7 +65,7 @@ void WalletReceiver::walletOpened( bool got )
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kwalletboth", "kwalletboth", "version" ); TDEAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletboth" ); TDEApplication app( "kwalletboth" );

@ -23,7 +23,7 @@ void openWallet()
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kwalletsync", "kwalletsync", "version" ); TDEAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletsync" ); TDEApplication app( "kwalletsync" );

@ -108,8 +108,8 @@ DeviceManager::DeviceManager(int def)
#if 1 #if 1
if (def==-1) if (def==-1)
{ {
KInstance *tmp_instance=0L; TDEInstance *tmp_instance=0L;
if (!KGlobal::_instance) tmp_instance=new KInstance("nonKDEapp"); if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp");
KConfig *config = new KConfig("kcmmidirc", true); KConfig *config = new KConfig("kcmmidirc", true);
config->setGroup("Configuration"); config->setGroup("Configuration");

@ -71,10 +71,10 @@ TQString KAboutTranslator::emailAddress() const
return mEmail; return mEmail;
} }
class KAboutDataPrivate class TDEAboutDataPrivate
{ {
public: public:
KAboutDataPrivate() TDEAboutDataPrivate()
: translatorName("_: NAME OF TRANSLATORS\nYour names") : translatorName("_: NAME OF TRANSLATORS\nYour names")
, translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails") , translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
, productName(0) , productName(0)
@ -82,7 +82,7 @@ public:
, customAuthorTextEnabled(false) , customAuthorTextEnabled(false)
, mTranslatedProgramName( 0 ) , mTranslatedProgramName( 0 )
{} {}
~KAboutDataPrivate() ~TDEAboutDataPrivate()
{ {
delete programLogo; delete programLogo;
delete[] mTranslatedProgramName; delete[] mTranslatedProgramName;
@ -96,9 +96,9 @@ public:
const char *mTranslatedProgramName; const char *mTranslatedProgramName;
}; };
const char *KAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org"; const char *TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
KAboutData::KAboutData( const char *appName, TDEAboutData::TDEAboutData( const char *appName,
const char *programName, const char *programName,
const char *version, const char *version,
const char *shortDescription, const char *shortDescription,
@ -118,7 +118,7 @@ KAboutData::KAboutData( const char *appName,
mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ), mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ),
mLicenseText (0) mLicenseText (0)
{ {
d = new KAboutDataPrivate; d = new TDEAboutDataPrivate;
if( appName ) { if( appName ) {
const char *p = strrchr(appName, '/'); const char *p = strrchr(appName, '/');
@ -130,7 +130,7 @@ KAboutData::KAboutData( const char *appName,
mAppName = 0; mAppName = 0;
} }
KAboutData::~KAboutData() TDEAboutData::~TDEAboutData()
{ {
if (mLicenseKey == License_File) if (mLicenseKey == License_File)
delete [] mLicenseText; delete [] mLicenseText;
@ -138,109 +138,109 @@ KAboutData::~KAboutData()
} }
void void
KAboutData::addAuthor( const char *name, const char *task, TDEAboutData::addAuthor( const char *name, const char *task,
const char *emailAddress, const char *webAddress ) const char *emailAddress, const char *webAddress )
{ {
mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress)); mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
} }
void void
KAboutData::addCredit( const char *name, const char *task, TDEAboutData::addCredit( const char *name, const char *task,
const char *emailAddress, const char *webAddress ) const char *emailAddress, const char *webAddress )
{ {
mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress)); mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
} }
void void
KAboutData::setTranslator( const char *name, const char *emailAddress) TDEAboutData::setTranslator( const char *name, const char *emailAddress)
{ {
d->translatorName=name; d->translatorName=name;
d->translatorEmail=emailAddress; d->translatorEmail=emailAddress;
} }
void void
KAboutData::setLicenseText( const char *licenseText ) TDEAboutData::setLicenseText( const char *licenseText )
{ {
mLicenseText = licenseText; mLicenseText = licenseText;
mLicenseKey = License_Custom; mLicenseKey = License_Custom;
} }
void void
KAboutData::setLicenseTextFile( const TQString &file ) TDEAboutData::setLicenseTextFile( const TQString &file )
{ {
mLicenseText = tqstrdup(TQFile::encodeName(file)); mLicenseText = tqstrdup(TQFile::encodeName(file));
mLicenseKey = License_File; mLicenseKey = License_File;
} }
void void
KAboutData::setAppName( const char *appName ) TDEAboutData::setAppName( const char *appName )
{ {
mAppName = appName; mAppName = appName;
} }
void void
KAboutData::setProgramName( const char* programName ) TDEAboutData::setProgramName( const char* programName )
{ {
mProgramName = programName; mProgramName = programName;
translateInternalProgramName(); translateInternalProgramName();
} }
void void
KAboutData::setVersion( const char* version ) TDEAboutData::setVersion( const char* version )
{ {
mVersion = version; mVersion = version;
} }
void void
KAboutData::setShortDescription( const char *shortDescription ) TDEAboutData::setShortDescription( const char *shortDescription )
{ {
mShortDescription = shortDescription; mShortDescription = shortDescription;
} }
void void
KAboutData::setLicense( LicenseKey licenseKey) TDEAboutData::setLicense( LicenseKey licenseKey)
{ {
mLicenseKey = licenseKey; mLicenseKey = licenseKey;
} }
void void
KAboutData::setCopyrightStatement( const char *copyrightStatement ) TDEAboutData::setCopyrightStatement( const char *copyrightStatement )
{ {
mCopyrightStatement = copyrightStatement; mCopyrightStatement = copyrightStatement;
} }
void void
KAboutData::setOtherText( const char *otherText ) TDEAboutData::setOtherText( const char *otherText )
{ {
mOtherText = otherText; mOtherText = otherText;
} }
void void
KAboutData::setHomepage( const char *homepage ) TDEAboutData::setHomepage( const char *homepage )
{ {
mHomepageAddress = homepage; mHomepageAddress = homepage;
} }
void void
KAboutData::setBugAddress( const char *bugAddress ) TDEAboutData::setBugAddress( const char *bugAddress )
{ {
mBugEmailAddress = bugAddress; mBugEmailAddress = bugAddress;
} }
void void
KAboutData::setProductName( const char *productName ) TDEAboutData::setProductName( const char *productName )
{ {
d->productName = productName; d->productName = productName;
} }
const char * const char *
KAboutData::appName() const TDEAboutData::appName() const
{ {
return mAppName; return mAppName;
} }
const char * const char *
KAboutData::productName() const TDEAboutData::productName() const
{ {
if (d->productName) if (d->productName)
return d->productName; return d->productName;
@ -249,7 +249,7 @@ KAboutData::productName() const
} }
TQString TQString
KAboutData::programName() const TDEAboutData::programName() const
{ {
if (mProgramName && *mProgramName) if (mProgramName && *mProgramName)
return i18n(mProgramName); return i18n(mProgramName);
@ -258,7 +258,7 @@ KAboutData::programName() const
} }
const char* const char*
KAboutData::internalProgramName() const TDEAboutData::internalProgramName() const
{ {
if (d->mTranslatedProgramName) if (d->mTranslatedProgramName)
return d->mTranslatedProgramName; return d->mTranslatedProgramName;
@ -270,7 +270,7 @@ KAboutData::internalProgramName() const
// because it may deadlock. Since i18n() needs it, when KLocale is available // because it may deadlock. Since i18n() needs it, when KLocale is available
// the i18n() call will be done here in advance. // the i18n() call will be done here in advance.
void void
KAboutData::translateInternalProgramName() const TDEAboutData::translateInternalProgramName() const
{ {
delete[] d->mTranslatedProgramName; delete[] d->mTranslatedProgramName;
d->mTranslatedProgramName = 0; d->mTranslatedProgramName = 0;
@ -279,13 +279,13 @@ KAboutData::translateInternalProgramName() const
} }
TQImage TQImage
KAboutData::programLogo() const TDEAboutData::programLogo() const
{ {
return d->programLogo ? (*d->programLogo) : TQImage(); return d->programLogo ? (*d->programLogo) : TQImage();
} }
void void
KAboutData::setProgramLogo(const TQImage& image) TDEAboutData::setProgramLogo(const TQImage& image)
{ {
if (!d->programLogo) if (!d->programLogo)
d->programLogo = new TQImage( image ); d->programLogo = new TQImage( image );
@ -294,13 +294,13 @@ KAboutData::setProgramLogo(const TQImage& image)
} }
TQString TQString
KAboutData::version() const TDEAboutData::version() const
{ {
return TQString::fromLatin1(mVersion); return TQString::fromLatin1(mVersion);
} }
TQString TQString
KAboutData::shortDescription() const TDEAboutData::shortDescription() const
{ {
if (mShortDescription && *mShortDescription) if (mShortDescription && *mShortDescription)
return i18n(mShortDescription); return i18n(mShortDescription);
@ -309,31 +309,31 @@ KAboutData::shortDescription() const
} }
TQString TQString
KAboutData::homepage() const TDEAboutData::homepage() const
{ {
return TQString::fromLatin1(mHomepageAddress); return TQString::fromLatin1(mHomepageAddress);
} }
TQString TQString
KAboutData::bugAddress() const TDEAboutData::bugAddress() const
{ {
return TQString::fromLatin1(mBugEmailAddress); return TQString::fromLatin1(mBugEmailAddress);
} }
const TQValueList<KAboutPerson> const TQValueList<KAboutPerson>
KAboutData::authors() const TDEAboutData::authors() const
{ {
return mAuthorList; return mAuthorList;
} }
const TQValueList<KAboutPerson> const TQValueList<KAboutPerson>
KAboutData::credits() const TDEAboutData::credits() const
{ {
return mCreditList; return mCreditList;
} }
const TQValueList<KAboutTranslator> const TQValueList<KAboutTranslator>
KAboutData::translators() const TDEAboutData::translators() const
{ {
TQValueList<KAboutTranslator> personList; TQValueList<KAboutTranslator> personList;
@ -382,7 +382,7 @@ KAboutData::translators() const
} }
TQString TQString
KAboutData::aboutTranslationTeam() TDEAboutData::aboutTranslationTeam()
{ {
return i18n("replace this with information about your translation team", return i18n("replace this with information about your translation team",
"<p>KDE is translated into many languages thanks to the work " "<p>KDE is translated into many languages thanks to the work "
@ -393,7 +393,7 @@ KAboutData::aboutTranslationTeam()
} }
TQString TQString
KAboutData::otherText() const TDEAboutData::otherText() const
{ {
if (mOtherText && *mOtherText) if (mOtherText && *mOtherText)
return i18n(mOtherText); return i18n(mOtherText);
@ -403,7 +403,7 @@ KAboutData::otherText() const
TQString TQString
KAboutData::license() const TDEAboutData::license() const
{ {
TQString result; TQString result;
if (!copyrightStatement().isEmpty()) if (!copyrightStatement().isEmpty())
@ -466,7 +466,7 @@ KAboutData::license() const
} }
TQString TQString
KAboutData::copyrightStatement() const TDEAboutData::copyrightStatement() const
{ {
if (mCopyrightStatement && *mCopyrightStatement) if (mCopyrightStatement && *mCopyrightStatement)
return i18n(mCopyrightStatement); return i18n(mCopyrightStatement);
@ -475,25 +475,25 @@ KAboutData::copyrightStatement() const
} }
TQString TQString
KAboutData::customAuthorPlainText() const TDEAboutData::customAuthorPlainText() const
{ {
return d->customAuthorPlainText; return d->customAuthorPlainText;
} }
TQString TQString
KAboutData::customAuthorRichText() const TDEAboutData::customAuthorRichText() const
{ {
return d->customAuthorRichText; return d->customAuthorRichText;
} }
bool bool
KAboutData::customAuthorTextEnabled() const TDEAboutData::customAuthorTextEnabled() const
{ {
return d->customAuthorTextEnabled; return d->customAuthorTextEnabled;
} }
void void
KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText) TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
{ {
d->customAuthorPlainText = plainText; d->customAuthorPlainText = plainText;
d->customAuthorRichText = richText; d->customAuthorRichText = richText;
@ -502,7 +502,7 @@ KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richT
} }
void void
KAboutData::unsetCustomAuthorText() TDEAboutData::unsetCustomAuthorText()
{ {
d->customAuthorPlainText = TQString::null; d->customAuthorPlainText = TQString::null;
d->customAuthorRichText = TQString::null; d->customAuthorRichText = TQString::null;

@ -28,21 +28,21 @@
#define _KABOUTDATA_H_ #define _KABOUTDATA_H_
class KAboutPersonPrivate; class KAboutPersonPrivate;
class KAboutDataPrivate; class TDEAboutDataPrivate;
/** /**
* This structure is used to store information about a person or developer. * This structure is used to store information about a person or developer.
* It can store the person's name, a task, an email address and a * It can store the person's name, a task, an email address and a
* link to a home page. This class is intended for use in the * link to a home page. This class is intended for use in the
* KAboutData class, but it can be used elsewhere as well. * TDEAboutData class, but it can be used elsewhere as well.
* Normally you should at least define the person's name. * Normally you should at least define the person's name.
* *
* Example Usage within a main(): * Example Usage within a main():
* *
* \code * \code
* KAboutData about("khello", I18N_NOOP("KHello"), "0.1", * TDEAboutData about("khello", I18N_NOOP("KHello"), "0.1",
* I18N_NOOP("A TDE version of Hello, world!"), * I18N_NOOP("A TDE version of Hello, world!"),
* KAboutData::License_LGPL, * TDEAboutData::License_LGPL,
* I18N_NOOP("Copyright (c) 2003 Developer")); * I18N_NOOP("Copyright (c) 2003 Developer"));
* *
* about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0); * about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0);
@ -122,7 +122,7 @@ class KAboutTranslatorPrivate;
/** /**
* This structure is used to store information about a translator. * This structure is used to store information about a translator.
* It can store the translator's name and an email address. * It can store the translator's name and an email address.
* This class is intended for use in the KAboutData class, * This class is intended for use in the TDEAboutData class,
* but it can be used elsewhere as well. * but it can be used elsewhere as well.
* Normally you should at least define the translator's name. * Normally you should at least define the translator's name.
* *
@ -179,7 +179,7 @@ private:
* classes. * classes.
* @author Espen Sand (espen@kde.org), David Faure (faure@kde.org) * @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
*/ */
class TDECORE_EXPORT KAboutData class TDECORE_EXPORT TDEAboutData
{ {
public: public:
/** /**
@ -235,7 +235,7 @@ class TDECORE_EXPORT KAboutData
* This defaults to the trinitydesktop.org bug system. * This defaults to the trinitydesktop.org bug system.
* *
*/ */
KAboutData( const char *appName, TDEAboutData( const char *appName,
const char *programName, const char *programName,
const char *version, const char *version,
const char *shortDescription = 0, const char *shortDescription = 0,
@ -246,7 +246,7 @@ class TDECORE_EXPORT KAboutData
const char *bugsEmailAddress = 0 const char *bugsEmailAddress = 0
); );
~KAboutData(); ~TDEAboutData();
/** /**
* Defines an author. You can call this function as many times you * Defines an author. You can call this function as many times you
@ -623,7 +623,7 @@ class TDECORE_EXPORT KAboutData
const char *mLicenseText; const char *mLicenseText;
static const char *defaultBugTracker; static const char *defaultBugTracker;
KAboutDataPrivate *d; TDEAboutDataPrivate *d;
}; };
#endif #endif

@ -623,7 +623,7 @@ static TQTime* smModificationTime = 0;
TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) : bool allowStyles, bool GUIenabled ) :
TQApplication( argc, argv, GUIenabled ), KInstance(rAppName), TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName),
#ifdef Q_WS_X11 #ifdef Q_WS_X11
display(0L), display(0L),
argb_visual(false), argb_visual(false),
@ -649,7 +649,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI // TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps
KInstance( TDECmdLineArgs::about), TDEInstance( TDECmdLineArgs::about),
#ifdef Q_WS_X11 #ifdef Q_WS_X11
display(0L), display(0L),
argb_visual(false), argb_visual(false),
@ -674,7 +674,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) : TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ), getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{ {
aIconPixmap.pm.icon = 0L; aIconPixmap.pm.icon = 0L;
aIconPixmap.pm.miniIcon = 0L; aIconPixmap.pm.miniIcon = 0L;
@ -690,7 +690,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) : TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ), disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{ {
aIconPixmap.pm.icon = 0L; aIconPixmap.pm.icon = 0L;
aIconPixmap.pm.miniIcon = 0L; aIconPixmap.pm.miniIcon = 0L;
@ -708,7 +708,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
bool allowStyles ) : bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{ {
if ((visual) && (colormap)) if ((visual) && (colormap))
getX11RGBAInformation(dpy); getX11RGBAInformation(dpy);
@ -724,10 +724,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
} }
TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
bool allowStyles, KInstance * _instance ) : bool allowStyles, TDEInstance * _instance ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
KInstance( _instance ), display(0L), d (new TDEApplicationPrivate) TDEInstance( _instance ), display(0L), d (new TDEApplicationPrivate)
{ {
if ((visual) && (colormap)) if ((visual) && (colormap))
getX11RGBAInformation(dpy); getX11RGBAInformation(dpy);
@ -743,10 +743,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
} }
#endif #endif
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) : TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ) :
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
GUIenabled ), GUIenabled ),
KInstance( _instance ), TDEInstance( _instance ),
#ifdef Q_WS_X11 #ifdef Q_WS_X11
display(0L), display(0L),
#endif #endif
@ -770,7 +770,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _i
#ifdef Q_WS_X11 #ifdef Q_WS_X11
TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) : bool allowStyles, bool GUIenabled ) :
TQApplication( display ), KInstance(rAppName), TQApplication( display ), TDEInstance(rAppName),
display(0L), display(0L),
argb_visual(false), argb_visual(false),
d (new TDEApplicationPrivate()) d (new TDEApplicationPrivate())
@ -1442,7 +1442,7 @@ bool TDEApplication::sessionSaving() const
void TDEApplication::startKdeinit() void TDEApplication::startKdeinit()
{ {
#ifndef Q_WS_WIN //TODO #ifndef Q_WS_WIN //TODO
KInstance inst( "starttdeinitlock" ); TDEInstance inst( "starttdeinitlock" );
KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) { if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock(); lock.lock();
@ -3630,7 +3630,7 @@ bool TDEApplication::guiEnabled()
} }
void TDEApplication::virtual_hook( int id, void* data ) void TDEApplication::virtual_hook( int id, void* data )
{ KInstance::virtual_hook( id, data ); } { TDEInstance::virtual_hook( id, data ); }
void KSessionManaged::virtual_hook( int, void* ) void KSessionManaged::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ } { /*BASE::virtual_hook( id, data );*/ }

@ -93,7 +93,7 @@ class TDEApplicationPrivate;
* @short Controls and provides information to all KDE applications. * @short Controls and provides information to all KDE applications.
* @author Matthias Kalle Dalheimer <kalle@kde.org> * @author Matthias Kalle Dalheimer <kalle@kde.org>
*/ */
class TDECORE_EXPORT TDEApplication : public TQApplication, public KInstance class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance
{ {
Q_OBJECT Q_OBJECT
@ -1232,14 +1232,14 @@ protected:
/** /**
* @internal Used by KUniqueApplication * @internal Used by KUniqueApplication
*/ */
TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ); TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance );
#ifdef Q_WS_X11 #ifdef Q_WS_X11
/** /**
* @internal Used by KUniqueApplication * @internal Used by KUniqueApplication
*/ */
TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
bool allowStyles, KInstance* _instance ); bool allowStyles, TDEInstance* _instance );
/** /**
* Used to catch X11 events * Used to catch X11 events

@ -115,7 +115,7 @@ int TDECmdLineArgs::argc = 0;
char **TDECmdLineArgs::argv = 0; char **TDECmdLineArgs::argv = 0;
char *TDECmdLineArgs::mCwd = 0; char *TDECmdLineArgs::mCwd = 0;
static KStaticDeleter <char> mCwdd; static KStaticDeleter <char> mCwdd;
const KAboutData *TDECmdLineArgs::about = 0; const TDEAboutData *TDECmdLineArgs::about = 0;
bool TDECmdLineArgs::parsed = false; bool TDECmdLineArgs::parsed = false;
bool TDECmdLineArgs::ignoreUnknown = false; bool TDECmdLineArgs::ignoreUnknown = false;
@ -128,7 +128,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char*
const char *_description, const char *_version, bool noKApp) const char *_description, const char *_version, bool noKApp)
{ {
init(_argc, _argv, init(_argc, _argv,
new KAboutData(_appname, programName, _version, _description), new TDEAboutData(_appname, programName, _version, _description),
noKApp); noKApp);
} }
@ -137,7 +137,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
const char *_description, const char *_version, bool noKApp) const char *_description, const char *_version, bool noKApp)
{ {
init(_argc, _argv, init(_argc, _argv,
new KAboutData(_appname, _appname, _version, _description), new TDEAboutData(_appname, _appname, _version, _description),
noKApp); noKApp);
} }
@ -145,12 +145,12 @@ void
TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname ) TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
{ {
init(_argc, _argv, init(_argc, _argv,
new KAboutData(_appname, _appname, "unknown", "TDE Application", false)); new TDEAboutData(_appname, _appname, "unknown", "TDE Application", false));
ignoreUnknown = true; ignoreUnknown = true;
} }
void void
TDECmdLineArgs::init(const KAboutData* ab) TDECmdLineArgs::init(const TDEAboutData* ab)
{ {
char **_argv = (char **) malloc(sizeof(char *)); char **_argv = (char **) malloc(sizeof(char *));
_argv[0] = (char *) ab->appName(); _argv[0] = (char *) ab->appName();
@ -159,7 +159,7 @@ TDECmdLineArgs::init(const KAboutData* ab)
void void
TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp) TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool noKApp)
{ {
argc = _argc; argc = _argc;
argv = _argv; argv = _argv;
@ -747,7 +747,7 @@ TDECmdLineArgs::enable_i18n()
return; return;
if (!KGlobal::_instance) { if (!KGlobal::_instance) {
KInstance *instance = new KInstance(about); TDEInstance *instance = new TDEInstance(about);
(void) instance->config(); (void) instance->config();
// Don't delete instance! // Don't delete instance!
} }

@ -72,7 +72,7 @@ class TDEApplication;
class KUniqueApplication; class KUniqueApplication;
class KCmdLineParsedOptions; class KCmdLineParsedOptions;
class KCmdLineParsedArgs; class KCmdLineParsedArgs;
class KAboutData; class TDEAboutData;
class TDECmdLineArgsPrivate; class TDECmdLineArgsPrivate;
/** /**
@ -263,17 +263,17 @@ public:
* Initialize class. * Initialize class.
* *
* This function should be called as the very first thing in * This function should be called as the very first thing in
* your application. It uses KAboutData to replace some of the * your application. It uses TDEAboutData to replace some of the
* arguments that would otherwise be required. * arguments that would otherwise be required.
* *
* @param _argc As passed to @p main(...). * @param _argc As passed to @p main(...).
* @param _argv As passed to @p main(...). * @param _argv As passed to @p main(...).
* @param about A KAboutData object describing your program. * @param about A TDEAboutData object describing your program.
* @param noKApp Set this true to not add commandline options for * @param noKApp Set this true to not add commandline options for
* TQApplication / TDEApplication * TQApplication / TDEApplication
*/ */
static void init(int _argc, char **_argv, static void init(int _argc, char **_argv,
const KAboutData *about, bool noKApp = false); const TDEAboutData *about, bool noKApp = false);
/** /**
* Initialize Class * Initialize Class
@ -281,14 +281,14 @@ public:
* This function should be called as the very first thing in your * This function should be called as the very first thing in your
* application. This method will rarely be used, since it doesn't * application. This method will rarely be used, since it doesn't
* provide any argument parsing. It does provide access to the * provide any argument parsing. It does provide access to the
* KAboutData information. * TDEAboutData information.
* This method is exactly the same as calling * This method is exactly the same as calling
* init(0,0, const KAboutData *about, true). * init(0,0, const TDEAboutData *about, true).
* *
* @param about the about data. * @param about the about data.
* \see KAboutData * \see TDEAboutData
*/ */
static void init(const KAboutData *about); static void init(const TDEAboutData *about);
/** /**
* Add options to your application. * Add options to your application.
@ -674,7 +674,7 @@ private:
bool isQt; bool isQt;
static TDECmdLineArgsList *argsList; // All options. static TDECmdLineArgsList *argsList; // All options.
static const KAboutData *about; static const TDEAboutData *about;
static int argc; // The original argc static int argc; // The original argc
static char **argv; // The original argv static char **argv; // The original argv

@ -38,7 +38,7 @@
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" ); TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -32,7 +32,7 @@
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" ); TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -952,8 +952,8 @@ TQString indent(TQString text, int spaces)
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3", TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
I18N_NOOP("KConfig Compiler") , KAboutData::License_LGPL ); I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" ); aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
@ -965,7 +965,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KInstance app( &aboutData ); TDEInstance app( &aboutData );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test1 *t = new Test1( TQString::null, TQString::null ); Test1 *t = new Test1( TQString::null, TQString::null );
delete t; delete t;
} }

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test2 *t = new Test2(); Test2 *t = new Test2();
delete t; delete t;
} }

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
TestNameSpace::Test3 *t = new TestNameSpace::Test3(); TestNameSpace::Test3 *t = new TestNameSpace::Test3();
delete t; delete t;
} }

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test4 *t = Test4::self(); Test4 *t = Test4::self();
delete t; delete t;
} }

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test5 *t = Test5::self(); Test5 *t = Test5::self();
delete t; delete t;
} }

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test6 *t = new Test6(TQString::null); Test6 *t = new Test6(TQString::null);
delete t; delete t;
} }

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test7 *t = new Test7(42); Test7 *t = new Test7(42);
delete t; delete t;
} }

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) ); Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
Test8a *config2 = new Test8a(); Test8a *config2 = new Test8a();
Test8b::self(); Test8b::self();

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
Test9 *t = new Test9( TQString::null, TQString::null ); Test9 *t = new Test9( TQString::null, TQString::null );
TQStringList myPathsList2 = t->myPathsList2(); TQStringList myPathsList2 = t->myPathsList2();

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] ) int main( int, char*[] )
{ {
KInstance i("test"); TDEInstance i("test");
TestDPointer *t = TestDPointer::self(); TestDPointer *t = TestDPointer::self();
delete t; delete t;
} }

@ -196,8 +196,8 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--pid"; argv[i++] = "--pid";
argv[i++] = pidtxt; argv[i++] = pidtxt;
const KInstance *instance = KGlobal::_instance; const TDEInstance *instance = KGlobal::_instance;
const KAboutData *about = instance ? instance->aboutData() : 0; const TDEAboutData *about = instance ? instance->aboutData() : 0;
if (about) { if (about) {
if (about->internalVersion()) { if (about->internalVersion()) {
argv[i++] = "--appversion"; argv[i++] = "--appversion";

@ -43,8 +43,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description, TDEAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); TDEAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -39,7 +39,7 @@ public:
s_self = this; s_self = this;
m_catalogueInitialized = false; m_catalogueInitialized = false;
} }
KGenericFactoryBase( const KAboutData *data ) KGenericFactoryBase( const TDEAboutData *data )
: m_aboutData(data) : m_aboutData(data)
{ {
s_self = this; s_self = this;
@ -55,18 +55,18 @@ public:
s_self = 0; s_self = 0;
} }
static KInstance *instance(); static TDEInstance *instance();
protected: protected:
virtual KInstance *createInstance() virtual TDEInstance *createInstance()
{ {
if ( m_aboutData ) if ( m_aboutData )
return new KInstance( m_aboutData ); return new TDEInstance( m_aboutData );
if ( m_instanceName.isEmpty() ) { if ( m_instanceName.isEmpty() ) {
kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl; kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl;
return 0; return 0;
} }
return new KInstance( m_instanceName ); return new TDEInstance( m_instanceName );
} }
virtual void setupTranslations( void ) virtual void setupTranslations( void )
@ -86,16 +86,16 @@ protected:
private: private:
TQCString m_instanceName; TQCString m_instanceName;
const KAboutData *m_aboutData; const TDEAboutData *m_aboutData;
bool m_catalogueInitialized; bool m_catalogueInitialized;
static KInstance *s_instance; static TDEInstance *s_instance;
static KGenericFactoryBase<T> *s_self; static KGenericFactoryBase<T> *s_self;
}; };
/* @internal */ /* @internal */
template <class T> template <class T>
KInstance *KGenericFactoryBase<T>::s_instance = 0; TDEInstance *KGenericFactoryBase<T>::s_instance = 0;
/* @internal */ /* @internal */
template <class T> template <class T>
@ -103,7 +103,7 @@ KGenericFactoryBase<T> *KGenericFactoryBase<T>::s_self = 0;
/* @internal */ /* @internal */
template <class T> template <class T>
KInstance *KGenericFactoryBase<T>::instance() TDEInstance *KGenericFactoryBase<T>::instance()
{ {
if ( !s_instance && s_self ) if ( !s_instance && s_self )
s_instance = s_self->createInstance(); s_instance = s_self->createInstance();
@ -141,17 +141,17 @@ KInstance *KGenericFactoryBase<T>::instance()
* that the caller passed to KLibFactory's create method. * that the caller passed to KLibFactory's create method.
* *
* In addition upon instantiation this template provides a central * In addition upon instantiation this template provides a central
* KInstance object for your component, accessible through the * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the * static instance() method. The instanceName argument of the
* KGenericFactory constructor is passed to the KInstance object. * KGenericFactory constructor is passed to the TDEInstance object.
* *
* The creation of the KInstance object can be customized by inheriting * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance * from this template class and re-implementing the virtual createInstance
* method. For example it could look like this: * method. For example it could look like this:
* \code * \code
* KInstance *MyFactory::createInstance() * TDEInstance *MyFactory::createInstance()
* { * {
* return new KInstance( myAboutData ); * return new TDEInstance( myAboutData );
* } * }
* \endcode * \endcode
* *
@ -180,7 +180,7 @@ public:
/** /**
* @since 3.3 * @since 3.3
*/ */
KGenericFactory( const KAboutData *data ) KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase<Product>( data ) : KGenericFactoryBase<Product>( data )
{} {}
@ -224,17 +224,17 @@ protected:
* that the caller passed to KLibFactory's create method. * that the caller passed to KLibFactory's create method.
* *
* In addition upon instantiation this template provides a central * In addition upon instantiation this template provides a central
* KInstance object for your component, accessible through the * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the * static instance() method. The instanceName argument of the
* KGenericFactory constructor is passed to the KInstance object. * KGenericFactory constructor is passed to the TDEInstance object.
* *
* The creation of the KInstance object can be customized by inheriting * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance * from this template class and re-implementing the virtual createInstance
* method. For example it could look like this: * method. For example it could look like this:
* \code * \code
* KInstance *MyFactory::createInstance() * TDEInstance *MyFactory::createInstance()
* { * {
* return new KInstance( myAboutData ); * return new TDEInstance( myAboutData );
* } * }
* \endcode * \endcode
* *
@ -275,7 +275,7 @@ public:
/** /**
* @since 3.3 * @since 3.3
*/ */
KGenericFactory( const KAboutData *data ) KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data ) : KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{} {}
@ -319,17 +319,17 @@ protected:
* that the caller passed to KLibFactory's create method. * that the caller passed to KLibFactory's create method.
* *
* In addition upon instantiation this template provides a central * In addition upon instantiation this template provides a central
* KInstance object for your component, accessible through the * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the * static instance() method. The instanceName argument of the
* KGenericFactory constructor is passed to the KInstance object. * KGenericFactory constructor is passed to the TDEInstance object.
* *
* The creation of the KInstance object can be customized by inheriting * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance * from this template class and re-implementing the virtual createInstance
* method. For example it could look like this: * method. For example it could look like this:
* \code * \code
* KInstance *MyFactory::createInstance() * TDEInstance *MyFactory::createInstance()
* { * {
* return new KInstance( myAboutData ); * return new TDEInstance( myAboutData );
* } * }
* \endcode * \endcode
* *
@ -371,7 +371,7 @@ public:
/** /**
* @since 3.3 * @since 3.3
*/ */
KGenericFactory( const KAboutData *data ) KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data ) : KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{} {}

@ -44,7 +44,7 @@
#ifndef NDEBUG #ifndef NDEBUG
#define MYASSERT(x) if (!x) \ #define MYASSERT(x) if (!x) \
tqFatal("Fatal error: you need to have a KInstance object before\n" \ tqFatal("Fatal error: you need to have a TDEInstance object before\n" \
"you do anything that requires it! Examples of this are config\n" \ "you do anything that requires it! Examples of this are config\n" \
"objects, standard directories or translations."); "objects, standard directories or translations.");
#else #else
@ -95,7 +95,7 @@ TDEGlobalNetworkManager *KGlobal::networkManager()
return _instance->networkManager(); return _instance->networkManager();
} }
KInstance *KGlobal::instance() TDEInstance *KGlobal::instance()
{ {
MYASSERT(_instance); MYASSERT(_instance);
return _instance; return _instance;
@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets()
return _charsets; return _charsets;
} }
void KGlobal::setActiveInstance(KInstance *i) void KGlobal::setActiveInstance(TDEInstance *i)
{ {
_activeInstance = i; _activeInstance = i;
if (i && _locale) if (i && _locale)
@ -215,8 +215,8 @@ KGlobal::deleteStaticDeleters()
// The Variables // The Variables
KStringDict *KGlobal::_stringDict = 0; KStringDict *KGlobal::_stringDict = 0;
KInstance *KGlobal::_instance = 0; TDEInstance *KGlobal::_instance = 0;
KInstance *KGlobal::_activeInstance = 0; TDEInstance *KGlobal::_activeInstance = 0;
KLocale *KGlobal::_locale = 0; KLocale *KGlobal::_locale = 0;
KCharsets *KGlobal::_charsets = 0; KCharsets *KGlobal::_charsets = 0;
KStaticDeleterList *KGlobal::_staticDeleters = 0; KStaticDeleterList *KGlobal::_staticDeleters = 0;

@ -19,7 +19,7 @@
#define _KGLOBAL_H #define _KGLOBAL_H
#include "tdelibs_export.h" #include "tdelibs_export.h"
#include <kinstance.h> // KDE4: class KInstance is enough here #include <kinstance.h> // KDE4: class TDEInstance is enough here
class KCharsets; class KCharsets;
class KConfig; class KConfig;
@ -53,7 +53,7 @@ public:
* cases the application itself). * cases the application itself).
* @return the global instance * @return the global instance
*/ */
static KInstance *instance(); static TDEInstance *instance();
/** /**
* Returns the application standard dirs object. * Returns the application standard dirs object.
@ -167,7 +167,7 @@ public:
//private: //private:
static KStringDict *_stringDict; static KStringDict *_stringDict;
static KInstance *_instance; static TDEInstance *_instance;
static KLocale *_locale; static KLocale *_locale;
static KCharsets *_charsets; static KCharsets *_charsets;
static KStaticDeleterList *_staticDeleters; static KStaticDeleterList *_staticDeleters;
@ -178,10 +178,10 @@ public:
* Don't use this - it's mainly for KAboutDialog and KBugReport. * Don't use this - it's mainly for KAboutDialog and KBugReport.
* @internal * @internal
*/ */
static void setActiveInstance(KInstance *d); static void setActiveInstance(TDEInstance *d);
static KInstance *activeInstance() { return _activeInstance; } static TDEInstance *activeInstance() { return _activeInstance; }
static KInstance *_activeInstance; static TDEInstance *_activeInstance;
}; };
/** /**

@ -1291,95 +1291,95 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
// Easy access functions // Easy access functions
TQPixmap DesktopIcon(const TQString& name, int force_size, int state, TQPixmap DesktopIcon(const TQString& name, int force_size, int state,
KInstance *instance) TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Desktop, force_size, state); return loader->loadIcon(name, KIcon::Desktop, force_size, state);
} }
TQPixmap DesktopIcon(const TQString& name, KInstance *instance) TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance)
{ {
return DesktopIcon(name, 0, KIcon::DefaultState, instance); return DesktopIcon(name, 0, KIcon::DefaultState, instance);
} }
TQIconSet DesktopIconSet(const TQString& name, int force_size, KInstance *instance) TQIconSet DesktopIconSet(const TQString& name, int force_size, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Desktop, force_size ); return loader->loadIconSet( name, KIcon::Desktop, force_size );
} }
TQPixmap BarIcon(const TQString& name, int force_size, int state, TQPixmap BarIcon(const TQString& name, int force_size, int state,
KInstance *instance) TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Toolbar, force_size, state); return loader->loadIcon(name, KIcon::Toolbar, force_size, state);
} }
TQPixmap BarIcon(const TQString& name, KInstance *instance) TQPixmap BarIcon(const TQString& name, TDEInstance *instance)
{ {
return BarIcon(name, 0, KIcon::DefaultState, instance); return BarIcon(name, 0, KIcon::DefaultState, instance);
} }
TQIconSet BarIconSet(const TQString& name, int force_size, KInstance *instance) TQIconSet BarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Toolbar, force_size ); return loader->loadIconSet( name, KIcon::Toolbar, force_size );
} }
TQPixmap SmallIcon(const TQString& name, int force_size, int state, TQPixmap SmallIcon(const TQString& name, int force_size, int state,
KInstance *instance) TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Small, force_size, state); return loader->loadIcon(name, KIcon::Small, force_size, state);
} }
TQPixmap SmallIcon(const TQString& name, KInstance *instance) TQPixmap SmallIcon(const TQString& name, TDEInstance *instance)
{ {
return SmallIcon(name, 0, KIcon::DefaultState, instance); return SmallIcon(name, 0, KIcon::DefaultState, instance);
} }
TQIconSet SmallIconSet(const TQString& name, int force_size, KInstance *instance) TQIconSet SmallIconSet(const TQString& name, int force_size, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Small, force_size ); return loader->loadIconSet( name, KIcon::Small, force_size );
} }
TQPixmap MainBarIcon(const TQString& name, int force_size, int state, TQPixmap MainBarIcon(const TQString& name, int force_size, int state,
KInstance *instance) TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::MainToolbar, force_size, state); return loader->loadIcon(name, KIcon::MainToolbar, force_size, state);
} }
TQPixmap MainBarIcon(const TQString& name, KInstance *instance) TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance)
{ {
return MainBarIcon(name, 0, KIcon::DefaultState, instance); return MainBarIcon(name, 0, KIcon::DefaultState, instance);
} }
TQIconSet MainBarIconSet(const TQString& name, int force_size, KInstance *instance) TQIconSet MainBarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::MainToolbar, force_size ); return loader->loadIconSet( name, KIcon::MainToolbar, force_size );
} }
TQPixmap UserIcon(const TQString& name, int state, KInstance *instance) TQPixmap UserIcon(const TQString& name, int state, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::User, 0, state); return loader->loadIcon(name, KIcon::User, 0, state);
} }
TQPixmap UserIcon(const TQString& name, KInstance *instance) TQPixmap UserIcon(const TQString& name, TDEInstance *instance)
{ {
return UserIcon(name, KIcon::DefaultState, instance); return UserIcon(name, KIcon::DefaultState, instance);
} }
TQIconSet UserIconSet(const TQString& name, KInstance *instance) TQIconSet UserIconSet(const TQString& name, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::User ); return loader->loadIconSet( name, KIcon::User );
} }
int IconSize(KIcon::Group group, KInstance *instance) int IconSize(KIcon::Group group, TDEInstance *instance)
{ {
KIconLoader *loader = instance->iconLoader(); KIconLoader *loader = instance->iconLoader();
return loader->currentSize(group); return loader->currentSize(group);

@ -87,10 +87,10 @@ public:
* *
* Usually, you use the default iconloader, which can be accessed via * Usually, you use the default iconloader, which can be accessed via
* KGlobal::iconLoader(), so you hardly ever have to create an * KGlobal::iconLoader(), so you hardly ever have to create an
* iconloader object yourself. That one is the current KInstance's * iconloader object yourself. That one is the current TDEInstance's
* (typically TDEApplication's) iconloader. * (typically TDEApplication's) iconloader.
* @see KGlobal::iconLoader() * @see KGlobal::iconLoader()
* @see KInstance::iconLoader() * @see TDEInstance::iconLoader()
*/ */
KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0); KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0);
@ -296,7 +296,7 @@ public:
KIconEffect *iconEffect() const; KIconEffect *iconEffect() const;
/** /**
* Called by KInstance::newIconLoader to reconfigure the icon loader. * Called by TDEInstance::newIconLoader to reconfigure the icon loader.
* @param _appname the new application name * @param _appname the new application name
* @param _dirs the new standard directories. If 0, the directories * @param _dirs the new standard directories. If 0, the directories
* from KGlobal will be taken. * from KGlobal will be taken.
@ -345,7 +345,7 @@ public:
* destroyed before all those iconsets are destroyed. * destroyed before all those iconsets are destroyed.
* *
* (Some broken applications use temporary KIconLoader objects). * (Some broken applications use temporary KIconLoader objects).
* Every KInstance 's iconloader has this feature enabled. * Every TDEInstance 's iconloader has this feature enabled.
* *
* @param enable true to enable delayed icon loading, false to disable * @param enable true to enable delayed icon loading, false to disable
* @see isDelayedIconSetLoadingEnabled() * @see isDelayedIconSetLoadingEnabled()
@ -447,40 +447,40 @@ public:
*/ */
TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0, TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState, int state=KIcon::DefaultState,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a desktop icon. * Load a desktop icon.
*/ */
TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance); TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance);
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a desktop icon, and apply the necessary effects to get an IconSet. * Load a desktop icon, and apply the necessary effects to get an IconSet.
*/ */
TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0, TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a toolbar icon. * Load a toolbar icon.
*/ */
TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a toolbar icon. * Load a toolbar icon.
*/ */
TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance); TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance);
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a toolbar icon, and apply the necessary effects to get an IconSet. * Load a toolbar icon, and apply the necessary effects to get an IconSet.
*/ */
TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0, TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
@ -488,20 +488,20 @@ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
*/ */
TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0, TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState, int state=KIcon::DefaultState,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a small icon. * Load a small icon.
*/ */
TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance); TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance);
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a small icon, and apply the necessary effects to get an IconSet. * Load a small icon, and apply the necessary effects to get an IconSet.
*/ */
TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0, TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
@ -509,45 +509,45 @@ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
*/ */
TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0, TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState, int state=KIcon::DefaultState,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a main toolbar icon. * Load a main toolbar icon.
*/ */
TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance); TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance);
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a main toolbar icon, and apply the effects to get an IconSet. * Load a main toolbar icon, and apply the effects to get an IconSet.
*/ */
TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0, TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics. * Load a user icon. User icons are searched in $appdir/pics.
*/ */
TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState, TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics. * Load a user icon. User icons are searched in $appdir/pics.
*/ */
TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance); TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, TDEInstance *instance);
/** /**
* \relates KIconLoader * \relates KIconLoader
* Load a user icon, and apply the effects to get an IconSet. * Load a user icon, and apply the effects to get an IconSet.
*/ */
TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name, TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
KInstance *instance=KGlobal::instance()); TDEInstance *instance=KGlobal::instance());
/** /**
* \relates KIconLoader * \relates KIconLoader
* Returns the current icon size for a specific group. * Returns the current icon size for a specific group.
*/ */
TDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance()); TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=KGlobal::instance());
#endif // __KIconLoader_h_Included__ #endif // __KIconLoader_h_Included__

@ -38,26 +38,26 @@
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <assert.h>
#include <tqptrdict.h> #include <tqptrdict.h>
static TQPtrList<KInstance> *allInstances = 0; static TQPtrList<TDEInstance> *allInstances = 0;
static TQPtrDict<TQCString> *allOldInstances = 0; static TQPtrDict<TQCString> *allOldInstances = 0;
#define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false); #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<TDEInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
#define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false); #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
#define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false); #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
#else #else
#define DEBUG_ADD #define DEBUG_ADD
#define DEBUG_REMOVE #define DEBUG_REMOVE
#define DEBUG_CHECK_ALIVE #define DEBUG_CHECK_ALIVE
#endif #endif
class KInstancePrivate class TDEInstancePrivate
{ {
public: public:
KInstancePrivate () TDEInstancePrivate ()
{ {
mimeSourceFactory = 0L; mimeSourceFactory = 0L;
} }
~KInstancePrivate () ~TDEInstancePrivate ()
{ {
delete mimeSourceFactory; delete mimeSourceFactory;
} }
@ -68,13 +68,13 @@ public:
KSharedConfig::Ptr sharedConfig; KSharedConfig::Ptr sharedConfig;
}; };
KInstance::KInstance( const TQCString& name) TDEInstance::TDEInstance( const TQCString& name)
: _dirs (0L), : _dirs (0L),
_config (0L), _config (0L),
_iconLoader (0L), _iconLoader (0L),
_hardwaredevices (0L), _hardwaredevices (0L),
_networkmanager (0L), _networkmanager (0L),
_name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false) _name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
{ {
DEBUG_ADD DEBUG_ADD
Q_ASSERT(!name.isEmpty()); Q_ASSERT(!name.isEmpty());
@ -84,11 +84,11 @@ KInstance::KInstance( const TQCString& name)
KGlobal::setActiveInstance(this); KGlobal::setActiveInstance(this);
} }
d = new KInstancePrivate (); d = new TDEInstancePrivate ();
d->ownAboutdata = true; d->ownAboutdata = true;
} }
KInstance::KInstance( const KAboutData * aboutData ) TDEInstance::TDEInstance( const TDEAboutData * aboutData )
: _dirs (0L), : _dirs (0L),
_config (0L), _config (0L),
_iconLoader (0L), _iconLoader (0L),
@ -105,11 +105,11 @@ KInstance::KInstance( const KAboutData * aboutData )
KGlobal::setActiveInstance(this); KGlobal::setActiveInstance(this);
} }
d = new KInstancePrivate (); d = new TDEInstancePrivate ();
d->ownAboutdata = false; d->ownAboutdata = false;
} }
KInstance::KInstance( KInstance* src ) TDEInstance::TDEInstance( TDEInstance* src )
: _dirs ( src->_dirs ), : _dirs ( src->_dirs ),
_config ( src->_config ), _config ( src->_config ),
_iconLoader ( src->_iconLoader ), _iconLoader ( src->_iconLoader ),
@ -126,7 +126,7 @@ KInstance::KInstance( KInstance* src )
KGlobal::setActiveInstance(this); KGlobal::setActiveInstance(this);
} }
d = new KInstancePrivate (); d = new TDEInstancePrivate ();
d->ownAboutdata = src->d->ownAboutdata; d->ownAboutdata = src->d->ownAboutdata;
d->sharedConfig = src->d->sharedConfig; d->sharedConfig = src->d->sharedConfig;
@ -139,7 +139,7 @@ KInstance::KInstance( KInstance* src )
delete src; delete src;
} }
KInstance::~KInstance() TDEInstance::~TDEInstance()
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
@ -172,7 +172,7 @@ KInstance::~KInstance()
} }
KStandardDirs *KInstance::dirs() const KStandardDirs *TDEInstance::dirs() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if( _dirs == 0 ) { if( _dirs == 0 ) {
@ -190,12 +190,12 @@ KStandardDirs *KInstance::dirs() const
extern bool kde_kiosk_exception; extern bool kde_kiosk_exception;
extern bool kde_kiosk_admin; extern bool kde_kiosk_admin;
void KInstance::setConfigReadOnly(bool ro) void TDEInstance::setConfigReadOnly(bool ro)
{ {
m_configReadOnly = ro; m_configReadOnly = ro;
} }
KConfig *KInstance::config() const KConfig *TDEInstance::config() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if( _config == 0 ) { if( _config == 0 ) {
@ -244,7 +244,7 @@ KConfig *KInstance::config() const
return _config; return _config;
} }
KSharedConfig *KInstance::sharedConfig() const KSharedConfig *TDEInstance::sharedConfig() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if (_config == 0) if (_config == 0)
@ -253,13 +253,13 @@ KSharedConfig *KInstance::sharedConfig() const
return d->sharedConfig; return d->sharedConfig;
} }
void KInstance::setConfigName(const TQString &configName) void TDEInstance::setConfigName(const TQString &configName)
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
d->configName = configName; d->configName = configName;
} }
KIconLoader *KInstance::iconLoader() const KIconLoader *TDEInstance::iconLoader() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if( _iconLoader == 0 ) { if( _iconLoader == 0 ) {
@ -270,7 +270,7 @@ KIconLoader *KInstance::iconLoader() const
return _iconLoader; return _iconLoader;
} }
TDEHardwareDevices *KInstance::hardwareDevices() const TDEHardwareDevices *TDEInstance::hardwareDevices() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if( _hardwaredevices == 0 ) { if( _hardwaredevices == 0 ) {
@ -280,7 +280,7 @@ TDEHardwareDevices *KInstance::hardwareDevices() const
return _hardwaredevices; return _hardwaredevices;
} }
TDEGlobalNetworkManager *KInstance::networkManager() const TDEGlobalNetworkManager *TDEInstance::networkManager() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if( _networkmanager == 0 ) { if( _networkmanager == 0 ) {
@ -290,37 +290,37 @@ TDEGlobalNetworkManager *KInstance::networkManager() const
return _networkmanager; return _networkmanager;
} }
void KInstance::newIconLoader() const void TDEInstance::newIconLoader() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
KIconTheme::reconfigure(); KIconTheme::reconfigure();
_iconLoader->reconfigure( _name, dirs() ); _iconLoader->reconfigure( _name, dirs() );
} }
const KAboutData * KInstance::aboutData() const const TDEAboutData * TDEInstance::aboutData() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
return _aboutData; return _aboutData;
} }
TQCString KInstance::instanceName() const TQCString TDEInstance::instanceName() const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
return _name; return _name;
} }
KMimeSourceFactory* KInstance::mimeSourceFactory () const KMimeSourceFactory* TDEInstance::mimeSourceFactory () const
{ {
DEBUG_CHECK_ALIVE DEBUG_CHECK_ALIVE
if (!d->mimeSourceFactory) if (!d->mimeSourceFactory)
{ {
d->mimeSourceFactory = new KMimeSourceFactory(_iconLoader); d->mimeSourceFactory = new KMimeSourceFactory(_iconLoader);
d->mimeSourceFactory->setInstance(const_cast<KInstance *>(this)); d->mimeSourceFactory->setInstance(const_cast<TDEInstance *>(this));
} }
return d->mimeSourceFactory; return d->mimeSourceFactory;
} }
void KInstance::virtual_hook( int, void* ) void TDEInstance::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ } { /*BASE::virtual_hook( id, data );*/ }

@ -19,12 +19,12 @@
#define _KINSTANCE_H #define _KINSTANCE_H
class KStandardDirs; class KStandardDirs;
class KAboutData; class TDEAboutData;
class KConfig; class KConfig;
class KIconLoader; class KIconLoader;
class KCharsets; class KCharsets;
class TQFont; class TQFont;
class KInstancePrivate; class TDEInstancePrivate;
class KMimeSourceFactory; class KMimeSourceFactory;
class KSharedConfig; class KSharedConfig;
class TDEHardwareDevices; class TDEHardwareDevices;
@ -42,7 +42,7 @@ class TDEGlobalNetworkManager;
* *
* @author Torben Weis * @author Torben Weis
*/ */
class TDECORE_EXPORT KInstance class TDECORE_EXPORT TDEInstance
{ {
friend class KStandardDirs; friend class KStandardDirs;
@ -51,19 +51,19 @@ class TDECORE_EXPORT KInstance
* Constructor. * Constructor.
* @param instanceName the name of the instance * @param instanceName the name of the instance
*/ */
KInstance( const TQCString& instanceName) ; TDEInstance( const TQCString& instanceName) ;
/** /**
* Constructor. * Constructor.
* When building a KInstance that is not your TDEApplication, * When building a TDEInstance that is not your TDEApplication,
* make sure that the KAboutData and the KInstance have the same life time. * make sure that the TDEAboutData and the TDEInstance have the same life time.
* You have to destroy both, since the instance doesn't own the about data. * You have to destroy both, since the instance doesn't own the about data.
* Don't build a KAboutData on the stack in this case ! * Don't build a TDEAboutData on the stack in this case !
* Building a KAboutData on the stack is only ok for usage with * Building a TDEAboutData on the stack is only ok for usage with
* TDECmdLineArgs and TDEApplication (not destroyed until the app exits). * TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
* @param aboutData data about this instance (see KAboutData) * @param aboutData data about this instance (see TDEAboutData)
*/ */
KInstance( const KAboutData * aboutData ); TDEInstance( const TDEAboutData * aboutData );
/* /*
* @internal * @internal
@ -71,12 +71,12 @@ class TDECORE_EXPORT KInstance
* Initialize from src and delete it. * Initialize from src and delete it.
*/ */
KInstance( KInstance* src ); TDEInstance( TDEInstance* src );
/** /**
* Destructor. * Destructor.
*/ */
virtual ~KInstance(); virtual ~TDEInstance();
/** /**
* Returns the application standard dirs object. * Returns the application standard dirs object.
@ -133,11 +133,11 @@ class TDECORE_EXPORT KInstance
* @return the about data of the instance, or 0 if it has * @return the about data of the instance, or 0 if it has
* not been set yet * not been set yet
*/ */
const KAboutData *aboutData() const; const TDEAboutData *aboutData() const;
/** /**
* Returns the name of the instance * Returns the name of the instance
* @return the instance name, can be null if the KInstance has been * @return the instance name, can be null if the TDEInstance has been
* created with a null name * created with a null name
*/ */
TQCString instanceName() const; TQCString instanceName() const;
@ -153,7 +153,7 @@ protected:
/** /**
* Copy Constructor is not allowed * Copy Constructor is not allowed
*/ */
KInstance( const KInstance& ); TDEInstance( const TDEInstance& );
/** /**
* Set name of default config file. * Set name of default config file.
@ -173,12 +173,12 @@ private:
mutable void *_placeholder; mutable void *_placeholder;
TQCString _name; TQCString _name;
const KAboutData *_aboutData; const TDEAboutData *_aboutData;
protected: protected:
virtual void virtual_hook( int id, void* data ); virtual void virtual_hook( int id, void* data );
private: private:
KInstancePrivate *d; TDEInstancePrivate *d;
bool m_configReadOnly; bool m_configReadOnly;
}; };

@ -346,7 +346,7 @@ static inline TQCString makeLibName( const char* name )
} }
//static //static
TQString KLibLoader::findLibrary( const char * name, const KInstance * instance ) TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
{ {
TQCString libname = makeLibName( name ); TQCString libname = makeLibName( name );

@ -27,7 +27,7 @@
#include <stdlib.h> // For backwards compatibility #include <stdlib.h> // For backwards compatibility
class KInstance; class TDEInstance;
class TQTimer; class TQTimer;
class KLibrary; class KLibrary;
class KLibFactory; class KLibFactory;
@ -271,9 +271,9 @@ public:
* @param name of the library. If it is not a path, the function searches in * @param name of the library. If it is not a path, the function searches in
* the "module" and "lib" resources. If there is no extension, * the "module" and "lib" resources. If there is no extension,
* ".la" will be appended. * ".la" will be appended.
* @param instance a KInstance used to get the standard paths * @param instance a TDEInstance used to get the standard paths
*/ */
static TQString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() ); static TQString findLibrary( const char * name, const TDEInstance * instance = KGlobal::instance() );
protected: protected:
KLibLoader( TQObject* parent = 0, const char* name = 0 ); KLibLoader( TQObject* parent = 0, const char* name = 0 );
@ -306,12 +306,12 @@ private:
* NOTE: you probably want to use KGenericFactory<PluginClassName> * NOTE: you probably want to use KGenericFactory<PluginClassName>
* instead of writing your own factory. * instead of writing your own factory.
* *
* In the constructor of your factory you should create an instance of KInstance * In the constructor of your factory you should create an instance of TDEInstance
* like this: * like this:
* \code * \code
* s_global = new KInstance( "kspread" ); * s_global = new TDEInstance( "kspread" );
* \endcode * \endcode
* This KInstance is comparable to KGlobal used by normal applications. * This TDEInstance is comparable to KGlobal used by normal applications.
* It allows you to find resource files (images, XML, sound etc.) belonging * It allows you to find resource files (images, XML, sound etc.) belonging
* to the library. * to the library.
* *

@ -2006,7 +2006,7 @@ void KLocale::initInstance()
if (KGlobal::_locale) if (KGlobal::_locale)
return; return;
KInstance *app = KGlobal::instance(); TDEInstance *app = KGlobal::instance();
if (app) { if (app) {
KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));

@ -41,7 +41,7 @@ public:
} }
KIconLoader *m_iconLoader; KIconLoader *m_iconLoader;
KInstance *m_instance; TDEInstance *m_instance;
}; };
KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader) KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader)
@ -96,7 +96,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
return result; return result;
} }
void KMimeSourceFactory::setInstance(KInstance *instance) void KMimeSourceFactory::setInstance(TDEInstance *instance)
{ {
d->m_instance = instance; d->m_instance = instance;
} }

@ -26,7 +26,7 @@
#include <kglobal.h> #include <kglobal.h>
class KMimeSourceFactoryPrivate; class KMimeSourceFactoryPrivate;
class KInstance; class TDEInstance;
/** /**
* An extension to TQMimeSourceFactory that uses KIconLoader to * An extension to TQMimeSourceFactory that uses KIconLoader to
@ -74,10 +74,10 @@ protected:
private: private:
/** /**
* @internal * @internal
* Associate with a KInstance so we can pull its iconLoader() when need arises. * Associate with a TDEInstance so we can pull its iconLoader() when need arises.
*/ */
friend class KInstance; friend class TDEInstance;
void setInstance(KInstance *); void setInstance(TDEInstance *);
KMimeSourceFactoryPrivate* d; KMimeSourceFactoryPrivate* d;
}; };

@ -277,7 +277,7 @@ void KNotifyClient::beep(const TQString& reason)
} }
KInstance * KNotifyClient::instance() { TDEInstance * KNotifyClient::instance() {
return KNotifyClient::Instance::current(); return KNotifyClient::Instance::current();
} }
@ -322,11 +322,11 @@ static KStaticDeleter<KNotifyClient::InstanceStack > instancesDeleter;
struct KNotifyClient::InstancePrivate struct KNotifyClient::InstancePrivate
{ {
KInstance *instance; TDEInstance *instance;
bool useSystemBell; bool useSystemBell;
}; };
KNotifyClient::Instance::Instance(KInstance *instance) KNotifyClient::Instance::Instance(TDEInstance *instance)
{ {
d = new InstancePrivate; d = new InstancePrivate;
d->instance = instance; d->instance = instance;
@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const
// static methods // static methods
// We always return a valid KNotifyClient::Instance here. If no special one // We always return a valid KNotifyClient::Instance here. If no special one
// is available, we have a default-instance with kapp as KInstance. // is available, we have a default-instance with kapp as TDEInstance.
// We make sure to always have that default-instance in the stack, because // We make sure to always have that default-instance in the stack, because
// the stack might have gotten cleared in the destructor. // the stack might have gotten cleared in the destructor.
// We can't use QStack::setAutoDelete( true ), because no instance besides // We can't use QStack::setAutoDelete( true ), because no instance besides
@ -370,7 +370,7 @@ KNotifyClient::Instance * KNotifyClient::Instance::currentInstance()
return instances()->currentInstance(); return instances()->currentInstance();
} }
KInstance *KNotifyClient::Instance::current() TDEInstance *KNotifyClient::Instance::current()
{ {
return currentInstance()->d->instance; return currentInstance()->d->instance;
} }

@ -20,7 +20,7 @@
#include <tqstring.h> #include <tqstring.h>
#include "tdelibs_export.h" #include "tdelibs_export.h"
class KInstance; class TDEInstance;
#undef None // X11 headers... #undef None // X11 headers...
/** /**
@ -82,7 +82,7 @@ namespace KNotifyClient
class InstanceStack; class InstanceStack;
/** /**
* Makes it possible to use KNotifyClient with a KInstance * Makes it possible to use KNotifyClient with a TDEInstance
* that is not the application. * that is not the application.
* *
* Use like this: * Use like this:
@ -91,20 +91,20 @@ namespace KNotifyClient
* KNotifyClient::event("MyEvent"); * KNotifyClient::event("MyEvent");
* \endcode * \endcode
* *
* @short Enables KNotifyClient to use a different KInstance * @short Enables KNotifyClient to use a different TDEInstance
*/ */
class TDECORE_EXPORT Instance class TDECORE_EXPORT Instance
{ {
public: public:
/** /**
* Constructs a KNotifyClient::Instance to make KNotifyClient use * Constructs a KNotifyClient::Instance to make KNotifyClient use
* the specified KInstance for the event configuration. * the specified TDEInstance for the event configuration.
* @param instance the instance for the event configuration * @param instance the instance for the event configuration
*/ */
Instance(KInstance *instance); Instance(TDEInstance *instance);
/** /**
* Destructs the KNotifyClient::Instance and resets KNotifyClient * Destructs the KNotifyClient::Instance and resets KNotifyClient
* to the previously used KInstance. * to the previously used TDEInstance.
*/ */
~Instance(); ~Instance();
/** /**
@ -114,13 +114,13 @@ namespace KNotifyClient
*/ */
bool useSystemBell() const; bool useSystemBell() const;
/** /**
* Returns the currently active KInstance. * Returns the currently active TDEInstance.
* @return the active KInstance * @return the active TDEInstance
*/ */
static KInstance *current(); static TDEInstance *current();
/** /**
* Returns the current KNotifyClient::Instance (not the KInstance). * Returns the current KNotifyClient::Instance (not the TDEInstance).
* @return the active Instance * @return the active Instance
*/ */
static Instance *currentInstance(); static Instance *currentInstance();
@ -317,9 +317,9 @@ namespace KNotifyClient
/** /**
* Shortcut to KNotifyClient::Instance::current() :) * Shortcut to KNotifyClient::Instance::current() :)
* @returns the current KInstance. * @returns the current TDEInstance.
*/ */
TDECORE_EXPORT KInstance * instance(); TDECORE_EXPORT TDEInstance * instance();
} }
#endif #endif

@ -53,7 +53,7 @@ int KShortcutList::index( const KKeySequence& seq ) const
return -1; return -1;
} }
const KInstance* KShortcutList::instance() const const TDEInstance* KShortcutList::instance() const
{ {
return 0; return 0;
} }

@ -26,7 +26,7 @@
class TQVariant; class TQVariant;
class KConfigBase; class KConfigBase;
class KInstance; class TDEInstance;
class KKeySequence; class KKeySequence;
class KShortcut; class KShortcut;
@ -137,10 +137,10 @@ class TDECORE_EXPORT KShortcutList
virtual int index( const KKeySequence& keySeq ) const; virtual int index( const KKeySequence& keySeq ) const;
/** /**
* The KInstance. * The TDEInstance.
* @return the KInstance of the list, can be 0 if not available * @return the TDEInstance of the list, can be 0 if not available
*/ */
virtual const KInstance* instance() const; virtual const TDEInstance* instance() const;
// These are here in order to handle expansion. // These are here in order to handle expansion.
enum Other { }; enum Other { };

@ -1687,19 +1687,19 @@ TQString KStandardDirs::localxdgconfdir() const
// just to make code more readable without macros // just to make code more readable without macros
TQString locate( const char *type, TQString locate( const char *type,
const TQString& filename, const KInstance* inst ) const TQString& filename, const TDEInstance* inst )
{ {
return inst->dirs()->findResource(type, filename); return inst->dirs()->findResource(type, filename);
} }
TQString locateLocal( const char *type, TQString locateLocal( const char *type,
const TQString& filename, const KInstance* inst ) const TQString& filename, const TDEInstance* inst )
{ {
return locateLocal(type, filename, true, inst); return locateLocal(type, filename, true, inst);
} }
TQString locateLocal( const char *type, TQString locateLocal( const char *type,
const TQString& filename, bool createDir, const KInstance* inst ) const TQString& filename, bool createDir, const TDEInstance* inst )
{ {
// try to find slashes. If there are some, we have to // try to find slashes. If there are some, we have to
// create the subdir first // create the subdir first

@ -96,7 +96,7 @@ class KStandardDirsPrivate;
* appends the name of the application. * appends the name of the application.
* So while you had to ::locate("data", "appname/filename") so you can * So while you had to ::locate("data", "appname/filename") so you can
* also write ::locate("appdata", "filename") if your TDEApplication instance * also write ::locate("appdata", "filename") if your TDEApplication instance
* is called "appname" (as set via TDEApplication's constructor or KAboutData, if * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
* you use the global KStandardDirs object KGlobal::dirs()). * you use the global KStandardDirs object KGlobal::dirs()).
* Please note though that you cannot use the "appdata" * Please note though that you cannot use the "appdata"
* type if you intend to use it in an applet for Kicker because 'appname' would * type if you intend to use it in an applet for Kicker because 'appname' would
@ -700,7 +700,7 @@ public:
* This function is just for convenience. It simply calls * This function is just for convenience. It simply calls
*instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename). *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
**/ **/
TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() ); TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() );
/*! /*!
* \relates KStandardDirs * \relates KStandardDirs
@ -711,7 +711,7 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
* specific file, filename must have a trailing slash. * specific file, filename must have a trailing slash.
* *
**/ **/
TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() ); TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() );
/*! /*!
* \relates KStandardDirs * \relates KStandardDirs
@ -722,7 +722,7 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
* filename must have a trailing slash. * filename must have a trailing slash.
* *
**/ **/
TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() ); TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = KGlobal::instance() );
/*! @} */ /*! @} */

@ -351,9 +351,9 @@ KUniqueApplication::~KUniqueApplication()
} }
// this gets called before even entering TQApplication::TQApplication() // this gets called before even entering TQApplication::TQApplication()
KInstance* KUniqueApplication::initHack( bool configUnique ) TDEInstance* KUniqueApplication::initHack( bool configUnique )
{ {
KInstance* inst = new KInstance( TDECmdLineArgs::about ); TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about );
if (configUnique) if (configUnique)
{ {
KConfigGroupSaver saver( inst->config(), "KDE" ); KConfigGroupSaver saver( inst->config(), "KDE" );

@ -113,7 +113,7 @@ public:
* Typically this is used like: * Typically this is used like:
* \code * \code
* int main(int argc, char **argv) { * int main(int argc, char **argv) {
* KAboutData about("myappname", "myAppName", .....); * TDEAboutData about("myappname", "myAppName", .....);
* TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::init(argc, argv, &about);
* TDECmdLineArgs::addCmdLineOptions( myCmdOptions ); * TDECmdLineArgs::addCmdLineOptions( myCmdOptions );
* KUniqueApplication::addCmdLineOptions(); * KUniqueApplication::addCmdLineOptions();
@ -204,7 +204,7 @@ private slots:
void newInstanceNoFork(); void newInstanceNoFork();
static KInstance* initHack( bool configUnique ); static TDEInstance* initHack( bool configUnique );
private: private:
static bool s_nofork; static bool s_nofork;

@ -469,7 +469,7 @@ void KSocksSocketDevice::initSocks()
if (kapp == 0L) if (kapp == 0L)
return; // no TDEApplication, so don't initialise return; // no TDEApplication, so don't initialise
// this should, however, test for KInstance // this should, however, test for TDEInstance
init = true; init = true;

@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow"); TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
TDECmdLineArgs::init( argc, argv, &about); TDECmdLineArgs::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
KInstance a("tde-config"); TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE); a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation (void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config(); (void)KGlobal::config();

@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow"); TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
TDECmdLineArgs::init( argc, argv, &about); TDECmdLineArgs::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
KInstance a("tde-config"); TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE); a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation (void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config(); (void)KGlobal::config();

@ -28,7 +28,7 @@
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
KAboutData about("kapptest", "kapptest", "version"); TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a; TDEApplication a;

@ -32,8 +32,8 @@ int main(int argc, char **argv) {
TQDate date; TQDate date;
TQString calType, option; TQString calType, option;
KAboutData aboutData( "kcalendartest", "KCalendarTest" , TDEAboutData aboutData( "kcalendartest", "KCalendarTest" ,
"0.1", description, KAboutData::License_GPL, "0.1", description, TDEAboutData::License_GPL,
"(c) 2002, Carlos Moro", 0, 0, "(c) 2002, Carlos Moro", 0, 0,
"cfmoro@correo.uniovi.es"); "cfmoro@correo.uniovi.es");
aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es"); aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es");

@ -26,7 +26,7 @@ public:
kdDebug(2 == 2) << "this is right " << perror << endl; kdDebug(2 == 2) << "this is right " << perror << endl;
kdDebug() << "Before instance creation" << endl; kdDebug() << "Before instance creation" << endl;
kdDebug(1202) << "Before instance creation" << endl; kdDebug(1202) << "Before instance creation" << endl;
KInstance i("kdebugtest"); TDEInstance i("kdebugtest");
kdDebug(1) << "kDebugInfo with inexisting area number" << endl; kdDebug(1) << "kDebugInfo with inexisting area number" << endl;
kdDebug(1202) << "This number has a value of " << 5 << endl; kdDebug(1202) << "This number has a value of " << 5 << endl;
// kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl; // kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl;

@ -410,7 +410,7 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("socktest2", "SockTest", "1.0"); TDEAboutData about("socktest2", "SockTest", "1.0");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();

@ -57,7 +57,7 @@ bool check(TQString txt, TQString a, TQString b)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
KAboutData about("socktest", "SockTest", "version"); TDEAboutData about("socktest", "SockTest", "version");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDEApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();

@ -5,7 +5,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KInstance instance("ktimezonestest"); TDEInstance instance("ktimezonestest");
if ((argc==2) && (strcmp(argv[1], "local")==0)) if ((argc==2) && (strcmp(argv[1], "local")==0))
{ {

@ -43,7 +43,7 @@ TestApp::newInstance( )
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
KAboutData about("kuniqueapptest", "kuniqueapptest", "version"); TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();

@ -27,7 +27,7 @@
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
KAboutData about("kapptest", "kapptest", "version"); TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a; TDEApplication a;

@ -60,8 +60,8 @@ int main(int argc, char *argv[])
{ {
tqDebug("argv[%d] = %s", i, argv[i]); tqDebug("argv[%d] = %s", i, argv[i]);
} }
KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"), TDEAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
"1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL, "1.0", I18N_NOOP("testqtargs"), TDEAboutData::License_GPL,
"", "", "", ""); "", "", "", "");
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);

@ -537,7 +537,7 @@ int main_console(int argc, char **argv)
{ {
printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]); printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]);
TDEApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1"); TDEAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
TDECmdLineArgs::init(&aboutd); TDECmdLineArgs::init(&aboutd);
TDEApplication app(false, false); TDEApplication app(false, false);

@ -43,7 +43,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name,
buildDialog(KGlobal::instance()->aboutData()); buildDialog(KGlobal::instance()->aboutData());
} }
KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *parent, KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent,
const char *name, bool modal ) const char *name, bool modal )
:KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close, :KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
parent, name, modal ) parent, name, modal )
@ -51,7 +51,7 @@ KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *par
buildDialog(aboutData); buildDialog(aboutData);
} }
void KAboutApplication::buildDialog( const KAboutData *aboutData ) void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
{ {
if( !aboutData ) if( !aboutData )
{ {
@ -65,7 +65,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
TQString appPageText = TQString appPageText =
i18n("No information available.\n" i18n("No information available.\n"
"The supplied KAboutData object does not exist."); "The supplied TDEAboutData object does not exist.");
TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 ); TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 );
appPage->addWidget( appPageLabel ); appPage->addWidget( appPageLabel );
return; return;
@ -172,7 +172,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
.arg((*it).emailAddress()); .arg((*it).emailAddress());
} }
text += KAboutData::aboutTranslationTeam() + "</qt>"; text += TDEAboutData::aboutTranslationTeam() + "</qt>";
addTextPage( i18n("T&ranslation"), text, true); addTextPage( i18n("T&ranslation"), text, true);
} }

@ -31,7 +31,7 @@
* *
* This class provides the standard "About Application" dialog box * This class provides the standard "About Application" dialog box
* that is used by KHelpMenu. It uses the information of the global * that is used by KHelpMenu. It uses the information of the global
* KAboutData that is specified at the start of your program in * TDEAboutData that is specified at the start of your program in
* main(). Normally you should not use this class directly but rather * main(). Normally you should not use this class directly but rather
* the KHelpMenu class or even better just subclass your toplevel * the KHelpMenu class or even better just subclass your toplevel
* window from KMainWindow. If you do the latter, the help menu and * window from KMainWindow. If you do the latter, the help menu and
@ -61,12 +61,12 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
/** /**
* Constructor. Mostly does the same stuff as the previous constructor, except * Constructor. Mostly does the same stuff as the previous constructor, except
* that it can take a custom KAboutData object instead of the one specified * that it can take a custom TDEAboutData object instead of the one specified
* in your main() function. This is especially useful for applications * in your main() function. This is especially useful for applications
* which are implemented as (dynamically loaded) libraries, e.g. panel * which are implemented as (dynamically loaded) libraries, e.g. panel
* applets. * applets.
* *
* @param aboutData A pointer to a KAboutData object which data * @param aboutData A pointer to a TDEAboutData object which data
* will be used for filling the dialog. * will be used for filling the dialog.
* @param parent The parent of the dialog box. You should use the * @param parent The parent of the dialog box. You should use the
* toplevel window so that the dialog becomes centered. * toplevel window so that the dialog becomes centered.
@ -76,17 +76,17 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
* made visible using TQWidget::show(). Otherwise it will be * made visible using TQWidget::show(). Otherwise it will be
* modal and must be made visible using TQWidget::exec(). * modal and must be made visible using TQWidget::exec().
*/ */
KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true ); KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
/* /*
FIXME: The two constructors should be replaced with the following after the lib freeze: FIXME: The two constructors should be replaced with the following after the lib freeze:
KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true ); KAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
This will make buildDialog() obsolete as well (Frerich). This will make buildDialog() obsolete as well (Frerich).
*/ */
protected: protected:
void buildDialog( const KAboutData *aboutData ); void buildDialog( const TDEAboutData *aboutData );
}; };

@ -658,7 +658,7 @@ int KAction::plug( TQWidget *w, int index )
if ( d->hasIcon() ) if ( d->hasIcon() )
{ {
KInstance *instance; TDEInstance *instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
else else
@ -698,7 +698,7 @@ int KAction::plug( TQWidget *w, int index )
KToolBar *bar = static_cast<KToolBar *>( w ); KToolBar *bar = static_cast<KToolBar *>( w );
int id_ = getToolButtonID(); int id_ = getToolButtonID();
KInstance *instance; TDEInstance *instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
else else

@ -48,7 +48,7 @@ class KAccelActions;
class KConfig; class KConfig;
class KConfigBase; class KConfigBase;
class KURL; class KURL;
class KInstance; class TDEInstance;
class KToolBar; class KToolBar;
class KActionCollection; class KActionCollection;
class KPopupMenu; class KPopupMenu;

@ -1278,7 +1278,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index )
int id_ = KAction::getToolButtonID(); int id_ = KAction::getToolButtonID();
KInstance * instance; TDEInstance * instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
else else
@ -1827,7 +1827,7 @@ int KActionMenu::plug( TQWidget* widget, int index )
index ); index );
else else
{ {
KInstance *instance; TDEInstance *instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
@ -1954,7 +1954,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index )
isEnabled(), plainText(), isEnabled(), plainText(),
index ); index );
} else { } else {
KInstance * instance; TDEInstance * instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
else else
@ -2290,7 +2290,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index )
int id_ = KAction::getToolButtonID(); int id_ = KAction::getToolButtonID();
KInstance * instance; TDEInstance * instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();
else else

@ -51,7 +51,7 @@ class KAccelActions;
class KConfig; class KConfig;
class KConfigBase; class KConfigBase;
class KURL; class KURL;
class KInstance; class TDEInstance;
class KToolBar; class KToolBar;
class KActionCollection; class KActionCollection;
class KPopupMenu; class KPopupMenu;

@ -56,7 +56,7 @@ public:
m_parentGUIClient = 0L; m_parentGUIClient = 0L;
} }
KInstance *m_instance; TDEInstance *m_instance;
TQString m_sXMLFile; TQString m_sXMLFile;
bool m_bAutoConnectShortcuts; bool m_bAutoConnectShortcuts;
//bool m_bOneKAccelOnly; //bool m_bOneKAccelOnly;
@ -77,7 +77,7 @@ public:
}; };
KActionCollection::KActionCollection( TQWidget *parent, const char *name, KActionCollection::KActionCollection( TQWidget *parent, const char *name,
KInstance *instance ) TDEInstance *instance )
: TQObject( parent, name ) : TQObject( parent, name )
{ {
kdDebug(129) << "KActionCollection::KActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis kdDebug(129) << "KActionCollection::KActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis
@ -90,7 +90,7 @@ KActionCollection::KActionCollection( TQWidget *parent, const char *name,
KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const char *name, KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const char *name,
KInstance *instance ) TDEInstance *instance )
: TQObject( parent, name ) : TQObject( parent, name )
{ {
kdDebug(129) << "KActionCollection::KActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis kdDebug(129) << "KActionCollection::KActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis
@ -104,10 +104,10 @@ KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const c
#ifndef KDE_NO_COMPAT #ifndef KDE_NO_COMPAT
// KDE 4: remove // KDE 4: remove
KActionCollection::KActionCollection( TQObject *parent, const char *name, KActionCollection::KActionCollection( TQObject *parent, const char *name,
KInstance *instance ) TDEInstance *instance )
: TQObject( parent, name ) : TQObject( parent, name )
{ {
kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, KInstance *instance )" << endl; //ellis kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
kdDebug(129) << kdBacktrace() << endl; kdDebug(129) << kdBacktrace() << endl;
d = new KActionCollectionPrivate; d = new KActionCollectionPrivate;
TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent ); TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
@ -457,7 +457,7 @@ KActionPtrList KActionCollection::actions() const
return lst; return lst;
} }
void KActionCollection::setInstance( KInstance *instance ) void KActionCollection::setInstance( TDEInstance *instance )
{ {
if ( instance ) if ( instance )
d->m_instance = instance; d->m_instance = instance;
@ -465,7 +465,7 @@ void KActionCollection::setInstance( KInstance *instance )
d->m_instance = KGlobal::instance(); d->m_instance = KGlobal::instance();
} }
KInstance *KActionCollection::instance() const TDEInstance *KActionCollection::instance() const
{ {
return d->m_instance; return d->m_instance;
} }
@ -695,7 +695,7 @@ bool KActionShortcutList::isConfigurable( uint i ) const
{ return m_actions.action(i)->isShortcutConfigurable(); } { return m_actions.action(i)->isShortcutConfigurable(); }
bool KActionShortcutList::setShortcut( uint i, const KShortcut& cut ) bool KActionShortcutList::setShortcut( uint i, const KShortcut& cut )
{ return m_actions.action(i)->setShortcut( cut ); } { return m_actions.action(i)->setShortcut( cut ); }
const KInstance* KActionShortcutList::instance() const const TDEInstance* KActionShortcutList::instance() const
{ return m_actions.instance(); } { return m_actions.instance(); }
TQVariant KActionShortcutList::getOther( Other, uint ) const TQVariant KActionShortcutList::getOther( Other, uint ) const
{ return TQVariant(); } { return TQVariant(); }

@ -49,7 +49,7 @@ class KAccelActions;
class KConfig; class KConfig;
class KConfigBase; class KConfigBase;
class KURL; class KURL;
class KInstance; class TDEInstance;
class KToolBar; class KToolBar;
class KActionCollection; class KActionCollection;
class KPopupMenu; class KPopupMenu;
@ -83,13 +83,13 @@ class TDEUI_EXPORT KActionCollection : public TQObject
Q_OBJECT Q_OBJECT
public: public:
KActionCollection( TQWidget *parent, const char *name = 0, KInstance *instance = 0 ); KActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
/** /**
* Use this constructor if you want the collection's actions to restrict * Use this constructor if you want the collection's actions to restrict
* their accelerator keys to @p watch rather than the @p parent. If * their accelerator keys to @p watch rather than the @p parent. If
* you don't require shortcuts, you can pass a null to the @p watch parameter. * you don't require shortcuts, you can pass a null to the @p watch parameter.
*/ */
KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, KInstance *instance = 0 ); KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, TDEInstance *instance = 0 );
#ifndef KDE_NO_COMPAT #ifndef KDE_NO_COMPAT
KActionCollection( const KActionCollection &copy ); KActionCollection( const KActionCollection &copy );
#endif #endif
@ -197,9 +197,9 @@ public:
*/ */
bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const; bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const;
void setInstance( KInstance *instance ); void setInstance( TDEInstance *instance );
/** The instance with which this class is associated. */ /** The instance with which this class is associated. */
KInstance *instance() const; TDEInstance *instance() const;
/** /**
* @deprecated * @deprecated
@ -335,7 +335,7 @@ private:
#ifndef KDE_NO_COMPAT #ifndef KDE_NO_COMPAT
public: public:
KActionCollection( TQObject *parent, const char *name = 0, KInstance *instance = 0 ); KActionCollection( TQObject *parent, const char *name = 0, TDEInstance *instance = 0 );
#endif #endif
public: public:

@ -24,7 +24,7 @@ class TDEUI_EXPORT KActionShortcutList : public KShortcutList
virtual bool isConfigurable( uint index ) const; virtual bool isConfigurable( uint index ) const;
virtual bool setShortcut( uint index, const KShortcut& shortcut ); virtual bool setShortcut( uint index, const KShortcut& shortcut );
virtual const KInstance* instance() const; virtual const TDEInstance* instance() const;
virtual TQVariant getOther( Other, uint index ) const; virtual TQVariant getOther( Other, uint index ) const;
virtual bool setOther( Other, uint index, TQVariant ); virtual bool setOther( Other, uint index, TQVariant );

@ -65,7 +65,7 @@ public:
KURL url; KURL url;
}; };
KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutData ) KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *aboutData )
: KDialogBase( Plain, : KDialogBase( Plain,
i18n("Submit Bug Report"), i18n("Submit Bug Report"),
Ok | Cancel, Ok | Cancel,

@ -25,7 +25,7 @@ class TQMultiLineEdit;
class TQLineEdit; class TQLineEdit;
class TQHButtonGroup; class TQHButtonGroup;
class KProcess; class KProcess;
class KAboutData; class TDEAboutData;
class KBugReportPrivate; class KBugReportPrivate;
/** /**
@ -33,8 +33,8 @@ class KBugReportPrivate;
* *
* All the information needed by the dialog box * All the information needed by the dialog box
* (program name, version, bug-report address, etc.) * (program name, version, bug-report address, etc.)
* comes from the KAboutData class. * comes from the TDEAboutData class.
* Make sure you create an instance of KAboutData and pass it * Make sure you create an instance of TDEAboutData and pass it
* to TDECmdLineArgs. * to TDECmdLineArgs.
* *
* @author David Faure <faure@kde.org> * @author David Faure <faure@kde.org>
@ -49,7 +49,7 @@ public:
* since KHelpMenu takes care of the menu item * since KHelpMenu takes care of the menu item
* for "Report Bug..." and of creating a KBugReport dialog. * for "Report Bug..." and of creating a KBugReport dialog.
*/ */
KBugReport( TQWidget * parent = 0L, bool modal=true, const KAboutData *aboutData = 0L ); KBugReport( TQWidget * parent = 0L, bool modal=true, const TDEAboutData *aboutData = 0L );
/** /**
* Destructor * Destructor
*/ */
@ -101,7 +101,7 @@ protected:
bool sendBugReport(); bool sendBugReport();
KProcess * m_process; KProcess * m_process;
const KAboutData * m_aboutData; const TDEAboutData * m_aboutData;
TQMultiLineEdit * m_lineedit; TQMultiLineEdit * m_lineedit;
TQLineEdit * m_subject; TQLineEdit * m_subject;

@ -44,8 +44,8 @@ public:
_unmanagedWidgetChangeState( false ) _unmanagedWidgetChangeState( false )
{ } { }
KInstance *_instance; TDEInstance *_instance;
KAboutData *_about; TDEAboutData *_about;
TQString _rootOnlyMsg; TQString _rootOnlyMsg;
bool _useRootOnlyMsg; bool _useRootOnlyMsg;
bool _hasOwnInstance; bool _hasOwnInstance;
@ -64,17 +64,17 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &)
{ {
init(); init();
if (name && strlen(name)) { if (name && strlen(name)) {
d->_instance = new KInstance(name); d->_instance = new TDEInstance(name);
KGlobal::locale()->insertCatalogue(name); KGlobal::locale()->insertCatalogue(name);
} else } else
d->_instance = new KInstance("kcmunnamed"); d->_instance = new TDEInstance("kcmunnamed");
KGlobal::setActiveInstance(this->instance()); KGlobal::setActiveInstance(this->instance());
d->managers.setAutoDelete( true ); d->managers.setAutoDelete( true );
} }
KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & ) KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & )
: TQWidget(parent, instance ? instance->instanceName().data() : 0) : TQWidget(parent, instance ? instance->instanceName().data() : 0)
{ {
init(); init();
@ -156,12 +156,12 @@ void KCModule::unmanagedWidgetChangeState(bool changed)
widgetChanged(); widgetChanged();
} }
const KAboutData *KCModule::aboutData() const const TDEAboutData *KCModule::aboutData() const
{ {
return d->_about; return d->_about;
} }
void KCModule::setAboutData( KAboutData* about ) void KCModule::setAboutData( TDEAboutData* about )
{ {
delete d->_about; delete d->_about;
d->_about = about; d->_about = about;
@ -192,7 +192,7 @@ void KCModule::changed()
emit changed(true); emit changed(true);
} }
KInstance *KCModule::instance() const TDEInstance *KCModule::instance() const
{ {
return d->_instance; return d->_instance;
} }

@ -29,11 +29,11 @@
class TQStringList; class TQStringList;
class KAboutData; class TDEAboutData;
class KConfigDialogManager; class KConfigDialogManager;
class KConfigSkeleton; class KConfigSkeleton;
class KCModulePrivate; class KCModulePrivate;
class KInstance; class TDEInstance;
/** /**
* The base class for control center modules. * The base class for control center modules.
@ -91,7 +91,7 @@ public:
*/ */
KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() ); KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
KCModule(KInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() ); KCModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
/* /*
* Destroys the module. * Destroys the module.
@ -182,15 +182,15 @@ public:
* If you override you should have it return a pointer to a constant. * If you override you should have it return a pointer to a constant.
* *
* *
* @returns the KAboutData for this module * @returns the TDEAboutData for this module
*/ */
virtual const KAboutData *aboutData() const; virtual const TDEAboutData *aboutData() const;
/** /**
* This sets the KAboutData returned by aboutData() * This sets the TDEAboutData returned by aboutData()
* @since 3.3 * @since 3.3
*/ */
void setAboutData( KAboutData* about ); void setAboutData( TDEAboutData* about );
/** /**
* Indicate which buttons will be used. * Indicate which buttons will be used.
@ -228,7 +228,7 @@ public:
*/ */
bool useRootOnlyMsg() const; bool useRootOnlyMsg() const;
KInstance *instance() const; TDEInstance *instance() const;
/** /**
* @return a list of @ref KConfigDialogManager's in use, if any. * @return a list of @ref KConfigDialogManager's in use, if any.

@ -214,7 +214,7 @@ public:
* In a KParts application we let create a KXMLGUIClient create a dummy one, * In a KParts application we let create a KXMLGUIClient create a dummy one,
* but it probably isn't used. * but it probably isn't used.
*/ */
KEditToolbarWidgetPrivate(KInstance *instance, KActionCollection* collection) KEditToolbarWidgetPrivate(TDEInstance *instance, KActionCollection* collection)
: m_collection( collection ) : m_collection( collection )
{ {
m_instance = instance; m_instance = instance;
@ -339,7 +339,7 @@ public:
//TQValueList<KAction*> m_actionList; //TQValueList<KAction*> m_actionList;
KActionCollection* m_collection; KActionCollection* m_collection;
KInstance *m_instance; TDEInstance *m_instance;
XmlData* m_currentXmlData; XmlData* m_currentXmlData;
TQDomElement m_currentToolbarElem; TQDomElement m_currentToolbarElem;
@ -466,7 +466,7 @@ void KEditToolbar::slotDefault()
if (TQDir::isRelativePath(file)) if (TQDir::isRelativePath(file))
{ {
const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
} }
else else

@ -149,7 +149,7 @@ TQString KGuiItem::plainText() const
return stripped; return stripped;
} }
TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, KInstance* instance ) const TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, TDEInstance* instance ) const
{ {
if( d->m_hasIcon ) if( d->m_hasIcon )
{ {

@ -61,10 +61,10 @@ public:
TQString text() const; TQString text() const;
TQString plainText() const; TQString plainText() const;
#ifndef KDE_NO_COMPAT #ifndef KDE_NO_COMPAT
TQIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const; TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
TQIconSet iconSet() const { return iconSet( KIcon::Small ); } TQIconSet iconSet() const { return iconSet( KIcon::Small ); }
#else #else
TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, KInstance* instance = KGlobal::instance()) const; TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
#endif #endif
TQString iconName() const; TQString iconName() const;

@ -59,7 +59,7 @@ public:
delete mSwitchApplicationLanguage; delete mSwitchApplicationLanguage;
} }
const KAboutData *mAboutData; const TDEAboutData *mAboutData;
KSwitchLanguageDialog *mSwitchApplicationLanguage; KSwitchLanguageDialog *mSwitchApplicationLanguage;
}; };
@ -74,7 +74,7 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
d->mAboutData = 0; d->mAboutData = 0;
} }
KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData, KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
bool showWhatsThis, KActionCollection *actions ) bool showWhatsThis, KActionCollection *actions )
: TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0), : TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0),
d(new KHelpMenuPrivate) d(new KHelpMenuPrivate)
@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu()
// I use hardcoded menu id's here. Reason is to stay backward // I use hardcoded menu id's here. Reason is to stay backward
// compatible. // compatible.
// //
const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
mMenu = new KPopupMenu(); mMenu = new KPopupMenu();

@ -31,7 +31,7 @@ class KActionCollection;
class KPopupMenu; class KPopupMenu;
class TQWidget; class TQWidget;
class KAboutData; class TDEAboutData;
class KAboutKDE; class KAboutKDE;
class KBugReport; class KBugReport;
class KDialogBase; class KDialogBase;
@ -175,7 +175,7 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
* standard actions. * standard actions.
* *
*/ */
KHelpMenu( TQWidget *parent, const KAboutData *aboutData, KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
bool showWhatsThis=true, KActionCollection *actions = 0 ); bool showWhatsThis=true, KActionCollection *actions = 0 );
/** /**

@ -306,7 +306,7 @@ public:
* Simply call insert with the action collections of each one in turn. * Simply call insert with the action collections of each one in turn.
* *
* @param title the title associated with the collection (if null, the * @param title the title associated with the collection (if null, the
* KAboutData::progName() of the collection's instance is used) * TDEAboutData::progName() of the collection's instance is used)
* @return true :) * @return true :)
* @since 3.1 * @since 3.1
*/ */

@ -189,7 +189,7 @@ public:
* *
* @param aboutAppText The string that is used in the application * @param aboutAppText The string that is used in the application
* specific dialog box. If you leave this string empty the * specific dialog box. If you leave this string empty the
* information in the global KAboutData of the * information in the global TDEAboutData of the
* application will be used to make a standard dialog box. * application will be used to make a standard dialog box.
* *
* @param showWhatsThis Set this to false if you do not want to include * @param showWhatsThis Set this to false if you do not want to include

@ -64,9 +64,9 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
case Preferences: case Preferences:
case HelpContents: case HelpContents:
{ {
const KAboutData *aboutData = KGlobal::instance()->aboutData(); const TDEAboutData *aboutData = KGlobal::instance()->aboutData();
/* TODO KDE4 /* TODO KDE4
const KAboutData *aboutData; const TDEAboutData *aboutData;
if ( parent ) if ( parent )
aboutData = parent->instance()->aboutData(); aboutData = parent->instance()->aboutData();
else else

@ -312,7 +312,7 @@ KActionCollection* KSystemTray::actionCollection()
return d->actionCollection; return d->actionCollection;
} }
TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance ) TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
{ {
KConfig *appCfg = kapp->config(); KConfig *appCfg = kapp->config();
KConfigGroupSaver configSaver(appCfg, "System Tray"); KConfigGroupSaver configSaver(appCfg, "System Tray");
@ -320,7 +320,7 @@ TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
} }
TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance ) TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance )
{ {
return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
} }

@ -105,7 +105,7 @@ public:
/** /**
* Changes the tray's text description (which can be seen e.g. in the systray * Changes the tray's text description (which can be seen e.g. in the systray
* configuration dialog). The default value is KAboutData::programName(). * configuration dialog). The default value is TDEAboutData::programName().
*/ */
virtual void setCaption( const TQString& title ); virtual void setCaption( const TQString& title );
@ -117,7 +117,7 @@ public:
* *
* @since 3.2 * @since 3.2
*/ */
static TQPixmap loadIcon( const TQString &icon, KInstance *instance=KGlobal::instance() ); static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() );
/** /**
* Loads an icon @p icon using the icon loader class of the given instance @p instance. * Loads an icon @p icon using the icon loader class of the given instance @p instance.
@ -128,7 +128,7 @@ public:
* *
* @since 3.5.12 * @since 3.5.12
*/ */
static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance=KGlobal::instance() ); static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=KGlobal::instance() );
signals: signals:
/** /**

@ -255,7 +255,7 @@ void KToolBar::init( bool readConfig, bool honorStyle )
} }
int KToolBar::insertButton(const TQString& icon, int id, bool enabled, int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
const TQString& text, int index, KInstance *_instance ) const TQString& text, int index, TDEInstance *_instance )
{ {
KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance ); KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance );
@ -268,7 +268,7 @@ int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
int KToolBar::insertButton(const TQString& icon, int id, const char *signal, int KToolBar::insertButton(const TQString& icon, int id, const char *signal,
const TQObject *receiver, const char *slot, const TQObject *receiver, const char *slot,
bool enabled, const TQString& text, int index, KInstance *_instance ) bool enabled, const TQString& text, int index, TDEInstance *_instance )
{ {
KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance); KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance);
insertWidgetInternal( button, index, id ); insertWidgetInternal( button, index, id );

@ -49,7 +49,7 @@ class KToolBarButton;
class KToolBoxManager; class KToolBoxManager;
class KAnimWidget; class KAnimWidget;
class KPopupMenu; class KPopupMenu;
class KInstance; class TDEInstance;
class KComboBox; class KComboBox;
class KXMLGUIClient; class KXMLGUIClient;
@ -207,7 +207,7 @@ public:
*/ */
int insertButton(const TQString& icon, int id, bool enabled = true, int insertButton(const TQString& icon, int id, bool enabled = true,
const TQString& text = TQString::null, int index=-1, const TQString& text = TQString::null, int index=-1,
KInstance *_instance = KGlobal::instance()); TDEInstance *_instance = KGlobal::instance());
/** /**
* This is the same as above, but with specified signals and * This is the same as above, but with specified signals and
@ -230,7 +230,7 @@ public:
int insertButton(const TQString& icon, int id, const char *signal, int insertButton(const TQString& icon, int id, const char *signal,
const TQObject *receiver, const char *slot, const TQObject *receiver, const char *slot,
bool enabled = true, const TQString& text = TQString::null, bool enabled = true, const TQString& text = TQString::null,
int index=-1, KInstance *_instance = KGlobal::instance() ); int index=-1, TDEInstance *_instance = KGlobal::instance() );
/** /**
* Inserts a button (a KToolBarButton) with the specified * Inserts a button (a KToolBarButton) with the specified

@ -93,7 +93,7 @@ public:
TQPoint m_mousePressPos; TQPoint m_mousePressPos;
KInstance *m_instance; TDEInstance *m_instance;
}; };
// This will construct a separator // This will construct a separator
@ -109,7 +109,7 @@ KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name )
KToolBarButton::KToolBarButton( const TQString& _icon, int _id, KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
TQWidget *_parent, const char *_name, TQWidget *_parent, const char *_name,
const TQString &_txt, KInstance *_instance ) const TQString &_txt, TDEInstance *_instance )
: TQToolButton( _parent, _name ), d( 0 ) : TQToolButton( _parent, _name ), d( 0 )
{ {
d = new KToolBarButtonPrivate; d = new KToolBarButtonPrivate;

@ -31,7 +31,7 @@
class KToolBar; class KToolBar;
class KToolBarButtonPrivate; class KToolBarButtonPrivate;
class KInstance; class TDEInstance;
class TQEvent; class TQEvent;
class TQPopupMenu; class TQPopupMenu;
class TQPainter; class TQPainter;
@ -61,7 +61,7 @@ public:
*/ */
KToolBarButton(const TQString& icon, int id, TQWidget *parent, KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null, const char *name=0L, const TQString &txt=TQString::null,
KInstance *_instance = KGlobal::instance()); TDEInstance *_instance = KGlobal::instance());
/** /**
* Construct a button with an existing pixmap. It is not * Construct a button with an existing pixmap. It is not

@ -61,7 +61,7 @@ public:
TQString attrIcon; TQString attrIcon;
KInstance *m_instance; TDEInstance *m_instance;
KXMLGUIClient *m_client; KXMLGUIClient *m_client;
}; };
@ -174,7 +174,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
if ( !icon.isEmpty() ) if ( !icon.isEmpty() )
{ {
KInstance *instance = d->m_instance; TDEInstance *instance = d->m_instance;
if ( !instance ) if ( !instance )
instance = KGlobal::instance(); instance = KGlobal::instance();
@ -371,7 +371,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
if ( !icon.isEmpty() ) if ( !icon.isEmpty() )
{ {
KInstance *instance = d->m_instance; TDEInstance *instance = d->m_instance;
if ( !instance ) if ( !instance )
instance = KGlobal::instance(); instance = KGlobal::instance();
@ -409,12 +409,12 @@ void KXMLGUIBuilder::setBuilderClient( KXMLGUIClient *client )
setBuilderInstance( client->instance() ); setBuilderInstance( client->instance() );
} }
KInstance *KXMLGUIBuilder::builderInstance() const TDEInstance *KXMLGUIBuilder::builderInstance() const
{ {
return d->m_instance; return d->m_instance;
} }
void KXMLGUIBuilder::setBuilderInstance( KInstance *instance ) void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
{ {
d->m_instance = instance; d->m_instance = instance;
} }

@ -27,7 +27,7 @@
class KXMLGUIBuilderPrivate; class KXMLGUIBuilderPrivate;
class TQWidget; class TQWidget;
class KInstance; class TDEInstance;
class KXMLGUIClient; class KXMLGUIClient;
/** /**
@ -48,9 +48,9 @@ class TDEUI_EXPORT KXMLGUIBuilder
/* @internal */ /* @internal */
void setBuilderClient( KXMLGUIClient *client ); void setBuilderClient( KXMLGUIClient *client );
/* @internal */ /* @internal */
KInstance *builderInstance() const; TDEInstance *builderInstance() const;
/* @internal */ /* @internal */
void setBuilderInstance( KInstance *instance ); void setBuilderInstance( TDEInstance *instance );
/* @internal */ /* @internal */
TQWidget *widget(); TQWidget *widget();

@ -50,7 +50,7 @@ public:
{ {
} }
KInstance *m_instance; TDEInstance *m_instance;
TQDomDocument m_doc; TQDomDocument m_doc;
KActionCollection *m_actionCollection; KActionCollection *m_actionCollection;
@ -120,7 +120,7 @@ KAction *KXMLGUIClient::action( const TQDomElement &element ) const
return actionCollection()->action( element.attribute( attrName ).latin1() ); return actionCollection()->action( element.attribute( attrName ).latin1() );
} }
KInstance *KXMLGUIClient::instance() const TDEInstance *KXMLGUIClient::instance() const
{ {
return d->m_instance; return d->m_instance;
} }
@ -154,7 +154,7 @@ void KXMLGUIClient::reloadXML()
setXMLFile( file ); setXMLFile( file );
} }
void KXMLGUIClient::setInstance( KInstance *instance ) void KXMLGUIClient::setInstance( TDEInstance *instance )
{ {
d->m_instance = instance; d->m_instance = instance;
actionCollection()->setInstance( instance ); actionCollection()->setInstance( instance );

@ -29,7 +29,7 @@
class TQWidget; class TQWidget;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KInstance; class TDEInstance;
class KXMLGUIClientPrivate; class KXMLGUIClientPrivate;
class KXMLGUIFactory; class KXMLGUIFactory;
class KXMLGUIBuilder; class KXMLGUIBuilder;
@ -95,9 +95,9 @@ public:
virtual KActionCollection* actionCollection() const; virtual KActionCollection* actionCollection() const;
/** /**
* @return The instance ( KInstance ) for this GUI client. * @return The instance ( TDEInstance ) for this GUI client.
*/ */
virtual KInstance *instance() const; virtual TDEInstance *instance() const;
/** /**
* @return The parsed XML in a TQDomDocument, set by * @return The parsed XML in a TQDomDocument, set by
@ -271,12 +271,12 @@ protected:
//bool addSuperClient( KXMLGUIClient * ); //bool addSuperClient( KXMLGUIClient * );
/** /**
* Sets the instance ( KInstance) for this part. * Sets the instance ( TDEInstance) for this part.
* *
* Call this first in the inherited class constructor. * Call this first in the inherited class constructor.
* (At least before setXMLFile().) * (At least before setXMLFile().)
*/ */
virtual void setInstance( KInstance *instance ); virtual void setInstance( TDEInstance *instance );
/** /**
* Sets the name of the rc file containing the XML for the part. * Sets the name of the rc file containing the XML for the part.

@ -96,14 +96,14 @@ public:
BuildStateStack m_stateStack; BuildStateStack m_stateStack;
}; };
TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const KInstance *instance ) TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInstance *instance )
{ {
return readConfigFile( filename, false, instance ); return readConfigFile( filename, false, instance );
} }
TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const KInstance *_instance ) TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance )
{ {
const KInstance *instance = _instance ? _instance : KGlobal::instance(); const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
TQString xml_file; TQString xml_file;
if (!TQDir::isRelativePath(filename)) if (!TQDir::isRelativePath(filename))
@ -140,9 +140,9 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
} }
bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
const TQString& filename, const KInstance *_instance ) const TQString& filename, const TDEInstance *_instance )
{ {
const KInstance *instance = _instance ? _instance : KGlobal::instance(); const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
TQString xml_file(filename); TQString xml_file(filename);
if (TQDir::isRelativePath(xml_file)) if (TQDir::isRelativePath(xml_file))

@ -32,7 +32,7 @@ class KAction;
class KXMLGUIFactoryPrivate; class KXMLGUIFactoryPrivate;
class KXMLGUIClient; class KXMLGUIClient;
class KXMLGUIBuilder; class KXMLGUIBuilder;
class KInstance; class TDEInstance;
namespace KXMLGUI namespace KXMLGUI
{ {
@ -79,10 +79,10 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
~KXMLGUIFactory(); ~KXMLGUIFactory();
// XXX move to somewhere else? (Simon) // XXX move to somewhere else? (Simon)
static TQString readConfigFile( const TQString &filename, bool never_null, const KInstance *instance = 0 ); static TQString readConfigFile( const TQString &filename, bool never_null, const TDEInstance *instance = 0 );
static TQString readConfigFile( const TQString &filename, const KInstance *instance = 0 ); static TQString readConfigFile( const TQString &filename, const TDEInstance *instance = 0 );
static bool saveConfigFile( const TQDomDocument& doc, const TQString& filename, static bool saveConfigFile( const TQDomDocument& doc, const TQString& filename,
const KInstance *instance = 0 ); const TDEInstance *instance = 0 );
static TQString documentToXML( const TQDomDocument& doc ); static TQString documentToXML( const TQDomDocument& doc );
static TQString elementToXML( const TQDomElement& elem ); static TQString elementToXML( const TQDomElement& elem );

@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index,
} }
} }
KInstance *oldInstance = m_state.builder->builderInstance(); TDEInstance *oldInstance = m_state.builder->builderInstance();
KXMLGUIClient *oldClient = m_state.builder->builderClient(); KXMLGUIClient *oldClient = m_state.builder->builderClient();
m_state.builder->setBuilderClient( m_state.guiClient ); m_state.builder->setBuilderClient( m_state.guiClient );

@ -118,7 +118,7 @@ void KLineEditTest::slotHide()
int main ( int argc, char **argv) int main ( int argc, char **argv)
{ {
KAboutData aboutData( "klineedittest", "klineedittest", "1.0" ); TDEAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication::addCmdLineOptions(); TDEApplication::addCmdLineOptions();

@ -36,7 +36,7 @@ int main( int argc, char **argv )
KXMLGUIFactory *factory = new KXMLGUIFactory( builder ); KXMLGUIFactory *factory = new KXMLGUIFactory( builder );
Client *shell = new Client; Client *shell = new Client;
shell->setInstance( new KInstance( "konqueror" ) ); shell->setInstance( new TDEInstance( "konqueror" ) );
shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() ); shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() );
(void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" ); (void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );

@ -11,7 +11,7 @@ public:
Client() {} Client() {}
void setXMLFile( const TQString &f, bool merge = true ) { KXMLGUIClient::setXMLFile( f, merge ); } void setXMLFile( const TQString &f, bool merge = true ) { KXMLGUIClient::setXMLFile( f, merge ); }
void setInstance( KInstance *inst ) { KXMLGUIClient::setInstance( inst ); } void setInstance( TDEInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
public slots: public slots:
void slotSec(); void slotSec();

Loading…
Cancel
Save