summaryrefslogtreecommitdiffstats
path: root/tdeui/kedittoolbar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdeui/kedittoolbar.cpp
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kedittoolbar.cpp')
-rw-r--r--tdeui/kedittoolbar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 563b007c0..63c4bc2b2 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -40,7 +40,7 @@
#include <kmessagebox.h>
#include <kxmlguifactory.h>
#include <kseparator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klistview.h>
#include <kdebug.h>
#include <kpushbutton.h>
@@ -1373,8 +1373,8 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem)
void KEditToolbarWidget::slotChangeIcon()
{
- // We can't use KIconChooser here, since it's in libkio
- // ##### KDE4: reconsider this, e.g. move KEditToolbar to libkio
+ // We can't use KIconChooser here, since it's in libtdeio
+ // ##### KDE4: reconsider this, e.g. move KEditToolbar to libtdeio
//if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing...
//otherwise m_kdialogProcess will be overwritten and set to zero in slotProcessExited()...crash!