diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:21 -0600 |
commit | b0a967eb693adc458fdf7d070379b8c1ec3e9415 (patch) | |
tree | 69fa22da8d08920ca8b1049861711e77a55512b9 /src/icnview.cpp | |
parent | a19dd7fc8e64bebb22b87a2d3a9a2601b662b35d (diff) | |
download | ktechlab-b0a967eb693adc458fdf7d070379b8c1ec3e9415.tar.gz ktechlab-b0a967eb693adc458fdf7d070379b8c1ec3e9415.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/icnview.cpp')
-rw-r--r-- | src/icnview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/icnview.cpp b/src/icnview.cpp index d7a026c..ee27bf5 100644 --- a/src/icnview.cpp +++ b/src/icnview.cpp @@ -46,8 +46,8 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v KPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu(); m->insertTitle( i18n("Connection Routing Mode") ); - m->insertItem( /*KGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); - m->insertItem( /*KGlobal::iconLoader()->loadIcon( "routing_mode_manual", KIcon::Small ),*/ i18n("Manual"), 1 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_manual", KIcon::Small ),*/ i18n("Manual"), 1 ); m->setCheckable(true); m->setItemChecked( manualRouting ? 1 : 0, true ); |