summaryrefslogtreecommitdiffstats
path: root/lilo-config/kde
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 20:34:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 20:34:22 +0000
commitb09bffed6b43262948018dfb0f11890850ddf7c1 (patch)
tree138696bfcc7ac01070d0e8ecaa1cdf94611a2bd8 /lilo-config/kde
parent6d43944a7130b9d1b4ae3fba37b774aced8612cf (diff)
downloadtdeadmin-b09bffed6b43262948018dfb0f11890850ddf7c1.tar.gz
tdeadmin-b09bffed6b43262948018dfb0f11890850ddf7c1.zip
TQt4 port kdeadmin
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lilo-config/kde')
-rw-r--r--lilo-config/kde/Details.cpp8
-rw-r--r--lilo-config/kde/Details.h17
-rw-r--r--lilo-config/kde/InputBox.cpp4
-rw-r--r--lilo-config/kde/InputBox.h3
-rw-r--r--lilo-config/kde/kcontrol.cpp12
-rw-r--r--lilo-config/kde/kcontrol.h3
6 files changed, 25 insertions, 22 deletions
diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp
index 0775e8d..385b715 100644
--- a/lilo-config/kde/Details.cpp
+++ b/lilo-config/kde/Details.cpp
@@ -33,8 +33,8 @@
#include <tqlabel.h>
#include <ui.h>
-Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /* f */)
- : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
+Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags /* f */)
+ : KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok, true)
{
l=lilo;
@@ -101,7 +101,7 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /*
vga->setCurrentItem(1);
else
for(int i=0; i<vga->count(); i++) {
- if(vga->text(i).contains("(" + mode + ")")) {
+ if(vga->text(i).tqcontains("(" + mode + ")")) {
vga->setCurrentItem(i);
break;
}
@@ -127,7 +127,7 @@ TQString Details::vgaMode() const
if(s=="default")
return "";
else if(s!="ask") {
- s=s.mid(s.find('(')+1);
+ s=s.mid(s.tqfind('(')+1);
s=s.left(s.length()-1);
}
return s;
diff --git a/lilo-config/kde/Details.h b/lilo-config/kde/Details.h
index 2e9f0f6..85cfe68 100644
--- a/lilo-config/kde/Details.h
+++ b/lilo-config/kde/Details.h
@@ -37,8 +37,9 @@
class Details:public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
+ Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
bool isReadOnly() const { return readonly->isChecked(); };
TQString vgaMode() const;
bool isUnsafe() const { return unsafe->isChecked(); };
@@ -50,12 +51,12 @@ private slots:
void check_pw();
private:
liloimage *l;
- QCheckBox *readonly;
- QComboBox *vga;
- QCheckBox *unsafe;
- QCheckBox *lock;
- QCheckBox *restricted;
- QCheckBox *use_password;
- QLineEdit *password;
+ TQCheckBox *readonly;
+ TQComboBox *vga;
+ TQCheckBox *unsafe;
+ TQCheckBox *lock;
+ TQCheckBox *restricted;
+ TQCheckBox *use_password;
+ TQLineEdit *password;
};
#endif
diff --git a/lilo-config/kde/InputBox.cpp b/lilo-config/kde/InputBox.cpp
index 3a707cf..585874d 100644
--- a/lilo-config/kde/InputBox.cpp
+++ b/lilo-config/kde/InputBox.cpp
@@ -31,8 +31,8 @@
#include <tqwhatsthis.h>
#include <ui.h>
-InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f)
- : KDialogBase(parent, name, true, TQString::null, hasCancel ? Ok | Cancel : Ok, Ok, true )
+InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f)
+ : KDialogBase(tqparent, name, true, TQString(), hasCancel ? Ok | Cancel : Ok, Ok, true )
{
TQVBox *page = makeVBoxMainWidget();
for(entries::iterator it=e.begin(); it!=e.end(); it++) {
diff --git a/lilo-config/kde/InputBox.h b/lilo-config/kde/InputBox.h
index 9bf88cd..50b9d10 100644
--- a/lilo-config/kde/InputBox.h
+++ b/lilo-config/kde/InputBox.h
@@ -39,10 +39,11 @@
class InputBox:public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
typedef std::list<entry> entries;
- InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
+ InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
private:
std::list<EditWidget*> edit;
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 846edc8..dbf2f40 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -35,12 +35,12 @@
#include <kaboutdata.h>
#include <unistd.h>
-KControl::KControl(TQWidget *parent, const char *name)
- : KCModule(parent, name)
+KControl::KControl(TQWidget *tqparent, const char *name)
+ : KCModule(tqparent, name)
{
- TQVBoxLayout *layout=new TQVBoxLayout(this);
+ TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
m=new MainWidget(this, name);
- layout->addWidget(m);
+ tqlayout->addWidget(m);
connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
if (getuid() != 0) {
m->makeReadOnly();
@@ -79,9 +79,9 @@ void KControl::configChanged() // SLOT
extern "C"
{
- KDE_EXPORT KCModule *create_lilo(TQWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_lilo(TQWidget *tqparent, const char *name)
{
- return new KControl(parent, "kcmlilo");
+ return new KControl(tqparent, "kcmlilo");
}
}
diff --git a/lilo-config/kde/kcontrol.h b/lilo-config/kde/kcontrol.h
index edb64d9..75d98dd 100644
--- a/lilo-config/kde/kcontrol.h
+++ b/lilo-config/kde/kcontrol.h
@@ -38,8 +38,9 @@ class KAboutData;
class KControl: public KCModule {
Q_OBJECT
+ TQ_OBJECT
public:
- KControl(TQWidget *parent, const char *name);
+ KControl(TQWidget *tqparent, const char *name);
void load();
void save();
void defaults();