summaryrefslogtreecommitdiffstats
path: root/amarok/src
diff options
context:
space:
mode:
Diffstat (limited to 'amarok/src')
-rw-r--r--amarok/src/Options2.ui.h2
-rw-r--r--amarok/src/amarok.h2
-rw-r--r--amarok/src/amarokcore/crashhandler.cpp2
-rw-r--r--amarok/src/deletedialog.cpp2
-rw-r--r--amarok/src/filebrowser.cpp2
-rw-r--r--amarok/src/filebrowser.h2
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.cpp2
-rw-r--r--amarok/src/mediadevice/daap/daapclient.h2
-rw-r--r--amarok/src/osd.cpp2
-rw-r--r--amarok/src/playlistbrowseritem.cpp2
-rw-r--r--amarok/src/playlistitem.cpp2
-rw-r--r--amarok/src/playlistwindow.cpp2
-rw-r--r--amarok/src/scripts/databasescripts/databaseScripts.rb2
-rw-r--r--amarok/src/statistics.cpp2
14 files changed, 14 insertions, 14 deletions
diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index e86b6838..5aedc187 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -123,7 +123,7 @@ void Options2::retrievePushButton_clicked()
connect( d, TQT_SIGNAL( finished() ), d, TQT_SLOT( delayedDestruct() ) );
connect( d, TQT_SIGNAL( finished() ), this, TQT_SLOT( updateStyleComboBox() ) );
- // Due to kdelibs idiocy, KNS::DownloadDialog is /always/ non-modal. So we have to
+ // Due to tdelibs idiocy, KNS::DownloadDialog is /always/ non-modal. So we have to
// ensure that closing the settings dialog before the DownloadDialog doesn't crash.
TQTimer::singleShot( 0, d, TQT_SLOT( exec() ) );
}
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index a349e12c..94d41449 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -9,7 +9,7 @@
#include <kurl.h> // recursiveUrlExpand
#include <kprocio.h> //Amarok::ProcIO
#include <kio/netaccess.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "amarok_export.h"
diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index 72bcb699..79dbf00e 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -14,7 +14,7 @@
#include <kapplication.h> //invokeMailer()
#include <kdebug.h> //kdBacktrace()
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <klocale.h>
#include <ktempfile.h>
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index 970526c5..b57ba895 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -14,7 +14,7 @@
***************************************************************************/
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kdialogbase.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 31ebb7d3..df79b622 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -1,7 +1,7 @@
/* This file is part of the KDE project
Copyright (C) 2004 Mark Kretschmann <[email protected]>
Copyright (C) 2003 Alexander Dymo <[email protected]>
- Copyright (C) 2003 Roberto Raggi <[email protected]>
+ Copyright (C) 2003 Roberto Raggi <[email protected]>
Copyright (C) 2001 Christoph Cullmann <[email protected]>
Copyright (C) 2001 Joseph Wenninger <[email protected]>
Copyright (C) 2001 Anders Lund <[email protected]>
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index 94eb8083..bdba92dd 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -1,7 +1,7 @@
/* This file is part of the KDE project
Copyright (C) 2004 Max Howell
Copyright (C) 2004 Mark Kretschmann <[email protected]>
- Copyright (C) 2003 Roberto Raggi <[email protected]>
+ Copyright (C) 2003 Roberto Raggi <[email protected]>
Copyright (C) 2001 Christoph Cullmann <[email protected]>
Copyright (C) 2001 Joseph Wenninger <[email protected]>
Copyright (C) 2001 Anders Lund <[email protected]>
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp
index f227c3ff..0d667245 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp
@@ -21,7 +21,7 @@
#include "magnatunedatabasehandler.h"
#include "magnatunelistview.h"
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <klocale.h>
#include <tqcolor.h>
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index 4b111a76..e21fa8be 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -18,7 +18,7 @@
#include "mediabrowser.h"
#include "threadmanager.h"
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kdialogbase.h>
#include <ktempfile.h>
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 88fdbd97..6e5bd7f7 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -522,7 +522,7 @@ OSDWidget::paintMe()
// Convert the ARGB pixmap to an ARGB image
// NOTE 1: TQPixmap::convertToImage() always converts an ARGB pixmap into an RGB image
- // NOTE 2: This should eventually make its way into kdelibs or Qt itself,
+ // NOTE 2: This should eventually make its way into tdelibs or Qt itself,
// as it would also be useful in applications other than Amarok
int w = blendedImage.width();
int h = blendedImage.height();
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index bba616fb..b0370ab8 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -38,7 +38,7 @@
#include <tqregexp.h>
#include <kapplication.h> //Used for Shoutcast random name generation
-#include <kdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
+#include <tdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
#include <kiconloader.h> //smallIcon
#include <kio/jobclasses.h> //podcast retrieval
#include <kio/job.h> //podcast retrieval
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index def2f6e6..a494dc1d 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -38,7 +38,7 @@
#include <tqpixmap.h>
#include <tqrect.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kfilemetainfo.h>
#include <kglobal.h>
#include <kiconeffect.h>
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 8f3af869..c62053f6 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -649,7 +649,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e )
// intercept F2 for inline tag renaming
// NOTE: tab will move to the next tag
// NOTE: if item is still null don't select first item in playlist, user wouldn't want that. It's silly.
- // TODO: berkus has solved the "inability to cancel" issue with KListView, but it's not in kdelibs yet..
+ // TODO: berkus has solved the "inability to cancel" issue with KListView, but it's not in tdelibs yet..
// item may still be null, but this is safe
// NOTE: column 0 cannot be edited currently, hence we pick column 1
diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index d2b5d162..18db654f 100644
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@@ -15,7 +15,7 @@
begin
require 'Korundum'
rescue LoadError
- error = 'Korundum (KDE bindings for ruby) from kdebindings v3.4 is required for this script.'
+ error = 'Korundum (KDE bindings for ruby) from tdebindings v3.4 is required for this script.'
system("dcop", "amarok", "playlist", "popupMessage", "DatabaseScripts: #{error}")
exit
end
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index 7a7f1e82..979ee203 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -21,7 +21,7 @@
#include "tagdialog.h" //showContextMenu()
#include <kapplication.h>
-#include <kdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
+#include <tdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
#include <kiconloader.h>
#include <klocale.h>
#include <kmultipledrag.h> //startDrag()