Rename KApplication to TDEApplication to avoid conflicts with KDE4

9 files changed, 19 insertions, 19 deletions

diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index 624a67fd..e6b7691a 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -193,7 +193,7 @@ void CoverInfo::popup() const
 {
     TQPixmap image = pixmap(FullSize);
     TQPoint mouse  = TQCursor::pos();
-    TQRect desktop = KApplication::desktop()->screenGeometry(mouse);
+    TQRect desktop = TDEApplication::desktop()->screenGeometry(mouse);
     
     int x = mouse.x();
     int y = mouse.y();
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 31570dbd..4c83fbd6 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -864,7 +864,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
     if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != TQDialog::Accepted)
         return;
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     for(TQMap<TQString, TQString>::ConstIterator it = map.begin();
         it != map.end(); ++it)
     {
@@ -879,7 +879,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
 
         processEvents();
     }
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 
     if(!errorFiles.isEmpty())
         KMessageBox::errorList(0, i18n("The following rename operations failed:\n"), errorFiles);
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 09a77546..95d38e6d 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -244,7 +244,7 @@ class KTRMEventHandler : public TQObject
 public:
     static void send(int fileId, KTRMEvent::Status status)
     {
-        KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
+        TDEApplication::postEvent(instance(), new KTRMEvent(fileId, status));
     }
 
 protected:
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 568a8d59..78b09d42 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -356,7 +356,7 @@ void HistoryItem::slotAddPlaying()
     PlayerManager *manager = PlayerManager::instance();
 
     if(manager->playing() && manager->playingFile() == m_file) {
-        m_history.prepend(Item(KApplication::randomString(20),
+        m_history.prepend(Item(TDEApplication::randomString(20),
                                m_file, Playlist::playingItem()->playlist()));
     }
 
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 047bba00..1a83797b 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -750,7 +750,7 @@ void Playlist::slotRefresh()
     if(l.isEmpty())
 	l = visibleItems();
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     for(PlaylistItemList::Iterator it = l.begin(); it != l.end(); ++it) {
 	(*it)->refreshFromDisk();
 
@@ -763,7 +763,7 @@ void Playlist::slotRefresh()
 
 	processEvents();
     }
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotRenameFile()
@@ -877,7 +877,7 @@ void Playlist::slotCoverChanged(int coverId)
 
 void Playlist::slotGuessTagInfo(TagGuesser::Type type)
 {
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
     PlaylistItemList items = selectedItems();
     setDynamicListsFrozen(true);
 
@@ -898,7 +898,7 @@ void Playlist::slotGuessTagInfo(TagGuesser::Type type)
 
     dataChanged();
     setDynamicListsFrozen(false);
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotReload()
@@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
 	    TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag(
 					      TQListViewItemIterator::Visible));
 	    if(selected.current() == visible.current())
-		KApplication::postEvent(parent(), new FocusUpEvent);
+		TDEApplication::postEvent(parent(), new FocusUpEvent);
 	}
 	
     }
@@ -1353,7 +1353,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
     if(!after)
 	after = static_cast<PlaylistItem *>(lastItem());
 
-    KApplication::setOverrideCursor(TQt::waitCursor);
+    TDEApplication::setOverrideCursor(TQt::waitCursor);
 
     m_blockDataChanged = true;
 
@@ -1370,7 +1370,7 @@ void Playlist::addFiles(const TQStringList &files, PlaylistItem *after)
     slotWeightDirty();
     dataChanged();
 
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id)
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index f8a258ae..cabdd462 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -618,7 +618,7 @@ void TagEditor::save(const PlaylistItemList &list)
 {
     if(!list.isEmpty() && m_dataChanged) {
 	
-	KApplication::setOverrideCursor(TQt::waitCursor);
+	TDEApplication::setOverrideCursor(TQt::waitCursor);
 	m_dataChanged = false;
 	m_performingSave = true;
 
@@ -685,7 +685,7 @@ void TagEditor::save(const PlaylistItemList &list)
 	TagTransactionManager::instance()->commit();
 	CollectionList::instance()->dataChanged();
 	m_performingSave = false;
-	KApplication::restoreOverrideCursor();
+	TDEApplication::restoreOverrideCursor();
     }
 }
 
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index 7caea019..5d85dcc1 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -61,7 +61,7 @@ void TagGuesserConfigDlg::accept()
 {
     if(m_child->lvSchemes->renameLineEdit()) {
         TQKeyEvent returnKeyPress(TQEvent::KeyPress, Key_Return, 0, 0);
-        KApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
+        TDEApplication::sendEvent(m_child->lvSchemes->renameLineEdit(), &returnKeyPress);
     }
 
     TQStringList schemes;
diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp
index 7f358343..7b92ee49 100644
--- a/juk/tagguessertest.cpp
+++ b/juk/tagguessertest.cpp
@@ -66,7 +66,7 @@ int main( int argc, char **argv )
 {
     KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
     check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",
             "Block Rockin' Beats", "Chemical Brothers", "01", "Live" );
     check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats (Live).mp3",
diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp
index d53a3a17..b60a68d0 100644
--- a/juk/tracksequenceiterator.cpp
+++ b/juk/tracksequenceiterator.cpp
@@ -97,7 +97,7 @@ void DefaultSequenceIterator::advance()
 
         if(albumRandom) {
             if(m_albumSearch.isNull() || m_albumSearch.matchedItems().isEmpty()) {
-                item = m_randomItems[KApplication::random() % m_randomItems.count()];
+                item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
                 initAlbumSearch(item);
             }
 
@@ -132,7 +132,7 @@ void DefaultSequenceIterator::advance()
                 kdError(65432) << "Unable to perform album random play on " << *item << endl;
         }
         else
-            item = m_randomItems[KApplication::random() % m_randomItems.count()];
+            item = m_randomItems[TDEApplication::random() % m_randomItems.count()];
 
         setCurrent(item);
         m_randomItems.remove(item);
@@ -173,7 +173,7 @@ void DefaultSequenceIterator::prepareToPlay(Playlist *playlist)
 
         PlaylistItem *newItem = 0;
         if(!items.isEmpty())
-            newItem = items[KApplication::random() % items.count()];
+            newItem = items[TDEApplication::random() % items.count()];
 
         setCurrent(newItem);
         refillRandomList();