From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:21:02 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kate/part/kateviewinternal.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kate/part/kateviewinternal.cpp')

diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index d93f81a86..7f916c6e9 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force
 
   if (m_cursorTimer.isActive ())
   {
-    if ( KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start( KApplication::cursorFlashTime() / 2 );
+    if ( TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 );
     m_view->renderer()->setDrawCaret(true);
   }
 
@@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout ()
 
 void KateViewInternal::focusInEvent (TQFocusEvent *)
 {
-  if (KApplication::cursorFlashTime() > 0)
-    m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+  if (TDEApplication::cursorFlashTime() > 0)
+    m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
   if (m_textHintEnabled)
     m_textHintTimer.start( m_textHintTimeout );
@@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e )
   if ( e->text().length() > 0 ) {
     m_doc->insertText( cursor.line(), cursor.col(), e->text() );
 
-    if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+    if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
     updateView( true );
     updateCursor( cursor, true );
-- 
cgit v1.2.1


From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kate/part/kateviewinternal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/kateviewinternal.cpp')

diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 7f916c6e9..bea6ba3bc 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
       TQPoint p( e->pos() - dragInfo.start );
 
       // we've left the drag square, we can start a real drag operation now
-      if( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
+      if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
         doDrag();
 
       return;
-- 
cgit v1.2.1


From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:17:18 -0600
Subject: Rename common header files for consistency with class renaming

---
 kate/part/kateviewinternal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/kateviewinternal.cpp')

diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index bea6ba3bc..a687c5523 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -37,7 +37,7 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
 
-- 
cgit v1.2.1


From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kate/part/kateviewinternal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/kateviewinternal.cpp')

diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index a687c5523..c2b0ca4db 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -38,7 +38,7 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 
 #include <tqstyle.h>
-- 
cgit v1.2.1