summaryrefslogtreecommitdiffstats
path: root/kword/KWCanvas.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:10:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:10:41 -0600
commit7422cac1a18dca897d3830a267eb91683d05a95b (patch)
tree2ba309f49b47a5fbb0b226801b224c2532b7ab1a /kword/KWCanvas.cpp
parent3fe437def8063926892bddf2dcc733861308836d (diff)
downloadkoffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz
koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWCanvas.cpp')
-rw-r--r--kword/KWCanvas.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 7dc7b96a2..3bf00e2bd 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -55,7 +55,7 @@
#include <kcursor.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <kurl.h>
#include <kurldrag.h>
#include <kio/netaccess.h>
@@ -1516,7 +1516,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e )
} else if ( KURLDrag::canDecode( e ) ) {
// TODO ask (with a popupmenu) between inserting a link and inserting the contents
- // TODO fix khtml to export images when dragging an image+link (as it does when using "Copy")
+ // TODO fix tdehtml to export images when dragging an image+link (as it does when using "Copy")
KURL::List lst;
KURLDrag::decode( e, lst );
@@ -1590,7 +1590,7 @@ void KWCanvas::doAutoScroll()
return;
}
- // This code comes from khtml
+ // This code comes from tdehtml
TQPoint pos( mapFromGlobal( TQCursor::pos() ) );
pos = TQPoint(pos.x() - viewport()->x(), pos.y() - viewport()->y());