summaryrefslogtreecommitdiffstats
path: root/kontact/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:18:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:18:14 -0600
commitb97ee238f88e9578da228388210cd8cab5360778 (patch)
tree8bf3ab88929af70826ebe3b84434c3403dc71c7d /kontact/src
parent656055dae6f13ee65d66fabf9041b288d81710af (diff)
downloadtdepim-b97ee238f88e9578da228388210cd8cab5360778.tar.gz
tdepim-b97ee238f88e9578da228388210cd8cab5360778.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'kontact/src')
-rw-r--r--kontact/src/aboutdialog.cpp4
-rw-r--r--kontact/src/iconsidepane.cpp6
-rw-r--r--kontact/src/mainwindow.cpp14
3 files changed, 12 insertions, 12 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index db40083a6..faa2a2447 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -66,7 +66,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
const TDEAboutData *about )
{
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon,
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQFrame *topFrame = addPage( title, TQString(), pixmap );
@@ -161,7 +161,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about )
return;
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature",
- KIcon::Desktop, 48 );
+ TDEIcon::Desktop, 48 );
TQString title = i18n( "%1 License" ).arg( about->programName() );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 6c490880c..581a91b96 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -112,10 +112,10 @@ void EntryItem::reloadPixmap()
int size = (int)navigator()->viewMode();
if ( size != 0 )
mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(),
- KIcon::Desktop, size,
+ TDEIcon::Desktop, size,
mPlugin->disabled() ?
- KIcon::DisabledState
- : KIcon::DefaultState);
+ TDEIcon::DisabledState
+ : TDEIcon::DefaultState);
else
mPixmap = TQPixmap();
}
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 8c82fa5f9..eff2d9089 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -433,13 +433,13 @@ void MainWindow::slotLoadProfile( const TQString& id )
cfg->sync();
Prefs::self()->readConfig();
applyMainWindowSettings( cfg );
- KIconTheme::reconfigure();
+ TDEIconTheme::reconfigure();
const WId wid = winId();
KIPC::sendMessage( KIPC::PaletteChanged, wid );
KIPC::sendMessage( KIPC::FontChanged, wid );
KIPC::sendMessage( KIPC::StyleChanged, wid );
KIPC::sendMessage( KIPC::SettingsChanged, wid );
- for ( int i = 0; i < KIcon::LastGroup; ++i )
+ for ( int i = 0; i < TDEIcon::LastGroup; ++i )
KIPC::sendMessage( KIPC::IconChanged, wid, i );
loadSettings();
@@ -1160,12 +1160,12 @@ void MainWindow::slotShowStatusMsg( const TQString &msg )
TQString MainWindow::introductionString()
{
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize( KIcon::Desktop );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ int iconSize = iconloader->currentSize( TDEIcon::Desktop );
- TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
- TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
- TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop );
+ TQString handbook_icon_path = iconloader->iconPath( "contents2", TDEIcon::Desktop );
+ TQString html_icon_path = iconloader->iconPath( "html", TDEIcon::Desktop );
+ TQString wizard_icon_path = iconloader->iconPath( "wizard", TDEIcon::Desktop );
TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
"<p>%1</p>"