summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kaboutdata.cpp90
-rw-r--r--tdecore/kaboutdata.h18
-rw-r--r--tdecore/kapplication.cpp24
-rw-r--r--tdecore/kapplication.h6
-rw-r--r--tdecore/kcmdlineargs.cpp14
-rw-r--r--tdecore/kcmdlineargs.h18
-rw-r--r--tdecore/kconfig_compiler/example/autoexample.cpp2
-rw-r--r--tdecore/kconfig_compiler/example/example.cpp2
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp6
-rw-r--r--tdecore/kconfig_compiler/tests/test1main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test2main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test3main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test4main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test5main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test6main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test7main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test8main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer_main.cpp2
-rw-r--r--tdecore/kcrash.cpp4
-rw-r--r--tdecore/kdetcompmgr.cpp4
-rw-r--r--tdecore/kgenericfactory.h54
-rw-r--r--tdecore/kglobal.cpp10
-rw-r--r--tdecore/kglobal.h12
-rw-r--r--tdecore/kiconloader.cpp32
-rw-r--r--tdecore/kiconloader.h40
-rw-r--r--tdecore/kinstance.cpp56
-rw-r--r--tdecore/kinstance.h34
-rw-r--r--tdecore/klibloader.cpp2
-rw-r--r--tdecore/klibloader.h12
-rw-r--r--tdecore/klocale.cpp2
-rw-r--r--tdecore/kmimesourcefactory.cpp4
-rw-r--r--tdecore/kmimesourcefactory.h8
-rw-r--r--tdecore/knotifyclient.cpp10
-rw-r--r--tdecore/knotifyclient.h24
-rw-r--r--tdecore/kshortcutlist.cpp2
-rw-r--r--tdecore/kshortcutlist.h8
-rw-r--r--tdecore/kstandarddirs.cpp6
-rw-r--r--tdecore/kstandarddirs.h8
-rw-r--r--tdecore/kuniqueapplication.cpp4
-rw-r--r--tdecore/kuniqueapplication.h4
-rw-r--r--tdecore/network/ksockssocketdevice.cpp2
-rw-r--r--tdecore/tde-config.cpp.cmake4
-rw-r--r--tdecore/tde-config.cpp.in4
-rw-r--r--tdecore/tests/kapptest.cpp2
-rw-r--r--tdecore/tests/kcalendartest.cpp4
-rw-r--r--tdecore/tests/kdebugtest.cpp2
-rw-r--r--tdecore/tests/kresolvertest.cpp2
-rw-r--r--tdecore/tests/ksocktest.cpp2
-rw-r--r--tdecore/tests/ktimezonestest.cpp2
-rw-r--r--tdecore/tests/kuniqueapptest.cpp2
-rw-r--r--tdecore/tests/startserviceby.cpp2
-rw-r--r--tdecore/tests/testqtargs.cpp4
53 files changed, 286 insertions, 286 deletions
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp
index 00d75225b..303403ef7 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/kaboutdata.cpp
@@ -71,10 +71,10 @@ TQString KAboutTranslator::emailAddress() const
return mEmail;
}
-class KAboutDataPrivate
+class TDEAboutDataPrivate
{
public:
- KAboutDataPrivate()
+ TDEAboutDataPrivate()
: translatorName("_: NAME OF TRANSLATORS\nYour names")
, translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
, productName(0)
@@ -82,7 +82,7 @@ public:
, customAuthorTextEnabled(false)
, mTranslatedProgramName( 0 )
{}
- ~KAboutDataPrivate()
+ ~TDEAboutDataPrivate()
{
delete programLogo;
delete[] mTranslatedProgramName;
@@ -96,9 +96,9 @@ public:
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 *version,
const char *shortDescription,
@@ -118,7 +118,7 @@ KAboutData::KAboutData( const char *appName,
mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ),
mLicenseText (0)
{
- d = new KAboutDataPrivate;
+ d = new TDEAboutDataPrivate;
if( appName ) {
const char *p = strrchr(appName, '/');
@@ -130,7 +130,7 @@ KAboutData::KAboutData( const char *appName,
mAppName = 0;
}
-KAboutData::~KAboutData()
+TDEAboutData::~TDEAboutData()
{
if (mLicenseKey == License_File)
delete [] mLicenseText;
@@ -138,109 +138,109 @@ KAboutData::~KAboutData()
}
void
-KAboutData::addAuthor( const char *name, const char *task,
+TDEAboutData::addAuthor( const char *name, const char *task,
const char *emailAddress, const char *webAddress )
{
mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
}
void
-KAboutData::addCredit( const char *name, const char *task,
+TDEAboutData::addCredit( const char *name, const char *task,
const char *emailAddress, const char *webAddress )
{
mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
}
void
-KAboutData::setTranslator( const char *name, const char *emailAddress)
+TDEAboutData::setTranslator( const char *name, const char *emailAddress)
{
d->translatorName=name;
d->translatorEmail=emailAddress;
}
void
-KAboutData::setLicenseText( const char *licenseText )
+TDEAboutData::setLicenseText( const char *licenseText )
{
mLicenseText = licenseText;
mLicenseKey = License_Custom;
}
void
-KAboutData::setLicenseTextFile( const TQString &file )
+TDEAboutData::setLicenseTextFile( const TQString &file )
{
mLicenseText = tqstrdup(TQFile::encodeName(file));
mLicenseKey = License_File;
}
void
-KAboutData::setAppName( const char *appName )
+TDEAboutData::setAppName( const char *appName )
{
mAppName = appName;
}
void
-KAboutData::setProgramName( const char* programName )
+TDEAboutData::setProgramName( const char* programName )
{
mProgramName = programName;
translateInternalProgramName();
}
void
-KAboutData::setVersion( const char* version )
+TDEAboutData::setVersion( const char* version )
{
mVersion = version;
}
void
-KAboutData::setShortDescription( const char *shortDescription )
+TDEAboutData::setShortDescription( const char *shortDescription )
{
mShortDescription = shortDescription;
}
void
-KAboutData::setLicense( LicenseKey licenseKey)
+TDEAboutData::setLicense( LicenseKey licenseKey)
{
mLicenseKey = licenseKey;
}
void
-KAboutData::setCopyrightStatement( const char *copyrightStatement )
+TDEAboutData::setCopyrightStatement( const char *copyrightStatement )
{
mCopyrightStatement = copyrightStatement;
}
void
-KAboutData::setOtherText( const char *otherText )
+TDEAboutData::setOtherText( const char *otherText )
{
mOtherText = otherText;
}
void
-KAboutData::setHomepage( const char *homepage )
+TDEAboutData::setHomepage( const char *homepage )
{
mHomepageAddress = homepage;
}
void
-KAboutData::setBugAddress( const char *bugAddress )
+TDEAboutData::setBugAddress( const char *bugAddress )
{
mBugEmailAddress = bugAddress;
}
void
-KAboutData::setProductName( const char *productName )
+TDEAboutData::setProductName( const char *productName )
{
d->productName = productName;
}
const char *
-KAboutData::appName() const
+TDEAboutData::appName() const
{
return mAppName;
}
const char *
-KAboutData::productName() const
+TDEAboutData::productName() const
{
if (d->productName)
return d->productName;
@@ -249,7 +249,7 @@ KAboutData::productName() const
}
TQString
-KAboutData::programName() const
+TDEAboutData::programName() const
{
if (mProgramName && *mProgramName)
return i18n(mProgramName);
@@ -258,7 +258,7 @@ KAboutData::programName() const
}
const char*
-KAboutData::internalProgramName() const
+TDEAboutData::internalProgramName() const
{
if (d->mTranslatedProgramName)
return d->mTranslatedProgramName;
@@ -270,7 +270,7 @@ KAboutData::internalProgramName() const
// because it may deadlock. Since i18n() needs it, when KLocale is available
// the i18n() call will be done here in advance.
void
-KAboutData::translateInternalProgramName() const
+TDEAboutData::translateInternalProgramName() const
{
delete[] d->mTranslatedProgramName;
d->mTranslatedProgramName = 0;
@@ -279,13 +279,13 @@ KAboutData::translateInternalProgramName() const
}
TQImage
-KAboutData::programLogo() const
+TDEAboutData::programLogo() const
{
return d->programLogo ? (*d->programLogo) : TQImage();
}
void
-KAboutData::setProgramLogo(const TQImage& image)
+TDEAboutData::setProgramLogo(const TQImage& image)
{
if (!d->programLogo)
d->programLogo = new TQImage( image );
@@ -294,13 +294,13 @@ KAboutData::setProgramLogo(const TQImage& image)
}
TQString
-KAboutData::version() const
+TDEAboutData::version() const
{
return TQString::fromLatin1(mVersion);
}
TQString
-KAboutData::shortDescription() const
+TDEAboutData::shortDescription() const
{
if (mShortDescription && *mShortDescription)
return i18n(mShortDescription);
@@ -309,31 +309,31 @@ KAboutData::shortDescription() const
}
TQString
-KAboutData::homepage() const
+TDEAboutData::homepage() const
{
return TQString::fromLatin1(mHomepageAddress);
}
TQString
-KAboutData::bugAddress() const
+TDEAboutData::bugAddress() const
{
return TQString::fromLatin1(mBugEmailAddress);
}
const TQValueList<KAboutPerson>
-KAboutData::authors() const
+TDEAboutData::authors() const
{
return mAuthorList;
}
const TQValueList<KAboutPerson>
-KAboutData::credits() const
+TDEAboutData::credits() const
{
return mCreditList;
}
const TQValueList<KAboutTranslator>
-KAboutData::translators() const
+TDEAboutData::translators() const
{
TQValueList<KAboutTranslator> personList;
@@ -382,7 +382,7 @@ KAboutData::translators() const
}
TQString
-KAboutData::aboutTranslationTeam()
+TDEAboutData::aboutTranslationTeam()
{
return i18n("replace this with information about your translation team",
"<p>KDE is translated into many languages thanks to the work "
@@ -393,7 +393,7 @@ KAboutData::aboutTranslationTeam()
}
TQString
-KAboutData::otherText() const
+TDEAboutData::otherText() const
{
if (mOtherText && *mOtherText)
return i18n(mOtherText);
@@ -403,7 +403,7 @@ KAboutData::otherText() const
TQString
-KAboutData::license() const
+TDEAboutData::license() const
{
TQString result;
if (!copyrightStatement().isEmpty())
@@ -466,7 +466,7 @@ KAboutData::license() const
}
TQString
-KAboutData::copyrightStatement() const
+TDEAboutData::copyrightStatement() const
{
if (mCopyrightStatement && *mCopyrightStatement)
return i18n(mCopyrightStatement);
@@ -475,25 +475,25 @@ KAboutData::copyrightStatement() const
}
TQString
-KAboutData::customAuthorPlainText() const
+TDEAboutData::customAuthorPlainText() const
{
return d->customAuthorPlainText;
}
TQString
-KAboutData::customAuthorRichText() const
+TDEAboutData::customAuthorRichText() const
{
return d->customAuthorRichText;
}
bool
-KAboutData::customAuthorTextEnabled() const
+TDEAboutData::customAuthorTextEnabled() const
{
return d->customAuthorTextEnabled;
}
void
-KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
+TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
{
d->customAuthorPlainText = plainText;
d->customAuthorRichText = richText;
@@ -502,7 +502,7 @@ KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richT
}
void
-KAboutData::unsetCustomAuthorText()
+TDEAboutData::unsetCustomAuthorText()
{
d->customAuthorPlainText = TQString::null;
d->customAuthorRichText = TQString::null;
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index 9fe8d8593..b803b779e 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -28,21 +28,21 @@
#define _KABOUTDATA_H_
class KAboutPersonPrivate;
-class KAboutDataPrivate;
+class TDEAboutDataPrivate;
/**
* 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
* 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.
*
* Example Usage within a main():
*
* \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!"),
- * KAboutData::License_LGPL,
+ * TDEAboutData::License_LGPL,
* I18N_NOOP("Copyright (c) 2003 Developer"));
*
* 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.
* 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.
* Normally you should at least define the translator's name.
*
@@ -179,7 +179,7 @@ private:
* classes.
* @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
*/
-class TDECORE_EXPORT KAboutData
+class TDECORE_EXPORT TDEAboutData
{
public:
/**
@@ -235,7 +235,7 @@ class TDECORE_EXPORT KAboutData
* This defaults to the trinitydesktop.org bug system.
*
*/
- KAboutData( const char *appName,
+ TDEAboutData( const char *appName,
const char *programName,
const char *version,
const char *shortDescription = 0,
@@ -246,7 +246,7 @@ class TDECORE_EXPORT KAboutData
const char *bugsEmailAddress = 0
);
- ~KAboutData();
+ ~TDEAboutData();
/**
* Defines an author. You can call this function as many times you
@@ -623,7 +623,7 @@ class TDECORE_EXPORT KAboutData
const char *mLicenseText;
static const char *defaultBugTracker;
- KAboutDataPrivate *d;
+ TDEAboutDataPrivate *d;
};
#endif
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 1f0dae669..62eb373e5 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -623,7 +623,7 @@ static TQTime* smModificationTime = 0;
TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) :
- TQApplication( argc, argv, GUIenabled ), KInstance(rAppName),
+ TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName),
#ifdef Q_WS_X11
display(0L),
argb_visual(false),
@@ -649,7 +649,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
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(), GUIenabled ), // We need to be able to run command line apps
- KInstance( TDECmdLineArgs::about),
+ TDEInstance( TDECmdLineArgs::about),
#ifdef Q_WS_X11
display(0L),
argb_visual(false),
@@ -674,7 +674,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
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.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 ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
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.miniIcon = 0L;
@@ -708,7 +708,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
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))
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,
- bool allowStyles, KInstance * _instance ) :
+ bool allowStyles, TDEInstance * _instance ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
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))
getX11RGBAInformation(dpy);
@@ -743,10 +743,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
}
#endif
-TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ) :
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
GUIenabled ),
- KInstance( _instance ),
+ TDEInstance( _instance ),
#ifdef Q_WS_X11
display(0L),
#endif
@@ -770,7 +770,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _i
#ifdef Q_WS_X11
TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) :
- TQApplication( display ), KInstance(rAppName),
+ TQApplication( display ), TDEInstance(rAppName),
display(0L),
argb_visual(false),
d (new TDEApplicationPrivate())
@@ -1442,7 +1442,7 @@ bool TDEApplication::sessionSaving() const
void TDEApplication::startKdeinit()
{
#ifndef Q_WS_WIN //TODO
- KInstance inst( "starttdeinitlock" );
+ TDEInstance inst( "starttdeinitlock" );
KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock();
@@ -3630,7 +3630,7 @@ bool TDEApplication::guiEnabled()
}
void TDEApplication::virtual_hook( int id, void* data )
-{ KInstance::virtual_hook( id, data ); }
+{ TDEInstance::virtual_hook( id, data ); }
void KSessionManaged::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index 89aaab2e2..49abf1202 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -93,7 +93,7 @@ class TDEApplicationPrivate;
* @short Controls and provides information to all KDE applications.
* @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
@@ -1232,14 +1232,14 @@ protected:
/**
* @internal Used by KUniqueApplication
*/
- TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance );
+ TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance );
#ifdef Q_WS_X11
/**
* @internal Used by KUniqueApplication
*/
TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
- bool allowStyles, KInstance* _instance );
+ bool allowStyles, TDEInstance* _instance );
/**
* Used to catch X11 events
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index d9e564d4a..186f7e3af 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -115,7 +115,7 @@ int TDECmdLineArgs::argc = 0;
char **TDECmdLineArgs::argv = 0;
char *TDECmdLineArgs::mCwd = 0;
static KStaticDeleter <char> mCwdd;
-const KAboutData *TDECmdLineArgs::about = 0;
+const TDEAboutData *TDECmdLineArgs::about = 0;
bool TDECmdLineArgs::parsed = 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)
{
init(_argc, _argv,
- new KAboutData(_appname, programName, _version, _description),
+ new TDEAboutData(_appname, programName, _version, _description),
noKApp);
}
@@ -137,7 +137,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
const char *_description, const char *_version, bool noKApp)
{
init(_argc, _argv,
- new KAboutData(_appname, _appname, _version, _description),
+ new TDEAboutData(_appname, _appname, _version, _description),
noKApp);
}
@@ -145,12 +145,12 @@ void
TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
{
init(_argc, _argv,
- new KAboutData(_appname, _appname, "unknown", "TDE Application", false));
+ new TDEAboutData(_appname, _appname, "unknown", "TDE Application", false));
ignoreUnknown = true;
}
void
-TDECmdLineArgs::init(const KAboutData* ab)
+TDECmdLineArgs::init(const TDEAboutData* ab)
{
char **_argv = (char **) malloc(sizeof(char *));
_argv[0] = (char *) ab->appName();
@@ -159,7 +159,7 @@ TDECmdLineArgs::init(const KAboutData* ab)
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;
argv = _argv;
@@ -747,7 +747,7 @@ TDECmdLineArgs::enable_i18n()
return;
if (!KGlobal::_instance) {
- KInstance *instance = new KInstance(about);
+ TDEInstance *instance = new TDEInstance(about);
(void) instance->config();
// Don't delete instance!
}
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 142544aeb..09a6a6558 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -72,7 +72,7 @@ class TDEApplication;
class KUniqueApplication;
class KCmdLineParsedOptions;
class KCmdLineParsedArgs;
-class KAboutData;
+class TDEAboutData;
class TDECmdLineArgsPrivate;
/**
@@ -263,17 +263,17 @@ public:
* Initialize class.
*
* 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.
*
* @param _argc 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
* TQApplication / TDEApplication
*/
static void init(int _argc, char **_argv,
- const KAboutData *about, bool noKApp = false);
+ const TDEAboutData *about, bool noKApp = false);
/**
* Initialize Class
@@ -281,14 +281,14 @@ public:
* This function should be called as the very first thing in your
* application. This method will rarely be used, since it doesn't
* provide any argument parsing. It does provide access to the
- * KAboutData information.
+ * TDEAboutData information.
* 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.
- * \see KAboutData
+ * \see TDEAboutData
*/
- static void init(const KAboutData *about);
+ static void init(const TDEAboutData *about);
/**
* Add options to your application.
@@ -674,7 +674,7 @@ private:
bool isQt;
static TDECmdLineArgsList *argsList; // All options.
- static const KAboutData *about;
+ static const TDEAboutData *about;
static int argc; // The original argc
static char **argv; // The original argv
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index eb8f8c4cf..ec71dea71 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -38,7 +38,7 @@
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" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp
index f15b4bb15..cf808c9b2 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/kconfig_compiler/example/example.cpp
@@ -32,7 +32,7 @@
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" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index e0b6422a4..91e8c7998 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -952,8 +952,8 @@ TQString indent(TQString text, int spaces)
int main( int argc, char **argv )
{
- KAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
- I18N_NOOP("KConfig Compiler") , KAboutData::License_LGPL );
+ TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+ I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
aboutData.addAuthor( "Waldo Bastian", 0, "bastian@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::addCmdLineOptions( options );
- KInstance app( &aboutData );
+ TDEInstance app( &aboutData );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/tdecore/kconfig_compiler/tests/test1main.cpp b/tdecore/kconfig_compiler/tests/test1main.cpp
index 976a7bbd6..79546639f 100644
--- a/tdecore/kconfig_compiler/tests/test1main.cpp
+++ b/tdecore/kconfig_compiler/tests/test1main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test1 *t = new Test1( TQString::null, TQString::null );
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test2main.cpp b/tdecore/kconfig_compiler/tests/test2main.cpp
index 904c57270..5970bf03d 100644
--- a/tdecore/kconfig_compiler/tests/test2main.cpp
+++ b/tdecore/kconfig_compiler/tests/test2main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test2 *t = new Test2();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test3main.cpp b/tdecore/kconfig_compiler/tests/test3main.cpp
index 9789d697d..f73ae38e3 100644
--- a/tdecore/kconfig_compiler/tests/test3main.cpp
+++ b/tdecore/kconfig_compiler/tests/test3main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
TestNameSpace::Test3 *t = new TestNameSpace::Test3();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test4main.cpp b/tdecore/kconfig_compiler/tests/test4main.cpp
index 8b38b3dbd..5229d8a87 100644
--- a/tdecore/kconfig_compiler/tests/test4main.cpp
+++ b/tdecore/kconfig_compiler/tests/test4main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test4 *t = Test4::self();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test5main.cpp b/tdecore/kconfig_compiler/tests/test5main.cpp
index 57ad5189d..89f28587f 100644
--- a/tdecore/kconfig_compiler/tests/test5main.cpp
+++ b/tdecore/kconfig_compiler/tests/test5main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test5 *t = Test5::self();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test6main.cpp b/tdecore/kconfig_compiler/tests/test6main.cpp
index 27dff57ff..9b1b7503e 100644
--- a/tdecore/kconfig_compiler/tests/test6main.cpp
+++ b/tdecore/kconfig_compiler/tests/test6main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test6 *t = new Test6(TQString::null);
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test7main.cpp b/tdecore/kconfig_compiler/tests/test7main.cpp
index 9c1ad1931..81cca0184 100644
--- a/tdecore/kconfig_compiler/tests/test7main.cpp
+++ b/tdecore/kconfig_compiler/tests/test7main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test7 *t = new Test7(42);
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test8main.cpp b/tdecore/kconfig_compiler/tests/test8main.cpp
index b3c242f68..04864a95c 100644
--- a/tdecore/kconfig_compiler/tests/test8main.cpp
+++ b/tdecore/kconfig_compiler/tests/test8main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
Test8a *config2 = new Test8a();
Test8b::self();
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp
index 39b904af9..8668d8d8c 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/kconfig_compiler/tests/test9main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test9 *t = new Test9( TQString::null, TQString::null );
TQStringList myPathsList2 = t->myPathsList2();
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
index a6c23c8fe..b62ee17af 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
TestDPointer *t = TestDPointer::self();
delete t;
}
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 4a3b778d9..86ec1f39d 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -196,8 +196,8 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--pid";
argv[i++] = pidtxt;
- const KInstance *instance = KGlobal::_instance;
- const KAboutData *about = instance ? instance->aboutData() : 0;
+ const TDEInstance *instance = KGlobal::_instance;
+ const TDEAboutData *about = instance ? instance->aboutData() : 0;
if (about) {
if (about->internalVersion()) {
argv[i++] = "--appversion";
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 90b2e9444..c4a903242 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -43,8 +43,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
- KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
+ TDEAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
+ TDEAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 3faaae7bf..032c14302 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -39,7 +39,7 @@ public:
s_self = this;
m_catalogueInitialized = false;
}
- KGenericFactoryBase( const KAboutData *data )
+ KGenericFactoryBase( const TDEAboutData *data )
: m_aboutData(data)
{
s_self = this;
@@ -55,18 +55,18 @@ public:
s_self = 0;
}
- static KInstance *instance();
+ static TDEInstance *instance();
protected:
- virtual KInstance *createInstance()
+ virtual TDEInstance *createInstance()
{
if ( m_aboutData )
- return new KInstance( m_aboutData );
+ return new TDEInstance( m_aboutData );
if ( m_instanceName.isEmpty() ) {
kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl;
return 0;
}
- return new KInstance( m_instanceName );
+ return new TDEInstance( m_instanceName );
}
virtual void setupTranslations( void )
@@ -86,16 +86,16 @@ protected:
private:
TQCString m_instanceName;
- const KAboutData *m_aboutData;
+ const TDEAboutData *m_aboutData;
bool m_catalogueInitialized;
- static KInstance *s_instance;
+ static TDEInstance *s_instance;
static KGenericFactoryBase<T> *s_self;
};
/* @internal */
template <class T>
-KInstance *KGenericFactoryBase<T>::s_instance = 0;
+TDEInstance *KGenericFactoryBase<T>::s_instance = 0;
/* @internal */
template <class T>
@@ -103,7 +103,7 @@ KGenericFactoryBase<T> *KGenericFactoryBase<T>::s_self = 0;
/* @internal */
template <class T>
-KInstance *KGenericFactoryBase<T>::instance()
+TDEInstance *KGenericFactoryBase<T>::instance()
{
if ( !s_instance && s_self )
s_instance = s_self->createInstance();
@@ -141,17 +141,17 @@ KInstance *KGenericFactoryBase<T>::instance()
* that the caller passed to KLibFactory's create method.
*
* 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
- * 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
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -180,7 +180,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase<Product>( data )
{}
@@ -224,17 +224,17 @@ protected:
* that the caller passed to KLibFactory's create method.
*
* 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
- * 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
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -275,7 +275,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{}
@@ -319,17 +319,17 @@ protected:
* that the caller passed to KLibFactory's create method.
*
* 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
- * 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
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -371,7 +371,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{}
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 6c88302ce..57135a769 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -44,7 +44,7 @@
#ifndef NDEBUG
#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" \
"objects, standard directories or translations.");
#else
@@ -95,7 +95,7 @@ TDEGlobalNetworkManager *KGlobal::networkManager()
return _instance->networkManager();
}
-KInstance *KGlobal::instance()
+TDEInstance *KGlobal::instance()
{
MYASSERT(_instance);
return _instance;
@@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets()
return _charsets;
}
-void KGlobal::setActiveInstance(KInstance *i)
+void KGlobal::setActiveInstance(TDEInstance *i)
{
_activeInstance = i;
if (i && _locale)
@@ -215,8 +215,8 @@ KGlobal::deleteStaticDeleters()
// The Variables
KStringDict *KGlobal::_stringDict = 0;
-KInstance *KGlobal::_instance = 0;
-KInstance *KGlobal::_activeInstance = 0;
+TDEInstance *KGlobal::_instance = 0;
+TDEInstance *KGlobal::_activeInstance = 0;
KLocale *KGlobal::_locale = 0;
KCharsets *KGlobal::_charsets = 0;
KStaticDeleterList *KGlobal::_staticDeleters = 0;
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 931ee6a98..5a775ae8c 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -19,7 +19,7 @@
#define _KGLOBAL_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 KConfig;
@@ -53,7 +53,7 @@ public:
* cases the application itself).
* @return the global instance
*/
- static KInstance *instance();
+ static TDEInstance *instance();
/**
* Returns the application standard dirs object.
@@ -167,7 +167,7 @@ public:
//private:
static KStringDict *_stringDict;
- static KInstance *_instance;
+ static TDEInstance *_instance;
static KLocale *_locale;
static KCharsets *_charsets;
static KStaticDeleterList *_staticDeleters;
@@ -178,10 +178,10 @@ public:
* Don't use this - it's mainly for KAboutDialog and KBugReport.
* @internal
*/
- static void setActiveInstance(KInstance *d);
- static KInstance *activeInstance() { return _activeInstance; }
+ static void setActiveInstance(TDEInstance *d);
+ static TDEInstance *activeInstance() { return _activeInstance; }
- static KInstance *_activeInstance;
+ static TDEInstance *_activeInstance;
};
/**
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index d3d8d5239..f413b75f3 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -1291,95 +1291,95 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
// Easy access functions
TQPixmap DesktopIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
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);
}
-TQIconSet DesktopIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet DesktopIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Desktop, force_size );
}
TQPixmap BarIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
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);
}
-TQIconSet BarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet BarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Toolbar, force_size );
}
TQPixmap SmallIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
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);
}
-TQIconSet SmallIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet SmallIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Small, force_size );
}
TQPixmap MainBarIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
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);
}
-TQIconSet MainBarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet MainBarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
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();
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);
}
-TQIconSet UserIconSet(const TQString& name, KInstance *instance)
+TQIconSet UserIconSet(const TQString& name, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::User );
}
-int IconSize(KIcon::Group group, KInstance *instance)
+int IconSize(KIcon::Group group, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->currentSize(group);
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 998d7a97f..2ad23ae38 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -87,10 +87,10 @@ public:
*
* Usually, you use the default iconloader, which can be accessed via
* 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.
* @see KGlobal::iconLoader()
- * @see KInstance::iconLoader()
+ * @see TDEInstance::iconLoader()
*/
KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0);
@@ -296,7 +296,7 @@ public:
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 _dirs the new standard directories. If 0, the directories
* from KGlobal will be taken.
@@ -345,7 +345,7 @@ public:
* destroyed before all those iconsets are destroyed.
*
* (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
* @see isDelayedIconSetLoadingEnabled()
@@ -447,40 +447,40 @@ public:
*/
TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a desktop icon.
*/
-TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a desktop icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a toolbar icon.
*/
TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a toolbar icon.
*/
-TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a toolbar icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \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,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a small icon.
*/
-TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a small icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \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,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* 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
* Load a main toolbar icon, and apply the effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics.
*/
TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* 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
* Load a user icon, and apply the effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* 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__
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 721864e5a..6d37c3dbc 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -38,26 +38,26 @@
#ifndef NDEBUG
#include <assert.h>
#include <tqptrdict.h>
- static TQPtrList<KInstance> *allInstances = 0;
+ static TQPtrList<TDEInstance> *allInstances = 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_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
#define DEBUG_ADD
#define DEBUG_REMOVE
#define DEBUG_CHECK_ALIVE
#endif
-class KInstancePrivate
+class TDEInstancePrivate
{
public:
- KInstancePrivate ()
+ TDEInstancePrivate ()
{
mimeSourceFactory = 0L;
}
- ~KInstancePrivate ()
+ ~TDEInstancePrivate ()
{
delete mimeSourceFactory;
}
@@ -68,13 +68,13 @@ public:
KSharedConfig::Ptr sharedConfig;
};
-KInstance::KInstance( const TQCString& name)
+TDEInstance::TDEInstance( const TQCString& name)
: _dirs (0L),
_config (0L),
_iconLoader (0L),
_hardwaredevices (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
Q_ASSERT(!name.isEmpty());
@@ -84,11 +84,11 @@ KInstance::KInstance( const TQCString& name)
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = true;
}
-KInstance::KInstance( const KAboutData * aboutData )
+TDEInstance::TDEInstance( const TDEAboutData * aboutData )
: _dirs (0L),
_config (0L),
_iconLoader (0L),
@@ -105,11 +105,11 @@ KInstance::KInstance( const KAboutData * aboutData )
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = false;
}
-KInstance::KInstance( KInstance* src )
+TDEInstance::TDEInstance( TDEInstance* src )
: _dirs ( src->_dirs ),
_config ( src->_config ),
_iconLoader ( src->_iconLoader ),
@@ -126,7 +126,7 @@ KInstance::KInstance( KInstance* src )
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = src->d->ownAboutdata;
d->sharedConfig = src->d->sharedConfig;
@@ -139,7 +139,7 @@ KInstance::KInstance( KInstance* src )
delete src;
}
-KInstance::~KInstance()
+TDEInstance::~TDEInstance()
{
DEBUG_CHECK_ALIVE
@@ -172,7 +172,7 @@ KInstance::~KInstance()
}
-KStandardDirs *KInstance::dirs() const
+KStandardDirs *TDEInstance::dirs() const
{
DEBUG_CHECK_ALIVE
if( _dirs == 0 ) {
@@ -190,12 +190,12 @@ KStandardDirs *KInstance::dirs() const
extern bool kde_kiosk_exception;
extern bool kde_kiosk_admin;
-void KInstance::setConfigReadOnly(bool ro)
+void TDEInstance::setConfigReadOnly(bool ro)
{
m_configReadOnly = ro;
}
-KConfig *KInstance::config() const
+KConfig *TDEInstance::config() const
{
DEBUG_CHECK_ALIVE
if( _config == 0 ) {
@@ -244,7 +244,7 @@ KConfig *KInstance::config() const
return _config;
}
-KSharedConfig *KInstance::sharedConfig() const
+KSharedConfig *TDEInstance::sharedConfig() const
{
DEBUG_CHECK_ALIVE
if (_config == 0)
@@ -253,13 +253,13 @@ KSharedConfig *KInstance::sharedConfig() const
return d->sharedConfig;
}
-void KInstance::setConfigName(const TQString &configName)
+void TDEInstance::setConfigName(const TQString &configName)
{
DEBUG_CHECK_ALIVE
d->configName = configName;
}
-KIconLoader *KInstance::iconLoader() const
+KIconLoader *TDEInstance::iconLoader() const
{
DEBUG_CHECK_ALIVE
if( _iconLoader == 0 ) {
@@ -270,7 +270,7 @@ KIconLoader *KInstance::iconLoader() const
return _iconLoader;
}
-TDEHardwareDevices *KInstance::hardwareDevices() const
+TDEHardwareDevices *TDEInstance::hardwareDevices() const
{
DEBUG_CHECK_ALIVE
if( _hardwaredevices == 0 ) {
@@ -280,7 +280,7 @@ TDEHardwareDevices *KInstance::hardwareDevices() const
return _hardwaredevices;
}
-TDEGlobalNetworkManager *KInstance::networkManager() const
+TDEGlobalNetworkManager *TDEInstance::networkManager() const
{
DEBUG_CHECK_ALIVE
if( _networkmanager == 0 ) {
@@ -290,37 +290,37 @@ TDEGlobalNetworkManager *KInstance::networkManager() const
return _networkmanager;
}
-void KInstance::newIconLoader() const
+void TDEInstance::newIconLoader() const
{
DEBUG_CHECK_ALIVE
KIconTheme::reconfigure();
_iconLoader->reconfigure( _name, dirs() );
}
-const KAboutData * KInstance::aboutData() const
+const TDEAboutData * TDEInstance::aboutData() const
{
DEBUG_CHECK_ALIVE
return _aboutData;
}
-TQCString KInstance::instanceName() const
+TQCString TDEInstance::instanceName() const
{
DEBUG_CHECK_ALIVE
return _name;
}
-KMimeSourceFactory* KInstance::mimeSourceFactory () const
+KMimeSourceFactory* TDEInstance::mimeSourceFactory () const
{
DEBUG_CHECK_ALIVE
if (!d->mimeSourceFactory)
{
d->mimeSourceFactory = new KMimeSourceFactory(_iconLoader);
- d->mimeSourceFactory->setInstance(const_cast<KInstance *>(this));
+ d->mimeSourceFactory->setInstance(const_cast<TDEInstance *>(this));
}
return d->mimeSourceFactory;
}
-void KInstance::virtual_hook( int, void* )
+void TDEInstance::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 2d94d10c1..36d463d8a 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -19,12 +19,12 @@
#define _KINSTANCE_H
class KStandardDirs;
-class KAboutData;
+class TDEAboutData;
class KConfig;
class KIconLoader;
class KCharsets;
class TQFont;
-class KInstancePrivate;
+class TDEInstancePrivate;
class KMimeSourceFactory;
class KSharedConfig;
class TDEHardwareDevices;
@@ -42,7 +42,7 @@ class TDEGlobalNetworkManager;
*
* @author Torben Weis
*/
-class TDECORE_EXPORT KInstance
+class TDECORE_EXPORT TDEInstance
{
friend class KStandardDirs;
@@ -51,19 +51,19 @@ class TDECORE_EXPORT KInstance
* Constructor.
* @param instanceName the name of the instance
*/
- KInstance( const TQCString& instanceName) ;
+ TDEInstance( const TQCString& instanceName) ;
/**
* Constructor.
- * When building a KInstance that is not your TDEApplication,
- * make sure that the KAboutData and the KInstance have the same life time.
+ * When building a TDEInstance that is not your TDEApplication,
+ * 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.
- * Don't build a KAboutData on the stack in this case !
- * Building a KAboutData on the stack is only ok for usage with
+ * Don't build a TDEAboutData on the stack in this case !
+ * Building a TDEAboutData on the stack is only ok for usage with
* 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
@@ -71,12 +71,12 @@ class TDECORE_EXPORT KInstance
* Initialize from src and delete it.
*/
- KInstance( KInstance* src );
+ TDEInstance( TDEInstance* src );
/**
* Destructor.
*/
- virtual ~KInstance();
+ virtual ~TDEInstance();
/**
* 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
* not been set yet
*/
- const KAboutData *aboutData() const;
+ const TDEAboutData *aboutData() const;
/**
* 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
*/
TQCString instanceName() const;
@@ -153,7 +153,7 @@ protected:
/**
* Copy Constructor is not allowed
*/
- KInstance( const KInstance& );
+ TDEInstance( const TDEInstance& );
/**
* Set name of default config file.
@@ -173,12 +173,12 @@ private:
mutable void *_placeholder;
TQCString _name;
- const KAboutData *_aboutData;
+ const TDEAboutData *_aboutData;
protected:
virtual void virtual_hook( int id, void* data );
private:
- KInstancePrivate *d;
+ TDEInstancePrivate *d;
bool m_configReadOnly;
};
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 2c75989d3..b7cad0fbe 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -346,7 +346,7 @@ static inline TQCString makeLibName( const char* name )
}
//static
-TQString KLibLoader::findLibrary( const char * name, const KInstance * instance )
+TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
{
TQCString libname = makeLibName( name );
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 10df2c445..9f080b88b 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -27,7 +27,7 @@
#include <stdlib.h> // For backwards compatibility
-class KInstance;
+class TDEInstance;
class TQTimer;
class KLibrary;
class KLibFactory;
@@ -271,9 +271,9 @@ public:
* @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,
* ".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:
KLibLoader( TQObject* parent = 0, const char* name = 0 );
@@ -306,12 +306,12 @@ private:
* NOTE: you probably want to use KGenericFactory<PluginClassName>
* 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:
* \code
- * s_global = new KInstance( "kspread" );
+ * s_global = new TDEInstance( "kspread" );
* \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
* to the library.
*
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index c4ae52b19..43c21ef2e 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -2006,7 +2006,7 @@ void KLocale::initInstance()
if (KGlobal::_locale)
return;
- KInstance *app = KGlobal::instance();
+ TDEInstance *app = KGlobal::instance();
if (app) {
KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index 37745d398..ed4265835 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -41,7 +41,7 @@ public:
}
KIconLoader *m_iconLoader;
- KInstance *m_instance;
+ TDEInstance *m_instance;
};
KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader)
@@ -96,7 +96,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
return result;
}
-void KMimeSourceFactory::setInstance(KInstance *instance)
+void KMimeSourceFactory::setInstance(TDEInstance *instance)
{
d->m_instance = instance;
}
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 2ee6728e6..7090b1733 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -26,7 +26,7 @@
#include <kglobal.h>
class KMimeSourceFactoryPrivate;
-class KInstance;
+class TDEInstance;
/**
* An extension to TQMimeSourceFactory that uses KIconLoader to
@@ -74,10 +74,10 @@ protected:
private:
/**
* @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;
- void setInstance(KInstance *);
+ friend class TDEInstance;
+ void setInstance(TDEInstance *);
KMimeSourceFactoryPrivate* d;
};
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index e4ae533ef..e84c8c44a 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -277,7 +277,7 @@ void KNotifyClient::beep(const TQString& reason)
}
-KInstance * KNotifyClient::instance() {
+TDEInstance * KNotifyClient::instance() {
return KNotifyClient::Instance::current();
}
@@ -322,11 +322,11 @@ static KStaticDeleter<KNotifyClient::InstanceStack > instancesDeleter;
struct KNotifyClient::InstancePrivate
{
- KInstance *instance;
+ TDEInstance *instance;
bool useSystemBell;
};
-KNotifyClient::Instance::Instance(KInstance *instance)
+KNotifyClient::Instance::Instance(TDEInstance *instance)
{
d = new InstancePrivate;
d->instance = instance;
@@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const
// static methods
// 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
// the stack might have gotten cleared in the destructor.
// We can't use QStack::setAutoDelete( true ), because no instance besides
@@ -370,7 +370,7 @@ KNotifyClient::Instance * KNotifyClient::Instance::currentInstance()
return instances()->currentInstance();
}
-KInstance *KNotifyClient::Instance::current()
+TDEInstance *KNotifyClient::Instance::current()
{
return currentInstance()->d->instance;
}
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 66ee95fab..ff96b020a 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -20,7 +20,7 @@
#include <tqstring.h>
#include "tdelibs_export.h"
-class KInstance;
+class TDEInstance;
#undef None // X11 headers...
/**
@@ -82,7 +82,7 @@ namespace KNotifyClient
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.
*
* Use like this:
@@ -91,20 +91,20 @@ namespace KNotifyClient
* KNotifyClient::event("MyEvent");
* \endcode
*
- * @short Enables KNotifyClient to use a different KInstance
+ * @short Enables KNotifyClient to use a different TDEInstance
*/
class TDECORE_EXPORT Instance
{
public:
/**
* 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
*/
- Instance(KInstance *instance);
+ Instance(TDEInstance *instance);
/**
* Destructs the KNotifyClient::Instance and resets KNotifyClient
- * to the previously used KInstance.
+ * to the previously used TDEInstance.
*/
~Instance();
/**
@@ -114,13 +114,13 @@ namespace KNotifyClient
*/
bool useSystemBell() const;
/**
- * Returns the currently active KInstance.
- * @return the active KInstance
+ * Returns the currently active TDEInstance.
+ * @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
*/
static Instance *currentInstance();
@@ -317,9 +317,9 @@ namespace KNotifyClient
/**
* Shortcut to KNotifyClient::Instance::current() :)
- * @returns the current KInstance.
+ * @returns the current TDEInstance.
*/
- TDECORE_EXPORT KInstance * instance();
+ TDECORE_EXPORT TDEInstance * instance();
}
#endif
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index 865bdc257..7c3fc67da 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -53,7 +53,7 @@ int KShortcutList::index( const KKeySequence& seq ) const
return -1;
}
-const KInstance* KShortcutList::instance() const
+const TDEInstance* KShortcutList::instance() const
{
return 0;
}
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 7a1890c1c..ce8f408a1 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -26,7 +26,7 @@
class TQVariant;
class KConfigBase;
-class KInstance;
+class TDEInstance;
class KKeySequence;
class KShortcut;
@@ -137,10 +137,10 @@ class TDECORE_EXPORT KShortcutList
virtual int index( const KKeySequence& keySeq ) const;
/**
- * The KInstance.
- * @return the KInstance of the list, can be 0 if not available
+ * The TDEInstance.
+ * @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.
enum Other { };
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index a7cdd3659..1f948653e 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1687,19 +1687,19 @@ TQString KStandardDirs::localxdgconfdir() const
// just to make code more readable without macros
TQString locate( const char *type,
- const TQString& filename, const KInstance* inst )
+ const TQString& filename, const TDEInstance* inst )
{
return inst->dirs()->findResource(type, filename);
}
TQString locateLocal( const char *type,
- const TQString& filename, const KInstance* inst )
+ const TQString& filename, const TDEInstance* inst )
{
return locateLocal(type, filename, true, inst);
}
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
// create the subdir first
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 560cca391..6c6e71ab2 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -96,7 +96,7 @@ class KStandardDirsPrivate;
* appends the name of the application.
* So while you had to ::locate("data", "appname/filename") so you can
* 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()).
* Please note though that you cannot use the "appdata"
* 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
*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
@@ -711,7 +711,7 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
* 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
@@ -722,7 +722,7 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
* 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() );
/*! @} */
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 97a8eec1b..708a9efb0 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -351,9 +351,9 @@ KUniqueApplication::~KUniqueApplication()
}
// 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)
{
KConfigGroupSaver saver( inst->config(), "KDE" );
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index eaa79dc57..ede89ef19 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -113,7 +113,7 @@ public:
* Typically this is used like:
* \code
* int main(int argc, char **argv) {
- * KAboutData about("myappname", "myAppName", .....);
+ * TDEAboutData about("myappname", "myAppName", .....);
* TDECmdLineArgs::init(argc, argv, &about);
* TDECmdLineArgs::addCmdLineOptions( myCmdOptions );
* KUniqueApplication::addCmdLineOptions();
@@ -204,7 +204,7 @@ private slots:
void newInstanceNoFork();
- static KInstance* initHack( bool configUnique );
+ static TDEInstance* initHack( bool configUnique );
private:
static bool s_nofork;
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index 02d9daa8d..6a60ce0a3 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -469,7 +469,7 @@ void KSocksSocketDevice::initSocks()
if (kapp == 0L)
return; // no TDEApplication, so don't initialise
- // this should, however, test for KInstance
+ // this should, however, test for TDEInstance
init = true;
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 58c6407d8..9fe328509 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
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::addCmdLineOptions( options ); // Add my own options.
- KInstance a("tde-config");
+ TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index 10a904e3f..61feeea7f 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
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::addCmdLineOptions( options ); // Add my own options.
- KInstance a("tde-config");
+ TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 6c5e135dc..53bb0f9f3 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -28,7 +28,7 @@
int
main(int argc, char *argv[])
{
- KAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 086cae304..62b14aa7a 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -32,8 +32,8 @@ int main(int argc, char **argv) {
TQDate date;
TQString calType, option;
- KAboutData aboutData( "kcalendartest", "KCalendarTest" ,
- "0.1", description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kcalendartest", "KCalendarTest" ,
+ "0.1", description, TDEAboutData::License_GPL,
"(c) 2002, Carlos Moro", 0, 0,
"cfmoro@correo.uniovi.es");
aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es");
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index ee49127ea..cc85b4554 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -26,7 +26,7 @@ public:
kdDebug(2 == 2) << "this is right " << perror << endl;
kdDebug() << "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(1202) << "This number has a value of " << 5 << endl;
// kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index ca5afe0eb..c5640dc09 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -410,7 +410,7 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
int main(int argc, char **argv)
{
- KAboutData about("socktest2", "SockTest", "1.0");
+ TDEAboutData about("socktest2", "SockTest", "1.0");
TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions();
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index c599c4570..48420acfc 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -57,7 +57,7 @@ bool check(TQString txt, TQString a, TQString b)
int
main(int argc, char *argv[])
{
- KAboutData about("socktest", "SockTest", "version");
+ TDEAboutData about("socktest", "SockTest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication::addCmdLineOptions();
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 650cc0512..729c88bb6 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
- KInstance instance("ktimezonestest");
+ TDEInstance instance("ktimezonestest");
if ((argc==2) && (strcmp(argv[1], "local")==0))
{
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index f696711a5..053956715 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -43,7 +43,7 @@ TestApp::newInstance( )
int
main(int argc, char *argv[])
{
- KAboutData about("kuniqueapptest", "kuniqueapptest", "version");
+ TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions();
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index ce30a9642..5cccaa3dc 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -27,7 +27,7 @@
int
main(int argc, char *argv[])
{
- KAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 56a3e943d..fd73923f2 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
{
tqDebug("argv[%d] = %s", i, argv[i]);
}
- KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
- "1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
+ TDEAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
+ "1.0", I18N_NOOP("testqtargs"), TDEAboutData::License_GPL,
"", "", "", "");
TDECmdLineArgs::init(argc, argv, &aboutData);