Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 242b9c326b
commit 7805c1823f

@ -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>

@ -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>

@ -22,7 +22,7 @@
#ifndef PLAYLISTITEM_H
#define PLAYLISTITEM_H
#include <klistview.h>
#include <tdelistview.h>
#define MIME_COLUMN 0
#define TITLE_COLUMN 1

@ -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>

@ -25,7 +25,7 @@
#include <config.h>
#endif
#include <klistview.h>
#include <tdelistview.h>
class TDEPopupMenu;
class TQWidget;

@ -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;

@ -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>

@ -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>

@ -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>

@ -26,7 +26,7 @@
#include <tqdatetime.h>
#include <tqtextbrowser.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kpushbutton.h>
#include <klineedit.h>

@ -25,7 +25,7 @@
#include <tqpixmap.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include "channeldesc.h"
#include "ktimereditor.h"

@ -32,8 +32,8 @@
#include <tdeconfig.h>
#include <kurl.h>
#include <kedittoolbar.h>
#include <kaction.h>
#include <kaccel.h>
#include <tdeaction.h>
#include <tdeaccel.h>
#include <kstdaction.h>
#include <klibloader.h>
#include <tdeparts/componentfactory.h>
@ -41,7 +41,7 @@
#include <kstatusbar.h>
#include <kmenubar.h>
#include <kcombobox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <ktabbar.h>
#include <twin.h>
#include <ktrader.h>

@ -29,7 +29,7 @@
#include <tqtimer.h>
#include <tqvbox.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tdeparts/part.h>
#include "kaffeineiface.h"

@ -19,7 +19,7 @@
*/
#include <tdeparts/genericfactory.h>
#include <kaction.h>
#include <tdeaction.h>
#include "dummy_part.h"

@ -24,14 +24,14 @@
#include <tdeparts/genericfactory.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kxmlguifactory.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <tdeio/netaccess.h>
#include <kmimetype.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqtimer.h>
#include <tqslider.h>

@ -30,7 +30,7 @@
#include <tqcursor.h>
#include <kstatusbar.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kmenubar.h>
#include <kdebug.h>

@ -15,7 +15,7 @@ You can use this part in your Application like this:
*** myplayer.h: ***
#include <kmainwindow.h>
#include <tdemainwindow.h>
class KaffeinePart;

@ -23,13 +23,13 @@
#include <kapplication.h>
#include <kinstance.h>
#include <kiconloader.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <kxmlguifactory.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeparts/genericfactory.h>
#include <kprogress.h>
#include <tdeio/netaccess.h>
@ -37,7 +37,7 @@
#include <dcopclient.h>
#include <kprocess.h>
#include <kprotocolinfo.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <tqvbox.h>
#include <tqlabel.h>

@ -26,8 +26,8 @@
#include <kiconloader.h>
#include <kdebug.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kaction.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <tqtimer.h>
#include <tqlabel.h>

Loading…
Cancel
Save