diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kontact/src/aboutdialog.cpp | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src/aboutdialog.cpp')
-rw-r--r-- | kontact/src/aboutdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index ae0d09658..db40083a6 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -46,7 +46,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) mCore( core ) { addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ), - KGlobal::instance()->aboutData() ); + TDEGlobal::instance()->aboutData() ); TQValueList<Plugin*> plugins = mCore->pluginList(); TQValueList<Plugin*>::ConstIterator end = plugins.end(); @@ -54,7 +54,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) for ( ; it != end; ++it ) addAboutPlugin( *it ); - addLicenseText( KGlobal::instance()->aboutData() ); + addLicenseText( TDEGlobal::instance()->aboutData() ); } void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) @@ -65,7 +65,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) void AboutDialog::addAboutData( const TQString &title, const TQString &icon, const TDEAboutData *about ) { - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); @@ -160,7 +160,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about ) if ( !about || about->license().isEmpty() ) return; - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); TQString title = i18n( "%1 License" ).arg( about->programName() ); |