diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kio/misc | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kio/misc')
| -rw-r--r-- | kio/misc/kfile/fileprops.cpp | 4 | ||||
| -rw-r--r-- | kio/misc/kpac/proxyscout.cpp | 2 | ||||
| -rw-r--r-- | kio/misc/kpac/proxyscout.h | 4 | ||||
| -rw-r--r-- | kio/misc/ksendbugmail/main.cpp | 4 | ||||
| -rw-r--r-- | kio/misc/uiserver.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index cba281cc7..bbd34a2a4 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, int main( int argc, char **argv ) { - KAboutData about( + TDEAboutData about( "kfile", I18N_NOOP( "kfile" ), KFILEVERSION, I18N_NOOP("A commandline tool to read and modify metadata of files." ), - KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer", + TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer", 0 /*text*/, "http://devel-home.kde.org/~pfeiffer/", "pfeiffer@kde.org" ); diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 5d8b008bf..b651e2313 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -41,7 +41,7 @@ namespace KPAC ProxyScout::ProxyScout( const TQCString& name ) : KDEDModule( name ), - m_instance( new KInstance( "proxyscout" ) ), + m_instance( new TDEInstance( "proxyscout" ) ), m_downloader( 0 ), m_script( 0 ), m_suspendTime( 0 ) diff --git a/kio/misc/kpac/proxyscout.h b/kio/misc/kpac/proxyscout.h index c18e5173d..78c8fc237 100644 --- a/kio/misc/kpac/proxyscout.h +++ b/kio/misc/kpac/proxyscout.h @@ -29,7 +29,7 @@ #include <time.h> class DCOPClientTransaction; -class KInstance; +class TDEInstance; namespace KPAC { @@ -56,7 +56,7 @@ namespace KPAC bool startDownload(); TQString handleRequest( const KURL& url ); - KInstance* m_instance; + TDEInstance* m_instance; Downloader* m_downloader; Script* m_script; diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index 527d8545f..be1eb8b96 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -59,9 +59,9 @@ void BugMailer::slotSend() { int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0", + TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0", I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"), - KAboutData::License_GPL, "(c) 2000 Stephan Kulow"); + TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow"); d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org"); TDECmdLineArgs::init(argc, argv, &d); diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 919676fc4..3e890c553 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -1380,9 +1380,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KLocale::setMainCatalogue("tdelibs"); // GS 5/2001 - I changed the name to "TDE" to make it look better // in the titles of dialogs which are displayed. - KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"), + TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"), "0.8", I18N_NOOP("TDE Progress Information UI Server"), - KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss"); + TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss"); // Who's the maintainer ? :) aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org"); aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk"); |