TDE
/
tdeadmin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeadmin
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent 6a1e482053
commit 09470cb1bf
43 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File

6
kcron/ktapp.cpp
Unescape View File

@ -11,15 +11,15 @@
#include "ktapp.h"
#include <kmenubar.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kmessagebox.h>
#include <tdeconfig.h>
#include <kapplication.h>
#include <klocale.h> // i18n()
#include <kstdaction.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include "cthost.h"

2
kcron/ktapp.h
Unescape View File

@ -16,7 +16,7 @@
#include <config.h>
#endif
#include <kmainwindow.h>
#include <tdemainwindow.h>
class TDEAction;
class TQString;

2
kcron/ktprintopt.cpp
Unescape View File

@ -15,7 +15,7 @@
#include <tqlayout.h>
#include <kdialog.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <kapplication.h>
#include "ktprintopt.h"

2
kcron/kttask.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqpalette.h>
#include <kapplication.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>

4
kdat/KDatMainWindow.cpp
Unescape View File

@ -32,8 +32,8 @@
#include <kapplication.h>
#include <kiconloader.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
#include <ktoolbar.h>
#include <tdepopupmenu.h>
#include <tdetoolbar.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kmessagebox.h>

2
kdat/KDatMainWindow.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KDat_h
#define KDat_h
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kdialog.h>
#include <tqpushbutton.h>
#include <tqlabel.h>

4
knetwortdeconf/knetwortdeconf/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ kcm_knetwortdeconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -n
## INCLUDES were found outside tdevelop specific part
kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
kcm_knetwortdeconfmodule_la_SOURCES = tdeselectdistrodlg.ui kknownhostinfo.cpp \
kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetwortdeconfmodule.cpp \
kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetwortdeconfigparser.cpp \
@ -26,7 +26,7 @@ kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
kprofileslistviewtooltip.cpp
EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h kselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h tdeselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
xdg_apps_DATA = kcm_knetwortdeconfmodule.desktop

2
knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
Unescape View File

@ -295,7 +295,7 @@
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

6
knetwortdeconf/knetwortdeconf/knetwortdeconf.h
Unescape View File

@ -42,11 +42,11 @@
#include <tqlayout.h>
#include <kdialog.h>
#include <kinputdialog.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <kcombobox.h>
#include <kmessagebox.h>
#include <kaboutapplication.h>

8
knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
Unescape View File

@ -1075,25 +1075,25 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

4
knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
Unescape View File

@ -42,7 +42,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@ -51,7 +51,7 @@
#include "kdetectdistrodlg.h"
#include "kreloadnetworkdlg.h"
#include "kinterfaceupdowndlg.h"
#include "kselectdistrodlg.h"
#include "tdeselectdistrodlg.h"
/**
*@author Juan Luis Baptiste

2
knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui
Unescape View File

@ -135,7 +135,7 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kpackage/debAptInterface.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <stdlib.h>
#include "klocale.h"
#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kdebug.h>

2
kpackage/debAptInterface.h
Unescape View File

@ -29,7 +29,7 @@
#include "../config.h"
#include <kaction.h>
#include <tdeaction.h>
#include "debInterface.h"

2
kpackage/findf.h
Unescape View File

@ -46,7 +46,7 @@
// KDE headers
#include <kapplication.h>
#include <kmenubar.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kdialogbase.h>
class FindF : public KDialogBase

4
kpackage/kpackage.cpp
Unescape View File

@ -41,8 +41,8 @@
#include <kprogress.h>
#include <kurl.h>
#include <kapplication.h>
#include <kaccel.h>
#include <kaction.h>
#include <tdeaccel.h>
#include <tdeaction.h>
#include <klocale.h>
#include <kinputdialog.h>
#include <kglobal.h>

2
kpackage/kpackage.h
Unescape View File

@ -37,7 +37,7 @@
// KDE headers
#include <kurl.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kpPty.h>
class KFileDialog;

2
kpackage/kplview.h
Unescape View File

@ -39,7 +39,7 @@
#include <tqlayout.h>
// KDE headers
#include "klistview.h"
#include "tdelistview.h"
// ksetup headers
#include "packageInfo.h"

6
kpackage/managementWidget.cpp
Unescape View File

@ -34,10 +34,10 @@
#include <klocale.h>
#include <kdebug.h>
#include <klistviewsearchline.h>
#include <kaction.h>
#include <tdelistviewsearchline.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
// kpackage.headers

6
kpackage/managementWidget.h
Unescape View File

@ -53,9 +53,9 @@
#include <tqhbox.h>
// KDE headers
#include <kaction.h>
#include <klistview.h>
#include <klistviewsearchline.h>
#include <tdeaction.h>
#include <tdelistview.h>
#include <tdelistviewsearchline.h>
// ksetup headers
#include "packageInfo.h"

4
kpackage/packageDisplay.h
Unescape View File

@ -46,8 +46,8 @@
#include <tqtabbar.h>
#include <tqtabwidget.h>
#include <tqvbox.h>
#include <kpopupmenu.h>
#include <klistview.h>
#include <tdepopupmenu.h>
#include <tdelistview.h>
class packagePropertiesWidget;
class packageInfo;

2
kpackage/pkgOptions.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kseparator.h>
#include <kdebug.h>
#include <kpushbutton.h>

2
kpackage/utils.h
Unescape View File

@ -29,7 +29,7 @@
#include "../config.h"
#include <string.h>
#include <klistview.h>
#include <tdelistview.h>
class KpTreeListItem;

2
ksysv/OldView.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kcursor.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobalsettings.h>

8
ksysv/TopWidget.cpp
Unescape View File

@ -52,11 +52,11 @@
#include <tqsimplerichtext.h>
#include <kresolver.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kkeydialog.h>
#include <kmenubar.h>
#include <kcompletion.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kdebug.h>
#include <kapplication.h>
@ -64,7 +64,7 @@
#include <khelpmenu.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kedittoolbar.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
@ -90,7 +90,7 @@
namespace Status
{
enum {
Changed, Checklist, Writable
Changed, Chectdelist, Writable
};
} // namespace Status

2
ksysv/TopWidget.h
Unescape View File

@ -15,7 +15,7 @@
#ifndef KSV_TOPWIDGET_H
#define KSV_TOPWIDGET_H
#include <kmainwindow.h>
#include <tdemainwindow.h>
class TQCheckBox;

2
ksysv/ksv_conf.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <kapplication.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tdeconfig.h>
#include "ksv_core.h"

2
ksysv/ksvdraglist.cpp
Unescape View File

@ -45,7 +45,7 @@
#include <tqlabel.h>
#include <kapplication.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>

2
ksysv/ksvdraglist.h
Unescape View File

@ -38,7 +38,7 @@
#include <tqcolor.h>
#include <tqpixmap.h>
#include <klistview.h>
#include <tdelistview.h>
#include "Data.h"

2
ksysv/ksvlookandfeel.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqlayout.h>
#include <kdialog.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
/*
* Constructs a KSVLookAndFeel which is a child of 'parent', with the

2
kuser/editGroup.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kcombobox.h>
#include <klineedit.h>

2
kuser/kgroupvw.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <klistview.h>
#include <tdelistview.h>
#include "kgroup.h"

2
kuser/kuservw.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <klistview.h>
#include <tdelistview.h>
#include "kuser.h"

2
kuser/mainView.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqfile.h>
#include <kinputdialog.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kdebug.h>

6
kuser/mainWidget.cpp
Unescape View File

@ -21,14 +21,14 @@
#include <tqtooltip.h>
#include <tqtimer.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <kstdaction.h>
#include <kdebug.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kstatusbar.h>
#include <kedittoolbar.h>

2
kuser/mainWidget.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef _KU_MAINWIDGET_H_
#define _KU_MAINWIDGET_H_
#include <kmainwindow.h>
#include <tdemainwindow.h>
class SelectConn;
class mainView;

2
kuser/propdlg.h
Unescape View File

@ -34,7 +34,7 @@
#include <kdatetimewidget.h>
#include <knuminput.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kcombobox.h>
#include "kuser.h"

4
lilo-config/common/Disks.cc
Unescape View File

@ -34,7 +34,7 @@
#include <stdlib.h>
#include <string.h>
StringList ptable::disklist()
StringList ptable::distdelist()
{
/* The basics behind scanning for a disk are simple: If it can be *
* opened, it exists. *
@ -121,7 +121,7 @@ StringList ptable::disklist()
StringList ptable::partlist()
{
StringList s;
StringList d=disklist();
StringList d=distdelist();
for(StringList::const_iterator it=d.begin(); it!=d.end(); it++) {
for(int i=1; i<32; i++) {
String drive;

4
lilo-config/common/Disks.h
Unescape View File

@ -33,9 +33,9 @@
#include <map>
class ptable {
public:
ptable(StringList const &disks=disklist());
ptable(StringList const &disks=distdelist());
ptable(String const &disk);
static StringList disklist();
static StringList distdelist();
static StringList partlist();
static String mountpoint(String const &device, bool fstab_fallback=false);
static String device(String const &mountpt, bool fstab_fallback=false);

2
lilo-config/common/lilo.cc
Unescape View File

@ -179,7 +179,7 @@ String const liloconf::liloOut()
bool liloconf::probe()
{
ptable p;
StringList drives=p.disklist();
StringList drives=p.distdelist();
String const root=p.device("/", true);
checked=false;
defaults.clear();

2
lilo-config/kde-qt-common/general.cpp
Unescape View File

@ -45,7 +45,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv);
drive=new TQComboBox(false, drv);
drive_lbl->setBuddy(drive);
StringList p=ptable::disklist();
StringList p=ptable::distdelist();
p+=ptable::partlist();
p.sort();
for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)

2
secpolicy/secpolicywin.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <kdialog.h>
#include <dcopclient.h>
#include <tqpopupmenu.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include "pamview.h"
#include "secpolicywin.h"

2
secpolicy/secpolicywin.h
Unescape View File

@ -25,7 +25,7 @@
#ifndef _SECPOLICYWIN_H
#define _SECPOLICYWIN_H
#include <kmainwindow.h>
#include <tdemainwindow.h>
class PamView;

Write Preview
Loading…
Cancel
Save