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/kateschema.cpp       |  6 +++---
 kate/part/kateviewinternal.cpp | 12 ++++++------
 kate/part/test_regression.cpp  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kate/part')

diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index a5e295888..1978c867c 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
 //BEGIN KateSchemaManager
 TQString KateSchemaManager::normalSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
 }
 
 TQString KateSchemaManager::printingSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
 }
 
 KateSchemaManager::KateSchemaManager ()
@@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   hbHl = new TQHBox( this );
   layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
-  lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl );
+  lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( defaultSchemaCombo );
 
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 );
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4292c3ad4..da3d96da9 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    KApplication a;
+    TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle("windows");
     KSimpleConfig cfg( "testkateregressionrc" );
-- 
cgit v1.2.1