diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:09:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:09:14 -0600 |
| commit | 13ea8e1fd74ed7130e03a7d2d6704f2c2fdb408c (patch) | |
| tree | b7f61a2afb0261a99941c1ab3b67d7e0ed421af5 /amarok/src/playlist.cpp | |
| parent | 45abbbb9b994b98f2df3cdae5083f6dd3648d364 (diff) | |
| download | amarok-13ea8e1fd74ed7130e03a7d2d6704f2c2fdb408c.tar.gz amarok-13ea8e1fd74ed7130e03a7d2d6704f2c2fdb408c.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/playlist.cpp')
| -rw-r--r-- | amarok/src/playlist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index 633d2606..db690e65 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -64,7 +64,7 @@ #include <tqvaluevector.h> //playNextTrack() #include <tqlayout.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcursor.h> //setOverrideCursor() #include <kdialogbase.h> @@ -75,7 +75,7 @@ #include <klineedit.h> //setCurrentTrack() #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krandomsequence.h> //random Mode #include <kstandarddirs.h> //TDEGlobal::dirs() #include <kstdaction.h> @@ -695,7 +695,7 @@ Playlist::restoreSession() } /* - The following two functions (saveLayout(), restoreLayout()), taken from klistview.cpp, are largely + The following two functions (saveLayout(), restoreLayout()), taken from tdelistview.cpp, are largely Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org> Copyright (C) 2000,2003 Charles Samuels <charles@kde.org> Copyright (C) 2000 Peter Putzer |