Rename KApplication to TDEApplication to avoid conflicts with KDE4

7 files changed, 20 insertions, 20 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 5cbd21b..216e05c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 01f64cd..8e254e8 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -67,7 +67,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
     break;
   }
  
-  TQPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
  
   if (ret.isNull())
     return TQMessageBox::standardIcon(icon);
diff --git a/src/k3b.h b/src/k3b.h
index f5690c0..3bdc3d9 100644
--- a/src/k3b.h
+++ b/src/k3b.h
@@ -165,7 +165,7 @@ class K3bMainWindow : public KParts::DockMainWindow
   virtual bool queryExit();
 
   /** saves the window properties for each open window during session end to the session config file, including saving the currently
-   * opened file by a temporary filename provided by KApplication.
+   * opened file by a temporary filename provided by TDEApplication.
    * @see KTMainWindow#saveProperties
    */
   virtual void saveProperties(KConfig *_cfg);
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 8e54cc4..a1f52d5 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -419,7 +419,7 @@ K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name )
 	   this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem* , const TQPoint& )) );
 
   // we always simulate the single click
-  slotSettingsChangedK3b(KApplication::SETTINGS_MOUSE);
+  slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE);
   if( kapp )
     connect( kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChangedK3b(int)) );
 
@@ -692,7 +692,7 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category)
 {
   // we force single click like konqueror does. This really should be done in KFileTreeView
 
-  if( category == KApplication::SETTINGS_MOUSE ) {
+  if( category == TDEApplication::SETTINGS_MOUSE ) {
     disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)),
 	       this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int)));
 
diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp
index 52195d0..270f7c0 100644
--- a/src/k3bmediacache.cpp
+++ b/src/k3bmediacache.cpp
@@ -184,7 +184,7 @@ int K3bMediaCache::blockDevice( K3bDevice::Device* dev )
       e->mutex.lock();
 
       // create (hopefully) unique id
-      e->blockedId = KApplication::random();
+      e->blockedId = TDEApplication::random();
 
       // let the info go
       e->mutex.unlock();
diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp
index a7ab856..ad217d4 100644
--- a/src/k3bpassivepopup.cpp
+++ b/src/k3bpassivepopup.cpp
@@ -72,7 +72,7 @@ static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt )
     break;
   }
 
-  TQPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
   
   if( ret.isNull() )
     return TQMessageBox::standardIcon( qIcon );
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 34af9c9..d3f1e72 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -193,7 +193,7 @@ protected:
 	  preW = h*16/9;
 
 	p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h );
-	TQPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true );
+	TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true );
 	p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon );
       }
       else {