Rename many classes and header files to avoid conflicts with KDE4

master
Timothy Pearson 12 years ago
parent b3fda942e3
commit 238c91031c

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
#include <tqprogressbar.h> #include <tqprogressbar.h>
#include <klistview.h> #include <tdelistview.h>
#include <kapplication.h> #include <kapplication.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpixmap.h> #include <tqpixmap.h>
@ -137,7 +137,7 @@ void AcqStatus::clear()
{ {
TDEListView::clear(); TDEListView::clear();
m_idOffset += m_items.size(); m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already m_items.clear(); // got deleted by tdelistview already
} }
void AcqStatus::Start() void AcqStatus::Start()

@ -8,7 +8,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klistview.h> #include <tdelistview.h>
#include <kprogress.h> #include <kprogress.h>
#include <vector> #include <vector>

@ -8,7 +8,7 @@
#include <tqstrlist.h> #include <tqstrlist.h>
#include <kapplication.h> #include <kapplication.h>
#include <klistbox.h> #include <tdelistbox.h>
#include <klocale.h> #include <klocale.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
#include <klistview.h> #include <tdelistview.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -8,7 +8,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqheader.h> #include <tqheader.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kdebug.h> #include <kdebug.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>

@ -4,8 +4,8 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <ktoolbarbutton.h> #include <tdetoolbarbutton.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <tdefiledetailview.h> #include <tdefiledetailview.h>

@ -459,7 +459,7 @@
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>TDEToolBar</class> <class>TDEToolBar</class>
<header location="global">ktoolbar.h</header> <header location="global">tdetoolbar.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>-1</height> <height>-1</height>
@ -497,7 +497,7 @@
</images> </images>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>ktoolbar.h</includehint> <includehint>tdetoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint> <includehint>adept/packageinfo.h</includehint>
<includehint>adept/lister.h</includehint> <includehint>adept/lister.h</includehint>
<includehint>tdefiledetailview.h</includehint> <includehint>tdefiledetailview.h</includehint>

@ -6,7 +6,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <klocale.h> #include <klocale.h>
#include "sourceseditor.h" #include "sourceseditor.h"

@ -6,7 +6,7 @@
#include <cstddef> #include <cstddef>
#include <apt-front/sources.h> #include <apt-front/sources.h>
#include <adept/sourceseditorui.h> #include <adept/sourceseditorui.h>
#include <klistview.h> #include <tdelistview.h>
namespace adept { namespace adept {

@ -168,6 +168,6 @@
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -7,8 +7,8 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -2,9 +2,9 @@
#ifndef APP_H #ifndef APP_H
#define APP_H #define APP_H
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <apt-front/cache/observer.h> #include <apt-front/cache/observer.h>
#include <apt-front/cache/component/state.h> #include <apt-front/cache/component/state.h>

@ -8,8 +8,8 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -2,9 +2,9 @@
#ifndef TESTUI_APP_H #ifndef TESTUI_APP_H
#define TESTUI_APP_H #define TESTUI_APP_H
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <apt-front/cache/observer.h> #include <apt-front/cache/observer.h>
#include <apt-front/cache/component/state.h> #include <apt-front/cache/component/state.h>
#include <apt-front/cache/component/history.h> #include <apt-front/cache/component/history.h>

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
#include <tqprogressbar.h> #include <tqprogressbar.h>
#include <klistview.h> #include <tdelistview.h>
#include <kapplication.h> #include <kapplication.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpixmap.h> #include <tqpixmap.h>
@ -137,7 +137,7 @@ void AcqStatus::clear()
{ {
TDEListView::clear(); TDEListView::clear();
m_idOffset += m_items.size(); m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already m_items.clear(); // got deleted by tdelistview already
} }
void AcqStatus::Start() void AcqStatus::Start()

@ -8,7 +8,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klistview.h> #include <tdelistview.h>
#include <kprogress.h> #include <kprogress.h>
#include <vector> #include <vector>

@ -8,7 +8,7 @@
#include <tqstrlist.h> #include <tqstrlist.h>
#include <kapplication.h> #include <kapplication.h>
#include <klistbox.h> #include <tdelistbox.h>
#include <klocale.h> #include <klocale.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
#include <klistview.h> #include <tdelistview.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -6,7 +6,7 @@
#include <tqthread.h> #include <tqthread.h>
#include <tqtextbrowser.h> #include <tqtextbrowser.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kdebug.h> #include <kdebug.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>

@ -4,8 +4,8 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <ktoolbarbutton.h> #include <tdetoolbarbutton.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <tdefiledetailview.h> #include <tdefiledetailview.h>

@ -417,7 +417,7 @@
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>TDEToolBar</class> <class>TDEToolBar</class>
<header location="global">ktoolbar.h</header> <header location="global">tdetoolbar.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>-1</height> <height>-1</height>
@ -455,7 +455,7 @@
</images> </images>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>ktoolbar.h</includehint> <includehint>tdetoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint> <includehint>adept/packageinfo.h</includehint>
<includehint>adept/lister.h</includehint> <includehint>adept/lister.h</includehint>
<includehint>tdefiledetailview.h</includehint> <includehint>tdefiledetailview.h</includehint>

@ -6,7 +6,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <klocale.h> #include <klocale.h>
#include "sourceseditor.h" #include "sourceseditor.h"

@ -5,7 +5,7 @@
#include <apt-front/sources.h> #include <apt-front/sources.h>
#include <adept/sourceseditorui.h> #include <adept/sourceseditorui.h>
#include <klistview.h> #include <tdelistview.h>
namespace adept { namespace adept {

@ -168,6 +168,6 @@
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -6,8 +6,8 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -2,9 +2,9 @@
#ifndef TESTUI_APP_H #ifndef TESTUI_APP_H
#define TESTUI_APP_H #define TESTUI_APP_H
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <apt-front/cache/observer.h> #include <apt-front/cache/observer.h>
#include <apt-front/cache/component/state.h> #include <apt-front/cache/component/state.h>
#include <apt-front/cache/component/history.h> #include <apt-front/cache/component/history.h>

@ -13,8 +13,8 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kaction.h> #include <tdeaction.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -7,8 +7,8 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>

@ -2,9 +2,9 @@
#ifndef TESTUI_APP_H #ifndef TESTUI_APP_H
#define TESTUI_APP_H #define TESTUI_APP_H
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <apt-front/cache/observer.h> #include <apt-front/cache/observer.h>
#include <apt-front/cache/component/state.h> #include <apt-front/cache/component/state.h>
#include <apt-front/cache/component/history.h> #include <apt-front/cache/component/history.h>

Loading…
Cancel
Save