diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:34 -0600 |
commit | 7805c1823f06453a70b837d3f0a41883c72ece9d (patch) | |
tree | 808f4d85be008d090d0ddf0757bb395927fc2b5e /kaffeine/src/input | |
parent | 242b9c326bdb62caf42fd39974198eb98bbb4d05 (diff) | |
download | kaffeine-7805c1823f06453a70b837d3f0a41883c72ece9d.tar.gz kaffeine-7805c1823f06453a70b837d3f0a41883c72ece9d.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kaffeine/src/input')
-rw-r--r-- | kaffeine/src/input/audiobrowser/playlist.cpp | 4 | ||||
-rw-r--r-- | kaffeine/src/input/audiobrowser/playlist.h | 2 | ||||
-rw-r--r-- | kaffeine/src/input/audiobrowser/playlistitem.h | 2 | ||||
-rw-r--r-- | kaffeine/src/input/audiobrowser/urllistview.cpp | 2 | ||||
-rw-r--r-- | kaffeine/src/input/audiobrowser/urllistview.h | 2 | ||||
-rw-r--r-- | kaffeine/src/input/disc/disc.cpp | 14 | ||||
-rw-r--r-- | kaffeine/src/input/disc/disc.h | 4 | ||||
-rw-r--r-- | kaffeine/src/input/dvb/dvbpanel.cpp | 2 | ||||
-rw-r--r-- | kaffeine/src/input/dvb/dvbpanel.h | 2 | ||||
-rw-r--r-- | kaffeine/src/input/dvb/kevents.h | 2 | ||||
-rw-r--r-- | kaffeine/src/input/dvb/krecord.h | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index 5cbc21a..203113d 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -38,9 +38,9 @@ #include <kpushbutton.h> #include <kdebug.h> #include <kurl.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <dcopref.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kcolordialog.h> #include <kurlcombobox.h> #include <kurlcompletion.h> diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h index 5d9d1b0..63aab68 100644 --- a/kaffeine/src/input/audiobrowser/playlist.h +++ b/kaffeine/src/input/audiobrowser/playlist.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <kdiroperator.h> #include <tdefileiconview.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqwidget.h> diff --git a/kaffeine/src/input/audiobrowser/playlistitem.h b/kaffeine/src/input/audiobrowser/playlistitem.h index 712ce85..38127bd 100644 --- a/kaffeine/src/input/audiobrowser/playlistitem.h +++ b/kaffeine/src/input/audiobrowser/playlistitem.h @@ -22,7 +22,7 @@ #ifndef PLAYLISTITEM_H #define PLAYLISTITEM_H -#include <klistview.h> +#include <tdelistview.h> #define MIME_COLUMN 0 #define TITLE_COLUMN 1 diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp index 250e55f..e95e6bb 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.cpp +++ b/kaffeine/src/input/audiobrowser/urllistview.cpp @@ -26,7 +26,7 @@ #include <kurl.h> #include <kglobalsettings.h> #include <tdefiledialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqfontmetrics.h> #include <tqdragobject.h> diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h index 9712d55..5d43c73 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.h +++ b/kaffeine/src/input/audiobrowser/urllistview.h @@ -25,7 +25,7 @@ #include <config.h> #endif -#include <klistview.h> +#include <tdelistview.h> class TDEPopupMenu; class TQWidget; diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index 15d7681..63a07e0 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdebug.h> #include <kinputdialog.h> @@ -301,19 +301,19 @@ void Disc::setEncoding( bool b ) void Disc::encode() { TQListViewItem *it; - TQStringList tracklist; + TQStringList tractdelist; it = list->firstChild(); if ( !it ) return; - tracklist.append( artistLab->text() ); - tracklist.append( albumLab->text() ); + tractdelist.append( artistLab->text() ); + tractdelist.append( albumLab->text() ); while ( it!=0 ) { if ( it->isSelected() ) - tracklist.append( it->text(0)+"-"+it->text(1) ); + tractdelist.append( it->text(0)+"-"+it->text(1) ); it = it->nextSibling(); } - if ( (int)tracklist.count()<3 ) { + if ( (int)tractdelist.count()<3 ) { KMessageBox::information( mainWidget, i18n("You must select the tracks to rip."), i18n("Warning") ); return; } @@ -329,7 +329,7 @@ void Disc::encode() return; } - if ( para->encode( tracklist, mainWidget ) ) + if ( para->encode( tractdelist, mainWidget ) ) encodeTimer.start( 1000 ); else { delete para; diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h index cf4bfe6..eb271f5 100644 --- a/kaffeine/src/input/disc/disc.h +++ b/kaffeine/src/input/disc/disc.h @@ -21,10 +21,10 @@ #ifndef DISC_H #define DISC_H -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqframe.h> #include <tqvbox.h> diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index e2c0d9d..b5ff0a8 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/kaffeine/src/input/dvb/dvbpanel.cpp @@ -38,7 +38,7 @@ #include <kstandarddirs.h> #include <kinputdialog.h> #include <kicondialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kprocess.h> #include <tdefiledialog.h> #include <ktrader.h> diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h index 0223f64..53fc9f9 100644 --- a/kaffeine/src/input/dvb/dvbpanel.h +++ b/kaffeine/src/input/dvb/dvbpanel.h @@ -32,7 +32,7 @@ #include <kapp.h> #include <kpushbutton.h> #include <kled.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconview.h> #include <klineedit.h> diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h index 9e061b0..3cd9aef 100644 --- a/kaffeine/src/input/dvb/kevents.h +++ b/kaffeine/src/input/dvb/kevents.h @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <tqtextbrowser.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <klineedit.h> diff --git a/kaffeine/src/input/dvb/krecord.h b/kaffeine/src/input/dvb/krecord.h index eb6e895..afcbe29 100644 --- a/kaffeine/src/input/dvb/krecord.h +++ b/kaffeine/src/input/dvb/krecord.h @@ -25,7 +25,7 @@ #include <tqpixmap.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include "channeldesc.h" #include "ktimereditor.h" |