From 3ed7c09d22a5f310a97516f5bab6068e5688a813 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:12:07 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 kjsembed/customobject_imp.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kjsembed/customobject_imp.cpp')

diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 652f3f5b..6d06d774 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -114,7 +114,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
         }
     }
 
-    KActionCollection *collection = dynamic_cast<KActionCollection*>( qobj );
+    TDEActionCollection *collection = dynamic_cast<TDEActionCollection*>( qobj );
     if( collection ) proxy->setOwner(JSProxy::Native);
 #endif // QT_ONLY
 
@@ -163,7 +163,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 	}
 
 #ifndef QT_ONLY
-	KMainWindow *mw = dynamic_cast<KMainWindow *>( widget );
+	TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( widget );
 	if ( mw ) {
 	    obj = new CustomObjectImp( exec, MainWindowSetCentralWidget, proxy );
 	    object.put( exec, "setCentralWidget", KJS::Object(obj) );
@@ -646,9 +646,9 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c
 
 #ifndef QT_ONLY
 
-    KListView *klv = dynamic_cast<KListView *>( proxy->object() );
+    TDEListView *klv = dynamic_cast<TDEListView *>( proxy->object() );
     if ( klv ) {
-	KListViewItem *lvm = new KListViewItem(klv);
+	TDEListViewItem *lvm = new TDEListViewItem(klv);
 
 	for( int idx = 0; idx < args.size(); ++idx){
 		TQVariant arg = convertToVariant(exec, args[idx]);
@@ -731,7 +731,7 @@ void CustomObjectImp::mainWinSetCentralWidget( KJS::ExecState *exec,
     TQWidget *cw = cwproxy ? cwproxy->widget() : 0;
     if ( !cw )
 	return;
-    KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
+    TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( proxy->object() );
     if ( !mw )
 	return;
 
@@ -752,7 +752,7 @@ void CustomObjectImp::mainWinSetStandardToolBarMenuEnabled( KJS::ExecState *exec
     if ( args.size() != 1 )
 	return;
 
-    KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
+    TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( proxy->object() );
     if ( !mw )
 	return;
 
@@ -769,9 +769,9 @@ void CustomObjectImp::mainWinCreateGUI( KJS::ExecState *exec, KJS::Object &, con
 {
 #ifndef QT_ONLY
     kdDebug(80001) << "mainWinCreateGUI() called" << endl;
-    KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
+    TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( proxy->object() );
     if ( !mw ) {
-	kdWarning() << "mainWinCreateGUI() called on non-KMainWindow" << endl;
+	kdWarning() << "mainWinCreateGUI() called on non-TDEMainWindow" << endl;
 	return;
     }
 
@@ -787,9 +787,9 @@ KJS::Value CustomObjectImp::mainWinMenuBar( KJS::ExecState *exec, KJS::Object &,
 {
 #ifndef QT_ONLY
     kdDebug(80001) << "mainWinMenuBar() called" << endl;
-    KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
+    TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( proxy->object() );
     if ( !mw ) {
-	kdWarning() << "mainWinMenuBar() called on non-KMainWindow" << endl;
+	kdWarning() << "mainWinMenuBar() called on non-TDEMainWindow" << endl;
 	return KJS::Value();
     }
 
@@ -806,9 +806,9 @@ KJS::Value CustomObjectImp::mainWinStatusBar( KJS::ExecState *exec, KJS::Object
 {
 #ifndef QT_ONLY
     kdDebug(80001) << "mainWinStatusBar() called" << endl;
-    KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
+    TDEMainWindow *mw = dynamic_cast<TDEMainWindow *>( proxy->object() );
     if ( !mw ) {
-	kdWarning() << "mainWinStatusBar() called on non-KMainWindow" << endl;
+	kdWarning() << "mainWinStatusBar() called on non-TDEMainWindow" << endl;
 	return KJS::Value();
     }
 
@@ -830,7 +830,7 @@ KJS::Value CustomObjectImp::xmlguiClientActionCollection( KJS::ExecState *exec,
 	return KJS::Value();
     }
 
-    KActionCollection *ac = gc->actionCollection();
+    TDEActionCollection *ac = gc->actionCollection();
     if (!ac) {
 	kdDebug(80001) << "XMLGUIClient action collection is null" << endl;
 	return KJS::Null();
@@ -1141,7 +1141,7 @@ KJS::Value CustomObjectImp::ksystemtrayContextMenu( KJS::ExecState *exec, KJS::O
 	return KJS::Boolean(false);
     }
     kdDebug() << "Valid system tray?" << endl;
-    KPopupMenu *pop = st->contextMenu();
+    TDEPopupMenu *pop = st->contextMenu();
     return proxy->part()->factory()->createProxy( exec, pop, proxy );
 #endif // QT_ONLY
 return KJS::Null();
@@ -1154,7 +1154,7 @@ KJS::Value CustomObjectImp::ksystemtrayActionCollection( KJS::ExecState *exec, K
     if ( !st )
 	return KJS::Value();
 
-    KActionCollection *ac = st->actionCollection();
+    TDEActionCollection *ac = st->actionCollection();
     return proxy->part()->factory()->createProxy( exec, ac, proxy );
 #endif // QT_ONLY
 return KJS::Null();
-- 
cgit v1.2.1