summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kcron/configure.in.in2
-rw-r--r--kcron/ctcron.cpp8
-rw-r--r--kcron/ctcron.h4
-rw-r--r--kcron/ctdom.cpp2
-rw-r--r--kcron/ctdom.h2
-rw-r--r--kcron/ctdow.cpp2
-rw-r--r--kcron/ctdow.h2
-rw-r--r--kcron/cthost.cpp2
-rw-r--r--kcron/cthost.h4
-rw-r--r--kcron/cthour.h2
-rw-r--r--kcron/cti18n.h4
-rw-r--r--kcron/ctminute.h2
-rw-r--r--kcron/ctmonth.cpp2
-rw-r--r--kcron/ctmonth.h2
-rw-r--r--kcron/cttask.cpp2
-rw-r--r--kcron/cttask.h2
-rw-r--r--kcron/ctunit.cpp6
-rw-r--r--kcron/ctunit.h2
-rw-r--r--kcron/ctvariable.cpp2
-rw-r--r--kcron/ctvariable.h2
-rw-r--r--kcron/ktapp.cpp34
-rw-r--r--kcron/ktapp.h5
-rw-r--r--kcron/ktlistcron.cpp12
-rw-r--r--kcron/ktlistcron.h6
-rw-r--r--kcron/ktlistitem.cpp8
-rw-r--r--kcron/ktlistitem.h6
-rw-r--r--kcron/ktlisttask.cpp8
-rw-r--r--kcron/ktlisttask.h2
-rw-r--r--kcron/ktlisttasks.cpp12
-rw-r--r--kcron/ktlisttasks.h4
-rw-r--r--kcron/ktlistvar.cpp8
-rw-r--r--kcron/ktlistvar.h2
-rw-r--r--kcron/ktlistvars.cpp12
-rw-r--r--kcron/ktlistvars.h4
-rw-r--r--kcron/ktprint.cpp6
-rw-r--r--kcron/ktprint.h4
-rw-r--r--kcron/ktprintopt.h1
-rw-r--r--kcron/kttask.cpp34
-rw-r--r--kcron/kttask.h1
-rw-r--r--kcron/ktvariable.cpp30
-rw-r--r--kcron/ktvariable.h1
-rw-r--r--kcron/ktview.cpp42
-rw-r--r--kcron/ktview.h5
-rw-r--r--kdat/Archive.cpp38
-rw-r--r--kdat/Archive.h16
-rw-r--r--kdat/ArchiveInfoWidget.cpp24
-rw-r--r--kdat/ArchiveInfoWidget.h3
-rw-r--r--kdat/BackupDlg.cpp42
-rw-r--r--kdat/BackupDlg.h7
-rw-r--r--kdat/BackupOptDlg.cpp8
-rw-r--r--kdat/BackupOptDlg.h3
-rw-r--r--kdat/BackupProfileInfoWidget.cpp16
-rw-r--r--kdat/BackupProfileInfoWidget.h3
-rw-r--r--kdat/BackupProfileManager.h1
-rw-r--r--kdat/BackupProfileWidget.cpp26
-rw-r--r--kdat/BackupProfileWidget.h5
-rw-r--r--kdat/File.cpp28
-rw-r--r--kdat/File.h28
-rw-r--r--kdat/FileInfoWidget.cpp48
-rw-r--r--kdat/FileInfoWidget.h5
-rw-r--r--kdat/FormatOptDlg.cpp22
-rw-r--r--kdat/FormatOptDlg.h5
-rw-r--r--kdat/IndexDlg.cpp46
-rw-r--r--kdat/IndexDlg.h7
-rw-r--r--kdat/InfoShellWidget.cpp9
-rw-r--r--kdat/InfoShellWidget.h9
-rw-r--r--kdat/KDat.kdoc10
-rw-r--r--kdat/KDatMainWindow.cpp112
-rw-r--r--kdat/KDatMainWindow.h1
-rw-r--r--kdat/LoggerWidget.cpp8
-rw-r--r--kdat/LoggerWidget.h5
-rw-r--r--kdat/Node.cpp136
-rw-r--r--kdat/Node.h19
-rw-r--r--kdat/Options.h1
-rw-r--r--kdat/OptionsDlg.cpp4
-rw-r--r--kdat/OptionsDlg.h5
-rw-r--r--kdat/OptionsDlgWidget.ui52
-rw-r--r--kdat/OptionsDlgWidget.ui.h2
-rw-r--r--kdat/RELEASE_NOTES2
-rw-r--r--kdat/Tape.cpp44
-rw-r--r--kdat/Tape.h4
-rw-r--r--kdat/TapeDrive.cpp34
-rw-r--r--kdat/TapeDrive.h3
-rw-r--r--kdat/TapeFileInfoWidget.cpp34
-rw-r--r--kdat/TapeFileInfoWidget.h5
-rw-r--r--kdat/TapeInfoWidget.cpp60
-rw-r--r--kdat/TapeInfoWidget.h3
-rw-r--r--kdat/TapeManager.h1
-rw-r--r--kdat/TarParser.h1
-rw-r--r--kdat/Util.cpp4
-rw-r--r--kdat/VerifyDlg.cpp46
-rw-r--r--kdat/VerifyDlg.h7
-rw-r--r--kdat/VerifyOptDlg.cpp16
-rw-r--r--kdat/VerifyOptDlg.h5
-rw-r--r--kdat/ktreeview.cpp284
-rw-r--r--kdat/ktreeview.h73
-rw-r--r--kfile-plugins/deb/kfile_deb.cpp8
-rw-r--r--kfile-plugins/deb/kfile_deb.h3
-rw-r--r--kfile-plugins/rpm/kfile_rpm.cpp12
-rw-r--r--kfile-plugins/rpm/kfile_rpm.h3
-rw-r--r--knetworkconf/Doxyfile2
-rw-r--r--knetworkconf/backends/file.pl.in10
-rwxr-xr-xknetworkconf/backends/guess_system.sh4
-rw-r--r--knetworkconf/backends/network.pl.in166
-rw-r--r--knetworkconf/backends/parse.pl.in20
-rw-r--r--knetworkconf/backends/replace.pl.in44
-rw-r--r--knetworkconf/backends/report.pl.in4
-rwxr-xr-xknetworkconf/backends/type1inst2
-rw-r--r--knetworkconf/backends/util.pl.in4
-rw-r--r--knetworkconf/backends/xml.pl.in82
-rw-r--r--knetworkconf/knetworkconf-mdk.spec2
-rw-r--r--knetworkconf/knetworkconf/kadddevicecontainer.cpp28
-rw-r--r--knetworkconf/knetworkconf/kadddevicecontainer.h3
-rw-r--r--knetworkconf/knetworkconf/kadddevicedlg.ui50
-rw-r--r--knetworkconf/knetworkconf/kadddevicedlg.ui.h2
-rw-r--r--knetworkconf/knetworkconf/kadddevicedlgextension.ui34
-rw-r--r--knetworkconf/knetworkconf/kadddevicedlgextension.ui.h2
-rw-r--r--knetworkconf/knetworkconf/kadddevicewifiext.ui14
-rw-r--r--knetworkconf/knetworkconf/kadddnsserverdlg.ui18
-rw-r--r--knetworkconf/knetworkconf/kadddnsserverdlg.ui.h2
-rw-r--r--knetworkconf/knetworkconf/kaddknownhostdlg.ui34
-rw-r--r--knetworkconf/knetworkconf/kaddknownhostdlg.ui.h2
-rw-r--r--knetworkconf/knetworkconf/kaddressvalidator.cpp64
-rw-r--r--knetworkconf/knetworkconf/kaddressvalidator.h48
-rw-r--r--knetworkconf/knetworkconf/kdetectdistrodlg.ui12
-rw-r--r--knetworkconf/knetworkconf/kinterfaceupdowndlg.ui16
-rw-r--r--knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h2
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.cpp44
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.h7
-rw-r--r--knetworkconf/knetworkconf/knetworkconfdlg.ui130
-rw-r--r--knetworkconf/knetworkconf/knetworkconfdlg.ui.h2
-rw-r--r--knetworkconf/knetworkconf/knetworkconfigparser.cpp78
-rw-r--r--knetworkconf/knetworkconf/knetworkconfigparser.h1
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.cpp6
-rw-r--r--knetworkconf/knetworkconf/knetworkconfmodule.h3
-rw-r--r--knetworkconf/knetworkconf/knetworkinterface.cpp8
-rw-r--r--knetworkconf/knetworkconf/knetworkinterface.h8
-rw-r--r--knetworkconf/knetworkconf/kprofileslistviewtooltip.h32
-rw-r--r--knetworkconf/knetworkconf/kreloadnetworkdlg.ui16
-rw-r--r--knetworkconf/knetworkconf/kselectdistrodlg.ui14
-rw-r--r--knetworkconf/knetworkconf/main.cpp4
-rwxr-xr-xknetworkconf/update_backends.sh2
-rw-r--r--kpackage/cache.cpp8
-rw-r--r--kpackage/cache.h4
-rw-r--r--kpackage/debAptInterface.cpp44
-rw-r--r--kpackage/debAptInterface.h1
-rw-r--r--kpackage/debDpkgInterface.h1
-rw-r--r--kpackage/debInterface.cpp24
-rw-r--r--kpackage/debInterface.h1
-rw-r--r--kpackage/fbsdInterface.cpp38
-rw-r--r--kpackage/fbsdInterface.h5
-rw-r--r--kpackage/findf.cpp20
-rw-r--r--kpackage/findf.h5
-rw-r--r--kpackage/gentooInterface.cpp14
-rw-r--r--kpackage/gentooInterface.h1
-rw-r--r--kpackage/kio.h6
-rw-r--r--kpackage/kissInterface.cpp12
-rw-r--r--kpackage/kissInterface.h1
-rw-r--r--kpackage/kpPty.cpp10
-rw-r--r--kpackage/kpPty.h4
-rw-r--r--kpackage/kpTerm.cpp14
-rw-r--r--kpackage/kpTerm.h8
-rw-r--r--kpackage/kpackage.cpp92
-rw-r--r--kpackage/kpackage.h18
-rw-r--r--kpackage/kplview.cpp24
-rw-r--r--kpackage/kplview.h11
-rw-r--r--kpackage/managementWidget.cpp32
-rw-r--r--kpackage/managementWidget.h16
-rw-r--r--kpackage/options.cpp12
-rw-r--r--kpackage/options.h5
-rw-r--r--kpackage/packageDisplay.cpp22
-rw-r--r--kpackage/packageDisplay.h12
-rw-r--r--kpackage/packageInfo.cpp50
-rw-r--r--kpackage/packageProperties.cpp26
-rw-r--r--kpackage/packageProperties.h5
-rw-r--r--kpackage/pkgInterface.cpp30
-rw-r--r--kpackage/pkgInterface.h3
-rw-r--r--kpackage/pkgOptions.cpp52
-rw-r--r--kpackage/pkgOptions.h15
-rw-r--r--kpackage/procbuf.cpp10
-rw-r--r--kpackage/procbuf.h6
-rw-r--r--kpackage/rpmInterface.cpp38
-rw-r--r--kpackage/rpmInterface.h1
-rw-r--r--kpackage/search.cpp16
-rw-r--r--kpackage/search.h3
-rw-r--r--kpackage/slackInterface.cpp30
-rw-r--r--kpackage/slackInterface.h1
-rw-r--r--kpackage/updateLoc.cpp34
-rw-r--r--kpackage/updateLoc.h21
-rw-r--r--ksysv/ActionList.cpp4
-rw-r--r--ksysv/ActionList.h3
-rw-r--r--ksysv/Data.cpp4
-rw-r--r--ksysv/Data.h12
-rw-r--r--ksysv/IOCore.cpp64
-rw-r--r--ksysv/OldView.cpp96
-rw-r--r--ksysv/OldView.h7
-rw-r--r--ksysv/PreferencesDialog.cpp14
-rw-r--r--ksysv/PreferencesDialog.h3
-rw-r--r--ksysv/Properties.cpp14
-rw-r--r--ksysv/Properties.h8
-rw-r--r--ksysv/RunlevelAuthIcon.cpp10
-rw-r--r--ksysv/RunlevelAuthIcon.h5
-rw-r--r--ksysv/ServiceDlg.cpp10
-rw-r--r--ksysv/ServiceDlg.h3
-rw-r--r--ksysv/SpinBox.cpp6
-rw-r--r--ksysv/SpinBox.h3
-rw-r--r--ksysv/TopWidget.cpp104
-rw-r--r--ksysv/TopWidget.h1
-rw-r--r--ksysv/configwizard.ui80
-rw-r--r--ksysv/kdltooltip.cpp22
-rw-r--r--ksysv/kdltooltip.h4
-rw-r--r--ksysv/kscroller.cpp26
-rw-r--r--ksysv/kscroller.h13
-rw-r--r--ksysv/ksv_conf.cpp16
-rw-r--r--ksysv/ksv_core.cpp8
-rw-r--r--ksysv/ksvapplication.h1
-rw-r--r--ksysv/ksvconfigwizard.cpp8
-rw-r--r--ksysv/ksvconfigwizard.h3
-rw-r--r--ksysv/ksvdrag.cpp4
-rw-r--r--ksysv/ksvdrag.h5
-rw-r--r--ksysv/ksvdraglist.cpp52
-rw-r--r--ksysv/ksvdraglist.h21
-rw-r--r--ksysv/ksvlookandfeel.cpp8
-rw-r--r--ksysv/ksvlookandfeel.h3
-rw-r--r--ksysv/ksvmiscconfig.cpp8
-rw-r--r--ksysv/ksvmiscconfig.h3
-rw-r--r--ksysv/ksvpathconfig.cpp8
-rw-r--r--ksysv/ksvpathconfig.h3
-rw-r--r--ksysv/lookandfeelconfig.ui70
-rw-r--r--ksysv/main.cpp4
-rw-r--r--ksysv/miscconfig.ui36
-rw-r--r--ksysv/pathconfig.ui42
-rw-r--r--ksysv/trash.cpp12
-rw-r--r--ksysv/trash.h13
-rw-r--r--kuser/addUser.cpp24
-rw-r--r--kuser/addUser.h3
-rw-r--r--kuser/delUser.cpp10
-rw-r--r--kuser/delUser.h3
-rw-r--r--kuser/editDefaults.cpp4
-rw-r--r--kuser/editDefaults.h3
-rw-r--r--kuser/editGroup.cpp58
-rw-r--r--kuser/editGroup.h3
-rw-r--r--kuser/filessettings.ui28
-rw-r--r--kuser/generalsettings.ui42
-rw-r--r--kuser/kgroup.cpp4
-rw-r--r--kuser/kgroup.h2
-rw-r--r--kuser/kgroupfiles.cpp30
-rw-r--r--kuser/kgroupldap.cpp28
-rw-r--r--kuser/kgroupldap.h1
-rw-r--r--kuser/kgroupvw.cpp16
-rw-r--r--kuser/kgroupvw.h5
-rw-r--r--kuser/kuser.cpp68
-rw-r--r--kuser/kuser.h4
-rw-r--r--kuser/kuser.kcfg2
-rw-r--r--kuser/kuserfiles.cpp38
-rw-r--r--kuser/kuserldap.cpp170
-rw-r--r--kuser/kuserldap.h1
-rw-r--r--kuser/kusersystem.cpp2
-rw-r--r--kuser/kuservw.cpp18
-rw-r--r--kuser/kuservw.h7
-rw-r--r--kuser/ldapsamba.ui42
-rw-r--r--kuser/ldapsettings.ui36
-rw-r--r--kuser/mainView.cpp28
-rw-r--r--kuser/mainView.h3
-rw-r--r--kuser/mainWidget.cpp28
-rw-r--r--kuser/mainWidget.h1
-rw-r--r--kuser/misc.cpp14
-rw-r--r--kuser/passwordpolicy.ui46
-rw-r--r--kuser/propdlg.cpp188
-rw-r--r--kuser/propdlg.h11
-rw-r--r--kuser/pwddlg.cpp18
-rw-r--r--kuser/pwddlg.h3
-rw-r--r--kuser/selectconn.cpp8
-rw-r--r--kuser/selectconn.h3
-rw-r--r--kuser/sha1.cpp34
-rw-r--r--kuser/sha1.h10
-rw-r--r--kuser/sid.cpp6
-rw-r--r--lilo-config/common/String.cc8
-rw-r--r--lilo-config/common/String.h10
-rw-r--r--lilo-config/common/lilo.cc56
-rw-r--r--lilo-config/common/lilo.h4
-rw-r--r--lilo-config/common/tests/String.cc16
-rw-r--r--lilo-config/kde-qt-common/EditWidget.cpp38
-rw-r--r--lilo-config/kde-qt-common/EditWidget.h19
-rw-r--r--lilo-config/kde-qt-common/expert.cpp6
-rw-r--r--lilo-config/kde-qt-common/expert.h9
-rw-r--r--lilo-config/kde-qt-common/general.cpp26
-rw-r--r--lilo-config/kde-qt-common/general.h25
-rw-r--r--lilo-config/kde-qt-common/images.cpp24
-rw-r--r--lilo-config/kde-qt-common/images.h31
-rw-r--r--lilo-config/kde-qt-common/mainwidget.cpp4
-rw-r--r--lilo-config/kde-qt-common/mainwidget.h3
-rw-r--r--lilo-config/kde-qt-common/ui.h36
-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
-rw-r--r--lilo-config/qt/Details.cpp24
-rw-r--r--lilo-config/qt/Details.h23
-rw-r--r--lilo-config/qt/InputBox.cpp14
-rw-r--r--lilo-config/qt/InputBox.h5
-rw-r--r--lilo-config/qt/standalone.cpp8
-rw-r--r--lilo-config/qt/standalone.h5
-rw-r--r--secpolicy/pamview.cpp8
-rw-r--r--secpolicy/pamview.h5
-rw-r--r--secpolicy/ppitem.cpp4
-rw-r--r--secpolicy/ppitem.h4
-rw-r--r--secpolicy/secpolicywin.cpp2
310 files changed, 3011 insertions, 2891 deletions
diff --git a/kcron/configure.in.in b/kcron/configure.in.in
index be677e4..c64a6b7 100644
--- a/kcron/configure.in.in
+++ b/kcron/configure.in.in
@@ -1,4 +1,4 @@
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_CHECK_HEADERS(sstream)
+KDE_CHECK_HEADERS(sstream)
AC_LANG_RESTORE
diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index bcc51e4..58d389a 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctcron.h"
@@ -60,7 +60,7 @@ CTCron::CTCron(bool _syscron, string _login) :
writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName);
if (!initFromPasswd(getpwnam(_login.c_str())))
{
- error = i18n("No password entry found for user '%1'").arg(_login.c_str());
+ error = i18n("No password entry found for user '%1'").tqarg(_login.c_str());
}
}
}
@@ -71,7 +71,7 @@ CTCron::CTCron(bool _syscron, string _login) :
writeCommand = "crontab " + KProcess::quote(tmpFileName);
if (!initFromPasswd(getpwuid(uid)))
{
- error = i18n("No password entry found for uid '%1'").arg(uid);
+ error = i18n("No password entry found for uid '%1'").tqarg(uid);
}
}
@@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron)
if ((line.find("#") == 0) && (line.find("\\") != 1))
{
// If the first 10 characters don't contain a character, it's probably a disabled entry.
- int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+ int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ");
if (first_text < 0)
continue;
diff --git a/kcron/ctcron.h b/kcron/ctcron.h
index 2aaf01b..485da8d 100644
--- a/kcron/ctcron.h
+++ b/kcron/ctcron.h
@@ -12,7 +12,7 @@
#ifndef CTCRON_H
#define CTCRON_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include <vector>
@@ -94,7 +94,7 @@ public:
/**
* Return error description
*/
- TQString errorMessage() { TQString r = error; error = TQString::null; return r; }
+ TQString errorMessage() { TQString r = error; error = TQString(); return r; }
/**
diff --git a/kcron/ctdom.cpp b/kcron/ctdom.cpp
index b1d7f5e..f4e0cf3 100644
--- a/kcron/ctdom.cpp
+++ b/kcron/ctdom.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctdom.h"
diff --git a/kcron/ctdom.h b/kcron/ctdom.h
index 4e66747..daadd1f 100644
--- a/kcron/ctdom.h
+++ b/kcron/ctdom.h
@@ -12,7 +12,7 @@
#ifndef CTDOM_H
#define CTDOM_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctunit.h"
diff --git a/kcron/ctdow.cpp b/kcron/ctdow.cpp
index fe93c86..1b59eb9 100644
--- a/kcron/ctdow.cpp
+++ b/kcron/ctdow.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctdow.h"
diff --git a/kcron/ctdow.h b/kcron/ctdow.h
index 05b6357..8616185 100644
--- a/kcron/ctdow.h
+++ b/kcron/ctdow.h
@@ -12,7 +12,7 @@
#ifndef CTDOW_H
#define CTDOW_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctunit.h"
diff --git a/kcron/cthost.cpp b/kcron/cthost.cpp
index 356047d..b368b77 100644
--- a/kcron/cthost.cpp
+++ b/kcron/cthost.cpp
@@ -10,7 +10,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "cthost.h"
diff --git a/kcron/cthost.h b/kcron/cthost.h
index 022ff54..a738300 100644
--- a/kcron/cthost.h
+++ b/kcron/cthost.h
@@ -12,7 +12,7 @@
#ifndef CTHOST_H
#define CTHOST_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include <vector>
@@ -78,7 +78,7 @@ public:
/**
* Error message
*/
- TQString errorMessage() { TQString r = error; error = TQString::null; return r; }
+ TQString errorMessage() { TQString r = error; error = TQString(); return r; }
/**
diff --git a/kcron/cthour.h b/kcron/cthour.h
index 702c410..f11d0f8 100644
--- a/kcron/cthour.h
+++ b/kcron/cthour.h
@@ -12,7 +12,7 @@
#ifndef CTHOUR_H
#define CTHOUR_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctunit.h"
diff --git a/kcron/cti18n.h b/kcron/cti18n.h
index e3a1757..a5b96ec 100644
--- a/kcron/cti18n.h
+++ b/kcron/cti18n.h
@@ -12,13 +12,13 @@
#ifndef CTI18N_H
#define CTI18N_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
//
// Note: I do make an exception to the above rule for this file, as it is
// necessary to support internationalization.
//
-// Regardless, please don't introduce any other Qt or KDE dependencies here.
+// Regardless, please don't introduce any other TQt or KDE dependencies here.
// -GM 11/99
#include <klocale.h>
diff --git a/kcron/ctminute.h b/kcron/ctminute.h
index 6d93e08..1f1c7ad 100644
--- a/kcron/ctminute.h
+++ b/kcron/ctminute.h
@@ -12,7 +12,7 @@
#ifndef CTMINUTE_H
#define CTMINUTE_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctunit.h"
diff --git a/kcron/ctmonth.cpp b/kcron/ctmonth.cpp
index b66cd39..d07a785 100644
--- a/kcron/ctmonth.cpp
+++ b/kcron/ctmonth.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctmonth.h"
diff --git a/kcron/ctmonth.h b/kcron/ctmonth.h
index f7aa8af..048dd78 100644
--- a/kcron/ctmonth.h
+++ b/kcron/ctmonth.h
@@ -12,7 +12,7 @@
#ifndef CTMONTH_H
#define CTMONTH_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctunit.h"
diff --git a/kcron/cttask.cpp b/kcron/cttask.cpp
index 22fc77b..4851792 100644
--- a/kcron/cttask.cpp
+++ b/kcron/cttask.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "cttask.h"
diff --git a/kcron/cttask.h b/kcron/cttask.h
index 061df57..65f8c21 100644
--- a/kcron/cttask.h
+++ b/kcron/cttask.h
@@ -12,7 +12,7 @@
#ifndef CTTASK_H
#define CTTASK_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include <string>
diff --git a/kcron/ctunit.cpp b/kcron/ctunit.cpp
index 0532131..e843b2e 100644
--- a/kcron/ctunit.cpp
+++ b/kcron/ctunit.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "cti18n.h"
@@ -84,7 +84,7 @@ void CTUnit<min, max>::parse(string tokStr)
{
subelement = tokStr.substr(0,commapos);
- // find "/" to determine step
+ // tqfind "/" to determine step
slashpos = subelement.find("/");
if (slashpos == -1)
{
@@ -99,7 +99,7 @@ void CTUnit<min, max>::parse(string tokStr)
step = 1;
}
- // find "=" to determine range
+ // tqfind "=" to determine range
dashpos = subelement.find("-");
if (dashpos == -1)
{
diff --git a/kcron/ctunit.h b/kcron/ctunit.h
index 871a274..5bd39f6 100644
--- a/kcron/ctunit.h
+++ b/kcron/ctunit.h
@@ -12,7 +12,7 @@
#ifndef CTUNIT_H
#define CTUNIT_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include <string>
diff --git a/kcron/ctvariable.cpp b/kcron/ctvariable.cpp
index f736c76..6777341 100644
--- a/kcron/ctvariable.cpp
+++ b/kcron/ctvariable.cpp
@@ -9,7 +9,7 @@
* (at your option) any later version. *
***************************************************************************/
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include "ctvariable.h"
diff --git a/kcron/ctvariable.h b/kcron/ctvariable.h
index 3f20600..11d8af1 100644
--- a/kcron/ctvariable.h
+++ b/kcron/ctvariable.h
@@ -12,7 +12,7 @@
#ifndef CTVARIABLE_H
#define CTVARIABLE_H
-// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes.
+// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes.
// I want to be able to reuse these classes with another GUI toolkit. -GM 11/99
#include <string>
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index 35c009c..e767b73 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -70,7 +70,7 @@ bool KTApp::init()
if (cthost->isError())
{
KMessageBox::error(this, i18n("The following error occurred while initializing KCron:"
- "\n\n%1\n\nKCron will now exit.\n").arg(cthost->errorMessage()));
+ "\n\n%1\n\nKCron will now exit.\n").tqarg(cthost->errorMessage()));
return false;
}
@@ -120,31 +120,31 @@ TQString KTApp::caption()
void KTApp::setupActions()
{
//File Menu
- KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
- KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
- KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+ KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
+ KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
//Edit menu
- KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
- KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
- KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
- (void)new KAction(i18n("&New..."), KStdAccel::openNew(), this,TQT_SLOT(slotEditNew()),actionCollection(),"edit_new");
+ KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
+ KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
+ (void)new KAction(i18n("&New..."), KStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new");
//I don't like this KStdAccel::open() for modifying, but I'm just porting this to xmlui
- (void)new KAction(i18n("M&odify..."), KStdAccel::open(), this,TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify");
- (void)new KAction(i18n("&Delete"), 0, this,TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete");
- (void)new KAction(i18n("&Enabled"), 0, this,TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable");
- (void)new KAction(i18n("&Run Now"), 0, this,TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run");
+ (void)new KAction(i18n("M&odify..."), KStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify");
+ (void)new KAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete");
+ (void)new KAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable");
+ (void)new KAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run");
//Settings menu
- (void)new KAction(i18n("Show &Toolbar"), 0, this,TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar");
- (void)new KAction(i18n("Show &Statusbar"), 0, this,TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar");
+ (void)new KAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar");
+ (void)new KAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar");
}
void KTApp::initStatusBar()
{
statusBar()->insertItem(i18n("Ready."), statusMessage, 1);
- statusBar()->setItemAlignment(statusMessage, Qt::AlignLeft | Qt::AlignVCenter);
+ statusBar()->setItemAlignment(statusMessage, TQt::AlignLeft | TQt::AlignVCenter);
}
void KTApp::saveOptions()
@@ -208,11 +208,11 @@ bool KTApp::queryClose()
{
if(cthost->dirty())
{
- KTApp* win = (KTApp*)parent();
+ KTApp* win = (KTApp*)tqparent();
int retVal = KMessageBox::warningYesNoCancel(win,
i18n("Scheduled tasks have been modified.\nDo you want to save changes?"),
- TQString::null,
+ TQString(),
KStdGuiItem::save(), KStdGuiItem::discard()
);
diff --git a/kcron/ktapp.h b/kcron/ktapp.h
index 0dd560f..6b28354 100644
--- a/kcron/ktapp.h
+++ b/kcron/ktapp.h
@@ -34,6 +34,7 @@ class CTHost;
class KTApp : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
friend class KTView;
@@ -237,13 +238,13 @@ private:
/**
* Read general options again and initialize all variables like the
- * geometry.
+ * tqgeometry.
*/
void readOptions();
/**
* Save general options like all bar positions and status as well as the
- * geometry to the configuration file.
+ * tqgeometry to the configuration file.
*/
void saveOptions();
diff --git a/kcron/ktlistcron.cpp b/kcron/ktlistcron.cpp
index 05dadb3..288f848 100644
--- a/kcron/ktlistcron.cpp
+++ b/kcron/ktlistcron.cpp
@@ -19,22 +19,22 @@
#include "kticon.h"
#include "ktprint.h"
-KTListCron::KTListCron(KTListItem* parent, const char* name,
+KTListCron::KTListCron(KTListItem* tqparent, const char* name,
CTCron* _ctcron) :
- KTListItem(parent, name, _ctcron)
+ KTListItem(tqparent, name, _ctcron)
{
refresh();
}
-KTListCron::KTListCron(TQListView* parent, const char* name,
+KTListCron::KTListCron(TQListView* tqparent, const char* name,
CTCron* _ctcron) :
- KTListItem(parent, name, _ctcron)
+ KTListItem(tqparent, name, _ctcron)
{
refresh();
}
-KTListCron::KTListCron(TQListView* parent, CTCron* _ctcron) :
- KTListItem(parent, (const char*)0, _ctcron)
+KTListCron::KTListCron(TQListView* tqparent, CTCron* _ctcron) :
+ KTListItem(tqparent, (const char*)0, _ctcron)
{
refresh();
}
diff --git a/kcron/ktlistcron.h b/kcron/ktlistcron.h
index 713a375..8b475ab 100644
--- a/kcron/ktlistcron.h
+++ b/kcron/ktlistcron.h
@@ -28,17 +28,17 @@ public:
/**
* Construct tasks or variables folder from branch.
*/
- KTListCron(KTListItem* parent, const char* name, CTCron* _ctcron);
+ KTListCron(KTListItem* tqparent, const char* name, CTCron* _ctcron);
/**
* Construct tasks or variables folder from root.
*/
- KTListCron(TQListView* parent, const char* name, CTCron* _ctcron);
+ KTListCron(TQListView* tqparent, const char* name, CTCron* _ctcron);
/**
* Construct user folder from root.
*/
- KTListCron(TQListView* parent, CTCron* _ctcron);
+ KTListCron(TQListView* tqparent, CTCron* _ctcron);
/**
* Refresh.
diff --git a/kcron/ktlistitem.cpp b/kcron/ktlistitem.cpp
index ef2ad0e..d8ef4c2 100644
--- a/kcron/ktlistitem.cpp
+++ b/kcron/ktlistitem.cpp
@@ -14,14 +14,14 @@
#include "ctcron.h"
-KTListItem::KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron) :
- TQListViewItem(parent, name),
+KTListItem::KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron) :
+ TQListViewItem(tqparent, name),
ctcron(_ctcron)
{
}
-KTListItem::KTListItem(TQListView* parent, const char* name, CTCron* _ctcron) :
- TQListViewItem(parent, name),
+KTListItem::KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron) :
+ TQListViewItem(tqparent, name),
ctcron(_ctcron)
{
}
diff --git a/kcron/ktlistitem.h b/kcron/ktlistitem.h
index 718fb79..fde698e 100644
--- a/kcron/ktlistitem.h
+++ b/kcron/ktlistitem.h
@@ -25,19 +25,19 @@ class CTCron;
* An enhanced TQListViewItem that ensures all list view items have the
* same interface.
*/
-class KTListItem : public QListViewItem
+class KTListItem : public TQListViewItem
{
public:
/**
* Construct a root list view item from a CTCron.
*/
- KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron);
+ KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron);
/**
* Construct a non-root list view item from a CTCron.
*/
- KTListItem(TQListView* parent, const char* name, CTCron* _ctcron);
+ KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron);
/**
* Destructor.
diff --git a/kcron/ktlisttask.cpp b/kcron/ktlisttask.cpp
index 17a1378..28329ed 100644
--- a/kcron/ktlisttask.cpp
+++ b/kcron/ktlisttask.cpp
@@ -18,14 +18,14 @@
#include "kttask.h"
#include "ktprint.h"
-KTListTask::KTListTask(KTListItem* parent,
+KTListTask::KTListTask(KTListItem* tqparent,
CTCron* _ctcron, CTTask* _cttask) :
- KTListItem(parent, 0, _ctcron),
+ KTListItem(tqparent, 0, _ctcron),
cttask(_cttask)
{
refresh();
- parent->setOpen(true);
+ tqparent->setOpen(true);
}
void KTListTask::refresh()
@@ -61,7 +61,7 @@ void KTListTask::edit()
{
KTTask(cttask,i18n("Modify Task")).exec();
refresh();
- parent()->sortChildItems(1, true);
+ tqparent()->sortChildItems(1, true);
}
CTTask* KTListTask::getCTTask() const
diff --git a/kcron/ktlisttask.h b/kcron/ktlisttask.h
index 3384745..9dfb2b2 100644
--- a/kcron/ktlisttask.h
+++ b/kcron/ktlisttask.h
@@ -30,7 +30,7 @@ public:
/**
* Initialize the list view item and task.
*/
- KTListTask(KTListItem* parent, CTCron* _ctcron, CTTask* _cttask);
+ KTListTask(KTListItem* tqparent, CTCron* _ctcron, CTTask* _cttask);
/**
* Refresh from underlying task.
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index 95c7779..1c21556 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -24,14 +24,14 @@
#include "kttask.h"
#include "ktprint.h"
-KTListTasks::KTListTasks(KTListItem* parent, CTCron* _ctcron) :
- KTListItem(parent, 0, _ctcron)
+KTListTasks::KTListTasks(KTListItem* tqparent, CTCron* _ctcron) :
+ KTListItem(tqparent, 0, _ctcron)
{
refresh();
}
-KTListTasks::KTListTasks(TQListView* parent, CTCron* _ctcron) :
- KTListItem(parent, 0, _ctcron)
+KTListTasks::KTListTasks(TQListView* tqparent, CTCron* _ctcron) :
+ KTListItem(tqparent, 0, _ctcron)
{
refresh();
}
@@ -50,7 +50,7 @@ void KTListTasks::create()
if (temptask->dirty())
{
getCTCron()->task.push_back(temptask);
- new KTListTask(this, getCTCron(), temptask); // Qt will clean up
+ new KTListTask(this, getCTCron(), temptask); // TQt will clean up
}
else
{
@@ -77,7 +77,7 @@ void KTListTasks::print (KTPrint& printer) const
printer.setFont(stnd);
- //firstChild() does not return null if there are no children, therefore
+ //firstChild() does not return null if there are no tqchildren, therefore
//we need to check the validation of the pointer without terminating
//the application. This maybe a bug in QT 1.44
diff --git a/kcron/ktlisttasks.h b/kcron/ktlisttasks.h
index ad5e5a3..d413cc8 100644
--- a/kcron/ktlisttasks.h
+++ b/kcron/ktlisttasks.h
@@ -30,12 +30,12 @@ public:
/**
* Construct tasks folder from branch.
*/
- KTListTasks(KTListItem* parent, CTCron* _ctcron);
+ KTListTasks(KTListItem* tqparent, CTCron* _ctcron);
/**
* Construct tasks folder from root.
*/
- KTListTasks(TQListView* parent, CTCron* _ctcron);
+ KTListTasks(TQListView* tqparent, CTCron* _ctcron);
/**
* Internationalized description.
diff --git a/kcron/ktlistvar.cpp b/kcron/ktlistvar.cpp
index e6c4f6a..5850052 100644
--- a/kcron/ktlistvar.cpp
+++ b/kcron/ktlistvar.cpp
@@ -19,13 +19,13 @@
#include "kticon.h"
#include "ktvariable.h"
-KTListVar::KTListVar(KTListItem* parent, CTCron* _ctcron,
+KTListVar::KTListVar(KTListItem* tqparent, CTCron* _ctcron,
CTVariable* _ctvariable) :
- KTListItem(parent, 0, _ctcron),
+ KTListItem(tqparent, 0, _ctcron),
ctvar(_ctvariable)
{
refresh();
- parent->setOpen(true);
+ tqparent->setOpen(true);
}
void KTListVar::refresh()
@@ -71,7 +71,7 @@ void KTListVar::edit()
{
KTVariable(ctvar,i18n("Modify Variable")).exec();
refresh();
- parent()->sortChildItems(1, true);
+ tqparent()->sortChildItems(1, true);
}
CTVariable* KTListVar::getCTVariable() const
diff --git a/kcron/ktlistvar.h b/kcron/ktlistvar.h
index 0d4e7f0..6bbb7a9 100644
--- a/kcron/ktlistvar.h
+++ b/kcron/ktlistvar.h
@@ -30,7 +30,7 @@ public:
/**
* Initialize the list view item and environment variable.
*/
- KTListVar(KTListItem* parent, CTCron* _ctcron, CTVariable* _ctvariable);
+ KTListVar(KTListItem* tqparent, CTCron* _ctcron, CTVariable* _ctvariable);
/**
* Refresh from underlying variable.
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index 64d43a1..ec9894a 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -25,14 +25,14 @@
#include "ktvariable.h"
#include "ktprint.h"
-KTListVars::KTListVars(KTListItem* parent, CTCron* _ctcron) :
- KTListItem(parent, 0, _ctcron)
+KTListVars::KTListVars(KTListItem* tqparent, CTCron* _ctcron) :
+ KTListItem(tqparent, 0, _ctcron)
{
refresh();
}
-KTListVars::KTListVars(TQListView* parent, CTCron* _ctcron) :
- KTListItem(parent, 0, _ctcron)
+KTListVars::KTListVars(TQListView* tqparent, CTCron* _ctcron) :
+ KTListItem(tqparent, 0, _ctcron)
{
refresh();
}
@@ -46,7 +46,7 @@ void KTListVars::create()
if (tempvar->dirty())
{
getCTCron()->variable.push_back(tempvar);
- new KTListVar(this, getCTCron(), tempvar); // Qt will clean up
+ new KTListVar(this, getCTCron(), tempvar); // TQt will clean up
}
else
{
@@ -73,7 +73,7 @@ void KTListVars::print(KTPrint& printer) const
printer.setFont(stnd);
- //firstChild() does not return null if there are no children, therefore
+ //firstChild() does not return null if there are no tqchildren, therefore
//we need to check the validation of the pointer without terminating
//the application. This maybe a bug in QT 1.44
diff --git a/kcron/ktlistvars.h b/kcron/ktlistvars.h
index f455596..07c53b4 100644
--- a/kcron/ktlistvars.h
+++ b/kcron/ktlistvars.h
@@ -31,12 +31,12 @@ public:
/**
* Construct variables folder from branch.
*/
- KTListVars(KTListItem* parent, CTCron* _ctcron);
+ KTListVars(KTListItem* tqparent, CTCron* _ctcron);
/**
* Construct variables folder from root.
*/
- KTListVars(TQListView* parent, CTCron* _ctcron);
+ KTListVars(TQListView* tqparent, CTCron* _ctcron);
/**
* Internationalized description.
diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp
index b1de5c6..ceb1482 100644
--- a/kcron/ktprint.cpp
+++ b/kcron/ktprint.cpp
@@ -104,7 +104,7 @@ TQFont KTPrint :: getFont () const
return paint->font();
}
-void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWrap)
+void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordWrap)
{
//Prints the string str into the column col using
//the remaining arguments as format flags
@@ -115,8 +115,8 @@ void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWra
return;
- //Setup the alignment
- switch (alignment) {
+ //Setup the tqalignment
+ switch (tqalignment) {
case alignTextLeft : format = AlignLeft | AlignTop | DontClip | ExpandTabs; break;
case alignTextCenter : format = AlignHCenter | AlignTop | DontClip | ExpandTabs; break;
case alignTextRight : format = AlignRight | AlignTop | DontClip | ExpandTabs; break;
diff --git a/kcron/ktprint.h b/kcron/ktprint.h
index 16c13b1..34b0254 100644
--- a/kcron/ktprint.h
+++ b/kcron/ktprint.h
@@ -87,7 +87,7 @@ public:
/**
* Print text
*/
- void print (const TQString &str, int col =1, int alignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
+ void print (const TQString &str, int col =1, int tqalignment=KTPrint::defaultLeftMargin, bool wordWrap = true);
/**
* Constructs the columns
@@ -178,7 +178,7 @@ private:
KPrinter *prnt;
/**
- *Nest a column class to make text layout nicer
+ *Nest a column class to make text tqlayout nicer
*/
class Column {
diff --git a/kcron/ktprintopt.h b/kcron/ktprintopt.h
index f1e3eb5..8673c9d 100644
--- a/kcron/ktprintopt.h
+++ b/kcron/ktprintopt.h
@@ -31,6 +31,7 @@ class KAccel;
class KTPrintOpt : public KPrintDialogPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 88e5567..46ec77c 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -33,18 +33,18 @@
#include "kticon.h"
-class KTPushButton : public QPushButton
+class KTPushButton : public TQPushButton
{
public:
- KTPushButton(TQWidget * parent, const char * name = 0 )
- : TQPushButton(parent, name), isSelected(false), isDirty(false)
+ KTPushButton(TQWidget * tqparent, const char * name = 0 )
+ : TQPushButton(tqparent, name), isSelected(false), isDirty(false)
{
updatePalette();
}
void updatePalette()
{
- palNormal = ((TQWidget *)parent())->palette();
+ palNormal = ((TQWidget *)tqparent())->palette();
palSelected = palNormal;
for(int cg = (int) TQPalette::Disabled; cg < (int) TQPalette::NColorGroups; cg++)
{
@@ -156,8 +156,8 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
leCommand->setText(TQString::fromLocal8Bit(cttask->command.c_str()));
- labComment->setFixedWidth( QMAX( labComment->width(), labCommand->width()) );
- labCommand->setFixedWidth( QMAX( labComment->width(), labCommand->width()) );
+ labComment->setFixedWidth( TQMAX( labComment->width(), labCommand->width()) );
+ labCommand->setFixedWidth( TQMAX( labComment->width(), labCommand->width()) );
slotCommandChanged();
@@ -269,7 +269,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
v4->addSpacing( 2 * KDialogBase::spacingHint() );
labAM = new TQLabel( i18n("AM"), bgHour, "labAM");
- labAM->setAlignment(AlignRight | AlignVCenter);
+ labAM->tqsetAlignment(AlignRight | AlignVCenter);
v4->addWidget( labAM );
@@ -292,7 +292,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
}
labPM = new TQLabel( i18n("PM"), bgHour, "labPM");
- labPM->setAlignment(AlignRight | AlignVCenter);
+ labPM->tqsetAlignment(AlignRight | AlignVCenter);
v4->addWidget( labPM );
hhours = new TQHBoxLayout( v4, KDialogBase::spacingHint() );
@@ -398,12 +398,12 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
// key acceleration
key_accel = new KAccel(this);
- key_accel->insert(KStdAccel::Open, this, TQT_SLOT(slotOK()));
- key_accel->insert(KStdAccel::Close, this, TQT_SLOT(slotCancel()));
- key_accel->insert(KStdAccel::Quit, this, TQT_SLOT(slotCancel()));
+ key_accel->insert(KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK()));
+ key_accel->insert(KStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
+ key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
key_accel->readSettings();
- setFixedSize( minimumSize() );
+ setFixedSize( tqminimumSize() );
slotDailyChanged();
slotMonthChanged();
slotDayOfMonthChanged();
@@ -421,10 +421,10 @@ void KTTask::slotCommandChanged()
/*
TQString qs(leCommand->text());
- int beginPos(qs.findRev("/", qs.length()) + 1);
+ int beginPos(qs.tqfindRev("/", qs.length()) + 1);
if (beginPos < 0) beginPos = 0;
- int endPos(qs.findRev(" ", qs.length()));
+ int endPos(qs.tqfindRev(" ", qs.length()));
if (endPos < 0) endPos = qs.length();
TQString iconName(qs.mid(beginPos, endPos-beginPos) + ".xpm");
@@ -609,9 +609,9 @@ void KTTask::slotOK()
// absolute path
TQString qs(leCommand->text());
- if (qs.find("/") == 0)
+ if (qs.tqfind("/") == 0)
{
- int spacePos(qs.find(" "));
+ int spacePos(qs.tqfind(" "));
if (spacePos < 0) spacePos = qs.length();
TQString programName(qs.left(spacePos));
TQFileInfo file(programName);
@@ -636,7 +636,7 @@ void KTTask::slotOK()
// save work in process
if (!cttask->user.empty())
{
- cttask->user = TQFile::encodeName(leUser->text());
+ cttask->user = TQFile::encodeName(leUser->text()).data();
}
else
{
diff --git a/kcron/kttask.h b/kcron/kttask.h
index be34ddb..3d52f5c 100644
--- a/kcron/kttask.h
+++ b/kcron/kttask.h
@@ -31,6 +31,7 @@ class CTTask;
class KTTask : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 19cbba0..60ff101 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
ctvar( _ctvar)
{
TQFrame *page = makeMainWidget();
- TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
- layout->setRowStretch(3, 1);
- layout->setColStretch(1, 1);
+ TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
+ tqlayout->setRowStretch(3, 1);
+ tqlayout->setColStretch(1, 1);
setIcon(KTIcon::application(true));
// variable
labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable");
- layout->addWidget(labVariable, 1, 0, Qt::AlignLeft | Qt::AlignTop);
+ tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
cmbVariable = new TQComboBox(true, page, "cmbVariable");
- layout->addWidget(cmbVariable, 1, 1);
+ tqlayout->addWidget(cmbVariable, 1, 1);
cmbVariable->insertItem("HOME");
cmbVariable->insertItem("MAILTO");
@@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
// icon
labIcon = new TQLabel(page, "labIcon");
- layout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
+ tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
// value
labValue = new TQLabel(i18n("Va&lue:"), page, "labValue");
- layout->addWidget(labValue, 2, 0, Qt::AlignLeft | Qt::AlignTop);
+ tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
leValue = new TQLineEdit(page, "leValue");
- layout->addMultiCellWidget(leValue, 2, 2, 1, 2);
+ tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2);
leValue->setMaxLength(255);
labValue->setBuddy(leValue);
// comment
labComment = new TQLabel(i18n("Co&mment:"), page, "labComment");
- layout->addWidget(labComment, 3, 0, Qt::AlignLeft | Qt::AlignTop);
+ tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
teComment = new KTextEdit(page, "teComment");
- teComment->setTextFormat(Qt::PlainText);
- layout->addMultiCellWidget(teComment, 3, 3, 1, 2);
+ teComment->setTextFormat(TQt::PlainText);
+ tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2);
labComment->setBuddy(teComment);
// enabled
chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled");
- layout->addWidget(chkEnabled, 4, 0);
+ tqlayout->addWidget(chkEnabled, 4, 0);
// set starting field values
cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str()));
@@ -142,9 +142,9 @@ void KTVariable::slotOk()
return;
}
- ctvar->variable = cmbVariable->currentText().local8Bit();
- ctvar->value = leValue->text().local8Bit();
- ctvar->comment = teComment->text().replace('\n',' ').replace('\r',' ').local8Bit();
+ ctvar->variable = cmbVariable->currentText().local8Bit().data();
+ ctvar->value = leValue->text().local8Bit().data();
+ ctvar->comment = teComment->text().tqreplace('\n',' ').tqreplace('\r',' ').local8Bit().data();
ctvar->enabled = chkEnabled->isChecked();
close();
}
diff --git a/kcron/ktvariable.h b/kcron/ktvariable.h
index 7870ef3..4cc06a4 100644
--- a/kcron/ktvariable.h
+++ b/kcron/ktvariable.h
@@ -33,6 +33,7 @@ class CTVariable;
class KTVariable : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index 27341de..9c5591e 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -51,8 +51,8 @@
#include "kttask.h"
#include "ktprint.h"
-KTView::KTView(TQWidget *parent, const char* name) :
- TQWidget(parent, name),
+KTView::KTView(TQWidget *tqparent, const char* name) :
+ TQWidget(tqparent, name),
listView(0),
currentCTCron(0),
currentIsTask(true),
@@ -62,21 +62,21 @@ KTView::KTView(TQWidget *parent, const char* name) :
clipboardCTTask(0),
clipboardCTVariable(0)
{
- ktapp = (KTApp*)parentWidget();
+ ktapp = (KTApp*)tqparentWidget();
setBackgroundMode(PaletteBase);
refresh();
listView->setSelected(listView->firstChild(), true);
- connect(this, TQT_SIGNAL(enableModificationButtons(bool)), parent,
+ connect(this, TQT_SIGNAL(enableModificationButtons(bool)), tqparent,
TQT_SLOT(slotEnableModificationButtons(bool)));
- connect(this, TQT_SIGNAL(enablePaste(bool)), parent,
+ connect(this, TQT_SIGNAL(enablePaste(bool)), tqparent,
TQT_SLOT(slotEnablePaste(bool)));
- connect(this, TQT_SIGNAL(enableRunNow(bool)), parent,
+ connect(this, TQT_SIGNAL(enableRunNow(bool)), tqparent,
TQT_SLOT(slotEnableRunNow(bool)));
- connect(this, TQT_SIGNAL(enableEnabled(bool)), parent,
+ connect(this, TQT_SIGNAL(enableEnabled(bool)), tqparent,
TQT_SLOT(slotEnableEnabled(bool)));
}
@@ -216,7 +216,7 @@ void KTView::print () const
//Check that the correct item is selected, they must
//select the top level entry for all items to print
while (ktli->depth() != 0)
- ktli = (KTListItem*)ktli->parent();
+ ktli = (KTListItem*)ktli->tqparent();
user = ktli; //Used to store user's name
@@ -266,16 +266,16 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const
{
TQFont stnd;
TQString logonInfo;
- TQDateTime now (TQDateTime::currentDateTime());
+ TQDateTime now (TQDateTime::tqcurrentDateTime());
char hostName[20];
gethostname(hostName, 20);
// SSA : Fix Me user name, logon name and host name musst be
// SSA : not only in us-ascii ??
logonInfo = i18n("user on host", "%1 <%2> on %3")
- .arg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
- .arg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
- .arg(TQString::fromLocal8Bit(hostName));
+ .tqarg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str()))
+ .tqarg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str()))
+ .tqarg(TQString::fromLocal8Bit(hostName));
stnd = printer.getFont();
printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
@@ -315,7 +315,7 @@ void KTView::resizeEvent (TQResizeEvent*)
{
listView->setFixedWidth(width());
listView->setFixedHeight(height());
- repaint();
+ tqrepaint();
}
void KTView::copy()
@@ -367,7 +367,7 @@ void KTView::create()
{
KTListItem* ktli = (KTListItem*)listView->currentItem();
if ((ktli->text(0) != KTListTasks::getDescription()) && (ktli->text(0) != KTListVars::getDescription())) {
- ktli = (KTListItem*)ktli->parent();
+ ktli = (KTListItem*)ktli->tqparent();
}
Q_CHECK_PTR(ktli);
ktli->create();
@@ -427,10 +427,10 @@ TQString KTView::absolute() const
{
TQString fullCommand = TQString::fromLocal8Bit(currentCTTask->command.c_str());
TQString command(fullCommand);
- int pos(command.find(" "));
+ int pos(command.tqfind(" "));
if (pos > 0) command = command.left(pos);
- if (command.find("/") == 0)
+ if (command.tqfind("/") == 0)
return fullCommand;
TQString path = TQString::fromLocal8Bit(currentCTCron->path().c_str());
@@ -439,7 +439,7 @@ TQString KTView::absolute() const
TQString prefix;
TQString full;
- while ((end = path.find(":", begin)) > 0)
+ while ((end = path.tqfind(":", begin)) > 0)
{
prefix = path.mid(begin, begin + end) + "/";
full = prefix + command;
@@ -498,7 +498,7 @@ void KTView::slotEdit(TQListViewItem* /*qlvi*/)
void KTView::slotSetCurrent (TQListViewItem* qlvi)
{
- TQListViewItem* parent = qlvi->parent();
+ TQListViewItem* tqparent = qlvi->tqparent();
if (qlvi->text(0) == KTListVars::getDescription())
{
@@ -527,9 +527,9 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi)
emit(enableEnabled(false));
}
- else if (parent)
+ else if (tqparent)
{
- if (parent->text(0) == KTListVars::getDescription())
+ if (tqparent->text(0) == KTListVars::getDescription())
{
// variable
currentCTCron = ((KTListVar*)qlvi)->getCTCron();
@@ -542,7 +542,7 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi)
emit(enableEnabled(currentCTVariable->enabled));
}
- else if (parent->text(0) == KTListTasks::getDescription())
+ else if (tqparent->text(0) == KTListTasks::getDescription())
{
// task
currentCTCron = ((KTListTask*)qlvi)->getCTCron();
diff --git a/kcron/ktview.h b/kcron/ktview.h
index f6e5a04..8a53478 100644
--- a/kcron/ktview.h
+++ b/kcron/ktview.h
@@ -31,16 +31,17 @@ class CTTask;
/**
* Main GUI view of the crontab entries.
*/
-class KTView : public QWidget
+class KTView : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Initializes view.
*/
- KTView (TQWidget* parent = 0, const char* name=0);
+ KTView (TQWidget* tqparent = 0, const char* name=0);
/**
* Destructor.
diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp
index 5e8ef65..1a78d44 100644
--- a/kdat/Archive.cpp
+++ b/kdat/Archive.cpp
@@ -94,7 +94,7 @@ void Archive::read( int version )
}
}
- // Number of immediate children (4 bytes).
+ // Number of immediate tqchildren (4 bytes).
fread( &ival, sizeof( ival ), 1, _fptr );
//===== Read files =====
@@ -148,7 +148,7 @@ void Archive::write( FILE* fptr )
fwrite( &ival, sizeof( ival ), 1, _fptr );
}
- // Number of immediate children (4 bytes).
+ // Number of immediate tqchildren (4 bytes).
ival = getChildren().count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
@@ -202,7 +202,7 @@ const TQPtrList<File>& Archive::getChildren()
{
read();
- return _children;
+ return _tqchildren;
}
const TQPtrList<Range>& Archive::getRanges()
@@ -255,7 +255,7 @@ void Archive::addChild( File* file )
{
read();
- _children.append( file );
+ _tqchildren.append( file );
}
File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename )
@@ -266,7 +266,7 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con
TQString fn( filename );
int idx = 0;
- while ( ( idx = fn.find( '/' ) ) > -1 ) {
+ while ( ( idx = fn.tqfind( '/' ) ) > -1 ) {
path.append( fn.left( idx + 1 ) );
fn.remove( 0, idx + 1 );
}
@@ -289,40 +289,40 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con
//path.remove(path.first());
path.remove(path.begin());
TQPtrListIterator<File> i( getChildren() );
- File* parent = 0;
+ File* tqparent = 0;
for ( ; i.current() ; ++i ) {
if ( i.current()->getName() == dir ) {
- parent = i.current();
+ tqparent = i.current();
break;
}
}
- if ( parent == 0 ) {
- parent = new File( 0, 0, 0, startRecord, endRecord, dir );
- addChild( parent );
+ if ( tqparent == 0 ) {
+ tqparent = new File( 0, 0, 0, startRecord, endRecord, dir );
+ addChild( tqparent );
}
for ( TQStringList::Iterator j = path.begin();
j != path.end();
++j ) {
TQString dir = *j;
- File* pparent = parent;
- TQPtrListIterator<File> i( pparent->getChildren() );
- for ( parent = 0; i.current() ; ++i ) {
+ File* ptqparent = tqparent;
+ TQPtrListIterator<File> i( ptqparent->getChildren() );
+ for ( tqparent = 0; i.current() ; ++i ) {
if ( i.current()->getName() == dir ) {
- parent = i.current();
+ tqparent = i.current();
break;
}
}
- if ( parent == 0 ) {
- parent = new File( pparent, 0, 0, 0, 0, dir );
- pparent->addChild( parent );
+ if ( tqparent == 0 ) {
+ tqparent = new File( ptqparent, 0, 0, 0, 0, dir );
+ ptqparent->addChild( tqparent );
}
}
- file = new File( parent, size, mtime, startRecord, endRecord, fn );
- parent->addChild( file );
+ file = new File( tqparent, size, mtime, startRecord, endRecord, fn );
+ tqparent->addChild( file );
return file;
}
diff --git a/kdat/Archive.h b/kdat/Archive.h
index 9f42684..4f593ab 100644
--- a/kdat/Archive.h
+++ b/kdat/Archive.h
@@ -39,7 +39,7 @@ class Archive {
FILE* _fptr;
int _offset;
TQString _name;
- TQPtrList<File> _children;
+ TQPtrList<File> _tqchildren;
RangeList _ranges;
Tape* _tape;
public:
@@ -67,7 +67,7 @@ public:
Archive( Tape* tape, FILE* fptr, int offset );
/**
- * Destroy the archive entry and all of its children.
+ * Destroy the archive entry and all of its tqchildren.
*/
~Archive();
@@ -82,7 +82,7 @@ public:
/**
* Recursively read the instance data for this archive entry and all of its
- * children. This method is used when converting from an older index format.
+ * tqchildren. This method is used when converting from an older index format.
*
* @param version The version of the old tape index.
*/
@@ -90,7 +90,7 @@ public:
/**
* Write out the archive entry to the open file. Entries for each of its
- * children will also be written.
+ * tqchildren will also be written.
*/
void write( FILE* fptr );
@@ -125,12 +125,12 @@ public:
/**
* Get the list of top-level files in this archive.
*
- * @return A list of the immediate children of this archive.
+ * @return A list of the immediate tqchildren of this archive.
*/
const TQPtrList<File>& getChildren();
/**
- * Get the list of ranges of this file and all of its children.
+ * Get the list of ranges of this file and all of its tqchildren.
*
* @return A list of ranges.
*/
@@ -159,7 +159,7 @@ public:
/**
* Create a new file entry, and add it to the archive. Based on the
- * full path name of the file, an appropriate parent is found. The parent
+ * full path name of the file, an appropriate tqparent is found. The tqparent
* may be this archive or another file entry. File entries will be created
* on demand if some or all of the file's path does not yet exist in this
* archive.
@@ -176,7 +176,7 @@ public:
File* addFile( int size, int mtime, int startRecord, int endRecord, const TQString & filename );
/**
- * Recursively calculate the list of ranges for all of the archive's children.
+ * Recursively calculate the list of ranges for all of the archive's tqchildren.
*/
void calcRanges();
};
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index c3838d4..754b701 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -35,33 +35,33 @@
#include "ArchiveInfoWidget.moc"
-ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name ),
+ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name ),
_archive( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this );
TQLabel* lbl3 = new TQLabel( i18n( "Size:" ), this );
- int max = lbl1->sizeHint().width();
- if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
- if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
+ int max = lbl1->tqsizeHint().width();
+ if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+ if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
- lbl2->setFixedSize( max, lbl2->sizeHint().height() );
- lbl3->setFixedSize( max, lbl3->sizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
_archiveName = new TQLineEdit( this );
- _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
+ _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->sizeHint().height() );
+ _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->sizeHint().height() );
+ _size->setFixedHeight( _size->tqsizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->sizeHint().height() );
+ _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/ArchiveInfoWidget.h b/kdat/ArchiveInfoWidget.h
index 5e745b0..e9bc175 100644
--- a/kdat/ArchiveInfoWidget.h
+++ b/kdat/ArchiveInfoWidget.h
@@ -32,6 +32,7 @@ class Archive;
*/
class ArchiveInfoWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
Archive* _archive;
TQLineEdit* _archiveName;
TQLabel* _ctime;
@@ -44,7 +45,7 @@ public:
/**
* Create a new archive info widget.
*/
- ArchiveInfoWidget( TQWidget* parent = 0, const char* name = 0 );
+ ArchiveInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the archive info widget.
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 8a26d2a..1c66805 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -51,8 +51,8 @@
BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental,
const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape,
- TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE ),
+ TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE ),
_proc( NULL ),
_tarParser( NULL ),
_archiveName( archiveName ),
@@ -93,55 +93,55 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir,
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
_timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
- _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
+ _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( archiveSize ), f1 );
- totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
+ totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "KB written:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
_kbytesWritten = new TQLabel( i18n( "0KB" ), f2 );
- _kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() );
+ _kbytesWritten->setFixedHeight( _kbytesWritten->tqsizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
TQLabel* lbl6 = new TQLabel( i18n( "Files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
_fileCount = new TQLabel( i18n( "0" ), f2 );
- _fileCount->setFixedHeight( _fileCount->sizeHint().height() );
+ _fileCount->setFixedHeight( _fileCount->tqsizeHint().height() );
_log = new LoggerWidget( i18n( "Backup log:" ), this );
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->sizeHint().height() );
+ _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "Save Log..." ), this );
- _save->setFixedSize( 80, _save->sizeHint().height() );
+ _save->setFixedSize( 80, _save->tqsizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new KPushButton( KStdGuiItem::cancel(), this );
- _abort->setFixedSize( 80, _abort->sizeHint().height() );
+ _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -299,13 +299,13 @@ void BackupDlg::slotProcessExited( KProcess* )
if ( _fileName.length() > 0 ) {
_archive->addFile( _fileSize, _fileMTime, _fileStartRecord, _totalRecords, _fileName );
- _fileName = TQString::null;
+ _fileName = TQString();
}
TapeDrive::instance()->close();
TapeDrive::instance()->open();
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
delete _proc;
_tape->addChild( _archive );
@@ -381,7 +381,7 @@ void BackupDlg::slotOK()
void BackupDlg::slotAbort()
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
if ( _proc ) {
_proc->kill();
delete _proc;
@@ -426,7 +426,7 @@ void BackupDlg::updateStats()
_kbytesWritten->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
+ str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h
index cf32bef..0cbc61c 100644
--- a/kdat/BackupDlg.h
+++ b/kdat/BackupDlg.h
@@ -33,10 +33,11 @@ class Tape;
class TarParser;
/**
- * @short Status dialog for backing up files.
+ * @short tqStatus dialog for backing up files.
*/
class BackupDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
KProcess* _proc;
TarParser* _tarParser;
TQString _archiveName;
@@ -92,12 +93,12 @@ public:
* @param removeSnapshot Remove the snapshot before backing up.
* @param archiveSize The estimate size of the archive in kilobytes.
* @param tape The tape index to add the archive to.
- * @param parent The parent widget for this dialog.
+ * @param tqparent The tqparent widget for this dialog.
* @param name The name of this widget.
*/
BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental,
const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape,
- TQWidget* parent = 0, const char* name = 0 );
+ TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the backup dialog.
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index b5311ac..86aa875 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -30,8 +30,8 @@
#include "BackupOptDlg.moc"
-BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE )
+BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE )
{
setIconText( i18n( "KDat: Backup Options" ) );
setCaption( i18n( "KDat: Backup Options" ) );
@@ -42,10 +42,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons
_profile->setBackupProfile( backupProfile );
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->sizeHint().height() );
+ ok->setFixedSize( 80, ok->tqsizeHint().height() );
connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, ok->sizeHint().height() );
+ cancel->setFixedSize( 80, ok->tqsizeHint().height() );
connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/BackupOptDlg.h b/kdat/BackupOptDlg.h
index 10047dc..4a5e3dd 100644
--- a/kdat/BackupOptDlg.h
+++ b/kdat/BackupOptDlg.h
@@ -29,6 +29,7 @@ class BackupProfileWidget;
*/
class BackupOptDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
BackupProfileWidget* _profile;
public:
/**
@@ -36,7 +37,7 @@ public:
*
* @param backupProfile The backup profile.
*/
- BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent=0, const char* name=0 );
+ BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent=0, const char* name=0 );
/**
* Destroy the backup options dialog.
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index 7e4a918..ff0b541 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -36,29 +36,29 @@
#include "BackupProfileInfoWidget.moc"
-BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name ),
+BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name ),
_backupProfile( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this );
- int max = lbl1->sizeHint().width();
+ int max = lbl1->tqsizeHint().width();
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
_name = new TQLineEdit( this );
- _name->setFixedHeight( _name->sizeHint().height() );
+ _name->setFixedHeight( _name->tqsizeHint().height() );
_profile = new BackupProfileWidget( this );
TQPushButton* getSelection = new TQPushButton( i18n( "Files >>" ), this );
- getSelection->setFixedSize( 80, getSelection->sizeHint().height() );
+ getSelection->setFixedSize( 80, getSelection->tqsizeHint().height() );
TQPushButton* setSelection = new TQPushButton( i18n( "<< Files" ), this );
- setSelection->setFixedSize( 80, setSelection->sizeHint().height() );
+ setSelection->setFixedSize( 80, setSelection->tqsizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->sizeHint().height() );
+ _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/BackupProfileInfoWidget.h b/kdat/BackupProfileInfoWidget.h
index 53ca292..3366cd4 100644
--- a/kdat/BackupProfileInfoWidget.h
+++ b/kdat/BackupProfileInfoWidget.h
@@ -28,6 +28,7 @@ class BackupProfileWidget;
*/
class BackupProfileInfoWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
BackupProfile* _backupProfile;
TQLineEdit* _name;
BackupProfileWidget* _profile;
@@ -44,7 +45,7 @@ public:
/**
* Create a new backup profile info widget.
*/
- BackupProfileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
+ BackupProfileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the backup profile widget.
diff --git a/kdat/BackupProfileManager.h b/kdat/BackupProfileManager.h
index 418d807..7e54dae 100644
--- a/kdat/BackupProfileManager.h
+++ b/kdat/BackupProfileManager.h
@@ -39,6 +39,7 @@
*/
class BackupProfileManager : public TQObject {
Q_OBJECT
+ TQ_OBJECT
static BackupProfileManager* _instance;
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index 45acb56..7530d5c 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -33,26 +33,26 @@
#include "BackupProfileWidget.moc"
-BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
- : KTabCtl( parent, name )
+BackupProfileWidget::BackupProfileWidget( TQWidget* tqparent, const char* name )
+ : KTabCtl( tqparent, name )
{
TQWidget* one = new TQWidget( this );
addTab( one, i18n( "Backup" ) );
TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), one );
- lbl1->setFixedSize( lbl1->sizeHint() );
+ lbl1->setFixedSize( lbl1->tqsizeHint() );
_archiveName = new TQLineEdit( one );
- _archiveName->setFixedHeight( _archiveName->sizeHint().height() );
+ _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Working folder:" ), one );
- lbl2->setFixedSize( lbl2->sizeHint() );
+ lbl2->setFixedSize( lbl2->tqsizeHint() );
_workingDir = new TQComboBox( FALSE, one );
- _workingDir->setFixedHeight( _workingDir->sizeHint().height() );
+ _workingDir->setFixedHeight( _workingDir->tqsizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Backup files:" ), one );
- lbl3->setFixedHeight( lbl3->sizeHint().height() );
+ lbl3->setFixedHeight( lbl3->tqsizeHint().height() );
_files = new TQListBox( one );
@@ -60,20 +60,20 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
addTab( two, i18n( "Tar Options" ) );
_oneFilesystem = new TQCheckBox( i18n( "Stay on one filesystem" ), two );
- _oneFilesystem->setFixedHeight( _oneFilesystem->sizeHint().height() );
+ _oneFilesystem->setFixedHeight( _oneFilesystem->tqsizeHint().height() );
_incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two );
- _incremental->setFixedHeight( _incremental->sizeHint().height() );
+ _incremental->setFixedHeight( _incremental->tqsizeHint().height() );
connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) );
_snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two );
- _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() );
+ _snapshotLabel->setFixedSize( _snapshotLabel->tqsizeHint() );
_snapshotFile = new TQLineEdit( two );
- _snapshotFile->setFixedHeight( _snapshotFile->sizeHint().height() );
+ _snapshotFile->setFixedHeight( _snapshotFile->tqsizeHint().height() );
_removeSnapshot = new TQCheckBox( i18n( "Remove snapshot file before backup" ), two );
- _removeSnapshot->setFixedHeight( _removeSnapshot->sizeHint().height() );
+ _removeSnapshot->setFixedHeight( _removeSnapshot->tqsizeHint().height() );
slotIncrementalToggled( FALSE );
@@ -205,7 +205,7 @@ void BackupProfileWidget::setAbsoluteFiles( const TQStringList& files )
TQString prefix = Util::longestCommonPath( files );
_workingDir->clear();
- for ( int pos = prefix.length(); pos > 0; pos = prefix.findRev( '/', pos - 1 ) ) {
+ for ( int pos = prefix.length(); pos > 0; pos = prefix.tqfindRev( '/', pos - 1 ) ) {
_workingDir->insertItem( prefix.left( pos ) );
}
_workingDir->insertItem( "/" );
diff --git a/kdat/BackupProfileWidget.h b/kdat/BackupProfileWidget.h
index 0a2f580..4458c38 100644
--- a/kdat/BackupProfileWidget.h
+++ b/kdat/BackupProfileWidget.h
@@ -35,6 +35,7 @@ class BackupProfile;
*/
class BackupProfileWidget : public KTabCtl {
Q_OBJECT
+ TQ_OBJECT
TQLineEdit* _archiveName;
TQComboBox* _workingDir;
TQListBox* _files;
@@ -56,10 +57,10 @@ public:
*
* @param archiveName The default name for the new archive.
* @param files The list of files to be archived.
- * @param parent The parent widget of this dialog.
+ * @param tqparent The tqparent widget of this dialog.
* @param name The widget name of this dialog.
*/
- BackupProfileWidget( TQWidget* parent=0, const char* name=0 );
+ BackupProfileWidget( TQWidget* tqparent=0, const char* name=0 );
/**
* Destroy the backup profile widget.
diff --git a/kdat/File.cpp b/kdat/File.cpp
index fd766b3..01a1e13 100644
--- a/kdat/File.cpp
+++ b/kdat/File.cpp
@@ -21,10 +21,10 @@
#include "File.h"
-File::File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name )
+File::File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name )
: _stubbed( FALSE ),
_name( name ),
- _parent( parent )
+ _parent( tqparent )
{
assert( endRecord >= startRecord );
@@ -34,9 +34,9 @@ File::File( File* parent, int size, int mtime, int startRecord, int endRecord, c
_union._data._endRecord = endRecord;
}
-File::File( File* parent, FILE* fptr, int offset )
+File::File( File* tqparent, FILE* fptr, int offset )
: _stubbed( TRUE ),
- _parent( parent )
+ _parent( tqparent )
{
_union._stub._fptr = fptr;
_union._stub._offset = offset;
@@ -44,9 +44,9 @@ File::File( File* parent, FILE* fptr, int offset )
File::~File()
{
- while ( _children.first() ) {
- delete _children.first();
- _children.removeFirst();
+ while ( _tqchildren.first() ) {
+ delete _tqchildren.first();
+ _tqchildren.removeFirst();
}
}
@@ -164,7 +164,7 @@ void File::write( FILE* fptr )
fwrite( &ival, sizeof( ival ), 1, fptr );
}
- // Number of immediate children (4 bytes).
+ // Number of immediate tqchildren (4 bytes).
ival = getChildren().count();
fwrite( &ival, sizeof( ival ), 1, fptr );
@@ -175,10 +175,10 @@ void File::write( FILE* fptr )
}
//===== Write files =====
- ival = _children.count();
+ ival = _tqchildren.count();
fwrite( &ival, sizeof( ival ), 1, fptr );
- TQPtrListIterator<File> i( _children );
+ TQPtrListIterator<File> i( _tqchildren );
int count = 0;
for ( ; i.current(); ++i, count++ ) {
// Fill in the file offset.
@@ -236,8 +236,8 @@ TQString File::getName()
TQString File::getFullPathName()
{
TQString tmp = _name.copy();
- for ( File* parent = getParent(); parent; parent = parent->getParent() ) {
- tmp.prepend( parent->getName() );
+ for ( File* tqparent = getParent(); tqparent; tqparent = tqparent->getParent() ) {
+ tmp.prepend( tqparent->getName() );
}
return tmp;
@@ -252,7 +252,7 @@ const TQPtrList<File>& File::getChildren()
{
read();
- return _children;
+ return _tqchildren;
}
const TQPtrList<Range>& File::getRanges()
@@ -266,7 +266,7 @@ void File::addChild( File* file )
{
read();
- _children.append( file );
+ _tqchildren.append( file );
}
void File::calcRanges()
diff --git a/kdat/File.h b/kdat/File.h
index 75b1d87..7bfcd3e 100644
--- a/kdat/File.h
+++ b/kdat/File.h
@@ -46,13 +46,13 @@ class File {
} _union;
TQString _name;
File* _parent;
- TQPtrList<File> _children;
+ TQPtrList<File> _tqchildren;
RangeList _ranges;
public:
/**
* Create a new file entry.
*
- * @param parent The directory file entry that contains this file.
+ * @param tqparent The directory file entry that contains this file.
* @param size The size of the file in bytes.
* @param mtime The last modification time of the file in seconds since
* the Epoch.
@@ -63,24 +63,24 @@ public:
* the file's path name should be passed in. The rest of the
* path is determined by this file entry's ancestors.
*/
- File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name );
+ File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name );
/**
* Create a new stubbed instance of a file entry. The file pointer and
* offset specify where the actual instance data can be found. The real
* data is read on demand when one of the accessor functions is called.
*
- * @param parent The directory file entry that contains this file.
+ * @param tqparent The directory file entry that contains this file.
* @param fptr The open index file containing this file entry. The file
* must be left open so that the file entry information can
* be read at a later time.
* @param offset The offset that will be seeked to when reading the file
* entry information.
*/
- File( File* parent, FILE* fptr, int offset );
+ File( File* tqparent, FILE* fptr, int offset );
/**
- * Destroy the file entry and all of its children.
+ * Destroy the file entry and all of its tqchildren.
*/
~File();
@@ -95,7 +95,7 @@ public:
/**
* Recursively read the instance for this file entry and all of it's
- * children. This method is used when converting from an older index format.
+ * tqchildren. This method is used when converting from an older index format.
*
* @param version The version of the old tape index.
*/
@@ -103,7 +103,7 @@ public:
/**
* Write out the file entry to the open file. Entries for each of its
- * children will also be written.
+ * tqchildren will also be written.
*/
void write( FILE* fptr );
@@ -163,7 +163,7 @@ public:
TQString getFullPathName();
/**
- * Get the file entry's parent. A NULL parent indicates that this is one
+ * Get the file entry's tqparent. A NULL tqparent indicates that this is one
* of (possibly) many top level directories within the tar archive.
*
* @return A pointer to the file entry that contains this file entry.
@@ -171,15 +171,15 @@ public:
File* getParent();
/**
- * Get the children of this file entry. A normal file will never have any
- * children. A directory may or may not have children.
+ * Get the tqchildren of this file entry. A normal file will never have any
+ * tqchildren. A directory may or may not have tqchildren.
*
- * @return A list of the immediate children of this file entry.
+ * @return A list of the immediate tqchildren of this file entry.
*/
const TQPtrList<File>& getChildren();
/**
- * Get the list of ranges of this file and all of its children.
+ * Get the list of ranges of this file and all of its tqchildren.
*
* @return A list of ranges.
*/
@@ -193,7 +193,7 @@ public:
void addChild( File* file );
/**
- * Recursively calculate the list of ranges for all of the file's children.
+ * Recursively calculate the list of ranges for all of the file's tqchildren.
*/
void calcRanges();
};
diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp
index 5b75cf7..bcb896d 100644
--- a/kdat/FileInfoWidget.cpp
+++ b/kdat/FileInfoWidget.cpp
@@ -36,8 +36,8 @@
#include "FileInfoWidget.moc"
-FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+FileInfoWidget::FileInfoWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this );
@@ -47,42 +47,42 @@ FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl6 = new TQLabel( i18n( "Owner:" ), this );
TQLabel* lbl7 = new TQLabel( i18n( "Group:" ), this );
- int max = lbl1->sizeHint().width();
- if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
- if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
- if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
- if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
- if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
- if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
-
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
- lbl2->setFixedSize( max, lbl2->sizeHint().height() );
- lbl3->setFixedSize( max, lbl3->sizeHint().height() );
- lbl4->setFixedSize( max, lbl4->sizeHint().height() );
- lbl5->setFixedSize( max, lbl5->sizeHint().height() );
- lbl6->setFixedSize( max, lbl6->sizeHint().height() );
- lbl7->setFixedSize( max, lbl7->sizeHint().height() );
+ int max = lbl1->tqsizeHint().width();
+ if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+ if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
+ if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
+ if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
+ if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
+ if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
+
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
+ lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
+ lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
_fileName = new TQLabel( "???", this );
- _fileName->setFixedHeight( _fileName->sizeHint().height() );
+ _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->sizeHint().height() );
+ _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->sizeHint().height() );
+ _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
_atime = new TQLabel( "???", this );
- _atime->setFixedHeight( _atime->sizeHint().height() );
+ _atime->setFixedHeight( _atime->tqsizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->sizeHint().height() );
+ _size->setFixedHeight( _size->tqsizeHint().height() );
_owner = new TQLabel( "???", this );
- _owner->setFixedHeight( _owner->sizeHint().height() );
+ _owner->setFixedHeight( _owner->tqsizeHint().height() );
_group = new TQLabel( "???", this );
- _group->setFixedHeight( _group->sizeHint().height() );
+ _group->setFixedHeight( _group->tqsizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/FileInfoWidget.h b/kdat/FileInfoWidget.h
index 9a0a32f..5e7f9e2 100644
--- a/kdat/FileInfoWidget.h
+++ b/kdat/FileInfoWidget.h
@@ -28,6 +28,7 @@ class TQLabel;
*/
class FileInfoWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
TQLabel* _fileName;
TQLabel* _ctime;
TQLabel* _mtime;
@@ -39,10 +40,10 @@ public:
/**
* Create a new file info widget.
*
- * @param parent The parent widget.
+ * @param tqparent The tqparent widget.
* @param name The name of this widget.
*/
- FileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
+ FileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the file info widget.
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index 81a74f4..3041be5 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -34,8 +34,8 @@
#include "FormatOptDlg.moc"
-FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE )
+FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE )
{
setIconText( i18n( "KDat: Format Options" ) );
setCaption( i18n( "KDat: Format Options" ) );
@@ -43,28 +43,28 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char*
TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Tape size:" ), this );
- int max = lbl1->sizeHint().width();
- if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
+ int max = lbl1->tqsizeHint().width();
+ if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
- lbl2->setFixedSize( max, lbl2->sizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
_entry = new TQLineEdit( this );
_entry->setText( def );
- _entry->setFixedHeight( _entry->sizeHint().height() );
+ _entry->setFixedHeight( _entry->tqsizeHint().height() );
_tapeSize = new TQLineEdit( this );
- _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
+ _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
_tapeSizeUnits = new TQComboBox( this );
- _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
+ _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
_tapeSizeUnits->insertItem( "MB" );
_tapeSizeUnits->insertItem( "GB" );
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->sizeHint().height() );
+ ok->setFixedSize( 80, ok->tqsizeHint().height() );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, cancel->sizeHint().height() );
+ cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
TQHBoxLayout* l2 = new TQHBoxLayout();
diff --git a/kdat/FormatOptDlg.h b/kdat/FormatOptDlg.h
index 861fa93..db557e9 100644
--- a/kdat/FormatOptDlg.h
+++ b/kdat/FormatOptDlg.h
@@ -30,6 +30,7 @@ class TQLineEdit;
*/
class FormatOptDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQString _name;
int _size;
TQLineEdit* _entry;
@@ -42,10 +43,10 @@ public:
* Create a new format options dialog.
*
* @param def The default value for the tape name.
- * @param parent The parent widget for the dialog.
+ * @param tqparent The tqparent widget for the dialog.
* @param name The name for the dialog.
*/
- FormatOptDlg( const TQString & def, TQWidget* parent=0, const char* name=0 );
+ FormatOptDlg( const TQString & def, TQWidget* tqparent=0, const char* name=0 );
/**
* Destroy the format options dialog.
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 7a0d71a..2808f86 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -41,8 +41,8 @@
#include "IndexDlg.moc"
-IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE ),
+IndexDlg::IndexDlg( Tape* tape, TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE ),
_tarParser( NULL ),
_tape( tape ),
_archive( NULL ),
@@ -70,55 +70,55 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Archives:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
_archives = new TQLabel( i18n( "0" ), f2 );
- _archives->setFixedHeight( _archives->sizeHint().height() );
+ _archives->setFixedHeight( _archives->tqsizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "KB read:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
_kbytesRead = new TQLabel( i18n( "0KB" ), f1 );
- _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
+ _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "Files:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
_files = new TQLabel( i18n( "0" ), f2 );
- _files->setFixedHeight( _kbytesRead->sizeHint().height() );
+ _files->setFixedHeight( _kbytesRead->tqsizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
TQLabel* lbl6 = new TQLabel( i18n( "Total files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
_totalFiles = new TQLabel( i18n( "0" ), f2 );
- _totalFiles->setFixedHeight( _totalFiles->sizeHint().height() );
+ _totalFiles->setFixedHeight( _totalFiles->tqsizeHint().height() );
_log = new LoggerWidget( i18n( "Index log:" ), this );
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->sizeHint().height() );
+ _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "Save Log..." ), this );
- _save->setFixedSize( 80, _save->sizeHint().height() );
+ _save->setFixedSize( 80, _save->tqsizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new TQPushButton( i18n( "Abort" ), this );
- _abort->setFixedSize( 80, _abort->sizeHint().height() );
+ _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -221,13 +221,13 @@ void IndexDlg::slotOK()
void IndexDlg::slotAbort()
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
_aborted = TRUE;
}
void IndexDlg::timerEvent( TQTimerEvent* )
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
// Rewind tape.
_log->append( i18n( "Rewinding tape." ) );
@@ -275,12 +275,12 @@ void IndexDlg::timerEvent( TQTimerEvent* )
_archiveCount++;
msg.setNum( _archiveCount );
_archives->setText( msg );
- msg = i18n( "Indexing archive %1." ).arg( _archiveCount );
+ msg = i18n( "Indexing archive %1." ).tqarg( _archiveCount );
_log->append( msg );
- msg = i18n( "Archive %1" ).arg( _archiveCount );
+ msg = i18n( "Archive %1" ).tqarg( _archiveCount );
_archive = new Archive( _tape, 0, msg );
- _fileName = TQString::null;
+ _fileName = TQString();
_fileSize = -1;
_fileMTime = -1;
_fileStartRecord = -1;
@@ -349,7 +349,7 @@ void IndexDlg::updateStats()
_kbytesRead->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+ str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h
index 5b237c8..9dfd6ea 100644
--- a/kdat/IndexDlg.h
+++ b/kdat/IndexDlg.h
@@ -34,10 +34,11 @@ class Tape;
class TarParser;
/**
- * @short Status dialog for recreating a tape index.
+ * @short tqStatus dialog for recreating a tape index.
*/
class IndexDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TarParser* _tarParser;
Tape* _tape;
Archive* _archive;
@@ -78,10 +79,10 @@ public:
* Create a new tape index dialog.
*
* @param tape A pointer to the empty tape index to fill in.
- * @param parent The parent widget for this dialog.
+ * @param tqparent The tqparent widget for this dialog.
* @param name The name of this dialog.
*/
- IndexDlg( Tape* tape, TQWidget* parent = 0, const char* name = 0 );
+ IndexDlg( Tape* tape, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the tape index dialog.
diff --git a/kdat/InfoShellWidget.cpp b/kdat/InfoShellWidget.cpp
index fc96e8c..bda2be9 100644
--- a/kdat/InfoShellWidget.cpp
+++ b/kdat/InfoShellWidget.cpp
@@ -23,8 +23,8 @@
#include "InfoShellWidget.moc"
-InfoShellWidget::InfoShellWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+InfoShellWidget::InfoShellWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
}
@@ -34,8 +34,9 @@ InfoShellWidget::~InfoShellWidget()
void InfoShellWidget::resizeEvent( TQResizeEvent* )
{
- if ( children() ) {
- TQObjectListIt i( *children() );
+ TQObjectList clo = childrenListObject();
+ if ( !clo.isEmpty() ) {
+ TQObjectListIt i( clo );
for ( ; i.current(); ++i ) {
((TQWidget*)i.current())->resize( size() );
}
diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h
index f7046db..ae8dd90 100644
--- a/kdat/InfoShellWidget.h
+++ b/kdat/InfoShellWidget.h
@@ -22,18 +22,19 @@
#include <tqwidget.h>
/**
- * @short A suitable parent for the info widgets.
+ * @short A suitable tqparent for the info widgets.
*/
class InfoShellWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create a new info shell widget.
*
- * @param parent The parent widget.
+ * @param tqparent The tqparent widget.
* @param name The name of this widget.
*/
- InfoShellWidget( TQWidget* parent = 0, const char* name = 0 );
+ InfoShellWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the info shell widget.
@@ -41,7 +42,7 @@ public:
~InfoShellWidget();
protected:
/**
- * Resize all children to fill all of the available space within the shell.
+ * Resize all tqchildren to fill all of the available space within the shell.
*/
virtual void resizeEvent( TQResizeEvent* e );
};
diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc
index 7297e64..d69f3eb 100644
--- a/kdat/KDat.kdoc
+++ b/kdat/KDat.kdoc
@@ -12,7 +12,7 @@ Archive::startBlock=Archive.html#startBlock
Archive::endBlock=Archive.html#endBlock
Archive::name=Archive.html#name
Archive::files=Archive.html#files
-Archive::children=Archive.html#children
+Archive::tqchildren=Archive.html#tqchildren
Archive::setEndBlock=Archive.html#setEndBlock
Archive::setName=Archive.html#setName
Archive::addFile=Archive.html#addFile
@@ -94,7 +94,7 @@ File::size=File.html#size
File::mtime=File.html#mtime
File::record=File.html#record
File::name=File.html#name
-File::children=File.html#children
+File::tqchildren=File.html#tqchildren
IndexDlg=IndexDlg.html
IndexDlg=IndexDlg.html
IndexDlg::_tarParser=IndexDlg.html#_tarParser
@@ -387,7 +387,7 @@ TapeDrive::seek=TapeDrive.html#seek
TapeDrive::unlock=TapeDrive.html#unlock
TapeDrive::write=TapeDrive.html#write
TapeDrive::slotTapeBlockSize=TapeDrive.html#slotTapeBlockSize
-TapeDrive::slotStatus=TapeDrive.html#slotStatus
+TapeDrive::slottqStatus=TapeDrive.html#slottqStatus
TapeDrive::status=TapeDrive.html#status
TapeInfoDlg=TapeInfoDlg.html
TapeInfoDlg=TapeInfoDlg.html
@@ -475,7 +475,7 @@ KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem
KTreeViewItem::~KTreeViewItem=KTreeViewItem.html#~KTreeViewItem
KTreeViewItem::appendChild=KTreeViewItem.html#appendChild
-KTreeViewItem::childAt=KTreeViewItem.html#childAt
+KTreeViewItem::tqchildAt=KTreeViewItem.html#tqchildAt
KTreeViewItem::childCount=KTreeViewItem.html#childCount
KTreeViewItem::childIndex=KTreeViewItem.html#childIndex
KTreeViewItem::expandButtonClicked=KTreeViewItem.html#expandButtonClicked
@@ -519,7 +519,7 @@ KTreeViewItem::delayedExpanding=KTreeViewItem.html#delayedExpanding
KTreeViewItem::doTree=KTreeViewItem.html#doTree
KTreeViewItem::doText=KTreeViewItem.html#doText
KTreeViewItem::paint=KTreeViewItem.html#paint
-KTreeViewItem::parent=KTreeViewItem.html#parent
+KTreeViewItem::tqparent=KTreeViewItem.html#tqparent
KTreeViewItem::sibling=KTreeViewItem.html#sibling
KTreeViewItem::pixmap=KTreeViewItem.html#pixmap
KTreeViewItem::text=KTreeViewItem.html#text
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 5ead8c9..d3cf265 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -152,20 +152,20 @@ KDatMainWindow::KDatMainWindow()
_menu->insertItem( i18n( "&File" ), _fileMenu );
_menu->insertItem( i18n( "&Settings" ), _editMenu );
_menu->insertSeparator();
- TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).arg( KDAT_VERSION );
+ TQString about = i18n( "KDat Version %1\n\nKDat is a tar-based tape archiver.\n\nCopyright (c) 1998-2000 Sean Vyain\nCopyright (c) 2001-2002 Lawrence Widman\nkdat@cardiothink.com" ).tqarg( KDAT_VERSION );
_menu->insertItem( i18n( "&Help" ), helpMenu( about ) );
_toolbar = new KToolBar( this );
- _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
+ _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
_toolbar->insertSeparator();
- _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
+ _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
_toolbar->setButtonIconSet( 1, BarIconSet("kdat_backup"));
- _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
+ _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
_toolbar->setButtonIconSet( 2, BarIconSet("kdat_restore"));
- _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
+ _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
_toolbar->setButtonIconSet( 3, BarIconSet("kdat_verify"));
addToolBar( _toolbar );
@@ -173,9 +173,9 @@ KDatMainWindow::KDatMainWindow()
_statusBar->insertItem( i18n( "Ready." ), 0 );
#ifdef KDAT_HORIZONTAL_LAYOUT /* 2002-01-20 LEW */
- _panner = new TQSplitter( TQSplitter::Horizontal, this, "panner");
+ _panner = new TQSplitter( Qt::Horizontal, this, "panner");
#else
- _panner = new TQSplitter( TQSplitter::Vertical, this, "panner");
+ _panner = new TQSplitter( Qt::Vertical, this, "panner");
#endif /* KDAT_HORIZONTAL_LAYOUT */
// Create info viewers.
@@ -211,7 +211,7 @@ KDatMainWindow::KDatMainWindow()
_tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() );
_tree->insertItem( new TapeIndexRootNode() );
- connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
+ connect( TapeDrive::instance(), TQT_SIGNAL( sigtqStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
setTapePresent( FALSE );
@@ -387,7 +387,7 @@ void KDatMainWindow::localSelected( int index )
_tree->expandItem( index );
_tree->collapseItem( index ); // 2002-01-30 LEW
}
- // repaint(); // this doesn't work 2002-01-30 LEW
+ // tqrepaint(); // this doesn't work 2002-01-30 LEW
/* 2002-01-30 LEW: RG and I don't like this behavior */
}
@@ -419,7 +419,7 @@ void KDatMainWindow::fileBackup()
TQString msg = i18n("KDat will dump your files properly to tape, but may not be able\n"
"to restore them. To restore your files by hand, you need to know\n"
"the name of the *non-rewinding* version of your tape device %1.\n"
- ).arg(Options::instance()->getTapeDevice());
+ ).tqarg(Options::instance()->getTapeDevice());
TQString msg2 = i18n("For example, if your device is /dev/st0, the non-rewinding version\n"
"is /dev/nst0. If your device name doesn't look like that, type\n"
"\"ls -l %2\" in a terminal window to see the real name of your\n"
@@ -430,7 +430,7 @@ void KDatMainWindow::fileBackup()
"The third call to \"tar\" will retrieve your data into your\n"
"current directory. Please let us know if this happens to you!\n"
" - KDat Maintenance Team\n"
- ).arg(Options::instance()->getTapeDevice());
+ ).tqarg(Options::instance()->getTapeDevice());
msg = msg.append(msg2);
KMessageBox::sorry( this, msg);
/* 2002-01-28 LEW */
@@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup()
backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() );
} else {
TQString name;
- name = i18n( "Archive created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
+ name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
name = name.stripWhiteSpace();
TQStringList files;
@@ -486,8 +486,8 @@ void KDatMainWindow::fileBackup()
msg = i18n( "WARNING: The estimated archive size is %1 KB but "
"the tape has only %2 KB of space!\n"
"Back up anyway?" )
- .arg(KGlobal::locale()->formatNumber(size, 0))
- .arg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
+ .tqarg(KGlobal::locale()->formatNumber(size, 0))
+ .tqarg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 ));
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Backup"), i18n("Backup") );
if ( result != KMessageBox::Continue) {
@@ -556,15 +556,15 @@ void KDatMainWindow::doVerify( bool restore )
Archive* archive = 0;
// Check for marked files first.
for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
- if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
- ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
- archiveNode = (MountedArchiveNode*)_tapeDriveNode->childAt( i );
+ if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
+ ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
+ archiveNode = (MountedArchiveNode*)_tapeDriveNode->tqchildAt( i );
archive = archiveNode->getArchive();
/* 2002-01-30 LEW */
#ifdef DEBUG
printf("KDatMainWindow::doVerify: %d node of %s: ", i,
(SelectableNode*)_tapeDriveNode->getText().latin1() );
- if( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ){
+ if( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ){
printf("is completely selected\n");
} else {
printf("is partially selected\n");
@@ -578,10 +578,10 @@ void KDatMainWindow::doVerify( bool restore )
if ( !archiveNode ) {
if ( ((Node*)_tree->getCurrentItem())->isType( Node::RangeableNodeType ) ) {
rangeableNode = (RangeableNode*)_tree->getCurrentItem();
- Node* parent = rangeableNode;
- for ( ; !parent->isType( Node::MountedArchiveNodeType ); parent = (Node*)parent->getParent() );
- assert( parent );
- archive = ((MountedArchiveNode*)parent)->getArchive();
+ Node* tqparent = rangeableNode;
+ for ( ; !tqparent->isType( Node::MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() );
+ assert( tqparent );
+ archive = ((MountedArchiveNode*)tqparent)->getArchive();
}
}
@@ -600,7 +600,7 @@ void KDatMainWindow::doVerify( bool restore )
ranges.addRange( it.current()->getStart(), it.current()->getEnd() );
}
if ( rangeableNode->isType( Node::MountedArchiveNodeType ) ) {
- // Make sure the mounted archive node has populated its children.
+ // Make sure the mounted archive node has populated its tqchildren.
archiveNode = (MountedArchiveNode*)rangeableNode;
if ( archiveNode->childCount() == 0 ) {
bool dummy = TRUE;
@@ -608,10 +608,10 @@ void KDatMainWindow::doVerify( bool restore )
}
for ( int i = rangeableNode->childCount() - 1; i >= 0; i-- ) {
- if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
- files.append( ((MountedTapeDirectoryNode*)rangeableNode->childAt( i ))->getFullPath() );
- } else if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
- files.append( ((MountedTapeFileNode*)rangeableNode->childAt( i ))->getFullPath() );
+ if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) {
+ files.append( ((MountedTapeDirectoryNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
+ } else if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeFileNodeType ) ) {
+ files.append( ((MountedTapeFileNode*)rangeableNode->tqchildAt( i ))->getFullPath() );
} else {
assert( FALSE );
}
@@ -627,14 +627,14 @@ void KDatMainWindow::doVerify( bool restore )
// Compile a list of files to verify/restore.
TQPtrStack<RangeableNode> stack;
- // Make sure the mounted archive node has populated its children.
+ // Make sure the mounted archive node has populated its tqchildren.
if ( archiveNode->childCount() == 0 ) {
bool dummy = TRUE;
archiveNode->expanding( dummy );
}
for ( int i = archiveNode->childCount() - 1; i >= 0; i-- ) {
- stack.push( (RangeableNode*)archiveNode->childAt( i ) );
+ stack.push( (RangeableNode*)archiveNode->tqchildAt( i ) );
}
RangeableNode* sel = 0;
while ( stack.count() > 0 ) {
@@ -654,7 +654,7 @@ void KDatMainWindow::doVerify( bool restore )
}
} else if ( sel->hasSelectedChildren() ) {
for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
- stack.push( (RangeableNode*)sel->childAt( i ) );
+ stack.push( (RangeableNode*)sel->tqchildAt( i ) );
}
}
}
@@ -697,7 +697,7 @@ void KDatMainWindow::fileMountTape()
"correct device is selected as the tape drive (e.g.\n"
"/dev/st0). If you hear the tape drive moving, wait\n"
"until it stops and then try mounting it again.")
- .arg(Options::instance()->getTapeDevice());
+ .tqarg(Options::instance()->getTapeDevice());
if ( !TapeManager::instance()->getMountedTape() ) {
if ( Options::instance()->getLoadOnMount() ) {
@@ -727,7 +727,7 @@ void KDatMainWindow::fileIndexTape()
IndexDlg dlg( TapeManager::instance()->getMountedTape(), this );
if ( dlg.exec() == TQDialog::Accepted ) {
TQString title;
- title = i18n( "KDat: %1" ).arg( TapeManager::instance()->getMountedTape()->getName() );
+ title = i18n( "KDat: %1" ).tqarg( TapeManager::instance()->getMountedTape()->getName() );
setCaption( title );
setIconText( title );
@@ -776,7 +776,7 @@ void KDatMainWindow::fileDeleteArchive()
}
TQString msg =
- i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).arg(archive->getName()).arg(list);
+ i18n( "An archive cannot be removed from the middle of the tape. If\nthe archive '%1' is deleted then\nthe following archives will also be deleted:\n%2\n\nDelete all listed archives?" ).tqarg(archive->getName()).tqarg(list);
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Archive"), i18n("Delete All"));
if (result == KMessageBox::Continue) {
@@ -790,7 +790,7 @@ void KDatMainWindow::fileDeleteArchive()
} else {
// This is the last (known) archive on the tape.
TQString msg =
- i18n( "Really delete the archive '%1'?" ).arg(archive->getName());
+ i18n( "Really delete the archive '%1'?" ).tqarg(archive->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Archive"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -824,7 +824,7 @@ void KDatMainWindow::fileDeleteIndex()
}
TQString msg =
- i18n( "Really delete the index for '%1'?" ).arg(tape->getName());
+ i18n( "Really delete the index for '%1'?" ).tqarg(tape->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Tape Index"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -847,7 +847,7 @@ void KDatMainWindow::fileFormatTape()
"correct device is selected as the tape drive (e.g.\n"
"/dev/st0). If you hear the tape drive moving, wait\n"
"until it stops and then try mounting it again.")
- .arg(Options::instance()->getTapeDevice());
+ .tqarg(Options::instance()->getTapeDevice());
if ( !TapeDrive::instance()->isTapePresent() ) {
KMessageBox::sorry( this, msg );
@@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape()
i18n("Format Tape"), i18n("Format"));
if (result == KMessageBox::Continue ) {
TQString name;
- name = i18n( "Tape created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
+ name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
FormatOptDlg dlg( name.stripWhiteSpace(), this );
if ( dlg.exec() != TQDialog::Accepted ) {
return;
@@ -898,7 +898,7 @@ void KDatMainWindow::fileNewBackupProfile()
// Pick a unique name.
TQString name;
for ( int i = 1; ; i++ ) {
- name = i18n( "Backup Profile %1").arg( i );
+ name = i18n( "Backup Profile %1").tqarg( i );
TQStringList list = BackupProfileManager::instance()->getBackupProfileNames();
TQStringList::Iterator it = list.begin();
for ( ; it != list.end(); ++it ) {
@@ -946,7 +946,7 @@ void KDatMainWindow::fileDeleteBackupProfile()
assert( backupProfile );
TQString msg =
- i18n("Really delete backup profile '%1'?").arg(backupProfile->getName());
+ i18n("Really delete backup profile '%1'?").tqarg(backupProfile->getName());
int result = KMessageBox::warningContinueCancel( this,
msg, i18n("Delete Backup Profile"), i18n("Delete"));
if (result == KMessageBox::Continue) {
@@ -1003,7 +1003,7 @@ void KDatMainWindow::setTapePresent( bool tapePresent, bool eject )
KMessageBox::sorry( this, i18n( "This tape has not been formatted by KDat." ));
} else {
int result = KMessageBox::questionYesNo( this,
- i18n( "This tape has not been formatted by KDat.\n\nWould you like to format it now?" ), TQString::null, i18n("Format"), i18n("Do Not Format"));
+ i18n( "This tape has not been formatted by KDat.\n\nWould you like to format it now?" ), TQString(), i18n("Format"), i18n("Do Not Format"));
if (result == KMessageBox::Yes) {
fileFormatTape();
return;
@@ -1098,19 +1098,19 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons
TQString msg;
// msg.truncate( 4095 );
TQDir dir;
- const QFileInfoList* infoList;
+ const TQFileInfoList* infoList;
while ( !dirStack.isEmpty() ) {
if( stop_flag == TRUE ) break;
TQString* path = dirStack.pop();
msg = i18n("Estimating backup size: %1, %2" )
- .arg(Util::kbytesToString( size / 2 ))
- .arg(KStringHandler::csqueeze(*path, 60));
+ .tqarg(Util::kbytesToString( size / 2 ))
+ .tqarg(KStringHandler::csqueeze(*path, 60));
status( msg );
KApplication::kApplication()->processEvents();
dir.setPath( *path );
infoList = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, 0 );
if ( infoList ) {
- QFileInfoListIterator i( *infoList );
+ TQFileInfoListIterator i( *infoList );
for ( ; i.current(); ++i ) {
if ( ( i.current()->fileName() != "." ) && ( i.current()->fileName() != ".." ) ) {
size++;
@@ -1165,7 +1165,7 @@ void KDatMainWindow::getBackupFiles( TQStringList& files )
files.append( sel->getFullPath() );
} else if ( sel->hasSelectedChildren() ) {
for ( int i = sel->childCount() - 1; i >= 0; i-- ) {
- stack.push( (ArchiveableNode*)sel->childAt( i ) );
+ stack.push( (ArchiveableNode*)sel->tqchildAt( i ) );
}
}
}
@@ -1192,9 +1192,9 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files )
}
int i;
for ( i = n->childCount() - 1; i >=0; i-- ) {
- tmp = ((ArchiveableNode*)n->childAt( i ))->getFullPath();
+ tmp = ((ArchiveableNode*)n->tqchildAt( i ))->getFullPath();
if ( tmp == (*it).left( tmp.length() ) ) {
- n = (ArchiveableNode*)n->childAt( i );
+ n = (ArchiveableNode*)n->tqchildAt( i );
break;
}
}
@@ -1232,7 +1232,7 @@ void KDatMainWindow::configureUI( Tape* tape )
// Title bar
if ( tape ) {
TQString title;
- title = i18n( "KDat: %1" ).arg(tape->getName());
+ title = i18n( "KDat: %1" ).tqarg(tape->getName());
setCaption( title );
setIconText( title );
} else {
@@ -1251,8 +1251,8 @@ void KDatMainWindow::configureUI( Tape* tape )
bool canRestore = ( tape ) && ( sel ) && sel->isType( Node::RangeableNodeType );
if ( !canRestore ) {
for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) {
- if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) ||
- ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) {
+ if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) ||
+ ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) {
canRestore = TRUE;
break;
}
@@ -1263,10 +1263,10 @@ void KDatMainWindow::configureUI( Tape* tape )
// even if sel==NULL when a child is selected (see loop above).
if( sel != (Node *)0x0 )
{
- for ( Node* parent = (Node*)sel->getParent();
- ( parent ) && ( parent->getParent() );
- parent = (Node*)parent->getParent() ) {
- if ( parent->isType( Node::TapeNodeType ) ) {
+ for ( Node* tqparent = (Node*)sel->getParent();
+ ( tqparent ) && ( tqparent->getParent() );
+ tqparent = (Node*)tqparent->getParent() ) {
+ if ( tqparent->isType( Node::TapeNodeType ) ) {
canRestore = FALSE;
}
}
@@ -1348,7 +1348,7 @@ void KDatMainWindow::create_backup_dialog()
_lbl->setGeometry( TQRect( 30, 20, 350, 200 ) );
_cancel = new KPushButton( KStdGuiItem::cancel(), _backupdialog );
- _cancel->setFixedSize( 80, _cancel->sizeHint().height() );
+ _cancel->setFixedSize( 80, _cancel->tqsizeHint().height() );
_cancel->setEnabled( TRUE );
/* 2002-01-24 LEW: looks like we can't increase the button width
to accomodate a wider message :( */
@@ -1357,7 +1357,7 @@ void KDatMainWindow::create_backup_dialog()
connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) );
_continue = new KPushButton( KStdGuiItem::cont(), _backupdialog );
- _continue->setFixedSize( 80, _continue->sizeHint().height() );
+ _continue->setFixedSize( 80, _continue->tqsizeHint().height() );
_continue->setEnabled( TRUE );
_continue->setDefault( TRUE );
// _continue->setGeometry( TQRect( 200, 170, 0, 0 ) ); /* 2002-01-28 LEW */
diff --git a/kdat/KDatMainWindow.h b/kdat/KDatMainWindow.h
index 7855923..022e856 100644
--- a/kdat/KDatMainWindow.h
+++ b/kdat/KDatMainWindow.h
@@ -53,6 +53,7 @@ class TapeInfoWidget;
*/
class KDatMainWindow : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
private:
bool _destroyed;
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 11921c2..2412104 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -29,11 +29,11 @@
#include "LoggerWidget.moc"
-LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+LoggerWidget::LoggerWidget( const TQString & title, TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
TQLabel* lbl1 = new TQLabel( title, this );
- lbl1->setFixedHeight( lbl1->sizeHint().height() );
+ lbl1->setFixedHeight( lbl1->tqsizeHint().height() );
_mle = new TQMultiLineEdit( this );
_mle->setReadOnly( TRUE );
@@ -55,7 +55,7 @@ void LoggerWidget::append( const TQString & text )
void LoggerWidget::save()
{
- TQString file = KFileDialog::getSaveFileName( TQString::null, TQString::null, this );
+ TQString file = KFileDialog::getSaveFileName( TQString(), TQString(), this );
if ( !file.isNull() ) {
TQFile f( file );
if ( f.exists() ) {
diff --git a/kdat/LoggerWidget.h b/kdat/LoggerWidget.h
index fed21c0..d649e65 100644
--- a/kdat/LoggerWidget.h
+++ b/kdat/LoggerWidget.h
@@ -28,16 +28,17 @@ class TQMultiLineEdit;
*/
class LoggerWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
TQMultiLineEdit* _mle;
public:
/**
* Create a titled logging widget
*
* @param title The title text displayed above the logging window.
- * @param parent The parent widget.
+ * @param tqparent The tqparent widget.
* @param name The name of this widget.
*/
- LoggerWidget( const TQString & title, TQWidget* parent = 0, const char* name = 0 );
+ LoggerWidget( const TQString & title, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the logging widget.
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index 7e42855..7999c9d 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -58,7 +58,7 @@ void Node::insertNode( Node* child )
if ( lastParent != this ) {
// Recompute lastDirIndex.
for ( lastDirIndex = 0;
- ( lastDirIndex < childCount() ) && ( ((Node*)childAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
+ ( lastDirIndex < childCount() ) && ( ((Node*)tqchildAt( lastDirIndex ))->getType() == TapeDirectoryNodeType );
lastDirIndex++ );
lastParent = this;
}
@@ -83,7 +83,7 @@ void Node::insertNode( Node* child )
while ( min < max ) {
mid = ( max - min ) / 2 + min;
//mid = ( min + max ) / 2;
- if ( child->getText().compare( childAt( mid )->getText() ) < 0 ) {
+ if ( child->getText().compare( tqchildAt( mid )->getText() ) < 0 ) {
max = mid - 1;
} else {
min = mid + 1;
@@ -94,8 +94,8 @@ void Node::insertNode( Node* child )
// KLUDGE!
mid -= 5;
if ( mid < smin ) mid = smin;
- if ( ((Node*)childAt( mid ))->getType() != child->getType() ) mid++;
- for ( ; ( mid <= smax ) && ( child->getText().compare( childAt( mid )->getText() ) > 0 ); mid++ );
+ if ( ((Node*)tqchildAt( mid ))->getType() != child->getType() ) mid++;
+ for ( ; ( mid <= smax ) && ( child->getText().compare( tqchildAt( mid )->getText() ) > 0 ); mid++ );
//printf( "index = %d, text = '%s'\n", mid, child->getText().data() );
insertChild( mid, child );
} else {
@@ -181,14 +181,14 @@ bool TapeNode::validate()
// Remove deleted archives.
Archive* a;
for ( uint j = 0; j < childCount(); ) {
- a = ((ArchiveNode*)childAt( j ))->getArchive();
+ a = ((ArchiveNode*)tqchildAt( j ))->getArchive();
for ( i.toFirst(); i.current(); ++i ) {
if ( i.current() == a ) {
break;
}
}
if ( !i.current() ) {
- removeChild( childAt( j ) );
+ removeChild( tqchildAt( j ) );
} else {
j++;
}
@@ -211,7 +211,7 @@ void TapeNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added
+ // We already have the tqchildren added
return;
}
@@ -235,8 +235,8 @@ ArchiveNode* TapeNode::findArchiveNode( Archive* archive )
{
ArchiveNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- if ( ((ArchiveNode*)childAt( i ))->getArchive() == archive ) {
- n = (ArchiveNode*)childAt( i );
+ if ( ((ArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
+ n = (ArchiveNode*)tqchildAt( i );
break;
}
}
@@ -280,7 +280,7 @@ void ArchiveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added.
+ // We already have the tqchildren added.
return;
}
@@ -311,7 +311,7 @@ TapeDirectoryNode::TapeDirectoryNode( File* file )
setDelayedExpanding( TRUE );
int len = _file->getName().length();
- int idx1 = _file->getName().findRev( '/', len - 2 );
+ int idx1 = _file->getName().tqfindRev( '/', len - 2 );
if ( idx1 < 0 ) {
setText( _file->getName().left( len - 1 ) );
} else {
@@ -338,7 +338,7 @@ void TapeDirectoryNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added.
+ // We already have the tqchildren added.
return;
}
@@ -372,7 +372,7 @@ TapeFileNode::TapeFileNode( File* file )
_file( file )
{
int len = _file->getName().length();
- int idx1 = _file->getName().findRev( '/', len - 1 );
+ int idx1 = _file->getName().tqfindRev( '/', len - 1 );
if ( idx1 < 0 ) {
setText( _file->getName().left( len ) );
} else {
@@ -411,7 +411,7 @@ void SelectableNode::doUpdateState()
bool hasSelected = FALSE;
bool allSelected = TRUE;
for ( uint i = 0; i < childCount(); i++ ) {
- switch ( ((SelectableNode*)childAt( i ))->_state ) {
+ switch ( ((SelectableNode*)tqchildAt( i ))->_state ) {
case SelAll:
oneSelected = TRUE;
hasSelected = TRUE;
@@ -443,15 +443,15 @@ void SelectableNode::doUpdateState()
void SelectableNode::doSetSelected( bool select )
{
- // All my children get the same selection state.
+ // All my tqchildren get the same selection state.
for ( uint i = 0; i < childCount(); i++ ) {
if ( select ) {
- if ( !((SelectableNode*)childAt( i ))->isSelected() ) {
- ((SelectableNode*)childAt( i ))->doSetSelected( TRUE );
+ if ( !((SelectableNode*)tqchildAt( i ))->isSelected() ) {
+ ((SelectableNode*)tqchildAt( i ))->doSetSelected( TRUE );
}
} else {
- if ( ((SelectableNode*)childAt( i ))->isSelected() || ((SelectableNode*)childAt( i ))->hasSelectedChildren() ) {
- ((SelectableNode*)childAt( i ))->doSetSelected( FALSE );
+ if ( ((SelectableNode*)tqchildAt( i ))->isSelected() || ((SelectableNode*)tqchildAt( i ))->hasSelectedChildren() ) {
+ ((SelectableNode*)tqchildAt( i ))->doSetSelected( FALSE );
}
}
}
@@ -482,7 +482,7 @@ const TQPixmap* SelectableNode::getSelectPixmap() const
bool SelectableNode::mousePressEvent( const TQPoint& point )
{
- if ( _selectRect.contains( point ) ) {
+ if ( _selectRect.tqcontains( point ) ) {
switch ( _state ) {
case SelAll:
setSelected( FALSE );
@@ -549,7 +549,7 @@ void SelectableNode::paintText( TQPainter* p, int indent, int cellHeight,
p->fontMetrics().leading()) / 2);
if (highlighted) {
paintHighlight(p, indent, cg, owner->hasFocus(),
- (Qt::GUIStyle)owner->style().styleHint(TQStyle::SH_GUIStyle)); // Qt3 doesn't make this easy ;)
+ (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
p->setPen(cg.base());
p->setBackgroundColor(cg.text());
}
@@ -605,7 +605,7 @@ void SelectableNode::setSelected( bool select )
((SelectableNode*)getParent())->doUpdateState();
}
- owner->repaint();
+ owner->tqrepaint();
KDatMainWindow::getInstance()->configureUI( TapeManager::instance()->getMountedTape() );
}
@@ -655,10 +655,10 @@ void MountedArchiveNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
- Node* parent = (Node*)getParent();
- for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->childAt( i ) != this ) {
- ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
+ Node* tqparent = (Node*)getParent();
+ for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
+ if ( tqparent->tqchildAt( i ) != this ) {
+ ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
}
}
}
@@ -680,7 +680,7 @@ void MountedArchiveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added.
+ // We already have the tqchildren added.
return;
}
@@ -713,7 +713,7 @@ MountedTapeDirectoryNode::MountedTapeDirectoryNode( File* file, int state )
setDelayedExpanding( TRUE );
int len = _file->getName().length();
- int idx1 = _file->getName().findRev( '/', len - 2 );
+ int idx1 = _file->getName().tqfindRev( '/', len - 2 );
if ( idx1 < 0 ) {
setText( _file->getName().left( len - 1 ) );
} else {
@@ -730,9 +730,9 @@ TQString MountedTapeDirectoryNode::getFullPath()
{
if ( _fullPath.length() == 0 ) {
_fullPath = getText() + "/";
- for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) {
+ for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) {
_fullPath.prepend( "/" );
- _fullPath.prepend( parent->getText() );
+ _fullPath.prepend( tqparent->getText() );
}
}
@@ -748,17 +748,17 @@ void MountedTapeDirectoryNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
- Node* parent = (Node*)getParent();
+ Node* tqparent = (Node*)getParent();
Node* arcNode = 0;
- while ( !parent->isType( TapeDriveNodeType ) ) {
- if ( parent->isType( MountedArchiveNodeType ) ) {
- arcNode = parent;
+ while ( !tqparent->isType( TapeDriveNodeType ) ) {
+ if ( tqparent->isType( MountedArchiveNodeType ) ) {
+ arcNode = tqparent;
}
- parent = (Node*)parent->getParent();
+ tqparent = (Node*)tqparent->getParent();
}
- for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->childAt( i ) != arcNode ) {
- ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
+ for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
+ if ( tqparent->tqchildAt( i ) != arcNode ) {
+ ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
}
}
}
@@ -780,7 +780,7 @@ void MountedTapeDirectoryNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added.
+ // We already have the tqchildren added.
return;
}
@@ -819,7 +819,7 @@ MountedTapeFileNode::MountedTapeFileNode( File* file, int state )
_file( file )
{
int len = _file->getName().length();
- int idx1 = _file->getName().findRev( '/', len - 1 );
+ int idx1 = _file->getName().tqfindRev( '/', len - 1 );
if ( idx1 < 0 ) {
setText( _file->getName().left( len ) );
} else {
@@ -836,9 +836,9 @@ TQString MountedTapeFileNode::getFullPath()
{
if ( _fullPath.length() == 0 ) {
_fullPath = getText();
- for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) {
+ for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) {
_fullPath.prepend( "/" );
- _fullPath.prepend( parent->getText() );
+ _fullPath.prepend( tqparent->getText() );
}
}
@@ -854,17 +854,17 @@ void MountedTapeFileNode::setSelected( bool select )
{
if ( select ) {
// Deselect all other archives.
- Node* parent = (Node*)getParent();
+ Node* tqparent = (Node*)getParent();
Node* arcNode = 0;
- while ( !parent->isType( TapeDriveNodeType ) ) {
- if ( parent->isType( MountedArchiveNodeType ) ) {
- arcNode = parent;
+ while ( !tqparent->isType( TapeDriveNodeType ) ) {
+ if ( tqparent->isType( MountedArchiveNodeType ) ) {
+ arcNode = tqparent;
}
- parent = (Node*)parent->getParent();
+ tqparent = (Node*)tqparent->getParent();
}
- for ( int i = parent->childCount() - 1; i >= 0; i-- ) {
- if ( parent->childAt( i ) != arcNode ) {
- ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE );
+ for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) {
+ if ( tqparent->tqchildAt( i ) != arcNode ) {
+ ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE );
}
}
}
@@ -934,7 +934,7 @@ void RootNode::expanding( bool expand )
{
expand = TRUE;
- // If we already have some children, check to see if the directory has been modified.
+ // If we already have some tqchildren, check to see if the directory has been modified.
if ( childCount() > 0 ) {
struct stat statinfo;
if ( stat( "/", &statinfo ) < 0 ) {
@@ -950,7 +950,7 @@ void RootNode::expanding( bool expand )
_mtime = statinfo.st_mtime;
- // Remove all the children.
+ // Remove all the tqchildren.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
removeChild( n );
@@ -975,10 +975,10 @@ void RootNode::expanding( bool expand )
return;
}
- // Fill in the child's children.
- const QFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
+ // Fill in the child's tqchildren.
+ const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
if ( list ) {
- QFileInfoListIterator it( *list );
+ TQFileInfoListIterator it( *list );
for ( ; it.current(); ++it ) {
if ( ( it.current()->fileName() != "." ) && ( it.current()->fileName() != ".." ) ) {
if ( it.current()->isDir() ) {
@@ -1050,7 +1050,7 @@ void DirectoryNode::expanding( bool expand )
}
path.prepend( "/" );
- // If we already have some children, check to see if the directory has been modified.
+ // If we already have some tqchildren, check to see if the directory has been modified.
if ( childCount() > 0 ) {
struct stat statinfo;
if ( stat( TQFile::encodeName(path), &statinfo ) < 0 ) {
@@ -1066,7 +1066,7 @@ void DirectoryNode::expanding( bool expand )
_mtime = statinfo.st_mtime;
- // Remove all the children.
+ // Remove all the tqchildren.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
removeChild( n );
@@ -1091,10 +1091,10 @@ void DirectoryNode::expanding( bool expand )
return;
}
- // Fill in the child's children.
- const QFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
+ // Fill in the child's tqchildren.
+ const TQFileInfoList* list = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, TQDir::Name | TQDir::DirsFirst );
if ( list ) {
- QFileInfoListIterator it( *list );
+ TQFileInfoListIterator it( *list );
for ( ; it.current(); ++it ) {
if ( ( it.current()->fileName() != "." ) && ( it.current()->fileName() != ".." ) ) {
if ( it.current()->isDir() ) {
@@ -1210,7 +1210,7 @@ void TapeDriveNode::expanding( bool expand )
expand = TRUE;
if ( childCount() > 0 ) {
- // We already have the children added
+ // We already have the tqchildren added
return;
}
@@ -1254,7 +1254,7 @@ void TapeDriveNode::slotTapeUnmounted()
setPixmap( *ImageCache::instance()->getTapeUnmounted() );
setText( i18n( "<no tape>" ) );
- // Remove all the children.
+ // Remove all the tqchildren.
Node* n;
while ( ( n = (Node*)getChild() ) ) {
Node::removeChild( n );
@@ -1304,14 +1304,14 @@ void TapeDriveNode::slotTapeModified( Tape* tape )
// Remove deleted archives.
Archive* a;
for ( uint j = 0; j < childCount(); ) {
- a = ((MountedArchiveNode*)childAt( j ))->getArchive();
+ a = ((MountedArchiveNode*)tqchildAt( j ))->getArchive();
for ( i.toFirst(); i.current(); ++i ) {
if ( i.current() == a ) {
break;
}
}
if ( !i.current() ) {
- Node::removeChild( childAt( j ) );
+ Node::removeChild( tqchildAt( j ) );
} else {
j++;
}
@@ -1322,8 +1322,8 @@ MountedArchiveNode* TapeDriveNode::findArchiveNode( Archive* archive )
{
MountedArchiveNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- if ( ((MountedArchiveNode*)childAt( i ))->getArchive() == archive ) {
- n = (MountedArchiveNode*)childAt( i );
+ if ( ((MountedArchiveNode*)tqchildAt( i ))->getArchive() == archive ) {
+ n = (MountedArchiveNode*)tqchildAt( i );
break;
}
}
@@ -1417,7 +1417,7 @@ TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape )
{
TapeNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- n = (TapeNode*)childAt( i );
+ n = (TapeNode*)tqchildAt( i );
if ( n->getTape() == tape ) {
return n;
}
@@ -1575,7 +1575,7 @@ BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile*
{
BackupProfileNode* n = 0;
for ( uint i = 0; i < childCount(); i++ ) {
- n = (BackupProfileNode*)childAt( i );
+ n = (BackupProfileNode*)tqchildAt( i );
if ( n->getBackupProfile() == backupProfile ) {
return n;
}
diff --git a/kdat/Node.h b/kdat/Node.h
index e33f7f8..d2d0c26 100644
--- a/kdat/Node.h
+++ b/kdat/Node.h
@@ -90,7 +90,7 @@ public:
/**
* This method is called immediately before the node is to be expanded.
- * This method can be used to fill in the children of this node, or
+ * This method can be used to fill in the tqchildren of this node, or
* prevent the node from expanding. The default implementation does
* nothing.
*
@@ -359,7 +359,7 @@ public:
virtual bool isType( int type );
/**
- * Determine whether the node and all of its children are selected.
+ * Determine whether the node and all of its tqchildren are selected.
*
* @return TRUE if the node is selected, otherwise FALSE.
*/
@@ -373,7 +373,7 @@ public:
bool hasSelectedChildren();
/**
- * Select/deselect this node and all of its children.
+ * Select/deselect this node and all of its tqchildren.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -445,7 +445,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its children.
+ * Select/deselect this node and all of its tqchildren.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -516,7 +516,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its children.
+ * Select/deselect this node and all of its tqchildren.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -596,7 +596,7 @@ public:
virtual const TQPtrList<Range>& getRanges();
/**
- * Select/deselect this node and all of its children.
+ * Select/deselect this node and all of its tqchildren.
*
* @param selected TRUE means the node will be selected, FALSE means the
* node will be deselected.
@@ -817,6 +817,7 @@ public:
*/
class TapeDriveNode : public TQObject, public Node {
Q_OBJECT
+ TQ_OBJECT
MountedArchiveNode* findArchiveNode( Archive* archive );
public:
@@ -862,7 +863,7 @@ public slots:
/**
* Locate the child associated with the modified tape index, and make sure
- * that the displayed information (including all children) is updated.
+ * that the displayed information (including all tqchildren) is updated.
*
* @param tape A pointer to the tape index that was modified.
*/
@@ -874,6 +875,7 @@ public slots:
*/
class TapeIndexRootNode : public TQObject, public Node {
Q_OBJECT
+ TQ_OBJECT
TapeNode* findTapeNode( Tape* tape );
public:
@@ -922,7 +924,7 @@ public slots:
/**
* Locate the child associated with the modified tape index, and make sure
- * that the displayed information (including all children) is updated.
+ * that the displayed information (including all tqchildren) is updated.
*
* @param tape A pointer to the tape index that was modified.
*/
@@ -980,6 +982,7 @@ public:
*/
class BackupProfileRootNode : public TQObject, public Node {
Q_OBJECT
+ TQ_OBJECT
BackupProfileNode* findBackupProfileNode( BackupProfile* backupProfile );
public:
diff --git a/kdat/Options.h b/kdat/Options.h
index d9701ea..07e02a0 100644
--- a/kdat/Options.h
+++ b/kdat/Options.h
@@ -28,6 +28,7 @@ class KConfig;
*/
class Options : public TQObject {
Q_OBJECT
+ TQ_OBJECT
KConfig* _config;
int _defaultTapeSize;
int _tapeBlockSize;
diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp
index f056bbf..31aec9c 100644
--- a/kdat/OptionsDlg.cpp
+++ b/kdat/OptionsDlg.cpp
@@ -34,9 +34,9 @@
#include <kglobal.h>
#include "OptionsDlg.moc"
-OptionsDlg::OptionsDlg( TQWidget* parent, const char* name )
+OptionsDlg::OptionsDlg( TQWidget* tqparent, const char* name )
: KDialogBase( Swallow, i18n ("Options"), Ok | Apply | Cancel,
- Ok, parent, name, true, true ), apply (0)
+ Ok, tqparent, name, true, true ), apply (0)
{
_baseWidget = new OptionsDlgWidget ( 0 );
setMainWidget (_baseWidget);
diff --git a/kdat/OptionsDlg.h b/kdat/OptionsDlg.h
index bd8a7de..b96fe8c 100644
--- a/kdat/OptionsDlg.h
+++ b/kdat/OptionsDlg.h
@@ -29,6 +29,7 @@ class OptionsDlgWidget;
*/
class OptionsDlg : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
private slots:
void slotOK();
void slotApply();
@@ -38,10 +39,10 @@ public:
/**
* Create a new options dialog.
*
- * @param parent The parent widget of the dialog.
+ * @param tqparent The tqparent widget of the dialog.
* @param name The name of the dialog.
*/
- OptionsDlg( TQWidget* parent = 0, const char* name = 0 );
+ OptionsDlg( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the options dialog.
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index 5ace94d..4d8d6a7 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>OptionsDlgWidget</class>
<author>Michael Pyne</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>OptionsDlgWidget</cstring>
</property>
@@ -20,9 +20,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
@@ -31,9 +31,9 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
@@ -43,7 +43,7 @@
<property name="name">
<cstring>_defaultTapeSize</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>96</width>
<height>0</height>
@@ -60,7 +60,7 @@
<property name="name">
<cstring>_tapeBlockSize</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>96</width>
<height>0</height>
@@ -94,7 +94,7 @@
<string>This option chooses whether the default tape size to the left is in megabytes (MB) or gigabytes (GB).</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="2">
+ <widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -102,7 +102,7 @@
<string>bytes</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -113,7 +113,7 @@
<cstring>_tapeBlockSize</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -126,9 +126,9 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<grid>
<property name="name">
@@ -153,7 +153,7 @@
<string>The location in the filesystem of the &lt;em&gt;non-rewinding&lt;/em&gt; tape device. The default is &lt;b&gt;/dev/tape&lt;/b&gt;.</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -183,7 +183,7 @@
<string>This setting controls the command that KDat uses to perform the tape backup. The full path should be given. The default is &lt;b&gt;tar&lt;/b&gt;.</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -196,7 +196,7 @@
</widget>
</grid>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@@ -207,7 +207,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>_loadOnMount</cstring>
</property>
@@ -223,7 +223,7 @@
This is required by some tape drives.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>_lockOnMount</cstring>
</property>
@@ -239,7 +239,7 @@ This is required by some tape drives.</string>
This doesn't work for all tape drives.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>_ejectOnUnmount</cstring>
</property>
@@ -255,7 +255,7 @@ This doesn't work for all tape drives.</string>
This option should not be used for floppy-tape drives.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>_variableBlockSize</cstring>
</property>
@@ -283,7 +283,7 @@ You must still specify the block size.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -370,16 +370,16 @@ You must still specify the block size.</string>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">OptionsDlgWidget.ui.h</include>
</includes>
-<signals>
+<Q_SIGNALS>
<signal>doBrowseTapeDevice()</signal>
<signal>doBrowseTarCommand()</signal>
<signal>valueChanged()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
<slot access="protected">slotValueChanged()</slot>
<slot access="protected">slotBrowseTapeDevice()</slot>
<slot access="protected">slotBrowseTarCommand()</slot>
-</slots>
-<layoutdefaults spacing="11" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="11" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kdat/OptionsDlgWidget.ui.h b/kdat/OptionsDlgWidget.ui.h
index 6b2d4d8..32c7497 100644
--- a/kdat/OptionsDlgWidget.ui.h
+++ b/kdat/OptionsDlgWidget.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kdat/RELEASE_NOTES b/kdat/RELEASE_NOTES
index 85314f8..adc1584 100644
--- a/kdat/RELEASE_NOTES
+++ b/kdat/RELEASE_NOTES
@@ -51,7 +51,7 @@
2002-01-21
- Added signal handler so user can have a chance to figure out what
- program was doing when it received one of the signals SIGHUP,
+ program was doing when it received one of the Q_SIGNALS SIGHUP,
SIGINT, SIGFPE, SIGSEGV, SIGTERM. The program can always be killed
with "kill -9 <pid>".
diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp
index ff35d1a..1f762c3 100644
--- a/kdat/Tape.cpp
+++ b/kdat/Tape.cpp
@@ -216,7 +216,7 @@ void Tape::read()
default:
{
KMessageBox::sorry( KDatMainWindow::getInstance(),
- i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).arg(version ),
+ i18n( "The tape index file format is version %d. The index cannot be read by this version of KDat. Perhaps the tape index file was created by a newer version of KDat?" ).tqarg(version ),
i18n("Tape Index") );
}
}
@@ -226,7 +226,7 @@ void Tape::readAll( int version )
{
read();
- TQPtrListIterator<Archive> i( _children );
+ TQPtrListIterator<Archive> i( _tqchildren );
for ( ; i.current(); ++i ) {
i.current()->readAll( version );
}
@@ -282,7 +282,7 @@ void Tape::write()
memset( buf, 0, 4096 );
memcpy( buf, _name.ascii(), _name.length() > 4095 ? 4095 : _name.length() );
fwrite( buf, sizeof( char ), 4096, _fptr );
- int ival = _children.count();
+ int ival = _tqchildren.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
// Fill in the archive offsets later...
@@ -292,7 +292,7 @@ void Tape::write()
}
//===== Write archives =====
- TQPtrListIterator<Archive> i( _children );
+ TQPtrListIterator<Archive> i( _tqchildren );
int count = 0;
for ( ; i.current(); ++i, count++ ) {
// Fill in the file offset.
@@ -346,7 +346,7 @@ const TQPtrList<Archive>& Tape::getChildren()
{
read();
- return _children;
+ return _tqchildren;
}
void Tape::setName( const TQString & name )
@@ -528,7 +528,7 @@ void Tape::addChild( Archive* archive )
archive->calcRanges();
- _children.append( archive );
+ _tqchildren.append( archive );
char buf[4096];
fseek( _fptr, 0, SEEK_END );
@@ -537,9 +537,9 @@ void Tape::addChild( Archive* archive )
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _children.count();
+ int ival = _tqchildren.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
- fseek( _fptr, ( _children.count() - 1 ) * 4, SEEK_CUR );
+ fseek( _fptr, ( _tqchildren.count() - 1 ) * 4, SEEK_CUR );
fwrite( &here, sizeof( here ), 1, _fptr );
fseek( _fptr, here, SEEK_SET );
archive->write( _fptr );
@@ -559,21 +559,21 @@ void Tape::removeChild( Archive* archive )
{
read();
- while ( _children.last() != archive ) {
- _children.removeLast();
+ while ( _tqchildren.last() != archive ) {
+ _tqchildren.removeLast();
}
- _children.removeLast();
+ _tqchildren.removeLast();
char buf[4096];
fseek( _fptr, 0, SEEK_SET );
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _children.count();
+ int ival = _tqchildren.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
int here;
if ( ival > 0 ) {
- fseek( _fptr, _children.count() * 4, SEEK_CUR );
+ fseek( _fptr, _tqchildren.count() * 4, SEEK_CUR );
fread( &here, sizeof( here ), 1, _fptr );
} else {
fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
@@ -593,13 +593,13 @@ void Tape::removeChild( Archive* archive )
void Tape::clear()
{
- if ( _children.count() < 1 ) {
+ if ( _tqchildren.count() < 1 ) {
return;
}
- while ( _children.first() ) {
- delete _children.first();
- _children.removeFirst();
+ while ( _tqchildren.first() ) {
+ delete _tqchildren.first();
+ _tqchildren.removeFirst();
}
char buf[4096];
@@ -607,7 +607,7 @@ void Tape::clear()
fgets( buf, 4096, _fptr );
fgets( buf, 4096, _fptr );
fseek( _fptr, 12 + 4096, SEEK_CUR );
- int ival = _children.count();
+ int ival = _tqchildren.count();
fwrite( &ival, sizeof( ival ), 1, _fptr );
fseek( _fptr, MAX_NUM_ARCHIVES * 4, SEEK_CUR );
int here = ftell( _fptr );
@@ -711,7 +711,7 @@ void Tape::readVersion1Index( FILE* fptr )
Archive* archive = new Archive( this, archiveTimeStamp, archiveName );
archive->setEndBlock( archiveEndBlock - archiveStartBlock );
- _children.append( archive );
+ _tqchildren.append( archive );
// Read the number of files.
if ( !fgets( buf, 4096, fptr ) ) {
@@ -827,7 +827,7 @@ void Tape::readVersion2Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _children.append( new Archive( this, fptr, ival ) );
+ _tqchildren.append( new Archive( this, fptr, ival ) );
}
}
@@ -870,7 +870,7 @@ void Tape::readVersion3Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _children.append( new Archive( this, fptr, ival ) );
+ _tqchildren.append( new Archive( this, fptr, ival ) );
}
}
@@ -913,7 +913,7 @@ void Tape::readVersion4Index( FILE* fptr )
int ival;
for ( ; numArchives; numArchives-- ) {
fread( &ival, sizeof( ival ), 1, fptr );
- _children.append( new Archive( this, fptr, ival ) );
+ _tqchildren.append( new Archive( this, fptr, ival ) );
}
/* 2002-01-31 LEW */
diff --git a/kdat/Tape.h b/kdat/Tape.h
index 335619c..153561e 100644
--- a/kdat/Tape.h
+++ b/kdat/Tape.h
@@ -34,7 +34,7 @@ class Tape {
int _mtime;
TQString _name;
int _size;
- TQPtrList<Archive> _children;
+ TQPtrList<Archive> _tqchildren;
FILE* _fptr;
@@ -148,7 +148,7 @@ public:
void removeChild( Archive* archive );
/**
- * Recursively destroy all children of the tape index.
+ * Recursively destroy all tqchildren of the tape index.
*/
void clear();
};
diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp
index 2e4c59b..4fbcb25 100644
--- a/kdat/TapeDrive.cpp
+++ b/kdat/TapeDrive.cpp
@@ -170,15 +170,15 @@ bool TapeDrive::isTapePresent()
}
// Get tape status.
- struct mtget tapeStatus;
- int ret = ioctl( _fd, MTIOCGET, &tapeStatus );
+ struct mtget tapetqStatus;
+ int ret = ioctl( _fd, MTIOCGET, &tapetqStatus );
if ( ret < 0 ) {
return FALSE;
}
// Check for the presence of a tape.
-// if ( !GMT_DR_OPEN( tapeStatus.mt_gstat ) ) {
- if ( GMT_ONLINE( tapeStatus.mt_gstat ) ) {
+// if ( !GMT_DR_OPEN( tapetqStatus.mt_gstat ) ) {
+ if ( GMT_ONLINE( tapetqStatus.mt_gstat ) ) {
// Lock the tape drive door.
//struct mtop tapeOp;
//tapeOp.mt_op = MTLOCK;
@@ -189,9 +189,9 @@ bool TapeDrive::isTapePresent()
//}
if ( _readOnly ) {
- emit sigStatus( i18n( "Tape mounted readonly." ) );
+ emit sigtqStatus( i18n( "Tape mounted readonly." ) );
} else {
- emit sigStatus( i18n( "Tape mounted read/write." ) );
+ emit sigtqStatus( i18n( "Tape mounted read/write." ) );
}
return TRUE;
} else {
@@ -221,14 +221,14 @@ Tape* TapeDrive::readHeader()
_tape = NULL;
// Rewind tape.
- emit sigStatus( "Rewinding tape..." );
+ emit sigtqStatus( "Rewinding tape..." );
if ( !rewind() ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Rewinding tape failed." ));
return NULL;
}
// KDat magic string.
- emit sigStatus( i18n( "Reading magic string..." ) );
+ emit sigtqStatus( i18n( "Reading magic string..." ) );
char magic[9];
if ( read( magic, 9 ) < 9 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading magic string failed." ));
@@ -240,7 +240,7 @@ Tape* TapeDrive::readHeader()
}
// Read version number.
- emit sigStatus( i18n( "Reading version number..." ) );
+ emit sigtqStatus( i18n( "Reading version number..." ) );
int version;
if ( read( (char*)&version, 4 ) < 4 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading version number failed." ));
@@ -252,7 +252,7 @@ Tape* TapeDrive::readHeader()
}
// Read tape ID.
- emit sigStatus( i18n( "Reading tape ID..." ) );
+ emit sigtqStatus( i18n( "Reading tape ID..." ) );
int len;
if ( read( (char*)&len, 4 ) < 4 ) {
KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading tape ID length failed." ));
@@ -517,12 +517,12 @@ bool TapeDrive::seek( int file, int tarBlock )
flush();
// Go to the desired archive.
- emit sigStatus( i18n( "Skipping to archive..." ) );
+ emit sigtqStatus( i18n( "Skipping to archive..." ) );
int curFile = getFile();
// printf( "TapeDrive::seek() -- curFile = %d\n", curFile );
if ( curFile < 0 ) {
- emit sigStatus( i18n( "Rewinding tape..." ) );
+ emit sigtqStatus( i18n( "Rewinding tape..." ) );
rewind();
curFile = 0;
}
@@ -539,11 +539,11 @@ bool TapeDrive::seek( int file, int tarBlock )
// printf( "TapeDrive::seek() -- desired tapeBlock = %d\n", tapeBlock );
// Go to the desired record within the archive.
- emit sigStatus( i18n( "Skipping to block..." ) );
+ emit sigtqStatus( i18n( "Skipping to block..." ) );
int curBlock = getBlock();
// printf( "TapeDrive::seek() -- curBlock = %d\n", curBlock );
if ( curBlock < 0 ) {
- emit sigStatus( i18n( "Rewinding tape..." ) );
+ emit sigtqStatus( i18n( "Rewinding tape..." ) );
rewind();
nextFile( file );
if ( ( curBlock = getBlock() ) < 0 ) {
@@ -597,13 +597,13 @@ bool TapeDrive::pastEOF()
return FALSE;
}
- struct mtget tapeStatus;
- if ( ioctl( _fd, MTIOCGET, &tapeStatus ) < 0 ) {
+ struct mtget tapetqStatus;
+ if ( ioctl( _fd, MTIOCGET, &tapetqStatus ) < 0 ) {
printf( "TapeDrive::pastEOF() -- ioctl( MTIOCGET ) failed!\n" );
return FALSE;
}
- return GMT_EOF( tapeStatus.mt_gstat );
+ return GMT_EOF( tapetqStatus.mt_gstat );
}
bool TapeDrive::setBlockSize( int blockSize )
diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h
index b777bc0..06a0b82 100644
--- a/kdat/TapeDrive.h
+++ b/kdat/TapeDrive.h
@@ -28,6 +28,7 @@ class Tape;
*/
class TapeDrive : public TQObject {
Q_OBJECT
+ TQ_OBJECT
int _fd;
bool _readOnly;
Tape* _tape;
@@ -241,7 +242,7 @@ signals:
*
* @param msg The informational message.
*/
- void sigStatus( const TQString & msg );
+ void sigtqStatus( const TQString & msg );
};
#endif
diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp
index 239d7f1..57ba85a 100644
--- a/kdat/TapeFileInfoWidget.cpp
+++ b/kdat/TapeFileInfoWidget.cpp
@@ -30,8 +30,8 @@
#include "TapeFileInfoWidget.moc"
-TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name )
+TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this );
TQLabel* lbl2 = new TQLabel( i18n( "Last modified:" ), this );
@@ -39,32 +39,32 @@ TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl4 = new TQLabel( i18n( "Start record:" ), this );
TQLabel* lbl5 = new TQLabel( i18n( "End record:" ), this );
- int max = lbl1->sizeHint().width();
- if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
- if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
- if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
- if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
+ int max = lbl1->tqsizeHint().width();
+ if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+ if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
+ if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
+ if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
- lbl2->setFixedSize( max, lbl2->sizeHint().height() );
- lbl3->setFixedSize( max, lbl3->sizeHint().height() );
- lbl4->setFixedSize( max, lbl4->sizeHint().height() );
- lbl5->setFixedSize( max, lbl5->sizeHint().height() );
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
_fileName = new TQLabel( "???", this );
- _fileName->setFixedHeight( _fileName->sizeHint().height() );
+ _fileName->setFixedHeight( _fileName->tqsizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->sizeHint().height() );
+ _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
_size = new TQLabel( "???", this );
- _size->setFixedHeight( _size->sizeHint().height() );
+ _size->setFixedHeight( _size->tqsizeHint().height() );
_startRecord = new TQLabel( "???", this );
- _startRecord->setFixedHeight( _startRecord->sizeHint().height() );
+ _startRecord->setFixedHeight( _startRecord->tqsizeHint().height() );
_endRecord = new TQLabel( "???", this );
- _endRecord->setFixedHeight( _endRecord->sizeHint().height() );
+ _endRecord->setFixedHeight( _endRecord->tqsizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
diff --git a/kdat/TapeFileInfoWidget.h b/kdat/TapeFileInfoWidget.h
index 9098fb0..e6f605e 100644
--- a/kdat/TapeFileInfoWidget.h
+++ b/kdat/TapeFileInfoWidget.h
@@ -30,6 +30,7 @@ class File;
*/
class TapeFileInfoWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
File* _file;
TQLabel* _fileName;
TQLabel* _mtime;
@@ -40,10 +41,10 @@ public:
/**
* Create a new tape file info widget.
*
- * @param parent The parent widget.
+ * @param tqparent The tqparent widget.
* @param name The name of this widget.
*/
- TapeFileInfoWidget( TQWidget* parent = 0, const char* name = 0 );
+ TapeFileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the tape file info widget.
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 1455743..933b504 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -37,8 +37,8 @@
#include "TapeInfoWidget.moc"
-TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
- : TQWidget( parent, name ),
+TapeInfoWidget::TapeInfoWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name ),
_tape( 0 )
{
TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this );
@@ -49,50 +49,50 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
TQLabel* lbl6 = new TQLabel( i18n( "Archive count:" ), this );
TQLabel* lbl7 = new TQLabel( i18n( "Space used:" ), this );
- int max = lbl1->sizeHint().width();
- if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width();
- if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width();
- if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width();
- if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width();
- if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width();
- if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width();
-
- lbl1->setFixedSize( max, lbl1->sizeHint().height() );
- lbl2->setFixedSize( max, lbl2->sizeHint().height() );
- lbl3->setFixedSize( max, lbl3->sizeHint().height() );
- lbl4->setFixedSize( max, lbl4->sizeHint().height() );
- lbl5->setFixedSize( max, lbl5->sizeHint().height() );
- lbl6->setFixedSize( max, lbl6->sizeHint().height() );
- lbl7->setFixedSize( max, lbl7->sizeHint().height() );
+ int max = lbl1->tqsizeHint().width();
+ if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width();
+ if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width();
+ if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width();
+ if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width();
+ if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width();
+ if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width();
+
+ lbl1->setFixedSize( max, lbl1->tqsizeHint().height() );
+ lbl2->setFixedSize( max, lbl2->tqsizeHint().height() );
+ lbl3->setFixedSize( max, lbl3->tqsizeHint().height() );
+ lbl4->setFixedSize( max, lbl4->tqsizeHint().height() );
+ lbl5->setFixedSize( max, lbl5->tqsizeHint().height() );
+ lbl6->setFixedSize( max, lbl6->tqsizeHint().height() );
+ lbl7->setFixedSize( max, lbl7->tqsizeHint().height() );
_tapeName = new TQLineEdit( this );
- _tapeName->setFixedHeight( _tapeName->sizeHint().height() );
+ _tapeName->setFixedHeight( _tapeName->tqsizeHint().height() );
_tapeSize = new TQLineEdit( this );
- _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() );
+ _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() );
_tapeSizeUnits = new TQComboBox( this );
- _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() );
+ _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() );
_tapeSizeUnits->insertItem( "MB" );
_tapeSizeUnits->insertItem( "GB" );
_tapeID = new TQLabel( "???", this );
- _tapeID->setFixedHeight( _tapeID->sizeHint().height() );
+ _tapeID->setFixedHeight( _tapeID->tqsizeHint().height() );
_ctime = new TQLabel( "???", this );
- _ctime->setFixedHeight( _ctime->sizeHint().height() );
+ _ctime->setFixedHeight( _ctime->tqsizeHint().height() );
_mtime = new TQLabel( "???", this );
- _mtime->setFixedHeight( _mtime->sizeHint().height() );
+ _mtime->setFixedHeight( _mtime->tqsizeHint().height() );
_archiveCount = new TQLabel( "???", this );
- _archiveCount->setFixedHeight( _archiveCount->sizeHint().height() );
+ _archiveCount->setFixedHeight( _archiveCount->tqsizeHint().height() );
_spaceUsed = new TQLabel( "???", this );
- _spaceUsed->setFixedHeight( _spaceUsed->sizeHint().height() );
+ _spaceUsed->setFixedHeight( _spaceUsed->tqsizeHint().height() );
_apply = new KPushButton( KStdGuiItem::apply(), this );
- _apply->setFixedSize( 80, _apply->sizeHint().height() );
+ _apply->setFixedSize( 80, _apply->tqsizeHint().height() );
_apply->setEnabled( FALSE );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 );
@@ -202,10 +202,10 @@ void TapeInfoWidget::setTape( Tape* tape )
used *= blockSize / 1024;
}
if ( _tape->getSize() > 0 ) {
- tmp = TQString::fromLatin1( "%1 / %2 (%3%)")
- .arg(Util::kbytesToString( used ))
- .arg(Util::kbytesToString( _tape->getSize() ))
- .arg(used * 100 / _tape->getSize() );
+ tmp = TQString::tqfromLatin1( "%1 / %2 (%3%)")
+ .tqarg(Util::kbytesToString( used ))
+ .tqarg(Util::kbytesToString( _tape->getSize() ))
+ .tqarg(used * 100 / _tape->getSize() );
} else {
tmp = Util::kbytesToString( used );
}
diff --git a/kdat/TapeInfoWidget.h b/kdat/TapeInfoWidget.h
index 9b16aa9..cf87aa7 100644
--- a/kdat/TapeInfoWidget.h
+++ b/kdat/TapeInfoWidget.h
@@ -33,6 +33,7 @@ class Tape;
*/
class TapeInfoWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
Tape* _tape;
TQLineEdit* _tapeName;
TQLineEdit* _tapeSize;
@@ -53,7 +54,7 @@ public:
/**
* Create a new tape info widget.
*/
- TapeInfoWidget( TQWidget* parent = 0, const char* name = 0 );
+ TapeInfoWidget( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the tape info widget.
diff --git a/kdat/TapeManager.h b/kdat/TapeManager.h
index b571605..60b1687 100644
--- a/kdat/TapeManager.h
+++ b/kdat/TapeManager.h
@@ -43,6 +43,7 @@
*/
class TapeManager : public TQObject {
Q_OBJECT
+ TQ_OBJECT
static TapeManager* _instance;
diff --git a/kdat/TarParser.h b/kdat/TarParser.h
index 8dd4058..326bab3 100644
--- a/kdat/TarParser.h
+++ b/kdat/TarParser.h
@@ -168,6 +168,7 @@ union record
*/
class TarParser : public TQObject {
Q_OBJECT
+ TQ_OBJECT
char _buf[512];
int _bufIdx;
int _blocksToSkip;
diff --git a/kdat/Util.cpp b/kdat/Util.cpp
index 11e7219..7f1dcd7 100644
--- a/kdat/Util.cpp
+++ b/kdat/Util.cpp
@@ -60,9 +60,9 @@ TQString Util::longestCommonPath( const TQStringList& files )
}
i = filesTmp.begin();
TQString prefix = *i;
- int idx = prefix.findRev( '/', j );
+ int idx = prefix.tqfindRev( '/', j );
if ( idx > -1 ) {
- prefix = prefix.left( prefix.findRev( '/', j ) );
+ prefix = prefix.left( prefix.tqfindRev( '/', j ) );
} else {
prefix = "";
}
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 92fe9cf..93e8a93 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -45,8 +45,8 @@
VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges,
- bool restore, TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE ),
+ bool restore, TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE ),
_restore( restore ),
_proc( NULL ),
_workingDir( workingDir ),
@@ -89,46 +89,46 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 );
- lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() );
+ lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
_elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
- _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
+ _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
- lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
+ lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
_timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
- _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
+ _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
- lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
+ lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( _archiveSize ), f1 );
- totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
+ totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
TQLabel* lbl4 = new TQLabel( i18n( "KB read:" ), f2 );
- lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
+ lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
_kbytesRead = new TQLabel( i18n( "0KB" ), f2 );
- _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
+ _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
- lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
+ lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
_transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
- _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
+ _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
TQLabel* lbl6;
if ( _restore ) {
lbl6 = new TQLabel( i18n( "Files:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
} else {
lbl6 = new TQLabel( i18n( "Differences:" ), f2 );
- lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+ lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
}
_files = new TQLabel( "0", f2 );
- _files->setFixedHeight( _files->sizeHint().height() );
+ _files->setFixedHeight( _files->tqsizeHint().height() );
if ( _restore ) {
_log = new LoggerWidget( i18n( "Restore log:" ), this );
@@ -137,17 +137,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
}
_ok = new KPushButton( KStdGuiItem::ok(), this );
- _ok->setFixedSize( 80, _ok->sizeHint().height() );
+ _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
_ok->setEnabled( FALSE );
_save = new TQPushButton( i18n( "&Save Log..." ), this );
- _save->setFixedSize( 80, _save->sizeHint().height() );
+ _save->setFixedSize( 80, _save->tqsizeHint().height() );
connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
_save->setEnabled( FALSE );
_abort = new TQPushButton( i18n( "&Abort" ), this );
- _abort->setFixedSize( 80, _abort->sizeHint().height() );
+ _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -233,7 +233,7 @@ void VerifyDlg::show()
void VerifyDlg::slotProcessExited( KProcess* )
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
delete _proc;
// Set this, or we get caught in a loop.
@@ -248,7 +248,7 @@ void VerifyDlg::slotProcessExited( KProcess* )
void VerifyDlg::slotStdout( KProcess*, char* buf, int len )
{
TQString data;
- data.replace( 0, len, buf );
+ data.tqreplace( 0, len, buf );
/* 2002-02-23 RG */
// data[len] = '\0';
data.truncate( len );
@@ -256,7 +256,7 @@ void VerifyDlg::slotStdout( KProcess*, char* buf, int len )
_leftover += data;
int newlineIndex;
- while ( ( newlineIndex = _leftover.find( '\n' ) ) > -1 ) {
+ while ( ( newlineIndex = _leftover.tqfind( '\n' ) ) > -1 ) {
_log->append( _leftover.left( newlineIndex ) );
// Count differences.
@@ -307,7 +307,7 @@ void VerifyDlg::slotAbort()
void VerifyDlg::timerEvent( TQTimerEvent* )
{
- killTimers();
+ TQT_TQOBJECT(this)->killTimers();
int oldElapsed = 0;
@@ -409,7 +409,7 @@ void VerifyDlg::updateStats()
_kbytesRead->setText( str );
if ( elapsed > 0 ) {
- str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
+ str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes * 60 / elapsed ) );
_transferRate->setText( str );
}
}
diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h
index 0535cd4..bc11524 100644
--- a/kdat/VerifyDlg.h
+++ b/kdat/VerifyDlg.h
@@ -33,10 +33,11 @@ class LoggerWidget;
class TapeDrive;
/**
- * @short Status dialog for verifying/restoring parts of an archive.
+ * @short tqStatus dialog for verifying/restoring parts of an archive.
*/
class VerifyDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
bool _restore;
KProcess* _proc;
TQString _workingDir;
@@ -79,11 +80,11 @@ public:
* @param fileno The tape file number of the archive to verify/restore.
* @param ranges A list of tar block ranges to read.
* @param restore TRUE means restore, FALSE means verify.
- * @param parent The parent widget for the dialog.
+ * @param tqparent The tqparent widget for the dialog.
* @param name The name of this widget.
*/
VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges,
- bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 );
+ bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the verify/restore dialog.
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index f65d41f..119c9f1 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -33,8 +33,8 @@
#include "VerifyOptDlg.moc"
-VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* parent, const char* name )
- : TQDialog( parent, name, TRUE ),
+VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* tqparent, const char* name )
+ : TQDialog( tqparent, name, TRUE ),
_restore( restore )
{
if ( _restore ) {
@@ -51,14 +51,14 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
} else {
lbl1 = new TQLabel( i18n( "Verify in folder:" ), this );
}
- lbl1->setFixedSize( lbl1->sizeHint() );
+ lbl1->setFixedSize( lbl1->tqsizeHint() );
_entry = new TQLineEdit( this );
_entry->setText( def );
- _entry->setFixedHeight( _entry->sizeHint().height() );
+ _entry->setFixedHeight( _entry->tqsizeHint().height() );
TQPushButton* browse = new TQPushButton( i18n( "..." ), this );
- browse->setFixedSize( browse->sizeHint() );
+ browse->setFixedSize( browse->tqsizeHint() );
TQLabel* lbl2;
if ( _restore ) {
@@ -66,15 +66,15 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
} else {
lbl2 = new TQLabel( i18n( "Verify files:" ), this );
}
- lbl2->setFixedHeight( lbl2->sizeHint().height() );
+ lbl2->setFixedHeight( lbl2->tqsizeHint().height() );
TQListBox* fileList = new TQListBox( this );
fileList->insertStringList(files);
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
- ok->setFixedSize( 80, ok->sizeHint().height() );
+ ok->setFixedSize( 80, ok->tqsizeHint().height() );
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
- cancel->setFixedSize( 80, cancel->sizeHint().height() );
+ cancel->setFixedSize( 80, cancel->tqsizeHint().height() );
TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
diff --git a/kdat/VerifyOptDlg.h b/kdat/VerifyOptDlg.h
index 48a3624..faa94a7 100644
--- a/kdat/VerifyOptDlg.h
+++ b/kdat/VerifyOptDlg.h
@@ -32,6 +32,7 @@ class TQLineEdit;
*/
class VerifyOptDlg : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
bool _restore;
TQString _workingDir;
TQLineEdit* _entry;
@@ -45,10 +46,10 @@ public:
* @param def The default working directory.
* @param files The list of files that will be verified/restored.
* @param restore TRUE means we are doing a restore, FALSE means we are doing a verify.
- * @param parent The parent widget for the dialog.
+ * @param tqparent The tqparent widget for the dialog.
* @param name The name for the dialog.
*/
- VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 );
+ VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destroy the verify/restore options dialog.
diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index 90d445e..70955e9 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -49,7 +49,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText) :
doTree(true),
doText(true),
child(0),
- parent(0),
+ tqparent(0),
sibling(0),
deleteChildren(false)
{
@@ -67,7 +67,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
doTree(true),
doText(true),
child(0),
- parent(0),
+ tqparent(0),
sibling(0),
deleteChildren(false)
{
@@ -79,7 +79,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
KTreeViewItem::~KTreeViewItem()
{
if (deleteChildren) {
- // remove the children
+ // remove the tqchildren
KTreeViewItem* i = child;
while (i) {
KTreeViewItem* d = i;
@@ -92,7 +92,7 @@ KTreeViewItem::~KTreeViewItem()
// appends a direct child
void KTreeViewItem::appendChild(KTreeViewItem* newChild)
{
- newChild->parent = this;
+ newChild->tqparent = this;
newChild->owner = owner;
if (!getChild()) {
child = newChild;
@@ -121,7 +121,7 @@ TQRect KTreeViewItem::boundingRect(int indent) const
}
// returns the child item at the specified index
-KTreeViewItem* KTreeViewItem::childAt(int index) const
+KTreeViewItem* KTreeViewItem::tqchildAt(int index) const
{
if (!hasChild())
return 0;
@@ -133,7 +133,7 @@ KTreeViewItem* KTreeViewItem::childAt(int index) const
return item;
}
-// returns the number of children this item has
+// returns the number of tqchildren this item has
uint KTreeViewItem::childCount() const
{
return numChildren;
@@ -155,7 +155,7 @@ int KTreeViewItem::childIndex(KTreeViewItem* searched) const
// indicates whether mouse press is in expand button
inline bool KTreeViewItem::expandButtonClicked(const TQPoint& coord) const
{
- return expandButton.contains(coord);
+ return expandButton.tqcontains(coord);
}
bool KTreeViewItem::mousePressEvent( const TQPoint& )
@@ -169,10 +169,10 @@ KTreeViewItem* KTreeViewItem::getChild() const
return child;
}
-// returns the parent of this item
+// returns the tqparent of this item
KTreeViewItem* KTreeViewItem::getParent() const
{
- return parent;
+ return tqparent;
}
// returns reference to the item pixmap
@@ -193,16 +193,16 @@ const TQString& KTreeViewItem::getText() const
return text;
}
-// indicates whether this item has any children
+// indicates whether this item has any tqchildren
bool KTreeViewItem::hasChild() const
{
return child != 0;
}
-// indicates whether this item has a parent
+// indicates whether this item has a tqparent
bool KTreeViewItem::hasParent() const
{
- return parent != 0;
+ return tqparent != 0;
}
// indicates whether this item has a sibling below it
@@ -234,7 +234,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
appendChild(newChild);
return;
}
- newChild->parent = this;
+ newChild->tqparent = this;
newChild->owner = owner;
if (index == 0) {
newChild->sibling = getChild();
@@ -260,7 +260,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
// indicates whether this item is displayed expanded
// NOTE: a TRUE response does not necessarily indicate the item
-// has any children
+// has any tqchildren
bool KTreeViewItem::isExpanded() const
{
return expanded;
@@ -314,41 +314,41 @@ void KTreeViewItem::paint(TQPainter* p, int indent, const TQColorGroup& cg,
void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight) const
{
- int parentLeaderX = indent - (22 / 2);
+ int tqparentLeaderX = indent - (22 / 2);
int cellCenterY = cellHeight / 2;
- expandButton.setRect(parentLeaderX - 4, cellCenterY - 4, 9, 9);
- p->setBrush(Qt::white);
+ expandButton.setRect(tqparentLeaderX - 4, cellCenterY - 4, 9, 9);
+ p->setBrush(TQt::white);
p->drawRect(expandButton);
if (expanded) {
- p->drawLine(parentLeaderX - 2, cellCenterY,
- parentLeaderX + 2, cellCenterY);
+ p->drawLine(tqparentLeaderX - 2, cellCenterY,
+ tqparentLeaderX + 2, cellCenterY);
} else {
- p->drawLine(parentLeaderX - 2, cellCenterY,
- parentLeaderX + 2, cellCenterY);
- p->drawLine(parentLeaderX, cellCenterY - 2,
- parentLeaderX, cellCenterY + 2);
+ p->drawLine(tqparentLeaderX - 2, cellCenterY,
+ tqparentLeaderX + 2, cellCenterY);
+ p->drawLine(tqparentLeaderX, cellCenterY - 2,
+ tqparentLeaderX, cellCenterY + 2);
}
- p->setBrush(Qt::NoBrush);
+ p->setBrush(TQt::NoBrush);
}
// paint the highlight
-void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& colorGroup,
- bool hasFocus, Qt::GUIStyle style) const
+void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& tqcolorGroup,
+ bool hasFocus, TQt::GUIStyle style) const
{
TQColor fc;
- if (style == Qt::WindowsStyle)
- fc = Qt::darkBlue; /* hardcoded in Qt */
+ if (style == TQt::WindowsStyle)
+ fc = TQt::darkBlue; /* hardcoded in TQt */
else
- fc = colorGroup.text();
+ fc = tqcolorGroup.text();
TQRect textRect = textBoundingRect(indent);
int t,l,b,r;
textRect.coords(&l, &t, &r, &b);
p->fillRect(textRect, fc); /* draw highlight background */
if (hasFocus) {
- if(style == Qt::WindowsStyle) { /* draw Windows style highlight */
+ if(style == TQt::WindowsStyle) { /* draw Windows style highlight */
textRect.setCoords(l - 1, t - 1, r + 1, b + 1);
- p->setPen(TQPen(Qt::yellow, 0, Qt::DotLine));
+ p->setPen(TQPen(TQt::yellow, 0, TQt::DotLine));
p->setBackgroundColor(fc);
p->setBackgroundMode(Qt::OpaqueMode);
p->drawRect(textRect);
@@ -372,7 +372,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
p->fontMetrics().leading()) / 2);
if (highlighted) {
paintHighlight(p, indent, cg, owner->hasFocus(),
- (Qt::GUIStyle)owner->style().styleHint(TQStyle::SH_GUIStyle)); // Qt3 doesn't make this easy ;)
+ (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
p->setPen(cg.base());
p->setBackgroundColor(cg.text());
}
@@ -386,43 +386,43 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
// paint the tree structure
void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
{
- int parentLeaderX = indent - (22 / 2);
+ int tqparentLeaderX = indent - (22 / 2);
int cellCenterY = cellHeight / 2;
int cellBottomY = cellHeight - 1;
int itemLeaderX = indent - 3;
/*
* If this is not the first item in the tree draw the line up
- * towards parent or sibling.
+ * towards tqparent or sibling.
*/
- if (parent->parent != 0 || parent->getChild() != this)
- p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY);
+ if (tqparent->tqparent != 0 || tqparent->getChild() != this)
+ p->drawLine(tqparentLeaderX, 0, tqparentLeaderX, cellCenterY);
// draw the line down towards sibling
if (sibling)
- p->drawLine(parentLeaderX, cellCenterY, parentLeaderX, cellBottomY);
+ p->drawLine(tqparentLeaderX, cellCenterY, tqparentLeaderX, cellBottomY);
/*
- * If this item has children or siblings in the tree or is a child of
+ * If this item has tqchildren or siblings in the tree or is a child of
* an item other than the root item then draw the little line from the
* item out to the left.
*/
if (sibling || (doExpandButton && (child || delayedExpanding)) ||
- parent->parent != 0 ||
+ tqparent->tqparent != 0 ||
/*
* The following handles the case of an item at the end of the
- * topmost level which doesn't have children.
+ * topmost level which doesn't have tqchildren.
*/
- parent->getChild() != this)
+ tqparent->getChild() != this)
{
- p->drawLine(parentLeaderX, cellCenterY, itemLeaderX, cellCenterY);
+ p->drawLine(tqparentLeaderX, cellCenterY, itemLeaderX, cellCenterY);
}
/*
* If there are siblings of ancestors below, draw our portion of the
* branches that extend through this cell.
*/
- KTreeViewItem* prevRoot = parent;
+ KTreeViewItem* prevRoot = tqparent;
while (prevRoot->getParent() != 0) { /* while not root item */
if (prevRoot->hasSibling()) {
int sibLeaderX = owner->indentation(prevRoot) - (22 / 2);
@@ -435,7 +435,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
// removes the given (direct) child from the branch
bool KTreeViewItem::removeChild(KTreeViewItem* theChild)
{
- // search item in list of children
+ // search item in list of tqchildren
KTreeViewItem* prevItem = 0;
KTreeViewItem* toRemove = getChild();
while (toRemove && toRemove != theChild) {
@@ -573,10 +573,10 @@ int KTreeViewItem::width(int indent, const TQFontMetrics& fm) const
*/
// constructor
-KTreeView::KTreeView(TQWidget *parent,
+KTreeView::KTreeView(TQWidget *tqparent,
const char *name,
WFlags f) :
- TQGridView(parent, name, f),
+ TQGridView(tqparent, name, f),
clearing(false),
current(-1),
drawExpandButton(true),
@@ -599,7 +599,7 @@ KTreeView::KTreeView(TQWidget *parent,
//case WindowsStyle:
//case MotifStyle:
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- setBackgroundColor(colorGroup().base());
+ setBackgroundColor(tqcolorGroup().base());
//break;
/*default:
setFrameStyle(TQFrame::Panel | TQFrame::Plain);
@@ -646,25 +646,25 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
appendChildItem(item, thePath);
}
-// appends the given item to the children of the item at the given index
+// appends the given item to the tqchildren of the item at the given index
void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
{
- /* find parent item and append new item to parent's sub tree */
- KTreeViewItem* parentItem = itemAt(index);
- if (!parentItem)
+ /* find tqparent item and append new item to tqparent's sub tree */
+ KTreeViewItem* tqparentItem = itemAt(index);
+ if (!tqparentItem)
return;
- appendChildItem(parentItem, newItem);
+ appendChildItem(tqparentItem, newItem);
}
-// appends the given item to the children of the item at the end of the
+// appends the given item to the tqchildren of the item at the end of the
// given path
void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
{
- /* find parent item and append new item to parent's sub tree */
- KTreeViewItem* parentItem = itemAt(thePath);
- if (!parentItem)
+ /* find tqparent item and append new item to tqparent's sub tree */
+ KTreeViewItem* tqparentItem = itemAt(thePath);
+ if (!tqparentItem)
return;
- appendChildItem(parentItem, newItem);
+ appendChildItem(tqparentItem, newItem);
}
// indicates whether horizontal scrollbar appears only when needed
@@ -744,7 +744,7 @@ void KTreeView::clear()
if(goingDown || TQApplication::closingDown())
return;
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
@@ -789,7 +789,7 @@ int KTreeView::expandLevel() const
// expands or collapses the subtree rooted at the given item,
// as approptiate
-// if item has no children, does nothing
+// if item has no tqchildren, does nothing
void KTreeView::expandOrCollapseItem(int index)
{
KTreeViewItem *item = itemAt(index);
@@ -813,7 +813,7 @@ bool KTreeView::forEveryItem(KForEvery func, void* user, KTreeViewItem* item)
if ((*func)(item, user)) {
return true;
}
- // visit the children (recursively)
+ // visit the tqchildren (recursively)
if (item->hasChild()) {
if (forEveryItem(func, user, item))
return true;
@@ -833,7 +833,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
if (item == 0) {
item = treeRoot;
} else {
- // children are invisible (hence, nothing to do)
+ // tqchildren are invisible (hence, nothing to do)
// if item is invisible or collapsed
if (!item->isVisible() || !item->isExpanded()) {
return false;
@@ -847,7 +847,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user,
if ((*func)(item, user)) {
return true;
}
- // visit the children (recursively)
+ // visit the tqchildren (recursively)
if (item->hasChild() && item->isExpanded()) {
if (forEveryVisibleItem(func, user, item))
return true;
@@ -994,7 +994,7 @@ int KTreeView::itemRow(KTreeViewItem* item)
/*
* move the subtree at the specified index up one branch level (make root
- * item a sibling of its current parent)
+ * item a sibling of its current tqparent)
*/
void KTreeView::join(int index)
{
@@ -1005,7 +1005,7 @@ void KTreeView::join(int index)
/*
* move the subtree at the specified index up one branch level (make root
- * item a sibling of it's current parent)
+ * item a sibling of it's current tqparent)
*/
void KTreeView::join(const KPath& path)
{
@@ -1014,7 +1014,7 @@ void KTreeView::join(const KPath& path)
join(item);
}
-/* move item at specified index one slot down in its parent's sub tree */
+/* move item at specified index one slot down in its tqparent's sub tree */
void KTreeView::lowerItem(int index)
{
KTreeViewItem *item = itemAt(index);
@@ -1022,7 +1022,7 @@ void KTreeView::lowerItem(int index)
lowerItem(item);
}
-/* move item at specified path one slot down in its parent's sub tree */
+/* move item at specified path one slot down in its tqparent's sub tree */
void KTreeView::lowerItem(const KPath& path)
{
KTreeViewItem* item = itemAt(path);
@@ -1030,7 +1030,7 @@ void KTreeView::lowerItem(const KPath& path)
lowerItem(item);
}
-/* move item at specified index one slot up in its parent's sub tree */
+/* move item at specified index one slot up in its tqparent's sub tree */
void KTreeView::raiseItem(int index)
{
KTreeViewItem* item = itemAt(index);
@@ -1038,7 +1038,7 @@ void KTreeView::raiseItem(int index)
raiseItem(item);
}
-/* move item at specified path one slot up in its parent's sub tree */
+/* move item at specified path one slot up in its tqparent's sub tree */
void KTreeView::raiseItem(const KPath& path)
{
KTreeViewItem* item = itemAt(path);
@@ -1113,7 +1113,7 @@ void KTreeView::setExpandButtonDrawing(bool enable)
drawExpandButton = enable;
forEveryItem(&KTreeView::setItemExpandButtonDrawing, 0);
if(autoUpdate() && isVisible())
- repaint();
+ tqrepaint();
}
// sets depth to which subtrees are automatically expanded, and
@@ -1132,10 +1132,10 @@ void KTreeView::setExpandLevel(int level)
}
setCurrentItem(itemRow(item));
if(autoUpdate() && isVisible())
- repaint();
+ tqrepaint();
}
-// sets the indent margin for all branches and repaints if auto update enabled
+// sets the indent margin for all branches and tqrepaints if auto update enabled
void KTreeView::setIndentSpacing(int spacing)
{
if (itemIndent == spacing)
@@ -1143,7 +1143,7 @@ void KTreeView::setIndentSpacing(int spacing)
itemIndent = spacing;
updateCellWidth();
if (autoUpdate() && isVisible())
- repaint();
+ tqrepaint();
}
// enables/disables vertical scrollbar
@@ -1160,7 +1160,7 @@ void KTreeView::setShowItemText(bool enable)
showText = enable;
forEveryItem(&KTreeView::setItemShowText, 0);
if(autoUpdate() && isVisible())
- repaint();
+ tqrepaint();
}
// indicates whether vertical scrolling is by pixel or row
@@ -1177,7 +1177,7 @@ void KTreeView::setTreeDrawing(bool enable)
drawTree = enable;
forEveryItem(&KTreeView::setItemTreeDrawing, 0);
if(autoUpdate() && isVisible())
- repaint();
+ tqrepaint();
}
// indicates whether item text keys are displayed
@@ -1237,7 +1237,7 @@ bool KTreeView::treeDrawing() const
}
-// appends a child to the specified parent item (note: a child, not a sibling, is added!)
+// appends a child to the specified tqparent item (note: a child, not a sibling, is added!)
void KTreeView::appendChildItem(KTreeViewItem* theParent,
KTreeViewItem* newItem)
{
@@ -1251,18 +1251,18 @@ void KTreeView::appendChildItem(KTreeViewItem* theParent,
newItem->setExpanded(true);
}
- // fix up branch levels of any children that the new item may already have
+ // fix up branch levels of any tqchildren that the new item may already have
if(newItem->hasChild()) {
fixChildren(newItem);
}
- // if necessary, adjust cell width, number of rows and repaint
+ // if necessary, adjust cell width, number of rows and tqrepaint
if (newItem->isVisible() || theParent->childCount() == 1) {
bool autoU = autoUpdate();
setAutoUpdate(false);
updateVisibleItems();
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
}
@@ -1302,7 +1302,7 @@ void KTreeView::collapseSubTree(KTreeViewItem* subRoot)
}
}
// roland
- repaint();
+ tqrepaint();
setAutoUpdate(TRUE);
// roland
}
@@ -1317,21 +1317,21 @@ bool KTreeView::countItem(KTreeViewItem*, void* total)
}
// if item is expanded, collapses it or vice-versa
-void KTreeView::expandOrCollapse(KTreeViewItem* parent)
+void KTreeView::expandOrCollapse(KTreeViewItem* tqparent)
{
bool autoU = autoUpdate();
setAutoUpdate(false);
- int parentIndex = itemRow(parent);
- if (parent->isExpanded()) {
- collapseSubTree(parent);
- emit collapsed(parentIndex);
+ int tqparentIndex = itemRow(tqparent);
+ if (tqparent->isExpanded()) {
+ collapseSubTree(tqparent);
+ emit collapsed(tqparentIndex);
}
else {
- expandSubTree(parent);
- emit expanded(parentIndex);
+ expandSubTree(tqparent);
+ emit expanded(tqparentIndex);
}
if (autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
@@ -1361,28 +1361,28 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot)
}
}
// roland
- repaint();
+ tqrepaint();
setAutoUpdate(TRUE);
// roland
}
// fix up branch levels out of whack from split/join operations on the tree
-void KTreeView::fixChildren(KTreeViewItem *parentItem)
+void KTreeView::fixChildren(KTreeViewItem *tqparentItem)
{
KTreeViewItem* childItem = 0;
KTreeViewItem* siblingItem = 0;
-// int childBranch = parentItem->getBranch() + 1;
- if(parentItem->hasChild()) {
- childItem = parentItem->getChild();
+// int childBranch = tqparentItem->getBranch() + 1;
+ if(tqparentItem->hasChild()) {
+ childItem = tqparentItem->getChild();
// childItem->setBranch(childBranch);
- childItem->owner = parentItem->owner;
+ childItem->owner = tqparentItem->owner;
fixChildren(childItem);
}
while(childItem && childItem->hasSibling()) {
siblingItem = childItem->getSibling();
// siblingItem->setBranch(childBranch);
- siblingItem->owner = parentItem->owner;
+ siblingItem->owner = tqparentItem->owner;
fixChildren(siblingItem);
childItem = siblingItem;
}
@@ -1483,37 +1483,37 @@ bool KTreeView::insertItem(KTreeViewItem* referenceItem,
{
setCellHeight(newItem->height(fontMetrics()));
}
- KTreeViewItem* parentItem;
+ KTreeViewItem* tqparentItem;
if (referenceItem) {
- parentItem = referenceItem->getParent();
- int insertIndex = parentItem->childIndex(referenceItem);
+ tqparentItem = referenceItem->getParent();
+ int insertIndex = tqparentItem->childIndex(referenceItem);
if (!prefix)
insertIndex++;
- parentItem->insertChild(insertIndex, newItem);
+ tqparentItem->insertChild(insertIndex, newItem);
}
else {
// no reference item, append at end of visible tree
- // need to repaint
- parentItem = treeRoot;
- parentItem->appendChild(newItem);
+ // need to tqrepaint
+ tqparentItem = treeRoot;
+ tqparentItem->appendChild(newItem);
}
// set item expansion
if (level(newItem) < expansion)
newItem->setExpanded(true);
- // fix up branch levels of any children
+ // fix up branch levels of any tqchildren
if (newItem->hasChild())
fixChildren(newItem);
- // if repaint necessary, do it if visible and auto update
+ // if tqrepaint necessary, do it if visible and auto update
// enabled
- if (newItem->isVisible() || parentItem->childCount() == 1) {
+ if (newItem->isVisible() || tqparentItem->childCount() == 1) {
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
updateVisibleItems();
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
return true;
@@ -1534,7 +1534,7 @@ void KTreeView::itemPath(KTreeViewItem* item, KPath& path) const
/*
* joins the item's branch into the tree, making the item a sibling of its
- * parent
+ * tqparent
*/
void KTreeView::join(KTreeViewItem *item)
{
@@ -1545,7 +1545,7 @@ void KTreeView::join(KTreeViewItem *item)
takeItem(item);
insertItem(itemParent, item, FALSE);
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
}
@@ -1587,16 +1587,16 @@ void KTreeView::keyPressEvent(TQKeyEvent *e)
// move highlight one page down and scroll down
- delta = QMAX(1, visibleHeight() / cellHeight());
- setCurrentItem(QMIN(currentItem() + delta, numRows() - 1));
+ delta = TQMAX(1, visibleHeight() / cellHeight());
+ setCurrentItem(TQMIN(currentItem() + delta, numRows() - 1));
ensureCellVisible(currentItem(), 0);
break;
case Key_Prior:
// move highlight one page up and scroll up
- delta = QMAX(1, visibleHeight() / cellHeight());
- setCurrentItem(QMAX(currentItem() - delta, 0));
+ delta = TQMAX(1, visibleHeight() / cellHeight());
+ setCurrentItem(TQMAX(currentItem() - delta, 0));
ensureCellVisible(currentItem(), 0);
break;
case Key_Plus:
@@ -1632,15 +1632,15 @@ int KTreeView::level(KTreeViewItem* item) const
assert(item->owner == this);
assert(item != treeRoot);
int l = 0;
- item = item->parent->parent; /* since item != treeRoot, there is a parent */
+ item = item->tqparent->tqparent; /* since item != treeRoot, there is a tqparent */
while (item != 0) {
- item = item->parent;
+ item = item->tqparent;
l++;
}
return l;
}
-/* move specified item down one slot in parent's subtree */
+/* move specified item down one slot in tqparent's subtree */
void KTreeView::lowerItem(KTreeViewItem *item)
{
KTreeViewItem *itemParent = item->getParent();
@@ -1649,9 +1649,9 @@ void KTreeView::lowerItem(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- insertItem(itemParent->childAt(itemChildIndex), item, FALSE);
+ insertItem(itemParent->tqchildAt(itemChildIndex), item, FALSE);
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
}
@@ -1681,7 +1681,7 @@ void KTreeView::mouseDoubleClickEvent(TQMouseEvent *e)
// hit test item
int indent = indentation(item);
- if(item->boundingRect(indent).contains(cellCoord))
+ if(item->boundingRect(indent).tqcontains(cellCoord))
emit selected(itemClicked);
}
@@ -1701,7 +1701,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e)
{
// first: check which button was pressed
- if (e->button() == MidButton)
+ if (e->button() == Qt::MidButton)
{
// RB: the MMB is hardcoded to the "rubberband" scroll mode
if (!rubberband_mode) {
@@ -1709,7 +1709,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e)
}
return;
}
- else if ( ( rubberband_mode ) && ( e->button() != RightButton ) )
+ else if ( ( rubberband_mode ) && ( e->button() != Qt::RightButton ) )
{
// another button was pressed while rubberbanding, stop the move.
// RB: if we allow other buttons while rubberbanding the tree can expand
@@ -1749,9 +1749,9 @@ void KTreeView::mousePressEvent(TQMouseEvent *e)
emit selected(itemClicked);
}
// hit item (to show info on the file/dir label clicked)
- else if (item->boundingRect(indentation(item)).contains(cellCoord)) {
+ else if (item->boundingRect(indentation(item)).tqcontains(cellCoord)) {
setCurrentItem(itemClicked); // highlight item
- if ( e->button() == RightButton ) {
+ if ( e->button() == Qt::RightButton ) {
emit popupMenu( itemClicked, mapToGlobal( TQPoint( e->pos().x(), e->pos().y() ) ) );
}
}
@@ -1761,7 +1761,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e)
void KTreeView::mouseReleaseEvent(TQMouseEvent *e)
{
/* if it's the MMB end rubberbanding */
- if (rubberband_mode && e->button()==MidButton)
+ if (rubberband_mode && e->button()==Qt::MidButton)
{
end_rubberband();
}
@@ -1859,14 +1859,14 @@ void KTreeView::paintCell(TQPainter* p, int row, int)
return;
p->setClipRect(cellRect(), TQPainter::CoordPainter );
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
int indent = indentation(item);
item->paint(p, indent, cg,
current == row); /* highlighted */
p->setClipping(false);
}
-/* raise the specified item up one slot in parent's subtree */
+/* raise the specified item up one slot in tqparent's subtree */
void KTreeView::raiseItem(KTreeViewItem *item)
{
KTreeViewItem *itemParent = item->getParent();
@@ -1875,9 +1875,9 @@ void KTreeView::raiseItem(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- insertItem(itemParent->childAt(--itemChildIndex), item, TRUE);
+ insertItem(itemParent->tqchildAt(--itemChildIndex), item, TRUE);
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
}
@@ -1891,15 +1891,15 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path)
// get the next key
TQString* searchString = path.pop();
- // find the parent item
- KTreeViewItem* parent = recursiveFind(path);
- if (parent == 0)
+ // find the tqparent item
+ KTreeViewItem* tqparent = recursiveFind(path);
+ if (tqparent == 0)
return 0;
/*
- * Iterate through the parent's children searching for searchString.
+ * Iterate through the tqparent's tqchildren searching for searchString.
*/
- KTreeViewItem* sibling = parent->getChild();
+ KTreeViewItem* sibling = tqparent->getChild();
while (sibling != 0) {
if (*searchString == sibling->getText()) {
break; /* found it! */
@@ -1961,9 +1961,9 @@ void KTreeView::split(KTreeViewItem *item)
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
takeItem(item);
- appendChildItem(itemParent->childAt(--itemChildIndex), item);
+ appendChildItem(itemParent->tqchildAt(--itemChildIndex), item);
if(autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
@@ -1988,22 +1988,22 @@ void KTreeView::takeItem(KTreeViewItem* item)
c = c->getParent();
}
if (c != 0) {
- // move current item to parent
+ // move current item to tqparent
cur = item->getParent();
if (cur == treeRoot)
cur = 0;
}
}
- KTreeViewItem* parentItem = item->getParent();
- parentItem->removeChild(item);
+ KTreeViewItem* tqparentItem = item->getParent();
+ tqparentItem->removeChild(item);
item->sibling = 0;
- if (wasVisible || parentItem->childCount() == 0) {
+ if (wasVisible || tqparentItem->childCount() == 0) {
bool autoU = autoUpdate();
setAutoUpdate(FALSE);
updateVisibleItems();
if (autoU && isVisible())
- repaint();
+ tqrepaint();
setAutoUpdate(autoU);
}
@@ -2012,7 +2012,7 @@ void KTreeView::takeItem(KTreeViewItem* item)
}
// visits each item, calculates the maximum width
-// and updates QGridView
+// and updates TQGridView
void KTreeView::updateCellWidth()
{
// make cells at least 1 pixel wide to avoid singularities (division by zero)
@@ -2041,10 +2041,10 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
}
/*
- * Record the children of item in the list of visible items.
+ * Record the tqchildren of item in the list of visible items.
*
* Don't register item itself, it's already in the list. Also only
- * allocate new space for children.
+ * allocate new space for tqchildren.
*/
count += item->childCount();
if (count > itemCapacity) {
@@ -2066,7 +2066,7 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count
visibleItems = newItems;
itemCapacity = newCapacity;
}
- // insert children
+ // insert tqchildren
for (KTreeViewItem* i = item->getChild(); i != 0; i = i->getSibling()) {
visibleItems[index++] = i;
updateVisibleItemRec(i, index, count);
diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h
index 5c6b52b..724caf5 100644
--- a/kdat/ktreeview.h
+++ b/kdat/ktreeview.h
@@ -43,25 +43,25 @@ public:
* item can be constructed this way, the text has to be non-null when
* the item is added to the tree, or it will not be inserted.
*
- * The constructor sets the delete-children flag to false. This flag
+ * The constructor sets the delete-tqchildren flag to false. This flag
* tells the item whether it shall delete the child items when it is
* itself deleted. By default the creator of the item is responsible to
* also delete the child items. (However, the versions of
* KTreeView::appendChildItem and KTreeView::insertChildItem that do
- * not take a KTreeViewItem set the delete-children flag to true.)
+ * not take a KTreeViewItem set the delete-tqchildren flag to true.)
*/
KTreeViewItem(const TQString& theText = TQString()); // text can not be null when added to the list!
KTreeViewItem(const TQString& theText, const TQPixmap& thePixmap);
/**
- * Destructor. It destroys its children if this item has been marked
+ * Destructor. It destroys its tqchildren if this item has been marked
* with setDeleteChildren(true).
*/
virtual ~KTreeViewItem();
/**
* Appends a new (direct) child item at the end. It does not update
- * administrative data in newChild except for its parent (which is this
+ * administrative data in newChild except for its tqparent (which is this
* item) and owner.
*/
void appendChild(KTreeViewItem* newChild);
@@ -70,7 +70,7 @@ public:
* Returns a pointer to the child item at the given index in this
* item's sub tree, or 0 if not found.
*/
- KTreeViewItem* childAt(int index) const;
+ KTreeViewItem* tqchildAt(int index) const;
/**
* Returns the number of child items in this item's sub tree.
@@ -100,7 +100,7 @@ public:
KTreeViewItem* getChild() const;
/**
- * Returns a pointer to the parent of this item, or 0 if none.
+ * Returns a pointer to the tqparent of this item, or 0 if none.
*/
KTreeViewItem* getParent() const;
@@ -123,12 +123,12 @@ public:
const TQString& getText() const;
/**
- * Indicates whether this item has any children.
+ * Indicates whether this item has any tqchildren.
*/
bool hasChild() const;
/**
- * Indicates whether this item has a parent.
+ * Indicates whether this item has a tqparent.
*/
bool hasParent() const;
@@ -142,7 +142,7 @@ public:
* Inserts the a new (direct) child in this item before the child at
* the specified index (first child is index 0). If there is no child
* at the specified index, the item is appended. It does not update
- * administrative data in newChild except for its parent (which is this
+ * administrative data in newChild except for its tqparent (which is this
* item) and owner.
*/
void insertChild(int index, KTreeViewItem* newChild);
@@ -152,7 +152,7 @@ public:
* items (if any) would be visible if this item were visible.
*
* Note: If this function returns true, it does not necessarily indicate that
- * this item is visible or that this item has any children.
+ * this item is visible or that this item has any tqchildren.
*/
bool isExpanded() const;
@@ -174,12 +174,12 @@ public:
* Sets the delayed-expanding flag. If this flag is true, the expanding
* signal is emitted when the item is about to be expanded. The expand
* button is always painted for this item, even if it doesn't have
- * children.
+ * tqchildren.
*/
void setDelayedExpanding(bool flag);
/**
- * Tells the item whether it should delete its children when it is
+ * Tells the item whether it should delete its tqchildren when it is
* deleted. The default is false, which means that the child items must
* be deleted explicitly.
*/
@@ -224,7 +224,7 @@ protected:
virtual int height(const TQFontMetrics& fm) const;
/**
- * Paints the item: pixmap, text, expand button, parent branches
+ * Paints the item: pixmap, text, expand button, tqparent branches
*/
virtual void paint(TQPainter* p, int indent,
const TQColorGroup& cg, bool highlighted) const;
@@ -239,7 +239,7 @@ protected:
*/
virtual void paintHighlight(TQPainter* p, int indent,
const TQColorGroup& cg, bool hasFocus,
- Qt::GUIStyle style) const;
+ TQt::GUIStyle style) const;
/**
* paints the item's text
@@ -286,7 +286,7 @@ protected:
bool doText;
mutable TQRect expandButton; /* is set in paint() */
KTreeViewItem* child;
- KTreeViewItem* parent;
+ KTreeViewItem* tqparent;
KTreeViewItem* sibling;
TQPixmap pixmap;
TQString text;
@@ -310,7 +310,7 @@ typedef bool (*KForEvery)
1. Introduction
================================================================================
- KTreeView is a class inherited from QTableView in the Qt user interface
+ KTreeView is a class inherited from TQTableView in the TQt user interface
library. It provides a way to display hierarchical data in a single-inheritance
tree, similar to tree controls in Microsoft Windows and other GUI's. It is most
suitable for directory trees or outlines, but I'm sure other uses will come to
@@ -331,7 +331,7 @@ typedef bool (*KForEvery)
by the programmer.
* The list items can be returned by index or logical path and the tree
- navigated by parent, child or sibling references contained in them. Also,
+ navigated by tqparent, child or sibling references contained in them. Also,
item information such as text, pixmap, branch level can be obtained.
* Items can be inserted, changed and removed either by index in the visible
@@ -395,18 +395,19 @@ typedef bool (*KForEvery)
signal void collpased(int) - emitted when an item in the tree is collapsed;
sends the index of the item
*/
-class KTreeView : public QGridView
+class KTreeView : public TQGridView
{
friend class KTreeViewItem;
Q_OBJECT
+ TQ_OBJECT
public:
/**
- * Widget contructor. Passes all parameters on to base QTableView, and
+ * Widget contructor. Passes all parameters on to base TQTableView, and
* does not use them directly. Does internal initialization, sets the
* current item to -1, and sets default values for scroll bars (both
* auto).
*/
- KTreeView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0);
+ KTreeView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0);
/*
* Desctructor. Deletes all items from the topmost level that have been
@@ -416,28 +417,28 @@ public:
/**
* Appends a new child item to the item at the specified row. If that
- * item already has children, the new item is appended below these
- * children. A KTreeViewItem is created for which the delete-children
+ * item already has tqchildren, the new item is appended below these
+ * tqchildren. A KTreeViewItem is created for which the delete-tqchildren
* flag is set to true.
*/
void appendChildItem(const TQString & theText, const TQPixmap& thePixmap,
int index);
/**
- * Same as above except that the parent item is specified by a path.
+ * Same as above except that the tqparent item is specified by a path.
*/
void appendChildItem(const TQString & theText, const TQPixmap& thePixmap,
const KPath& thePath);
/**
* Appendss the specified item as a child of the item that is at the
- * specified row. If that item already has children, the new item is
- * appended below these children.
+ * specified row. If that item already has tqchildren, the new item is
+ * appended below these tqchildren.
*/
void appendChildItem(KTreeViewItem* newItem, int index);
/**
- * Same as above except that the parent item is specified by a path.
+ * Same as above except that the tqparent item is specified by a path.
*/
void appendChildItem(KTreeViewItem* newItem, const KPath& thePath);
@@ -514,7 +515,7 @@ public:
void expandItem(int index);
/**
- Returns the depth to which all parent items are automatically
+ Returns the depth to which all tqparent items are automatically
expanded.
*/
int expandLevel() const;
@@ -528,7 +529,7 @@ public:
/**
* Iterates every item in the tree, visible or not, and applies the
* function func with a pointer to each item and user data supplied as
- * parameters. The children of the specified root item are visited
+ * parameters. The tqchildren of the specified root item are visited
* (root itself is not visited!). If root is 0 all items in the tree
* are visited. KForEveryFunc is defined as:
*
@@ -567,7 +568,7 @@ public:
* the value of prefix. The new item is added to the same branch as the
* referenced item. If row is -1, the item is simply appended to the
* tree at the topmost level. A KTreeViewItem is created for which the
- * delete-children flag is set to true. Returns true if the item has
+ * delete-tqchildren flag is set to true. Returns true if the item has
* been successfully inserted in the tree, otherwise false.
*/
bool insertItem(const TQString & theText, const TQPixmap& thePixmap,
@@ -621,7 +622,7 @@ public:
/**
* Outdents the item at the given row one level so that it becomes a
- * sibling of its parent.
+ * sibling of its tqparent.
*/
void join(int index);
@@ -755,7 +756,7 @@ public:
/**
* This function is deprecated. Use numRows() instead.
- * Returns the number of items that are visible (their parents are
+ * Returns the number of items that are visible (their tqparents are
* expanded).
*/
int visibleCount() const { return numRows(); }
@@ -784,7 +785,7 @@ signals:
protected:
/**
* Appends theChild to theParent as a new direct child. All internal
- * state is updated and the widget is repainted as necessary. theChild
+ * state is updated and the widget is tqrepainted as necessary. theChild
* remains invisible if any ancestor of theParent is collapsed.
*/
void appendChildItem(KTreeViewItem* theParent,
@@ -800,13 +801,13 @@ protected:
/** Internal function used for counting items */
bool countItem(KTreeViewItem* item, void* total);
- void expandOrCollapse(KTreeViewItem *parentItem);
+ void expandOrCollapse(KTreeViewItem *tqparentItem);
/**
* Expands the specified subtree and updates the display. subRoot need
* not be visible.
*/
void expandSubTree(KTreeViewItem* subRoot);
- void fixChildren(KTreeViewItem *parentItem);
+ void fixChildren(KTreeViewItem *tqparentItem);
virtual void focusInEvent(TQFocusEvent *e);
void forEveryItem(KForEveryM func,
void *user);
@@ -827,7 +828,7 @@ protected:
* topmost level. If referenceItem is not 0, it must be an item that is
* already in the KTreeView. Internal data is updated and the display
* is refreshed as necessary. The inserted item may still be invisible
- * if any of the parents is collapsed. newItem must not be 0.
+ * if any of the tqparents is collapsed. newItem must not be 0.
*/
bool insertItem(KTreeViewItem* referenceItem, KTreeViewItem* newItem,
bool prefix);
@@ -869,7 +870,7 @@ public:
protected:
virtual void updateCellWidth();
virtual void updateVisibleItems();
- void updateVisibleItemRec(KTreeViewItem* parent, int& count, int& width);
+ void updateVisibleItemRec(KTreeViewItem* tqparent, int& count, int& width);
KTreeViewItem* treeRoot;
bool clearing;
diff --git a/kfile-plugins/deb/kfile_deb.cpp b/kfile-plugins/deb/kfile_deb.cpp
index 3839764..fdd16f2 100644
--- a/kfile-plugins/deb/kfile_deb.cpp
+++ b/kfile-plugins/deb/kfile_deb.cpp
@@ -43,10 +43,10 @@ typedef KGenericFactory<KDebPlugin> DebFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_deb, DebFactory( "kfile_deb" ))
-KDebPlugin::KDebPlugin(TQObject *parent, const char *name,
+KDebPlugin::KDebPlugin(TQObject *tqparent, const char *name,
const TQStringList &args)
- : KFilePlugin(parent, name, args)
+ : KFilePlugin(tqparent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-deb" );
KFileMimeTypeInfo::GroupInfo* group = 0L;
@@ -64,7 +64,7 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
KAr debfile (info.path());
if ( !debfile.open( IO_ReadOnly ) ) {
- kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+ kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
return false;
}
@@ -104,7 +104,7 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
char linebuf[100];
controldev.readLine(linebuf, sizeof( linebuf ));
TQString line(linebuf);
- int fieldstart = line.find(TQRegExp(":"), 0) + 2;
+ int fieldstart = line.tqfind(TQRegExp(":"), 0) + 2;
if (fieldstart == 1) break;
TQString fieldname = line.mid(0, fieldstart - 2);
TQString fielddata = line.mid(fieldstart, line.length() - fieldstart - 1);
diff --git a/kfile-plugins/deb/kfile_deb.h b/kfile-plugins/deb/kfile_deb.h
index 8b374b9..14b80a9 100644
--- a/kfile-plugins/deb/kfile_deb.h
+++ b/kfile-plugins/deb/kfile_deb.h
@@ -27,9 +27,10 @@ class TQStringList;
class KDebPlugin: public KFilePlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDebPlugin( TQObject *parent, const char *name, const TQStringList& args );
+ KDebPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
diff --git a/kfile-plugins/rpm/kfile_rpm.cpp b/kfile-plugins/rpm/kfile_rpm.cpp
index 9089b4b..ed98acd 100644
--- a/kfile-plugins/rpm/kfile_rpm.cpp
+++ b/kfile-plugins/rpm/kfile_rpm.cpp
@@ -36,10 +36,10 @@ typedef KGenericFactory<KRpmPlugin> RpmFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_rpm, RpmFactory( "kfile_rpm" ))
-KRpmPlugin::KRpmPlugin(TQObject *parent, const char *name,
+KRpmPlugin::KRpmPlugin(TQObject *tqparent, const char *name,
const TQStringList &args)
- : KFilePlugin(parent, name, args)
+ : KFilePlugin(tqparent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-rpm" );
KFileMimeTypeInfo::GroupInfo* group = 0L;
@@ -72,7 +72,7 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
if (!file.open(IO_ReadOnly))
{
- kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+ kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
return false;
}
@@ -126,18 +126,18 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
case RPM_INT32_TYPE: uint32_t int32tag;
dstream >> int32tag;
if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int32tag));
- if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int32tag ));
+ if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int32tag ));
break;
case RPM_INT16_TYPE: uint16_t int16tag;
dstream >> int16tag;
if ( !tagname.isEmpty() ) appendItem(general, tagname, int(int16tag));
- if ( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), TQString("%1").arg( int16tag ));
+ if ( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), TQString("%1").tqarg( int16tag ));
break;
case RPM_I18NSTRING_TYPE: // Fallthru
case RPM_STRING_TYPE: TQString strtag; char in;
while ( ( in = file.getch() ) != '\0' ) strtag += in;
if ( !tagname.isEmpty() ) appendItem(general, tagname, strtag);
- if( all.isValid() ) appendItem(all, TQString("%1").arg( tag ), strtag);
+ if( all.isValid() ) appendItem(all, TQString("%1").tqarg( tag ), strtag);
break;
}
file.at(oldPos); // Restore old position
diff --git a/kfile-plugins/rpm/kfile_rpm.h b/kfile-plugins/rpm/kfile_rpm.h
index 80b5c2f..86dca89 100644
--- a/kfile-plugins/rpm/kfile_rpm.h
+++ b/kfile-plugins/rpm/kfile_rpm.h
@@ -27,9 +27,10 @@ class TQStringList;
class KRpmPlugin: public KFilePlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KRpmPlugin( TQObject *parent, const char *name, const TQStringList& args );
+ KRpmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
diff --git a/knetworkconf/Doxyfile b/knetworkconf/Doxyfile
index c227a40..df7555c 100644
--- a/knetworkconf/Doxyfile
+++ b/knetworkconf/Doxyfile
@@ -82,7 +82,7 @@ FILE_PATTERNS = *.c \
*.tlh \
*.diff \
*.patch \
- *.moc \
+ *.tqmoc \
*.xpm
RECURSIVE = yes
EXCLUDE =
diff --git a/knetworkconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in
index ac73301..35d17cb 100644
--- a/knetworkconf/backends/file.pl.in
+++ b/knetworkconf/backends/file.pl.in
@@ -81,7 +81,7 @@ sub gst_file_get_data_path
}
-# Give a command, and it will put in C locale, some sane PATH values and find
+# Give a command, and it will put in C locale, some sane PATH values and tqfind
# the program to run in the path. Redirects stderr to null.
sub get_cmd_path
{
@@ -456,11 +456,11 @@ sub gst_file_open_write_compressed
sub gst_file_run_pipe
{
- my ($cmd, $mode_mask, $stderr) = @_;
+ my ($cmd, $mode_tqmask, $stderr) = @_;
my ($command);
local *PIPE;
- $mode_mask = $GST_FILE_READ if $mode_mask eq undef;
+ $mode_tqmask = $GST_FILE_READ if $mode_tqmask eq undef;
&gst_report_enter ();
@@ -480,8 +480,8 @@ sub gst_file_run_pipe
return undef;
}
- $command .= " |" if $mode_mask & $GST_FILE_READ;
- $command = "| $command > /dev/null" if $mode_mask & $GST_FILE_WRITE;
+ $command .= " |" if $mode_tqmask & $GST_FILE_READ;
+ $command = "| $command > /dev/null" if $mode_tqmask & $GST_FILE_WRITE;
open PIPE, $command;
&gst_report ("file_run_pipe_success", $command);
diff --git a/knetworkconf/backends/guess_system.sh b/knetworkconf/backends/guess_system.sh
index 9b7bfa9..0f0a457 100755
--- a/knetworkconf/backends/guess_system.sh
+++ b/knetworkconf/backends/guess_system.sh
@@ -84,7 +84,7 @@ main:
.prologue 0
.long 0x47e03d80 # implver $0
lda \$2,259
- .long 0x47e20c21 # amask $2,$1
+ .long 0x47e20c21 # atqmask $2,$1
srl \$1,8,\$2
sll \$2,2,\$2
sll \$0,3,\$0
@@ -711,7 +711,7 @@ EOF
.prologue 0
.long 0x47e03d80 # implver $0
lda \$2,259
- .long 0x47e20c21 # amask $2,$1
+ .long 0x47e20c21 # atqmask $2,$1
srl \$1,8,\$2
sll \$2,2,\$2
sll \$0,3,\$0
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 19c021a..6441761 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -37,7 +37,7 @@ if ($SCRIPTSDIR =~ /^@scriptsdir[@]/)
require "$SCRIPTSDIR/general.pl$DOTIN";
require "$SCRIPTSDIR/file.pl$DOTIN";
require "$SCRIPTSDIR/parse.pl$DOTIN";
-require "$SCRIPTSDIR/replace.pl$DOTIN";
+require "$SCRIPTSDIR/tqreplace.pl$DOTIN";
require "$SCRIPTSDIR/service.pl$DOTIN";
require "$SCRIPTSDIR/util.pl$DOTIN";
require "$SCRIPTSDIR/xml.pl$DOTIN";
@@ -161,10 +161,10 @@ sub gst_network_config_wireless
sub gst_network_enable_iface
{
my ($hash, $dev, $command_ifconfig) = @_;
- my ($address, $netmask, $bootproto, $remote_address);
+ my ($address, $nettqmask, $bootproto, $remote_address);
$address = $$hash{"configuration"}{"address"};
- $netmask = $$hash{"configuration"}{"netmask"};
+ $nettqmask = $$hash{"configuration"}{"nettqmask"};
$bootproto = $$hash{"configuration"}{"bootproto"};
$remote_address = $$hash{"configuration"}{"remote_address"};
@@ -188,7 +188,7 @@ sub gst_network_enable_iface
$command = $command_ifconfig;
$command .= " $dev";
$command .= " $address" if ($address);
- $command .= " netmask $netmask" if ($netmask);
+ $command .= " nettqmask $nettqmask" if ($nettqmask);
$command .= " dstaddr $remote_address" if ($remote_address);
$command .= " up";
}
@@ -432,19 +432,19 @@ sub gst_network_ipv4_vec2str
# Gets the subnet, in bitmap.
sub gst_network_ipv4_calc_subnet_vec
{
- my ($addr, $mask) = @_;
- my ($addrvec, $maskvec);
+ my ($addr, $tqmask) = @_;
+ my ($addrvec, $tqmaskvec);
$addrvec = &gst_network_ipv4_str2vec ($addr);
- $maskvec = &gst_network_ipv4_str2vec ($mask);
+ $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
- return $addrvec & $maskvec;
+ return $addrvec & $tqmaskvec;
}
# What you're looking for.
sub gst_network_ipv4_calc_subnet
{
- my ($addr, $mask) = @_;
+ my ($addr, $tqmask) = @_;
return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_subnet_vec);
}
@@ -452,18 +452,18 @@ sub gst_network_ipv4_calc_subnet
# The broadcast, bitmap.
sub gst_network_ipv4_calc_bcast_vec
{
- my ($addr, $mask) = @_;
+ my ($addr, $tqmask) = @_;
$addrvec = &gst_network_ipv4_str2vec ($addr);
- $maskvec = &gst_network_ipv4_str2vec ($mask);
+ $tqmaskvec = &gst_network_ipv4_str2vec ($tqmask);
- return $addrvec | ~$maskvec;
+ return $addrvec | ~$tqmaskvec;
}
# And this returning the quad-dot notation.
sub gst_network_ipv4_calc_bcast
{
- my ($addr, $mask) = @_;
+ my ($addr, $tqmask) = @_;
return &gst_network_ipv4_vec2str (&gst_network_ipv4_calc_bcast_vec);
}
@@ -870,7 +870,7 @@ sub gst_network_freebsd_interfaces_get_info
{
$ifaces{$dev}{"hwaddr"} = $1 if /ether[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"addr"} = $1 if /inet[ \t]+([^ \t]+)/i;
- $ifaces{$dev}{"mask"} = $1 if /netmask[ \t]+([^ \t]+)/i;
+ $ifaces{$dev}{"tqmask"} = $1 if /nettqmask[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"bcast"} = $1 if /broadcast[ \t]+([^ \t]+)/i;
}
}
@@ -905,7 +905,7 @@ sub gst_network_linux_interfaces_get_info
{
$ifaces{$dev}{"hwaddr"} = $1 if /HWaddr[ \t]+([^ \t]+)/i;
$ifaces{$dev}{"addr"} = $1 if /addr:([^ \t]+)/i;
- $ifaces{$dev}{"mask"} = $1 if /mask:([^ \t]+)/i;
+ $ifaces{$dev}{"tqmask"} = $1 if /tqmask:([^ \t]+)/i;
$ifaces{$dev}{"bcast"} = $1 if /bcast:([^ \t]+)/i;
$ifaces{$dev}{"enabled"} = 1 if /^UP[ \t]/i;
}
@@ -1028,17 +1028,17 @@ sub gst_network_interface_ensure_broadcast_and_network
{
my ($iface) = @_;
- if (exists $$iface{"netmask"} &&
+ if (exists $$iface{"nettqmask"} &&
exists $$iface{"address"})
{
if (! exists $$iface{"broadcast"})
{
- $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"netmask"});
+ $$iface{"broadcast"} = &gst_network_ipv4_calc_bcast ($$iface{"address"}, $$iface{"nettqmask"});
}
if (! exists $$iface{"network"})
{
- $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"netmask"});
+ $$iface{"network"} = &gst_network_ipv4_calc_subnet ($$iface{"address"}, $$iface{"nettqmask"});
}
}
}
@@ -1660,7 +1660,7 @@ sub gst_network_interfaces_get
{
delete $$hash{$i}{"addr"};
delete $$hash{$i}{"bcast"};
- delete $$hash{$i}{"mask"};
+ delete $$hash{$i}{"tqmask"};
}
foreach $i (@ifaces)
@@ -2182,7 +2182,7 @@ sub gst_network_suse70_interface_activate
sub gst_network_slackware91_interface_activate_by_dev
{
my ($dev, $enabled) = @_;
- my ($address, $netmask, $gateway);
+ my ($address, $nettqmask, $gateway);
my ($file) = "/etc/rc.d/rc.inet1.conf";
my ($ret) = 0;
@@ -2206,10 +2206,10 @@ sub gst_network_slackware91_interface_activate_by_dev
else
{
$address = &gst_parse_rcinet1conf ($file, $dev, "IPADDR");
- $netmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK");
- $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $netmask);
+ $nettqmask = &gst_parse_rcinet1conf ($file, $dev, "NETMASK");
+ $gateway = &gst_network_get_gateway ($file, "GATEWAY", $address, $nettqmask);
- $ret = &gst_file_run ("ifconfig $dev $address netmask $netmask up");
+ $ret = &gst_file_run ("ifconfig $dev $address nettqmask $nettqmask up");
# Add the gateway if necessary
if ($gateway ne undef)
@@ -3526,34 +3526,34 @@ sub gst_network_suse90_set_auto
}
}
-# Return IP address or netmask, depending on $what
+# Return IP address or nettqmask, depending on $what
sub gst_network_pld10_get_ipaddr
{
my ($file, $key, $what) = @_;
- my ($ipaddr, $netmask, $ret, $i);
- my @netmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
+ my ($ipaddr, $nettqmask, $ret, $i);
+ my @nettqmask_prefixes = (0, 128, 192, 224, 240, 248, 252, 254, 255);
$ipaddr = &gst_parse_sh($file, $key);
return undef if $ipaddr eq "";
if($ipaddr =~ /([^\/]*)\/([[:digit:]]*)/)
{
- $netmask = $2;
- return undef if $netmask eq "";
+ $nettqmask = $2;
+ return undef if $nettqmask eq "";
if($what eq "address")
{
return $1;
}
- for($i = 0; $i < int($netmask/8); $i++)
+ for($i = 0; $i < int($nettqmask/8); $i++)
{
$ret .= "255.";
}
- $ret .= "$netmask_prefixes[$b%8]." if $netmask < 32;
+ $ret .= "$nettqmask_prefixes[$b%8]." if $nettqmask < 32;
- for($i = int($netmask/8) + 1; $i < 4; $i++)
+ for($i = int($nettqmask/8) + 1; $i < 4; $i++)
{
$ret .= "0.";
}
@@ -3564,7 +3564,7 @@ sub gst_network_pld10_get_ipaddr
return undef;
}
-# Writes IP address or netmask, depending in $what, to $file
+# Writes IP address or nettqmask, depending in $what, to $file
sub gst_network_pld10_set_ipaddr
{
my ($file, $key, $what, $value) = @_;
@@ -3580,7 +3580,7 @@ sub gst_network_pld10_set_ipaddr
"254" => 7,
"255" => 8
);
- my ($ipaddr, $netmask);
+ my ($ipaddr, $nettqmask);
$ipaddr = &gst_parse_sh($file, $key);
return undef if $ipaddr eq "";
@@ -3593,8 +3593,8 @@ sub gst_network_pld10_set_ipaddr
{
if($value =~ /([[:digit:]]*).([[:digit:]]*).([[:digit:]]*).([[:digit:]]*)/)
{
- $netmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4};
- $ipaddr =~ s/\/[[:digit:]]*/\/$netmask/;
+ $nettqmask = $prefixes{$1} + $prefixes{$2} + $prefixes{$3} + $prefixes{$4};
+ $ipaddr =~ s/\/[[:digit:]]*/\/$nettqmask/;
}
}
@@ -3605,25 +3605,25 @@ sub gst_network_pld10_set_ipaddr
# it checks if a IP address is in the same network than another
sub gst_network_is_ip_in_same_network
{
- my ($address1, $address2, $netmask) = @_;
- my (@add1, @add2, @mask);
+ my ($address1, $address2, $nettqmask) = @_;
+ my (@add1, @add2, @tqmask);
my ($i);
return 0 if (($address1 eq undef) ||
($address2 eq undef) ||
- ($netmask eq undef));
+ ($nettqmask eq undef));
@add1 = split (/\./, $address1);
@add2 = split (/\./, $address2);
- @mask = split (/\./, $netmask);
+ @tqmask = split (/\./, $nettqmask);
for ($i = 0; $i < 4; $i++)
{
$add1[$i] += 0;
$add2[$i] += 0;
- $mask[$i] += 0;
+ $tqmask[$i] += 0;
- return 0 if (($add1[$i] & $mask[$i]) != ($add2[$i] & $mask[$i]));
+ return 0 if (($add1[$i] & $tqmask[$i]) != ($add2[$i] & $tqmask[$i]));
}
return 1;
@@ -3633,14 +3633,14 @@ sub gst_network_is_ip_in_same_network
sub gst_network_get_gateway_dev_from_address
{
my ($interface, $gateway) = @_;
- my ($address, $netmask, $key);
+ my ($address, $nettqmask, $key);
foreach $key (keys %$interface)
{
$address = $$interface{$key}{"address"};
- $netmask = $$interface{$key}{"netmask"};
+ $nettqmask = $$interface{$key}{"nettqmask"};
- return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $netmask));
+ return $$interface{$key}{"dev"} if (&gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask));
}
return undef;
@@ -3658,23 +3658,23 @@ sub gst_network_get_plip_gateway
sub gst_network_get_gateway
{
- my ($file, $key, $address, $netmask) = @_;
+ my ($file, $key, $address, $nettqmask) = @_;
my ($gateway);
return undef if ($address eq undef);
$gateway = &gst_parse_sh ($file, $key);
- return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask);
+ return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask);
return undef;
}
sub gst_network_suse90_get_gateway
{
- my ($file, $address, $netmask) = @_;
+ my ($file, $address, $nettqmask) = @_;
my ($gateway) = &gst_parse_split_first_array_pos ($file, "default", 0, "[ \t]+", "[ \t]+");
- return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $netmask);
+ return $gateway if &gst_network_is_ip_in_same_network ($address, $gateway, $nettqmask);
return undef;
}
@@ -3689,10 +3689,10 @@ sub gst_network_suse90_get_plip_gateway
sub gst_network_suse90_replace_gateway
{
- my ($file, $dev, $address, $netmask, $value) = @_;
+ my ($file, $dev, $address, $nettqmask, $value) = @_;
- return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $netmask);
+ return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") if &gst_network_is_ip_in_same_network ($address, $value, $nettqmask);
# return &gst_replace_split ($file, "default", "[ \t]+", "$value \- $dev") ;
return undef;
@@ -4039,7 +4039,7 @@ sub gst_network_ensure_loopback_interface
"user" => 0,
"dev" => "lo",
"address" => "127.0.0.1",
- "netmask" => "255.0.0.0",
+ "nettqmask" => "255.0.0.0",
"broadcast" => "127.255.255.255",
"network" => "127.0.0.0",
"bootproto" => "none",
@@ -4674,7 +4674,7 @@ sub gst_network_get_interface_parse_table
# [ "user", \&gst_parse_sh_bool, IFCFG, USERCTL ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -4737,7 +4737,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_trivial, IFACE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -4807,7 +4807,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_trivial, IFACE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -4874,7 +4874,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -4938,7 +4938,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -5003,7 +5003,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, NAME ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
[ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -5069,7 +5069,7 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_parse_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
# [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ],
- [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
+ [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@@ -5124,7 +5124,7 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_network_debian_woody_get_auto, [INTERFACES, IFACE]],
# [ "name", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "address" ],
- [ "netmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
+ [ "nettqmask", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "broadcast", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_parse_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@@ -5176,7 +5176,7 @@ sub gst_network_get_interface_parse_table
[ "name", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ],
[ "dev", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], NETDEV ],
[ "address", \&gst_network_suse70_parse_iface_sh, [IFCFG, IFACE], IPADDR ],
- [ "netmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], netmask ],
+ [ "nettqmask", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], nettqmask ],
[ "broadcast", \&gst_network_suse70_get_ifconfig_arg, [IFCFG, IFACE], broadcast ],
# [ "network", \&gst_parse_trivial, 0 ], # not supported.
# [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported
@@ -5203,12 +5203,12 @@ sub gst_network_get_interface_parse_table
[ "auto", \&gst_network_suse90_get_auto, IFCFG, STARTMODE ],
[ "bootproto", \&gst_network_parse_bootproto, IFCFG, BOOTPROTO ],
[ "address", \&gst_parse_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_parse_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_parse_sh, IFCFG, NETMASK ],
[ "remote_address", \&gst_parse_sh, IFCFG, REMOTE_IPADDR ],
[ "essid", \&gst_parse_sh, IFCFG, WIRELESS_ESSID ],
[ "key_type", \&gst_network_get_wep_key_type, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]],
[ "key", \&gst_network_get_wep_key, [ \&gst_parse_sh, IFCFG, WIRELESS_KEY ]],
- [ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%netmask%" ],
+ [ "gateway", \&gst_network_suse90_get_gateway, ROUTE_CONF, "%address%", "%nettqmask%" ],
[ "gateway", \&gst_network_suse90_get_plip_gateway, ROUTE_CONF, "%remote_address%" ],
# Modem stuff goes here
[ "serial_port", \&gst_parse_sh, IFCFG, MODEM_DEVICE ],
@@ -5252,7 +5252,7 @@ sub gst_network_get_interface_parse_table
# [ "name", \&gst_parse_sh, IFCFG, DEVICE ],
[ "dev", \&gst_parse_sh, IFCFG, DEVICE ],
[ "address", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "address" ],
- [ "netmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "netmask" ],
+ [ "nettqmask", \&gst_network_pld10_get_ipaddr, IFCFG, IPADDR, "nettqmask" ],
# [ "broadcast", \&gst_parse_sh, IFCFG, BROADCAST ],
# [ "network", \&gst_parse_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ],
@@ -5300,8 +5300,8 @@ sub gst_network_get_interface_parse_table
[ "user", \&gst_parse_trivial, 0 ], # not supported.
[ "dev", \&gst_parse_trivial, IFACE ],
[ "address", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], IPADDR ],
- [ "netmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ],
- [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%netmask%" ],
+ [ "nettqmask", \&gst_parse_rcinet1conf, [RC_INET_CONF, IFACE], NETMASK ],
+ [ "gateway", \&gst_network_get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%nettqmask%" ],
[ "auto", \&gst_network_slackware91_get_auto, [RC_INET, RC_LOCAL, IFACE]],
[ "bootproto", \&gst_network_slackware91_parse_bootproto, [RC_INET_CONF, IFACE]],
[ "essid", \&gst_parse_wireless_opts, [ WIRELESS, IFACE ], \&gst_network_get_wireless_ifaces, ESSID ],
@@ -5348,7 +5348,7 @@ sub gst_network_get_interface_parse_table
[ "user", \&gst_parse_trivial, 0 ], # not supported.
[ "dev", \&gst_parse_trivial, IFACE ],
[ "address", \&gst_parse_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
- [ "netmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "netmask[ \t]+([0-9\.]*)" ],
+ [ "nettqmask", \&gst_parse_confd_net_re, NET, "config_%dev%", "nettqmask[ \t]+([0-9\.]*)" ],
[ "remote_address", \&gst_parse_confd_net_re, NET, "config_%dev%", "dest_address[ \t]+([0-9\.]*)" ],
# [ "gateway", \&gst_parse_sh_re, NET, "gateway", "%dev%/([0-9\.\:]*)" ],
[ "gateway", \&gst_network_gentoo_parse_gateway, [ NET, IFACE ]],
@@ -5396,15 +5396,15 @@ sub gst_network_get_interface_parse_table
# we need to double check these values both in the start_if and in the rc.conf files, in this order
[ "address", \&gst_parse_startif, STARTIF, "inet[ \t]+([0-9\.]+)" ],
[ "address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)" ],
- [ "netmask", \&gst_parse_startif, STARTIF, "netmask[ \t]+([0-9\.]+)" ],
- [ "netmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)" ],
+ [ "nettqmask", \&gst_parse_startif, STARTIF, "nettqmask[ \t]+([0-9\.]+)" ],
+ [ "nettqmask", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)" ],
[ "remote_address", \&gst_parse_startif, STARTIF, "dest_address[ \t]+([0-9\.]+)" ],
[ "remote_address", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)" ],
[ "essid", \&gst_parse_startif, STARTIF, "ssid[ \t]+(\".*\"|[^\"][^ ]+)" ],
[ "essid", \&gst_parse_sh_re, RC_CONF, "ifconfig_%dev%", "ssid[ \t]+([^ ]*)" ],
# this is for plip interfaces
[ "gateway", \&gst_network_get_plip_gateway, RC_CONF, "defaultrouter", "%remote_address%" ],
- [ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%netmask%" ],
+ [ "gateway", \&gst_network_get_gateway, RC_CONF, "defaultrouter", "%address%", "%nettqmask%" ],
[ "enabled", \&gst_network_interface_active, IFACE, \&gst_network_freebsd5_active_interfaces_get ],
[ "bootproto", \&gst_network_parse_bootproto, RC_CONF, "ifconfig_%dev%" ],
# Modem stuff
@@ -5961,7 +5961,7 @@ sub gst_network_get_interface_replace_table
[ "dev", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6020,7 +6020,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6082,7 +6082,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6142,7 +6142,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6202,7 +6202,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6262,7 +6262,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
[ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6324,7 +6324,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_replace_interfaces_option_kw_not, [INTERFACES, IFACE], "noauto" ],
[ "name", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "name" ],
[ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ],
- [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
+ [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "broadcast", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "broadcast" ],
[ "network", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "network" ],
[ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
@@ -6372,7 +6372,7 @@ sub gst_network_get_interface_replace_table
[ "bootproto", \&gst_network_deb22_replace_bootproto, [INTERFACES, IFACE]],
[ "auto", \&gst_network_debian_woody_set_auto, [INTERFACES, IFACE]],
[ "address", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "address" ],
- [ "netmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
+ [ "nettqmask", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "nettqmask" ],
[ "gateway", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
[ "essid", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-essid" ],
[ "key", \&gst_replace_interfaces_option_str, [INTERFACES, IFACE], "wireless-key" ],
@@ -6432,7 +6432,7 @@ sub gst_network_get_interface_replace_table
[ "name", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], GST_IFACE_NAME ],
[ "address", \&gst_network_suse70_replace_iface_sh, [IFCFG, IFACE], IPADDR ],
[ "address", \&gst_network_suse70_set_ifconfig_ip, [IFCFG, IFACE] ],
- [ "netmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], netmask ],
+ [ "nettqmask", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], nettqmask ],
[ "broadcast", \&gst_network_suse70_set_ifconfig_arg, [IFCFG, IFACE], broadcast ],
# [ "network", \&gst_parse_trivial, 0 ], # not supported.
# [ "gateway", \&gst_parse_sh, IFCFG, GATEWAY ], # not supported
@@ -6458,7 +6458,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_network_suse90_set_auto, IFCFG, STARTMODE ],
[ "bootproto", \&gst_network_suse90_replace_bootproto, IFCFG, BOOTPROTO ],
[ "address", \&gst_replace_sh, IFCFG, IPADDR ],
- [ "netmask", \&gst_replace_sh, IFCFG, NETMASK ],
+ [ "nettqmask", \&gst_replace_sh, IFCFG, NETMASK ],
[ "remote_address", \&gst_replace_sh, IFCFG, REMOTE_IPADDR ],
[ "essid", \&gst_replace_sh, IFCFG, WIRELESS_ESSID ],
[ "key", \&gst_replace_sh, IFCFG, WIRELESS_KEY ],
@@ -6506,7 +6506,7 @@ sub gst_network_get_interface_replace_table
# [ "name", \&gst_replace_sh, IFCFG, NAME ],
[ "dev", \&gst_replace_sh, IFCFG, DEVICE ],
[ "address", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "address" ],
- [ "netmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "netmask" ],
+ [ "nettqmask", \&gst_network_pld10_set_ipaddr, IFCFG, IPADDR, "nettqmask" ],
# [ "broadcast", \&gst_replace_sh, IFCFG, BROADCAST ],
# [ "network", \&gst_replace_sh, IFCFG, NETWORK ],
[ "gateway", \&gst_replace_sh, IFCFG, GATEWAY ],
@@ -6551,7 +6551,7 @@ sub gst_network_get_interface_replace_table
table =>
[
[ "address", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], IPADDR ],
- [ "netmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ],
+ [ "nettqmask", \&gst_replace_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ],
[ "gateway", \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ],
[ "bootproto", \&gst_network_slackware91_replace_bootproto, [ RC_INET_CONF, IFACE ] ],
[ "auto", \&gst_network_slackware91_set_auto, [ RC_INET, RC_LOCAL, IFACE ] ],
@@ -6603,7 +6603,7 @@ sub gst_network_get_interface_replace_table
[ "bootproto", \&gst_network_gentoo_replace_bootproto, [ NET, IFACE ]],
[ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
[ "address", \&gst_replace_confd_net_re, NET, "config_%dev%", "^[ \t]*([0-9\.]+)" ],
- [ "netmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+netmask[ \t]+[0-9\.]*", " netmask %netmask%"],
+ [ "nettqmask", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+nettqmask[ \t]+[0-9\.]*", " nettqmask %nettqmask%"],
[ "broadcast", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+broadcast[ \t]+[0-9\.]*", " broadcast %broadcast%" ],
[ "remote_address", \&gst_replace_confd_net_re, NET, "config_%dev%", "[ \t]+dest_address[ \t]+[0-9\.]*", " dest_address %remote_address%" ],
[ "gateway", \&gst_replace_confd_net_re, NET, "routes_%dev%", "[ \t]*default[ \t]+(via|gw)[ \t]+[0-9\.\:]*", "default via %gateway%" ],
@@ -6648,7 +6648,7 @@ sub gst_network_get_interface_replace_table
[ "auto", \&gst_network_freebsd5_set_auto, [ RC_CONF, IFACE ]],
[ "bootproto", \&gst_network_freebsd5_replace_bootproto, [ RC_CONF, IFACE ]],
[ "address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "inet[ \t]+([0-9\.]+)", "inet %address%" ],
- [ "netmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "netmask[ \t]+([0-9\.]+)", " netmask %netmask%" ],
+ [ "nettqmask", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "nettqmask[ \t]+([0-9\.]+)", " nettqmask %nettqmask%" ],
[ "remote_address", \&gst_replace_sh_re, RC_CONF, "ifconfig_%dev%", "dest_address[ \t]+([0-9\.]+)", " dest_address %remote_address%" ],
[ "essid", \&gst_network_freebsd5_replace_essid, [ RC_CONF, STARTIF, IFACE ]],
# Modem stuff
diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 25c9373..7064536 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1437,7 +1437,7 @@ sub gst_parse_xml
my ($model, $branch);
($model) = &gst_xml_model_scan ($file);
- $branch = &gst_xml_model_find ($model, $varpath);
+ $branch = &gst_xml_model_tqfind ($model, $varpath);
if ($branch)
{
@@ -1451,12 +1451,12 @@ sub gst_parse_xml
sub gst_parse_xml_child_names
{
my ($file, $varpath) = @_;
- my ($model, $branch, @children);
+ my ($model, $branch, @tqchildren);
($model) = &gst_xml_model_scan ($file);
- $branch = &gst_xml_model_find ($model, $varpath);
+ $branch = &gst_xml_model_tqfind ($model, $varpath);
- if (!$branch) { return @children; }
+ if (!$branch) { return @tqchildren; }
my @list = @$branch;
shift @list; # Attributes
@@ -1465,7 +1465,7 @@ sub gst_parse_xml_child_names
{
if ($list [0] ne "__unparsed__" && $list [0] ne "0")
{
- push @children, shift @list;
+ push @tqchildren, shift @list;
}
else
{
@@ -1475,7 +1475,7 @@ sub gst_parse_xml_child_names
shift @list;
}
- return @children;
+ return @tqchildren;
}
sub gst_parse_alchemist
@@ -1500,16 +1500,16 @@ sub gst_parse_alchemist_print_option
my ($varpath, $model, $branch, $fd, $options, $option);
($model) = &gst_xml_model_scan ($file);
- $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer .
+ $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer .
"/filter_data/foomatic_defaults");
return undef if (!$branch);
- $options = &gst_xml_model_get_children ($branch);
+ $options = &gst_xml_model_get_tqchildren ($branch);
foreach $o (@$options)
{
- my $opt_node = &gst_xml_model_find ($o, "name");
+ my $opt_node = &gst_xml_model_tqfind ($o, "name");
next if (!$opt_node);
if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name)
@@ -1521,7 +1521,7 @@ sub gst_parse_alchemist_print_option
return undef if (!$option);
- my $node = &gst_xml_model_find ($option, "default");
+ my $node = &gst_xml_model_tqfind ($option, "default");
return undef if (!$node);
return &gst_xml_model_get_attribute ($node, "VALUE");
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index a72e3ef..30ec359 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# replace.pl: Common in-line replacing stuff for the ximian-setup-tools backends.
+# tqreplace.pl: Common in-line replacing stuff for the ximian-setup-tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
#
@@ -59,7 +59,7 @@ require "$SCRIPTSDIR/parse.pl$DOTIN";
# Additional abstraction: replace table entries can have
# arrays inside. The replace proc will be ran with every
# combination that the arrays provide. Ex:
-# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will replace
+# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will tqreplace
# using all possibilities in the combinatory of [0, 1]x[2, 3].
# Check RedHat 7.2's network replace table for further
# enlightenment.
@@ -264,7 +264,7 @@ sub gst_replace_join_first_array
return &gst_replace_split ($file, $key, $re1, join (&gst_replace_regexp_to_separator ($re2), @$value));
}
-# Escape $value in /bin/sh way, find/append key and set escaped value.
+# Escape $value in /bin/sh way, tqfind/append key and set escaped value.
sub gst_replace_sh
{
my ($file, $key, $value) = @_;
@@ -289,7 +289,7 @@ sub gst_replace_sh
return $ret;
}
-# Escape $value in /bin/sh way, find/append key and set escaped value, make sure line har
+# Escape $value in /bin/sh way, tqfind/append key and set escaped value, make sure line har
sub gst_replace_sh_export
{
my ($file, $key, $value) = @_;
@@ -443,7 +443,7 @@ sub gst_replace_line_first
return 0;
}
-# For every key in %$value, replace/append the corresponding key/value pair.
+# For every key in %$value, tqreplace/append the corresponding key/value pair.
# The separator for $re1
sub gst_replace_join_hash
{
@@ -477,7 +477,7 @@ sub gst_replace_join_hash
return $res;
}
-# Find $re matching send string and replace parenthesyzed
+# Find $re matching send string and replace tqparenthesyzed
# part of $re with $value. FIXME: apply meeks' more general impl.
sub gst_replace_chat
{
@@ -550,7 +550,7 @@ sub gst_replace_chat
return $ret;
}
-# Find/append $section in ini $file and replace/append
+# Find/append $section in ini $file and tqreplace/append
# $var = $value pair. FIXME: should reimplement with
# interfaces style. This is too large.
sub gst_replace_ini
@@ -1149,7 +1149,7 @@ sub gst_replace_interfaces_iface_stanza_delete
return &gst_file_buffer_save ($buff, $file);
}
-# Find $iface stanza line and replace $pos value (ie the method).
+# Find $iface stanza line and tqreplace $pos value (ie the method).
sub gst_replace_interfaces_stanza_value
{
my ($file, $iface, $pos, $value) = @_;
@@ -1323,7 +1323,7 @@ sub gst_replace_pump_add_device
}
# Find a "device" section for $iface and
-# replace/add/delete the $key option inside the section.
+# tqreplace/add/delete the $key option inside the section.
sub gst_replace_pump_iface_option_str
{
my ($file, $iface, $key, $value) = @_;
@@ -1448,31 +1448,31 @@ sub gst_replace_alchemist_ensure_list_types
my ($model, $varpath, $setpath) = @_;
my ($branch, @path);
- $branch = &gst_xml_model_find ($model, $varpath);
+ $branch = &gst_xml_model_tqfind ($model, $varpath);
@path = split /\//, $setpath;
# NOTE: The following could be done with a depth-iterator callback from a func
- # similar to gst_xml_model_find ().
+ # similar to gst_xml_model_tqfind ().
for $elem (@path)
{
next if ($elem eq "");
- my @children = @$branch;
- shift @children; # Attributes
+ my @tqchildren = @$branch;
+ shift @tqchildren; # Attributes
$branch = undef;
- while (@children)
+ while (@tqchildren)
{
- if ($children [0] eq $elem)
+ if ($tqchildren [0] eq $elem)
{
- shift @children;
- $branch = shift @children;
+ shift @tqchildren;
+ $branch = shift @tqchildren;
&gst_xml_model_set_attribute ($branch, "TYPE", "LIST");
last;
}
- shift @children;
- shift @children;
+ shift @tqchildren;
+ shift @tqchildren;
}
last if ($branch == undef);
@@ -1511,7 +1511,7 @@ sub gst_replace_alchemist_print
&gst_xml_model_set_attribute ($branch, "VALUE", $value);
&gst_xml_model_set_attribute ($branch, "TYPE", $type);
- $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer);
+ $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer);
&gst_xml_model_set_attribute ($branch, "ATOMIC", "TRUE");
return &gst_xml_model_save ($model, $file, $compressed);
@@ -1532,11 +1532,11 @@ sub gst_replace_alchemist_print_option
# See if option is already defined.
- $options = &gst_xml_model_get_children ($branch);
+ $options = &gst_xml_model_get_tqchildren ($branch);
foreach $o (@$options)
{
- my $opt_node = &gst_xml_model_find ($o, "name");
+ my $opt_node = &gst_xml_model_tqfind ($o, "name");
next if (!$opt_node);
if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name)
diff --git a/knetworkconf/backends/report.pl.in b/knetworkconf/backends/report.pl.in
index 68326dd..ceaadd6 100644
--- a/knetworkconf/backends/report.pl.in
+++ b/knetworkconf/backends/report.pl.in
@@ -260,7 +260,7 @@ sub gst_report
"file_open_read_failed" => ["warn", "Could not open [%s] for reading."],
"file_open_read_success" => ["info", "Reading options from [%s]."],
"file_open_write_failed" => ["error", "Failed to write to [%s]."],
- "file_open_write_create" => ["warn", "Could not find [%s] for writing. Creating [%s]."],
+ "file_open_write_create" => ["warn", "Could not tqfind [%s] for writing. Creating [%s]."],
"file_open_write_success" => ["info", "Writing to [%s]."],
"file_run_pipe_failed" => ["warn", "Failed to pipe command [%s] for reading."],
"file_run_pipe_success" => ["info", "Piping command [%s] for reading."],
@@ -269,7 +269,7 @@ sub gst_report
"file_backup_rotate" => ["info", "Backup directory [%s] was rotated."],
"file_backup_success" => ["info", "Saved backup for [%s]."],
"file_open_filter_failed" => ["warn", "No file to patch: [%s]."],
- "file_open_filter_create" => ["warn", "Could not find [%s] for patching. Creating [%s]."],
+ "file_open_filter_create" => ["warn", "Could not tqfind [%s] for patching. Creating [%s]."],
"file_open_filter_success" => ["info", "Found [%s]. Patching [%s]."],
"file_buffer_load" => ["info", "Loading file [%s] to buffer."],
"file_buffer_save" => ["info", "Saving buffer to file [%s]."],
diff --git a/knetworkconf/backends/type1inst b/knetworkconf/backends/type1inst
index 86d6425..bb624be 100755
--- a/knetworkconf/backends/type1inst
+++ b/knetworkconf/backends/type1inst
@@ -876,7 +876,7 @@ sub font_sample {
die_bug("Bad argument(s) to font_sample()!\n");
}
-# Here we create a full page sample for the current font. It contains
+# Here we create a full page sample for the current font. It tqcontains
# a large point-size version, a normal sized version, and a small version.
$text = <<"TEXT";
diff --git a/knetworkconf/backends/util.pl.in b/knetworkconf/backends/util.pl.in
index b175fb8..e6c5893 100644
--- a/knetworkconf/backends/util.pl.in
+++ b/knetworkconf/backends/util.pl.in
@@ -279,7 +279,7 @@ sub gst_get_key_for_subkey_and_subvalues
# --- IP calculation --- #
-# &gst_ip_calc_network (<IP>, <netmask>)
+# &gst_ip_calc_network (<IP>, <nettqmask>)
#
# Calculates the network address and returns it as a string.
@@ -300,7 +300,7 @@ sub gst_ip_calc_network
}
-# &gst_ip_calc_network (<IP>, <netmask>)
+# &gst_ip_calc_network (<IP>, <nettqmask>)
#
# Calculates the broadcast address and returns it as a string.
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index b9810c6..9421f75 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -238,7 +238,7 @@ sub gst_xml_print_arrays
}
}
-# Pass a hash, create a parent tag $tag and print <key>val</key> for every
+# Pass a hash, create a tqparent tag $tag and print <key>val</key> for every
# value pair in the hash. If structure refs are found, these are recursively
# printed with print_structure.
sub gst_xml_print_hash
@@ -352,34 +352,34 @@ sub gst_xml_model_print_recurse
my ($tree, $indent) = @_;
my ($string);
- my @children = @$tree;
- shift @children; # Attributes
+ my @tqchildren = @$tree;
+ shift @tqchildren; # Attributes
- while (@children)
+ while (@tqchildren)
{
- my $branch = $children [1];
+ my $branch = $tqchildren [1];
- if ($children [0] eq "__unparsed__")
+ if ($tqchildren [0] eq "__unparsed__")
{
- $string .= "<" . $children [1] . ">";
+ $string .= "<" . $tqchildren [1] . ">";
}
- elsif ($children [0] eq "0")
+ elsif ($tqchildren [0] eq "0")
{
- $string .= $children [1];
+ $string .= $tqchildren [1];
}
elsif (@$branch == 1) # Empty tag.
{
- $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . "/>";
+ $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . "/>";
}
else
{
- $string .= "<" . $children [0] . &gst_xml_model_print_attributes ($branch) . ">";
+ $string .= "<" . $tqchildren [0] . &gst_xml_model_print_attributes ($branch) . ">";
$string .= &gst_xml_model_print_recurse ($branch);
- $string .= "</" . $children [0] . ">";
+ $string .= "</" . $tqchildren [0] . ">";
}
- shift @children;
- shift @children;
+ shift @tqchildren;
+ shift @tqchildren;
}
# if ($branch)
@@ -814,7 +814,7 @@ sub gst_xml_get_state
# XML model operations.
# Locate a node from the branch leading up to it.
-sub gst_xml_model_find
+sub gst_xml_model_tqfind
{
my ($model, $varpath) = @_;
my ($branch, @path);
@@ -825,21 +825,21 @@ sub gst_xml_model_find
for $elem (@path)
{
next if ($elem eq "");
- my @children = @$branch;
- shift @children; # Attributes
+ my @tqchildren = @$branch;
+ shift @tqchildren; # Attributes
$branch = undef;
- while (@children)
+ while (@tqchildren)
{
- if ($children [0] eq $elem)
+ if ($tqchildren [0] eq $elem)
{
- shift @children;
- $branch = shift @children;
+ shift @tqchildren;
+ $branch = shift @tqchildren;
last;
}
- shift @children;
- shift @children;
+ shift @tqchildren;
+ shift @tqchildren;
}
last if ($branch == undef);
@@ -855,7 +855,7 @@ sub gst_xml_model_add
my ($branch, @path);
@path = split /\//, $addpath;
- $branch = &gst_xml_model_find ($model, $varpath);
+ $branch = &gst_xml_model_tqfind ($model, $varpath);
if ($branch == undef)
{
return -1;
@@ -890,23 +890,23 @@ sub gst_xml_model_ensure
{
next if ($elem eq "");
- my @children = @$branch;
- my $parent_branch = $branch;
+ my @tqchildren = @$branch;
+ my $tqparent_branch = $branch;
- shift @children; # Attributes
+ shift @tqchildren; # Attributes
$branch = undef;
- while (@children)
+ while (@tqchildren)
{
- if ($children [0] eq $elem)
+ if ($tqchildren [0] eq $elem)
{
- shift @children;
- $branch = shift @children;
+ shift @tqchildren;
+ $branch = shift @tqchildren;
last;
}
- shift @children;
- shift @children;
+ shift @tqchildren;
+ shift @tqchildren;
}
if ($branch == undef)
@@ -918,8 +918,8 @@ sub gst_xml_model_ensure
push @list, \%hash;
- push @$parent_branch, $elem;
- push @$parent_branch, $branch;
+ push @$tqparent_branch, $elem;
+ push @$tqparent_branch, $branch;
}
}
@@ -932,7 +932,7 @@ sub gst_xml_model_remove
my ($branch, $i);
@path = split /\//, $addpath;
- $branch = &gst_xml_model_find ($model, $varpath);
+ $branch = &gst_xml_model_tqfind ($model, $varpath);
if ($branch == undef)
{
return -1;
@@ -950,22 +950,22 @@ sub gst_xml_model_remove
return -1;
}
-sub gst_xml_model_get_children
+sub gst_xml_model_get_tqchildren
{
my ($branch) = @_;
- my (@children);
+ my (@tqchildren);
- if (!$branch) { return \@children; }
+ if (!$branch) { return \@tqchildren; }
for ($i = 1; $i < @$branch; $i += 2)
{
if (@$branch [$i] ne "__unparsed__" && @$branch [$i] ne "0")
{
- push @children, @$branch [$i + 1];
+ push @tqchildren, @$branch [$i + 1];
}
}
- return \@children;
+ return \@tqchildren;
}
sub gst_xml_model_get_pcdata
diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec
index ce65b36..4267f34 100644
--- a/knetworkconf/knetworkconf-mdk.spec
+++ b/knetworkconf/knetworkconf-mdk.spec
@@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT/*
%files -f %name.lang
-#Quick Hack: for some reason the %find_lang command doesn't find
+#Quick Hack: for some reason the %find_lang command doesn't tqfind
#the translations files, it outputs a knetworkconf.lang file full
#of empty lines instead of the following ones:
%lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 129d5c9..6690739 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -17,24 +17,24 @@
***************************************************************************/
#include "kadddevicecontainer.h"
-KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
- : KDialog(parent, name)
+KAddDeviceContainer::KAddDeviceContainer(TQWidget *tqparent, const char *name)
+ : KDialog(tqparent, name)
{
_modified = false;
_advanced = false;
//Setup extension dialog
setExtension( new KAddDeviceDlgExtension( this ) );
- setOrientation( Vertical );
+ setOrientation(Qt::Vertical );
//Create dialog that contains the KAddDeviceDlg and KAddDeviceWifiExt (when
//configuring a wireless interface) widgets
TQPixmap activeEthernetDeviceImg(BarIcon("network_connected_lan_knc"));
setIcon(activeEthernetDeviceImg);
- //First create a main QHBoxLayout
+ //First create a main TQHBoxLayout
mainLayout = new TQVBoxLayout( this, 10, 2, "mainLayout");
- //Create the Addvanced settings, Ok and Cancel buttons and add them to a QHBoxLayout
+ //Create the Addvanced settings, Ok and Cancel buttons and add them to a TQHBoxLayout
buttonsLayout = new TQHBoxLayout( 0, 0, 4, "buttonsLayout");
kpbAdvanced = new KPushButton( this, "kpbAdvanced" );
buttonsLayout->addWidget( kpbAdvanced );
@@ -49,7 +49,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
kpbCancel = new KPushButton( this, "kpbCancel" );
buttonsLayout->addWidget( kpbCancel );
- setCaption( TQString::null );
+ setCaption( TQString() );
kpbAdvanced->setText( i18n( "&Advanced Settings" ) );
TQToolTip::add( kpbAdvanced, i18n( "Toggle between advanced and basic settings" ) );
TQWhatsThis::add( kpbAdvanced, i18n( "Toggle between advanced and basic settings" ) );
@@ -58,7 +58,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
kpbCancel->setText( i18n( "&Cancel" ) );
TQToolTip::add( kpbCancel, i18n( "Forget changes" ) );
- //Creat and add the KAddDeviceDlg widget to the main layout
+ //Creat and add the KAddDeviceDlg widget to the main tqlayout
addDlg = new KAddDeviceDlg(this);
mainLayout->addWidget(addDlg);
mainLayout->setResizeMode(TQLayout::Auto);
@@ -67,14 +67,14 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
// connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
- connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
+ connect(addDlg->kcbNettqmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&)));
connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool)));
connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int)));
// connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool)));
- // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool)));
+ // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNettqmask,TQT_SLOT(setDisabled(bool)));
// connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool)));
connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot()));
connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot()));
@@ -120,7 +120,7 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
if (addDlg->rbBootProtoManual->isChecked())
{
TQString ipAddress = addDlg->kleIPAddress->text();
- TQString netmask = addDlg->kcbNetmask->currentText();
+ TQString nettqmask = addDlg->kcbNettqmask->currentText();
TQString broadcast = advancedOptions->kleBroadcast->text();
TQString gateway = advancedOptions->kleGateway->text();
@@ -128,8 +128,8 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
{
KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
}
- else if (_advanced && !KAddressValidator::isNetmaskValid(netmask))
- KMessageBox::error(this,i18n("The format of the specified netmask is not valid."),i18n("Invalid IP Address"));
+ else if (_advanced && !KAddressValidator::isNettqmaskValid(nettqmask))
+ KMessageBox::error(this,i18n("The format of the specified nettqmask is not valid."),i18n("Invalid IP Address"));
else if (!broadcast.isEmpty() && _advanced && !KAddressValidator::isBroadcastValid(broadcast))
KMessageBox::error(this,i18n("The format of the specified broadcast is not valid."),i18n("Invalid IP Address"));
@@ -172,12 +172,12 @@ void KAddDeviceContainer::advancedOptionsSlot()
if (!_advanced)
{
kpbAdvanced->setText(i18n("Basic Settings"));
- addDlg->kcbNetmask->setEditable(true);
+ addDlg->kcbNettqmask->setEditable(true);
}
else
{
kpbAdvanced->setText(i18n("Advanced Settings"));
- addDlg->kcbNetmask->setEditable(false);
+ addDlg->kcbNettqmask->setEditable(false);
}
_advanced = !_advanced;
showExtension(_advanced );
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index d749576..17c3f15 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -46,8 +46,9 @@ Network interface configuration dialog. This dialog contains the KAddDeviceDlg a
class KAddDeviceContainer : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0);
+ KAddDeviceContainer(TQWidget *tqparent = 0, const char *name = 0);
~KAddDeviceContainer();
KPushButton* kpbAdvanced;
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index eecf497..dd99d94 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -2,7 +2,7 @@
<class>KAddDeviceDlg</class>
<comment>Dialog to add/configure an network device.</comment>
<author>Juan Luis Baptiste</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KAddDeviceDlg</cstring>
</property>
@@ -22,13 +22,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -53,7 +53,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>gbBasicDeviceInfo</cstring>
</property>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -118,14 +118,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>rbBootProtoManual</cstring>
</property>
@@ -140,7 +140,7 @@
&lt;p&gt;In this case, please use the fields below to enter the desired values manually.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>rbBootProtoAuto</cstring>
</property>
@@ -166,14 +166,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5">
+ <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5">
<property name="name">
<cstring>kcbstartAtBoot</cstring>
</property>
@@ -228,16 +228,16 @@
</property>
</item>
<property name="name">
- <cstring>kcbNetmask</cstring>
+ <cstring>kcbNettqmask</cstring>
</property>
<property name="editable">
<bool>false</bool>
</property>
<property name="toolTip" stdset="0">
- <string>Subnetmask of the network device</string>
+ <string>Subnettqmask of the network device</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;p&gt;Please enter the desired subnetmask for the interface here.&lt;/p&gt;
+ <string>&lt;p&gt;Please enter the desired subnettqmask for the interface here.&lt;/p&gt;
&lt;p&gt;For small private networks, 255.255.255.0 will most often be a reasonable default value.&lt;/p&gt;
&lt;p&gt;This field will change from a popup box to a combo box as soon as you enable the advanced settings below.&lt;/p&gt;</string>
</property>
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -269,25 +269,25 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
<property name="text">
- <string>Netmask:</string>
+ <string>Nettqmask:</string>
</property>
<property name="toolTip" stdset="0">
- <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string>
+ <string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string>
</property>
<property name="whatsThis" stdset="0">
- <string>The netmask defines a range of IP numbers which will build a subnet inside the network.</string>
+ <string>The nettqmask defines a range of IP numbers which will build a subnet inside the network.</string>
</property>
</widget>
<widget class="KLineEdit" row="2" column="3" rowspan="1" colspan="2">
@@ -321,14 +321,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="2" column="1">
+ <widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -352,7 +352,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -384,7 +384,7 @@
<connection>
<sender>rbBootProtoAuto</sender>
<signal>toggled(bool)</signal>
- <receiver>kcbNetmask</receiver>
+ <receiver>kcbNettqmask</receiver>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
@@ -393,7 +393,7 @@
<tabstop>kcbAutoBootProto</tabstop>
<tabstop>rbBootProtoManual</tabstop>
<tabstop>kleIPAddress</tabstop>
- <tabstop>kcbNetmask</tabstop>
+ <tabstop>kcbNettqmask</tabstop>
<tabstop>kcbstartAtBoot</tabstop>
</tabstops>
<includes>
@@ -402,7 +402,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui.h b/knetworkconf/knetworkconf/kadddevicedlg.ui.h
index bf3f21b..658941e 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui.h
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
index 35d4927..31657ec 100644
--- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KAddDeviceDlgExtension</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KAddDeviceDlgExtension</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbAdvancedDeviceInfo</cstring>
</property>
@@ -33,7 +33,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -72,7 +72,7 @@
<string>The Broadcast is a special address. All devices of a network respond if packages are sent to this address.</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel1_3</cstring>
</property>
@@ -103,7 +103,7 @@
<string>&lt;p&gt;Here you should enter the default gateway for the network device.&lt;/p&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2_2</cstring>
</property>
@@ -118,36 +118,36 @@
<connections>
<connection>
<sender>kleBroadcast</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>KAddDeviceDlgExtension</receiver>
- <slot>valueChanged(const QString&amp;)</slot>
+ <slot>valueChanged(const TQString&amp;)</slot>
</connection>
<connection>
<sender>kleDescription</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>KAddDeviceDlgExtension</receiver>
- <slot>valueChanged(const QString&amp;)</slot>
+ <slot>valueChanged(const TQString&amp;)</slot>
</connection>
<connection>
<sender>kleGateway</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>KAddDeviceDlgExtension</receiver>
- <slot>valueChanged(const QString&amp;)</slot>
+ <slot>valueChanged(const TQString&amp;)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">kadddevicedlgextension.ui.h</include>
</includes>
-<signals>
+<Q_SIGNALS>
<signal>valueChangedSignal(int)</signal>
-</signals>
-<slots>
- <slot access="private">valueChanged( const QString &amp; s )</slot>
-</slots>
+</Q_SIGNALS>
+<Q_SLOTS>
+ <slot access="private">valueChanged( const TQString &amp; s )</slot>
+</Q_SLOTS>
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h b/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
index 1e38f60..2d08799 100644
--- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
+++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/kadddevicewifiext.ui b/knetworkconf/knetworkconf/kadddevicewifiext.ui
index d8d728a..6b04eb6 100644
--- a/knetworkconf/knetworkconf/kadddevicewifiext.ui
+++ b/knetworkconf/knetworkconf/kadddevicewifiext.ui
@@ -2,7 +2,7 @@
<class>KAddDeviceWifiExt</class>
<comment>Extension to the KAddDeviceDlg dialog to configure wireless settings.</comment>
<author>Juan Luis Baptiste</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KAddDeviceWifiExt</cstring>
</property>
@@ -24,7 +24,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>gbWirelessSettings</cstring>
</property>
@@ -35,7 +35,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -53,7 +53,7 @@
<cstring>kleWepKey</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -61,7 +61,7 @@
<string>ESSID:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -69,7 +69,7 @@
<string>Key type:</string>
</property>
</widget>
- <widget class="QComboBox" row="2" column="1">
+ <widget class="TQComboBox" row="2" column="1">
<item>
<property name="text">
<string>ASCII</string>
@@ -88,7 +88,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpassdlg.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index 2df997e..57094a5 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -12,13 +12,13 @@
<height>81</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>16</height>
@@ -69,14 +69,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lIPAddress</cstring>
</property>
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -147,16 +147,16 @@
<includes>
<include location="local" impldecl="in implementation">kadddnsserverdlg.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="private">validateAddressSlot()</slot>
<slot access="private">makeButtonsResizeable()</slot>
-</slots>
+</Q_SLOTS>
<functions>
<function specifier="non virtual">setAddingAlias( bool add )</function>
<function returnType="bool">modified()</function>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
index 0d34f67..dd6057f 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 22782ba..96cf559 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -22,15 +22,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>20</height>
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>180</width>
<height>20</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -139,14 +139,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -162,9 +162,9 @@
<cstring>klbAliases</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout25</cstring>
+ <cstring>tqlayout25</cstring>
</property>
<vbox>
<property name="name">
@@ -174,7 +174,7 @@
<property name="name">
<cstring>kpbAddHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -191,7 +191,7 @@
<property name="name">
<cstring>kpbEditHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -208,7 +208,7 @@
<property name="name">
<cstring>kpbRemoveHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -278,18 +278,18 @@
<includes>
<include location="local" impldecl="in implementation">kaddknownhostdlg.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="private">validateAddressSlot()</slot>
<slot access="private">makeButtonsResizeable()</slot>
<slot access="private">editHostSlot()</slot>
<slot access="private">removeHostSlot()</slot>
<slot access="private">addHostSlot()</slot>
-</slots>
+</Q_SLOTS>
<functions>
<function access="private" specifier="non virtual">init()</function>
<function specifier="non virtual" returnType="bool">modified()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
index 701e1b2..1ace4eb 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp
index 03d21c6..d7d23bc 100644
--- a/knetworkconf/knetworkconf/kaddressvalidator.cpp
+++ b/knetworkconf/knetworkconf/kaddressvalidator.cpp
@@ -18,7 +18,7 @@
#include "kaddressvalidator.h"
/*
- Class for validating IP address and netmasks, and to calculate network and broadcast values.
+ Class for validating IP address and nettqmasks, and to calculate network and broadcast values.
The functions to do the last two things where taken from the code of ipcalc.c, made by
Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc. .
*/
@@ -33,7 +33,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){
int i;
int number;
bool ok;
- if ((addr.contains('.') > 3) || (addr.length() > 15))
+ if ((addr.tqcontains('.') > 3) || (addr.length() > 15))
return false;
for (i = 0; i < 4; i++)
{
@@ -53,7 +53,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){
else
return false;
}
-bool KAddressValidator::isNetmaskValid(TQString addr){
+bool KAddressValidator::isNettqmaskValid(TQString addr){
TQString s = "";
int i;
int number;
@@ -123,37 +123,37 @@ bool KAddressValidator::isBroadcastValid(TQString addr){
}
-/** \fn unsigned long int prefix2mask(int bits)
- \brief creates a netmask from a specified number of bits
+/** \fn unsigned long int prefix2tqmask(int bits)
+ \brief creates a nettqmask from a specified number of bits
- This function converts a prefix length to a netmask. As CIDR (classless
+ This function converts a prefix length to a nettqmask. As CIDR (classless
internet domain internet domain routing) has taken off, more an more IP
addresses are being specified in the format address/prefix
- (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you
- need to see what netmask corresponds to the prefix part of the address, this
- is the function. See also \ref mask2prefix.
+ (i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you
+ need to see what nettqmask corresponds to the prefix part of the address, this
+ is the function. See also \ref tqmask2prefix.
- \param prefix is the number of bits to create a mask for.
- \return a network mask, in network byte order.
+ \param prefix is the number of bits to create a tqmask for.
+ \return a network tqmask, in network byte order.
*/
-unsigned long int KAddressValidator::prefix2mask(int prefix){
+unsigned long int KAddressValidator::prefix2tqmask(int prefix){
return htonl(~((2 << (31 - prefix)) - 1));
}
-/** \fn int mask2prefix(unsigned long int mask)
- \brief calculates the number of bits masked off by a netmask.
+/** \fn int tqmask2prefix(unsigned long int tqmask)
+ \brief calculates the number of bits tqmasked off by a nettqmask.
This function calculates the significant bits in an IP address as specified by
- a netmask. See also \ref prefix2mask.
+ a nettqmask. See also \ref prefix2tqmask.
- \param mask is the netmask, specified as an unsigned long integer in network byte order.
+ \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order.
\return the number of significant bits. */
-int KAddressValidator::mask2prefix(unsigned long int mask){
+int KAddressValidator::tqmask2prefix(unsigned long int tqmask){
unsigned i;
int count = IPBITS;
for (i = 0; i < IPBITS; i++)
{
- if (!(ntohl(mask) & ((2 << i) - 1)))
+ if (!(ntohl(tqmask) & ((2 << i) - 1)))
count--;
}
@@ -170,7 +170,7 @@ int KAddressValidator::mask2prefix(unsigned long int mask){
\return the calculated broadcast address for the network, in network byte
order. */
unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int prefix){
- return (addr & prefix2mask(prefix)) | ~prefix2mask(prefix);
+ return (addr & prefix2tqmask(prefix)) | ~prefix2tqmask(prefix);
}
/** \fn unsigned long int calc_network(unsigned long int addr, int prefix)
\brief calculates the network address for a specified address and prefix.
@@ -180,25 +180,25 @@ unsigned long int KAddressValidator::calc_broadcast(unsigned long int addr, int
\return the base address of the network that addr is associated with, in
network byte order. */
unsigned long int KAddressValidator::calc_network(unsigned long int addr, int prefix){
- return (addr & prefix2mask(prefix));
+ return (addr & prefix2tqmask(prefix));
}
-/** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and
+/** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and
returns the network value also as a TQString, or NULL if it couldn't be calculated. */
-TQString KAddressValidator::calculateNetwork(TQString addr,TQString netmask){
- struct in_addr _addr, _netmask, _network;
+TQString KAddressValidator::calculateNetwork(TQString addr,TQString nettqmask){
+ struct in_addr _addr, _nettqmask, _network;
int prefix = 0;
TQString s;
- if (addr.isNull() || netmask.isNull())
+ if (addr.isNull() || nettqmask.isNull())
return NULL; //bad address
if (!inet_pton(AF_INET,addr.latin1(),&_addr))
return NULL; //bad address
else
{
- if (!inet_pton(AF_INET,netmask.latin1(),&_netmask))
+ if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask))
return NULL; //bad address
else
{
- prefix = mask2prefix(_netmask.s_addr);
+ prefix = tqmask2prefix(_nettqmask.s_addr);
_network.s_addr = calc_network(_addr.s_addr, prefix);
char * char_network = new char[20];
if (!inet_ntop(AF_INET,&_network,char_network,20))
@@ -210,23 +210,23 @@ TQString KAddressValidator::calculateNetwork(TQString addr,TQString netmask){
return s;
}
-/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and
+/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and
returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */
-TQString KAddressValidator::calculateBroadcast(TQString addr, TQString netmask){
- struct in_addr _addr, _netmask, _network;
+TQString KAddressValidator::calculateBroadcast(TQString addr, TQString nettqmask){
+ struct in_addr _addr, _nettqmask, _network;
int prefix = 0;
TQString s;
- if (addr.isNull() || netmask.isNull())
+ if (addr.isNull() || nettqmask.isNull())
return NULL; //bad address
if (!inet_pton(AF_INET,addr.latin1(),&_addr))
return NULL; //bad address
else
{
- if (!inet_pton(AF_INET,netmask.latin1(),&_netmask))
+ if (!inet_pton(AF_INET,nettqmask.latin1(),&_nettqmask))
return NULL; //bad address
else
{
- prefix = mask2prefix(_netmask.s_addr);
+ prefix = tqmask2prefix(_nettqmask.s_addr);
_network.s_addr = calc_broadcast(_addr.s_addr, prefix);
char * char_network = new char[20];
if (!inet_ntop(AF_INET,&_network,char_network,20))
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.h b/knetworkconf/knetworkconf/kaddressvalidator.h
index 9e1df59..5a05d84 100644
--- a/knetworkconf/knetworkconf/kaddressvalidator.h
+++ b/knetworkconf/knetworkconf/kaddressvalidator.h
@@ -19,7 +19,7 @@
#define KADDRESSVALIDATOR_H
/*
- Class for validating IP address and netmasks, and to calculate network and broadcast values.
+ Class for validating IP address and nettqmasks, and to calculate network and broadcast values.
The functions to do the last two things where taken from the code of ipcalc.c, made by
Erik Troan <ewt@redhat.com> and Preston Brown <pbrown@redhat.com> from Red Hat Inc.
*/
@@ -30,12 +30,12 @@
\def IPBITS
\brief the number of bits in an IP address.
*/
-#define IPBITS (sizeof(Q_UINT32) * 8)
+#define IPBITS (sizeof(TQ_UINT32) * 8)
/*!
\def IPBYTES
\brief the number of bytes in an IP address.
*/
-#define IPBYTES (sizeof(Q_UINT32))
+#define IPBYTES (sizeof(TQ_UINT32))
#include <sys/types.h>
#include <sys/socket.h>
@@ -43,7 +43,7 @@
#include <netinet/in.h>
#include <tqstring.h>
-/**Class that has simple methods for validating IP addresses, netmasks, calculating
+/**Class that has simple methods for validating IP addresses, nettqmasks, calculating
broadcast and network addresses.
*@author Juan Luis Baptiste
@@ -55,19 +55,19 @@ public:
~KAddressValidator();
/** Validates if the address written by the user is a valid one. Return true if it is and false if not. */
static bool isValidIPAddress(TQString addr);
- /** Validates if the Netmask written by the user is a valid one. Return true if it is and false if not. */
- static bool isNetmaskValid(TQString addr);
+ /** Validates if the Nettqmask written by the user is a valid one. Return true if it is and false if not. */
+ static bool isNettqmaskValid(TQString addr);
/** Validates if the Network written by the user is a valid one. Return true if it is and false if not. */
static bool isNetworkValid(const TQString &addr);
/** Validates if the Broadcast written by the user is a valid one. Return true if it is and false if not. */
static bool isBroadcastValid(TQString addr);
- /** Is a wrapper function to calc_network that receives the IP address and netsmask as TQString and
+ /** Is a wrapper function to calc_network that receives the IP address and netstqmask as TQString and
returns the network value also as a TQString, or NULL if it couldn't be calculated. */
- static TQString calculateNetwork(TQString addr,TQString netmask);
-/** Is a wrapper function to calc_broadcast that receives the IP address and netsmask as TQString and
+ static TQString calculateNetwork(TQString addr,TQString nettqmask);
+/** Is a wrapper function to calc_broadcast that receives the IP address and netstqmask as TQString and
returns the broadcast value also as a TQString, or NULL if it couldn't be calculated. */
- static TQString calculateBroadcast(TQString addr, TQString netmask);
+ static TQString calculateBroadcast(TQString addr, TQString nettqmask);
private: // Private methods
/** \fn unsigned long int calc_broadcast(unsigned long int addr, int prefix)
@@ -88,29 +88,29 @@ private: // Private methods
\return the base address of the network that addr is associated with, in
network byte order. */
static unsigned long int calc_network(unsigned long int addr, int prefix);
- /** \fn unsigned long int prefix2mask(int bits)
- \brief creates a netmask from a specified number of bits
+ /** \fn unsigned long int prefix2tqmask(int bits)
+ \brief creates a nettqmask from a specified number of bits
- This function converts a prefix length to a netmask. As CIDR (classless
+ This function converts a prefix length to a nettqmask. As CIDR (classless
internet domain internet domain routing) has taken off, more an more IP
addresses are being specified in the format address/prefix
- (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you
- need to see what netmask corresponds to the prefix part of the address, this
- is the function. See also \ref mask2prefix.
+ (i.e. 192.168.2.3/24, with a corresponding nettqmask 255.255.255.0). If you
+ need to see what nettqmask corresponds to the prefix part of the address, this
+ is the function. See also \ref tqmask2prefix.
- \param prefix is the number of bits to create a mask for.
- \return a network mask, in network byte order.
+ \param prefix is the number of bits to create a tqmask for.
+ \return a network tqmask, in network byte order.
*/
- static unsigned long int prefix2mask(int prefix);
- /** \fn int mask2prefix(unsigned long int mask)
- \brief calculates the number of bits masked off by a netmask.
+ static unsigned long int prefix2tqmask(int prefix);
+ /** \fn int tqmask2prefix(unsigned long int tqmask)
+ \brief calculates the number of bits tqmasked off by a nettqmask.
This function calculates the significant bits in an IP address as specified by
- a netmask. See also \ref prefix2mask.
+ a nettqmask. See also \ref prefix2tqmask.
- \param mask is the netmask, specified as an unsigned long integer in network byte order.
+ \param tqmask is the nettqmask, specified as an unsigned long integer in network byte order.
\return the number of significant bits. */
- static int mask2prefix(unsigned long int mask);
+ static int tqmask2prefix(unsigned long int tqmask);
};
#endif
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
index bb97b4c..8391d6c 100644
--- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KDetectDistroDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>KDetectDistroDlg</cstring>
</property>
@@ -19,15 +19,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>pixmapLabel1</cstring>
</property>
@@ -52,7 +52,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>text</cstring>
</property>
@@ -69,5 +69,5 @@
<data format="PNG" length="983">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index 68285c4..ac0b9e0 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>pixmapLabel1</cstring>
</property>
@@ -43,18 +43,18 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>label</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -94,10 +94,10 @@
<includes>
<include location="local" impldecl="in implementation">kinterfaceupdowndlg.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>close()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
</includehints>
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
index 4a5fc41..060c5cf 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index 8723d4b..11dbad0 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -19,7 +19,7 @@
#include "knetworkconf.h"
-KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
+KNetworkConf::KNetworkConf(TQWidget *tqparent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(tqparent, name)
{
netInfo = 0L;
makeButtonsResizeable();
@@ -104,7 +104,7 @@ void KNetworkConf::loadNetworkDevicesInfo()
{
if ( device->getType() != "loopback" )
{
- if (klvCardList->findItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0)
+ if (klvCardList->tqfindItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0)
{
TQListViewItem * item = new TQListViewItem( klvCardList, 0 );
@@ -230,7 +230,7 @@ void KNetworkConf::configureDeviceSlot(){
if (item != NULL)
{
TQString currentDevice = item->text(0);
- configDlg.setCaption(i18n("Configure Device %1").arg(currentDevice));
+ configDlg.setCaption(i18n("Configure Device %1").tqarg(currentDevice));
KNetworkInterface *dev = getDeviceInfo(currentDevice);
KAddDeviceDlgExtension *advancedOptions = (KAddDeviceDlgExtension *)configDlg.extension();
@@ -245,7 +245,7 @@ void KNetworkConf::configureDeviceSlot(){
configDlg.addDlg->rbBootProtoManual->setChecked(false);
configDlg.addDlg->rbBootProtoAuto->setChecked(true);
configDlg.addDlg->kleIPAddress->setEnabled(false);
- configDlg.addDlg->kcbNetmask->setEnabled(false);
+ configDlg.addDlg->kcbNettqmask->setEnabled(false);
configDlg.kpbAdvanced->setEnabled(false);
}
else if (dev->getBootProto().lower() == "bootp")
@@ -266,12 +266,12 @@ void KNetworkConf::configureDeviceSlot(){
if (!dev->getBroadcast().isEmpty())
advancedOptions->kleBroadcast->setText(dev->getBroadcast());
else
- advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNetmask()));
+ advancedOptions->kleBroadcast->setText(KAddressValidator::calculateBroadcast(dev->getIpAddress(),dev->getNettqmask()));
advancedOptions->kleGateway->setText(dev->getGateway());
- if (!dev->getNetmask().isEmpty())
- configDlg.addDlg->kcbNetmask->setCurrentText(dev->getNetmask());
+ if (!dev->getNettqmask().isEmpty())
+ configDlg.addDlg->kcbNettqmask->setCurrentText(dev->getNettqmask());
if (readOnly)
{
@@ -305,7 +305,7 @@ void KNetworkConf::configureDeviceSlot(){
dev->setBootProto("none");
}
//If the selected boot protocol is dhcp or bootp (Auto), then we don't need the
- //past IP address, netmask, network and broadcast, as a new one will be assigned by
+ //past IP address, nettqmask, network and broadcast, as a new one will be assigned by
//the dhcp server.
else if (configDlg.addDlg->rbBootProtoAuto->isChecked())
{
@@ -314,7 +314,7 @@ void KNetworkConf::configureDeviceSlot(){
dev->setIpAddress("");
configDlg.addDlg->kleIPAddress->setText("");
dev->setGateway("");
- dev->setNetmask("");
+ dev->setNettqmask("");
dev->setNetwork("");
dev->setBroadcast("");
}
@@ -326,7 +326,7 @@ void KNetworkConf::configureDeviceSlot(){
if (valuesChanged(dev,
configDlg.addDlg->kcbAutoBootProto->currentText(),
- configDlg.addDlg->kcbNetmask->currentText(),
+ configDlg.addDlg->kcbNettqmask->currentText(),
configDlg.addDlg->kleIPAddress->text(),
advancedOptions->kleGateway->text(),
configDlg.addDlg->kcbstartAtBoot->isChecked(),
@@ -335,12 +335,12 @@ void KNetworkConf::configureDeviceSlot(){
{
dev->setIpAddress(configDlg.addDlg->kleIPAddress->text().stripWhiteSpace());
dev->setGateway(advancedOptions->kleGateway->text().stripWhiteSpace());
- dev->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace());
- TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
+ dev->setNettqmask(configDlg.addDlg->kcbNettqmask->currentText().stripWhiteSpace());
+ TQString network = KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace());
dev->setNetwork(network);
TQString broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace();
if (broadcast.isEmpty())
- broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
+ broadcast = KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNettqmask().stripWhiteSpace());
dev->setBroadcast(broadcast);
dev->setDescription(advancedOptions->kleDescription->text());
@@ -677,19 +677,19 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){
KInterfaceUpDownDlg* dialog = new KInterfaceUpDownDlg(this,"Changing device state");
if (state == DEVICE_UP)
- dialog->label->setText(i18n("Enabling interface <b>%1</b>").arg(dev));
+ dialog->label->setText(i18n("Enabling interface <b>%1</b>").tqarg(dev));
else
- dialog->label->setText(i18n("Disabling interface <b>%1</b>").arg(dev));
+ dialog->label->setText(i18n("Disabling interface <b>%1</b>").tqarg(dev));
dialog->setModal(true);
dialog->show();
- procDeviceState = new TQProcess(this);
+ procDeviceState = new TQProcess(TQT_TQOBJECT(this));
TQString cmd;
procDeviceState->addArgument( locate("data",BACKEND_PATH) );
//If the platform couldn't be autodetected specify it manually
- if (netInfo->getPlatformName() != TQString::null)
+ if (netInfo->getPlatformName() != TQString())
{
procDeviceState->addArgument( "--platform" );
procDeviceState->addArgument( netInfo->getPlatformName() );
@@ -740,7 +740,7 @@ void KNetworkConf::verifyDeviceStateChanged(){
}
else if (commandOutput == "\n<!-- GST: end of request -->")
{
- TQListViewItem *item = klvCardList->findItem(currentDevice,0,ExactMatch);
+ TQListViewItem *item = klvCardList->tqfindItem(currentDevice,0,ExactMatch);
if (item != NULL)
{
dev = getDeviceInfo(currentDevice);
@@ -789,14 +789,14 @@ TQStringList KNetworkConf::getDeviceList(){
/** No descriptions */
bool KNetworkConf::valuesChanged(KNetworkInterface *dev,
TQString bootProto,
- TQString netmask,
+ TQString nettqmask,
TQString ipAddr,
TQString gateway,
bool onBoot,
TQString desc,
TQString broadcast){
if ((dev->getBootProto() != bootProto) ||
- (dev->getNetmask() != netmask) ||
+ (dev->getNettqmask() != nettqmask) ||
(dev->getIpAddress() != ipAddr) ||
(dev->getGateway() != gateway) ||
((dev->getOnBoot() == "yes") && !(onBoot)) ||
@@ -1000,7 +1000,7 @@ void KNetworkConf::showInterfaceContextMenuSlot(KListView* lv, TQListViewItem* l
context->insertSeparator(2);
context->insertItem( "&Configure Interface...", this, TQT_SLOT(configureDeviceSlot()));
context->popup(pt);
- //context->insertItem( "About &Qt", this, TQT_SLOT(aboutQt()) );
+ //context->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) );
}
void KNetworkConf::enableSignals()
@@ -1057,7 +1057,7 @@ void KNetworkConf::createProfileSlot()
bool ok;
TQString newProfileName = KInputDialog::getText(i18n("Create New Network Profile"),
i18n("Name of new profile:"),
- TQString::null, &ok, this );
+ TQString(), &ok, this );
if ( ok && !newProfileName.isEmpty() )
{
TQPtrList<KNetworkInfo> profiles = netInfo->getProfilesList();
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index 813b150..af034b4 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -75,10 +75,11 @@
/** KNetworkConf is the base class of the project */
class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
{
- Q_OBJECT
+ Q_OBJECT
+ TQ_OBJECT
public:
/** construtor */
- KNetworkConf(TQWidget* parent=0, const char *name=0);
+ KNetworkConf(TQWidget* tqparent=0, const char *name=0);
/** destructor */
~KNetworkConf();
/** Puts the application in read-only mode. This happens when the user runing the application isn't root. */
@@ -164,7 +165,7 @@ class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
virtual void removeServerSlot();
bool valuesChanged(KNetworkInterface *dev,
TQString bootProto,
- TQString netmask,
+ TQString nettqmask,
TQString ipAddr,
TQString gateway,
bool onBoot,
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index a2fa917..a184930 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KNetworkConfDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KNetworkConfDlg</cstring>
</property>
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>510</width>
<height>410</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -48,7 +48,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget</cstring>
</property>
@@ -58,7 +58,7 @@
<property name="toolTip" stdset="0">
<string></string>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -69,15 +69,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>301</width>
<height>20</height>
@@ -175,9 +175,9 @@
<string>List of configured network devices</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<hbox>
<property name="name">
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>230</height>
@@ -240,7 +240,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -257,7 +257,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbDefaultGateway</cstring>
</property>
@@ -274,7 +274,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout11</cstring>
</property>
@@ -288,7 +288,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel3</cstring>
</property>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>181</width>
<height>0</height>
@@ -315,7 +315,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout27</cstring>
</property>
@@ -358,14 +358,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>0</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -385,13 +385,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>65</width>
<height>32767</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>90</height>
@@ -424,7 +424,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -435,7 +435,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>gbDNSServersList</cstring>
</property>
@@ -460,9 +460,9 @@
<string></string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout23</cstring>
+ <cstring>tqlayout23</cstring>
</property>
<vbox>
<property name="name">
@@ -478,7 +478,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -523,7 +523,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>16</height>
@@ -532,9 +532,9 @@
</spacer>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout25</cstring>
+ <cstring>tqlayout25</cstring>
</property>
<vbox>
<property name="name">
@@ -550,7 +550,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -561,7 +561,7 @@
<property name="name">
<cstring>kpbAddDomainServer</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -578,7 +578,7 @@
<property name="name">
<cstring>kpbEditDomainServer</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -595,7 +595,7 @@
<property name="name">
<cstring>kpbRemoveDomainServer</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -618,7 +618,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -629,7 +629,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>gbKnownHostsList</cstring>
</property>
@@ -667,9 +667,9 @@
<cstring>klvKnownHosts</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout20</cstring>
+ <cstring>tqlayout20</cstring>
</property>
<hbox>
<property name="name">
@@ -679,7 +679,7 @@
<property name="name">
<cstring>kpbAddKnownHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -696,7 +696,7 @@
<property name="name">
<cstring>kpbEditKnownHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -713,7 +713,7 @@
<property name="name">
<cstring>kpbRemoveKnownHost</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -730,7 +730,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>tlHostName</cstring>
</property>
@@ -754,7 +754,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>tlDomainName</cstring>
</property>
@@ -764,7 +764,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>TabPage</cstring>
</property>
@@ -775,7 +775,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup2</cstring>
</property>
@@ -805,9 +805,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>tqlayout28</cstring>
</property>
<vbox>
<property name="name">
@@ -857,7 +857,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -876,7 +876,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -920,13 +920,13 @@
</connection>
<connection>
<sender>klvCardList</sender>
- <signal>rightButtonClicked(QListViewItem*,const QPoint&amp;,int)</signal>
+ <signal>rightButtonClicked(TQListViewItem*,const QPoint&amp;,int)</signal>
<receiver>KNetworkConfDlg</receiver>
<slot>showInterfaceContextMenuSlot()</slot>
</connection>
<connection>
<sender>klvCardList</sender>
- <signal>doubleClicked(QListViewItem*)</signal>
+ <signal>doubleClicked(TQListViewItem*)</signal>
<receiver>KNetworkConfDlg</receiver>
<slot>configureDeviceSlot()</slot>
</connection>
@@ -938,7 +938,7 @@
</connection>
<connection>
<sender>klbDomainServerList</sender>
- <signal>doubleClicked(QListBoxItem*)</signal>
+ <signal>doubleClicked(TQListBoxItem*)</signal>
<receiver>KNetworkConfDlg</receiver>
<slot>editServerSlot()</slot>
</connection>
@@ -992,21 +992,21 @@
</connection>
<connection>
<sender>klvKnownHosts</sender>
- <signal>doubleClicked(QListViewItem*)</signal>
+ <signal>doubleClicked(TQListViewItem*)</signal>
<receiver>KNetworkConfDlg</receiver>
<slot>editKnownHostSlot()</slot>
</connection>
<connection>
<sender>kcbGwDevice</sender>
- <signal>activated(const QString&amp;)</signal>
+ <signal>activated(const TQString&amp;)</signal>
<receiver>KNetworkConfDlg</receiver>
- <slot>enableApplyButtonSlot(const QString&amp;)</slot>
+ <slot>enableApplyButtonSlot(const TQString&amp;)</slot>
</connection>
<connection>
<sender>klvProfilesList</sender>
- <signal>itemRenamed(QListViewItem*)</signal>
+ <signal>itemRenamed(TQListViewItem*)</signal>
<receiver>KNetworkConfDlg</receiver>
- <slot>updateProfileNameSlot(QListViewItem*)</slot>
+ <slot>updateProfileNameSlot(TQListViewItem*)</slot>
</connection>
<connection>
<sender>kpbCreateProfile</sender>
@@ -1016,9 +1016,9 @@
</connection>
<connection>
<sender>klvProfilesList</sender>
- <signal>itemRenamed(QListViewItem*)</signal>
+ <signal>itemRenamed(TQListViewItem*)</signal>
<receiver>KNetworkConfDlg</receiver>
- <slot>updateProfileNameSlot(QListViewItem*)</slot>
+ <slot>updateProfileNameSlot(TQListViewItem*)</slot>
</connection>
<connection>
<sender>kpbDeleteProfile</sender>
@@ -1042,7 +1042,7 @@
<includes>
<include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="private">enableButtonsSlot()</slot>
<slot access="private">quitSlot()</slot>
<slot access="private">moveUpServerSlot()</slot>
@@ -1050,7 +1050,7 @@
<slot>helpSlot()</slot>
<slot access="private">configureDeviceSlot()</slot>
<slot access="private">enableApplyButtonSlot( bool )</slot>
- <slot access="private">enableApplyButtonSlot( const QString &amp; )</slot>
+ <slot access="private">enableApplyButtonSlot( const TQString &amp; )</slot>
<slot>aboutSlot()</slot>
<slot access="private">addServerSlot()</slot>
<slot access="private">removeServerSlot()</slot>
@@ -1068,11 +1068,11 @@
<slot access="private">enableProfileSlot()</slot>
<slot access="private">createProfileSlot()</slot>
<slot>updateProfileNameSlot()</slot>
- <slot access="private">updateProfileNameSlot(QListViewItem *item)</slot>
+ <slot access="private">updateProfileNameSlot(TQListViewItem *item)</slot>
<slot access="private">removeProfileSlot()</slot>
<slot access="private">updateProfileSlot()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui.h b/knetworkconf/knetworkconf/knetworkconfdlg.ui.h
index 68bb00f..4d77089 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui.h
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui.h
@@ -1,7 +1,7 @@
/****************************************************************************
** ui.h extension file, included from the uic-generated form implementation.
**
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
** update this file, preserving your code. Create an init() slot in place of
** a constructor, and a destroy() slot in place of a destructor.
*****************************************************************************/
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
index ceacdac..093ab9f 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -27,7 +27,7 @@ KNetworkConfigParser::KNetworkConfigParser(){
if (!askAgain || platform.length() > 0)
runDetectionScript(platform);
else
- runDetectionScript(TQString::null);
+ runDetectionScript(TQString());
}
/** Runs the gst backend to get network values. You can pass to the script a specific platform to load using the platform parameter. */
void KNetworkConfigParser::runDetectionScript(TQString platform){
@@ -38,7 +38,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
if (pathToProgram.isEmpty())
{
KMessageBox::error(0,
- i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH),
+ i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{KDE_PATH}/%1 \nfile is present.").tqarg(BACKEND_PATH),
i18n("Could Not Find Network Configuration Backend Script"));
dialog->close();
//kapp->quit();
@@ -46,7 +46,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
else
{
procDetect->addArgument( pathToProgram );
- if (platform != TQString::null)
+ if (platform != TQString())
{
procDetect->addArgument( "--platform" );
procDetect->addArgument( platform );
@@ -73,7 +73,7 @@ $knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces. */
void KNetworkConfigParser::listIfaces(const TQString &platform){
procDetect = new TQProcess(this);
procDetect->addArgument( locate("data",BACKEND_PATH) );
- if (platform != TQString::null)
+ if (platform != TQString())
{
procDetect->addArgument( "--platform" );
procDetect->addArgument( platform );
@@ -123,7 +123,7 @@ void KNetworkConfigParser::readListIfacesSlot(){
{
TQDomElement interface = node.toElement();
KNetworkInterface *tempDevice = new KNetworkInterface();
- tempDevice = getInterfaceInfo(interface,TQString::null);
+ tempDevice = getInterfaceInfo(interface,TQString());
if (tempDevice->getType().lower() != LOOPBACK_IFACE_TYPE)
{
@@ -142,8 +142,8 @@ void KNetworkConfigParser::readListIfacesSlot(){
originalDevice->setIpAddress(tempDevice->getIpAddress());
if (!tempDevice->getMacAddress().isEmpty())
originalDevice->setMacAddress(tempDevice->getMacAddress());
- if (!tempDevice->getNetmask().isEmpty())
- originalDevice->setNetmask(tempDevice->getNetmask());
+ if (!tempDevice->getNettqmask().isEmpty())
+ originalDevice->setNettqmask(tempDevice->getNettqmask());
if (!tempDevice->getNetwork().isEmpty())
originalDevice->setNetwork(tempDevice->getNetwork());
}
@@ -212,7 +212,7 @@ void KNetworkConfigParser::loadRoutingInfo( KRoutingInfo *routingInfo){
f.close();
#endif
}
-QString
+TQString
KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex)
{
bool ok;
@@ -221,7 +221,7 @@ KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex)
TQString temp = "";
TQString temp2 = "";
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+#if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN
temp = hex.mid(6,2);
temp2 = temp2.setNum(temp.toInt(&ok,16));
dec.append(temp2);
@@ -299,9 +299,9 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo)
procSaveNetworkInfo->addArgument( "--set" );
// KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal
- KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true);
+ KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)tqparent(), 0, true);
dialog->setCaption(i18n("Reloading Network"));
- dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("<center>").arg("</center>"));
+ dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").tqarg("<center>").tqarg("</center>"));
dialog->show();
xmlOuput = "";
@@ -410,11 +410,11 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo
t = doc->createTextNode( device->getBroadcast() );
innerTag.appendChild( t );
}
- if (!device->getNetmask().isEmpty())
+ if (!device->getNettqmask().isEmpty())
{
- innerTag = doc->createElement( "netmask" );
+ innerTag = doc->createElement( "nettqmask" );
configurationTag.appendChild( innerTag );
- t = doc->createTextNode( device->getNetmask() );
+ t = doc->createTextNode( device->getNettqmask() );
innerTag.appendChild( t );
}
if (!device->getNetwork().isEmpty())
@@ -677,11 +677,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if (!e.text().isEmpty())
tempDevice->setGateway(e.text());
}
- else if ( configNodeName == "netmask" || configNodeName == "mask")
+ else if ( configNodeName == "nettqmask" || configNodeName == "tqmask")
{
TQDomElement e = configNode.toElement();
if (!e.text().isEmpty())
- tempDevice->setNetmask(e.text());
+ tempDevice->setNettqmask(e.text());
}
else if ( configNodeName == "network" )
{
@@ -707,11 +707,11 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if (!e.text().isEmpty())
tempDevice->setIpAddress(e.text());
}
- else if ( nodeName == "mask")
+ else if ( nodeName == "tqmask")
{
TQDomElement e = node.toElement();
if (!e.text().isEmpty())
- tempDevice->setNetmask(e.text());
+ tempDevice->setNettqmask(e.text());
}
else if ( nodeName == "bdcast")
{
@@ -747,7 +747,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
}
node = node.nextSibling();
}
- if (type != TQString::null)
+ if (type != TQString())
tempDevice->setType(type);
TQString description;
@@ -769,7 +769,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp"))
{
tempDevice->setIpAddress("");
- tempDevice->setNetmask("");
+ tempDevice->setNettqmask("");
tempDevice->setNetwork("");
tempDevice->setBroadcast("");
}
@@ -820,7 +820,7 @@ void KNetworkConfigParser::readNetworkInfo()
//If the platform where knetworkconf is running isn't supported, show the
//user a dialog with all the supported platforms to choose.
- if (xmlErr.contains("platform_unsup::"))
+ if (xmlErr.tqcontains("platform_unsup::"))
{
connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) );
loadSupportedPlatforms();
@@ -1081,92 +1081,92 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){
key = key.section(":",0,0);
TQString name = (*it);
name = name.section(":",1,1);
- if (key.contains("debian"))
+ if (key.tqcontains("debian"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/debian.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("mandriva"))
+ else if (key.tqcontains("mandriva"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/mandriva.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("conectiva"))
+ else if (key.tqcontains("conectiva"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/conectiva.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("pld"))
+ else if (key.tqcontains("pld"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/pld.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("redhat"))
+ else if (key.tqcontains("redhat"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/redhat.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("suse"))
+ else if (key.tqcontains("suse"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/suse.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("turbolinux"))
+ else if (key.tqcontains("turbolinux"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/turbolinux.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("fedora"))
+ else if (key.tqcontains("fedora"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/fedora.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("openna"))
+ else if (key.tqcontains("openna"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/openna.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("slackware"))
+ else if (key.tqcontains("slackware"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/slackware.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("freebsd"))
+ else if (key.tqcontains("freebsd"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/freebsd.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("gentoo"))
+ else if (key.tqcontains("gentoo"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/gentoo.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("blackpanther"))
+ else if (key.tqcontains("blackpanther"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/blackpanther.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("rpath"))
+ else if (key.tqcontains("rpath"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/rpath.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("vine"))
+ else if (key.tqcontains("vine"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/vine.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("ubuntu"))
+ else if (key.tqcontains("ubuntu"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("yoper"))
+ else if (key.tqcontains("yoper"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/yoper.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
- else if (key.contains("ark"))
+ else if (key.tqcontains("ark"))
{
TQPixmap distroImg(locate("data","knetworkconf/pixmaps/ark.png"));
dialog->klbDistroList->insertItem(distroImg, name);
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h
index f0af15f..6bb688b 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.h
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.h
@@ -59,6 +59,7 @@
class KNetworkConfigParser : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
KNetworkConfigParser();
~KNetworkConfigParser();
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index 3f67b0c..ddaaa60 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -23,8 +23,8 @@
-KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/)
- : KCModule(parent,name)
+KNetworkConfModule::KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/)
+ : KCModule(tqparent,name)
{
TQVBoxLayout *top = new TQVBoxLayout(this);
@@ -110,7 +110,7 @@ KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"
TQString KNetworkConfModule::quickHelp() const
{
- return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
+ return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").tqarg("<h1>").tqarg("</h1><p>").tqarg("</p>");
}
//#include "knetworkconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h
index 6dedaed..2e30e27 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.h
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.h
@@ -25,9 +25,10 @@
class KNetworkConfModule : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/);
+ KNetworkConfModule(TQWidget* tqparent, const char *name/*, TQStringList list*/);
~KNetworkConfModule();
void load();
diff --git a/knetworkconf/knetworkconf/knetworkinterface.cpp b/knetworkconf/knetworkconf/knetworkinterface.cpp
index 0a7fad5..1db8dee 100644
--- a/knetworkconf/knetworkconf/knetworkinterface.cpp
+++ b/knetworkconf/knetworkconf/knetworkinterface.cpp
@@ -34,8 +34,8 @@ TQString KNetworkInterface::getDeviceName(){
TQString KNetworkInterface::getIpAddress(){
return ipAddress;
}
-TQString KNetworkInterface::getNetmask(){
- return netmask;
+TQString KNetworkInterface::getNettqmask(){
+ return nettqmask;
}
TQString KNetworkInterface::getNetwork(){
return network;
@@ -59,8 +59,8 @@ void KNetworkInterface::setDeviceName(const TQString &deviceName){
void KNetworkInterface::setIpAddress(const TQString &ipAddress){
KNetworkInterface::ipAddress = ipAddress;
}
-void KNetworkInterface::setNetmask(const TQString &netmask){
- KNetworkInterface::netmask = netmask;
+void KNetworkInterface::setNettqmask(const TQString &nettqmask){
+ KNetworkInterface::nettqmask = nettqmask;
}
void KNetworkInterface::setNetwork(const TQString &network){
KNetworkInterface::network = network;
diff --git a/knetworkconf/knetworkconf/knetworkinterface.h b/knetworkconf/knetworkconf/knetworkinterface.h
index 65ccfc0..4a64641 100644
--- a/knetworkconf/knetworkconf/knetworkinterface.h
+++ b/knetworkconf/knetworkconf/knetworkinterface.h
@@ -33,7 +33,7 @@ class KNetworkInterface {
TQString getBroadcast();
TQString getDeviceName();
TQString getIpAddress();
- TQString getNetmask();
+ TQString getNettqmask();
TQString getNetwork();
TQString getOnBoot();
TQString getGateway();
@@ -41,7 +41,7 @@ class KNetworkInterface {
void setBroadcast(const TQString &broadcast);
void setDeviceName(const TQString &deviceName);
void setIpAddress(const TQString &ipAddress);
- void setNetmask(const TQString &netmask);
+ void setNettqmask(const TQString &nettqmask);
void setNetwork(const TQString &network);
void setOnBoot(const TQString &onBoot);
void setGateway(const TQString &gateway);
@@ -61,8 +61,8 @@ class KNetworkInterface {
TQString bootProto;
/** IPv4 address of the interface. */
TQString ipAddress;
- /** The Netmask. */
- TQString netmask;
+ /** The Nettqmask. */
+ TQString nettqmask;
/** The network. */
TQString network;
/** The broadcast. */
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index ec65c68..15dfde8 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -25,10 +25,10 @@
#include "knetworkinfo.h"
#include "knetworkconfigparser.h"
-class KProfilesListViewToolTip : public QToolTip
+class KProfilesListViewToolTip : public TQToolTip
{
public:
- KProfilesListViewToolTip(TQListView* parent);
+ KProfilesListViewToolTip(TQListView* tqparent);
void setProfiles(TQPtrList<KNetworkInfo> profiles_);
~KProfilesListViewToolTip();
@@ -47,7 +47,7 @@ inline void KProfilesListViewToolTip::setProfiles(TQPtrList<KNetworkInfo> profil
profiles = profiles_;
}
-inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* parent ):TQToolTip( parent->viewport() ), listView( parent ) {}
+inline KProfilesListViewToolTip::KProfilesListViewToolTip( TQListView* tqparent ):TQToolTip( tqparent->viewport() ), listView( tqparent ) {}
inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
{
@@ -60,9 +60,9 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
if ( !item )
return;
- const TQRect itemRect = listView->itemRect( item );
+ const TQRect tqitemRect = listView->tqitemRect( item );
- if ( !itemRect.isValid() )
+ if ( !tqitemRect.isValid() )
return;
const int col = listView->header()->sectionAt( p.x() );
@@ -75,7 +75,7 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
if ( !headerRect.isValid() )
return;
- const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width() + 60, itemRect.height() );
+ const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width() + 60, tqitemRect.height() );
TQString tipStr;
@@ -91,31 +91,31 @@ inline void KProfilesListViewToolTip::maybeTip( const TQPoint& p )
{
if (device->getType() != LOOPBACK_IFACE_TYPE)
{
- tipStr.append(i18n("<p><b>Interface:</b> %1").arg(device->getDeviceName().latin1()));
- tipStr.append(i18n("<br><b>Type:</b> %1").arg(device->getType()));
+ tipStr.append(i18n("<p><b>Interface:</b> %1").tqarg(device->getDeviceName().latin1()));
+ tipStr.append(i18n("<br><b>Type:</b> %1").tqarg(device->getType()));
TQString bootProto;
if (device->getBootProto() == "none")
bootProto = "Manual";
else
bootProto = device->getBootProto();
- tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").arg(bootProto));
+ tipStr.append(i18n("<br><b>Boot Protocol:</b> %1").tqarg(bootProto));
if (bootProto != "dhcp")
{
- tipStr.append(i18n("<br><b>IP Address:</b> %1").arg(device->getIpAddress()));
- tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").arg(device->getBroadcast()));
+ tipStr.append(i18n("<br><b>IP Address:</b> %1").tqarg(device->getIpAddress()));
+ tipStr.append(i18n("<br><b>Broadcast Address:</b> %1").tqarg(device->getBroadcast()));
}
- tipStr.append(i18n("<br><b>On Boot:</b> %1").arg(device->getOnBoot()));
+ tipStr.append(i18n("<br><b>On Boot:</b> %1").tqarg(device->getOnBoot()));
}
}
KRoutingInfo *route = profile->getRoutingInfo();
- tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").arg(route->getGateway()));
+ tipStr.append(i18n("</p><p><b>Default Gateway:</b> %1").tqarg(route->getGateway()));
KDNSInfo *dns = profile->getDNSInfo();
- tipStr.append(i18n("<br><b>Domain Name:</b> %1").arg(dns->getDomainName()));
- tipStr.append(i18n("<br><b>Machine Name:</b> %1").arg(dns->getMachineName()));
+ tipStr.append(i18n("<br><b>Domain Name:</b> %1").tqarg(dns->getDomainName()));
+ tipStr.append(i18n("<br><b>Machine Name:</b> %1").tqarg(dns->getMachineName()));
TQStringList nameServers = dns->getNameServers();
for ( TQStringList::Iterator it = nameServers.begin(); it != nameServers.end(); ++it)
{
- tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").arg((*it)));
+ tipStr.append(i18n("<br><b>DNS Name Server:</b> %1").tqarg((*it)));
}
}
}
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 3041186..816f4ab 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -12,13 +12,13 @@
<height>130</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>342</width>
<height>130</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>342</width>
<height>130</height>
@@ -30,9 +30,9 @@
<property name="icon">
<pixmap>image0</pixmap>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
- <cstring>tlNetworkStatus</cstring>
+ <cstring>tlNetworktqStatus</cstring>
</property>
<property name="geometry">
<rect>
@@ -50,7 +50,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -76,7 +76,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>PixmapLabel1</cstring>
</property>
@@ -95,7 +95,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -129,7 +129,7 @@ the changes can take effect.</string>
<slot>close()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui
index 4bed8ea..e982f42 100644
--- a/knetworkconf/knetworkconf/kselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui
@@ -61,7 +61,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox" row="3" column="0">
+ <widget class="TQCheckBox" row="3" column="0">
<property name="name">
<cstring>cbAskAgain</cstring>
</property>
@@ -79,14 +79,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -94,7 +94,7 @@
<string>&lt;font size="+1"&gt;&lt;p align="center"&gt;&lt;b&gt;Your Platform is Not Supported&lt;/b&gt;&lt;/p&gt;&lt;/font&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0" rowspan="1" colspan="4">
+ <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -129,10 +129,10 @@
<slot>accept()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>exitSlot()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klistbox.h</includehint>
diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp
index 8ebe038..9ee6be9 100644
--- a/knetworkconf/knetworkconf/main.cpp
+++ b/knetworkconf/knetworkconf/main.cpp
@@ -40,10 +40,10 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo
extern "C"
{
- KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *tqparent, const char *name)
{
KGlobal::locale()->insertCatalogue("knetworkconf");
- return new KNetworkConfModule(parent, name);
+ return new KNetworkConfModule(tqparent, name);
}
}
diff --git a/knetworkconf/update_backends.sh b/knetworkconf/update_backends.sh
index 9b77d13..d6a5e0c 100755
--- a/knetworkconf/update_backends.sh
+++ b/knetworkconf/update_backends.sh
@@ -35,7 +35,7 @@ fi
diractual=`pwd`
cd $1;
-cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README replace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2
+cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README tqreplace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2
echo
echo 'Ready, dont forget to check configure.in.in or Makefile.am to see if they need further updating.'
diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index a50e838..d60be2f 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -60,7 +60,7 @@ TQString cacheObj::PDir()
TQDir d(tmpd);
if (!d.exists()) {
if (!d.mkdir(tmpd)) {
- KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
tmpd = "";
} else {
chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -81,7 +81,7 @@ TQString cacheObj::CDir()
TQDir d(tmpd);
if (!d.exists()) {
if (!d.mkdir(tmpd)) {
- KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
+ KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
tmpd = "";
} else {
chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -95,7 +95,7 @@ int cacheObj::newDCache(const TQString &url, const TQString &fn, TQString &fnam
KURL u(url);
if ( !u.isValid() ) {
- KpMsgE(i18n("Malformed URL: %1").arg(url),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").tqarg(url),TRUE);
return -1;
}
@@ -193,7 +193,7 @@ void CacheList::read ()
while (!stream.eof()) {
line = stream.readLine() ;
if (line[0] != '#') { // not a comment
- append (line) ; // to this QStringList
+ append (line) ; // to this TQStringList
}
}
CLFile.close() ;
diff --git a/kpackage/cache.h b/kpackage/cache.h
index 2a54b7c..86cac1e 100644
--- a/kpackage/cache.h
+++ b/kpackage/cache.h
@@ -51,7 +51,7 @@ public:
TQString option;
bool subdirs;
- cacheObj(const TQString &Pbase, const TQString &Plocation, const TQString &PcacheFile, const TQString &Poption = TQString::null, bool Psubdirs = FALSE);
+ cacheObj(const TQString &Pbase, const TQString &Plocation, const TQString &PcacheFile, const TQString &Poption = TQString(), bool Psubdirs = FALSE);
~cacheObj();
static TQString PDir();
@@ -88,7 +88,7 @@ public:
/**
* @short the list of cached files in a directory stored in the file "kpackage_cachelist"
**/
-class CacheList : public QStringList
+class CacheList : public TQStringList
{
public:
/**
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index 9139adf..d453726 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -100,19 +100,19 @@ bool DEBAPT::isType(char *, const TQString &)
void DEBAPT::makeMenu(KActionCollection* act)
{
- updateM = new KAction( i18n("&Update"), TQString::null,
+ updateM = new KAction( i18n("&Update"), TQString(),
0, this,
TQT_SLOT(updateS()), act, "debapt_update");
- upgradeM = new KAction( i18n("U&pgrade"), TQString::null,
+ upgradeM = new KAction( i18n("U&pgrade"), TQString(),
0, this,
TQT_SLOT(upgradeS()), act, "debapt_upgrade");
- fixupM = new KAction( i18n("&Fixup"), TQString::null,
+ fixupM = new KAction( i18n("&Fixup"), TQString(),
0, this,
TQT_SLOT(fixupS()), act, "debapt_fixup");
- fileM = new KAction( i18n("&Apt-File Update"), TQString::null,
+ fileM = new KAction( i18n("&Apt-File Update"), TQString(),
0, this,
TQT_SLOT(fileS()), act, "debapt_file");
}
@@ -156,7 +156,7 @@ void DEBAPT::fileS()
kprun->exec();
}
} else {
- KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
}
}
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
packageInfo *p;
TQStringList plist;
- kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQString cmd = "cat " STATUS;
TQStringList list = kpty->run(cmd);
- kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
// kdDebug() << "H=" << hostName << "\n";
if (hostName.isEmpty())
- kpackage->setStatus(i18n("Querying DEB APT available list"));
+ kpackage->settqStatus(i18n("Querying DEB APT available list"));
else
- kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
kpackage->setPercent(0);
TQStringList list = kpty->run("apt-cache dumpavail");
if (hostName.isEmpty())
- kpackage->setStatus(i18n("Processing DEB APT available list"));
+ kpackage->settqStatus(i18n("Processing DEB APT available list"));
else
- kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
+ kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
// kdDebug() << "A=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -318,7 +318,7 @@ TQStringList DEBAPT::listInstalls(const TQStringList &packs, bool install, bool
TQString packAll;
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
// kdDebug() << "M=" << *it << "\n";
- if ((*it).find(match) >= 0 || extras) {
+ if ((*it).tqfind(match) >= 0 || extras) {
if (extras) {
if ((*it)[0] == ' ') {
packAll += *it;
@@ -351,21 +351,21 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll)
TQStringList filelist = kpty->run(s);
for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) {
- int p = (*it).find(": ");
+ int p = (*it).tqfind(": ");
if( p !=-1 )
- (*it).replace(p, 2, "\t");
+ (*it).tqreplace(p, 2, "\t");
}
if (filelist.count() == 1) {
TQStringList::Iterator it = filelist.begin();
- if ((*it).find("not found") >= 0) {
+ if ((*it).tqfind("not found") >= 0) {
filelist.remove(it);
}
}
return filelist;
} else {
- KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
+ KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
TQStringList nill;
return nill;
}
@@ -514,10 +514,10 @@ void DEBAPT::writeApt(const TQStringList &list) {
TQString cmd = "sh -c \"/bin/echo -e '";
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
TQString s = *it;
- s.replace("\""," ");
- s.replace("'"," ");
- s.replace("!"," ");
- s.replace("`"," ");
+ s.tqreplace("\""," ");
+ s.tqreplace("'"," ");
+ s.tqreplace("!"," ");
+ s.tqreplace("`"," ");
cmd += s;
cmd += "\n";
}
diff --git a/kpackage/debAptInterface.h b/kpackage/debAptInterface.h
index 2e23ac5..e7b78ea 100644
--- a/kpackage/debAptInterface.h
+++ b/kpackage/debAptInterface.h
@@ -38,6 +38,7 @@
class DEBAPT: public DEB
{
Q_OBJECT
+ TQ_OBJECT
public:
DEBAPT();
diff --git a/kpackage/debDpkgInterface.h b/kpackage/debDpkgInterface.h
index fe9f422..2f83b79 100644
--- a/kpackage/debDpkgInterface.h
+++ b/kpackage/debDpkgInterface.h
@@ -38,6 +38,7 @@ class cacheObj;
class DEBDPKG: public DEB
{
Q_OBJECT
+ TQ_OBJECT
public:
DEBDPKG();
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 41146fe..8ad5226 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -123,11 +123,11 @@ bool DEB::parseName(const TQString &name, TQString *n, TQString *v)
{
int d1, d2, s1;
- s1 = name.findRev('.');
+ s1 = name.tqfindRev('.');
if (s1 > 0) {
- d2 = name.findRev('-',s1-1);
+ d2 = name.tqfindRev('-',s1-1);
if (d2 > 0) {
- d1 = name.findRev('_',d2-1);
+ d1 = name.tqfindRev('_',d2-1);
if (d1 < 0)
d1 = d2;
*n = name.left(d1);
@@ -155,7 +155,7 @@ void DEB::listPackList(TQPtrList<packageInfo> *pki, const TQString &fname, cache
local = u.isLocalFile();
}
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
TQFile file(STATUS);
@@ -248,7 +248,7 @@ packageInfo *DEB::getIRPackageInfo( const TQString &name)
TQStringList list = kpty->run(s);
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
// kdDebug() << "U=" << *it << "\n";
- if ((*it).find("Package:") >= 0) {
+ if ((*it).tqfind("Package:") >= 0) {
kdDebug() << "found\n";
while (it != list.begin()) {
list.remove(list.begin());
@@ -280,7 +280,7 @@ packageInfo *DEB::getUPackageInfo( const TQString &name)
TQStringList list = kpty->run(s);
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
// kdDebug() << "U=" << *it << "\n";
- if ((*it).find("Package:") >= 0) {
+ if ((*it).tqfind("Package:") >= 0) {
// kdDebug() << "found\n";
while (it != list.begin()) {
list.remove(list.begin());
@@ -316,7 +316,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt)
for ( TQStringList::Iterator it = ln.begin(); it != ln.end(); ++it ) {
loop:
- int col = (*it).find(':');
+ int col = (*it).tqfind(':');
key = ((*it).left(col)).lower();
if (key[0] == ' ') {
key.remove(0,1);
@@ -354,7 +354,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt)
} else if (key == "section") {
a.insert("group", val);
} else if (key == "status") {
- if ((val.find("not-installed") >= 0) || (val.find("config-files") >= 0)) {
+ if ((val.tqfind("not-installed") >= 0) || (val.tqfind("config-files") >= 0)) {
return 0;
}
if (val != "install ok installed" &&
@@ -492,7 +492,7 @@ TQStringList DEB::getUFileList(const TQString &fn)
it != filelist.end(); ++it ) {
// kdDebug() << "F=" << *it << "\n";
if (pt < 0) {
- pt = (*it).findRev(' ');
+ pt = (*it).tqfindRev(' ');
}
(*it) = (*it).mid(pt + 1);
}
@@ -509,14 +509,14 @@ TQStringList DEB::FindFile(const TQString &name, bool)
TQStringList filelist = kpty->run(s);
for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) {
- int p = (*it).find(": ");
+ int p = (*it).tqfind(": ");
if( p !=-1 )
- (*it).replace(p, 2, "\t");
+ (*it).tqreplace(p, 2, "\t");
}
if (filelist.count() == 1) {
TQStringList::Iterator it = filelist.begin();
- if ((*it).find("not found") >= 0) {
+ if ((*it).tqfind("not found") >= 0) {
filelist.remove(it);
}
}
diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h
index 9cc450d..78bfe4c 100644
--- a/kpackage/debInterface.h
+++ b/kpackage/debInterface.h
@@ -54,6 +54,7 @@ class cacheObj;
class DEB: public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
DEB();
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 8b5a6d6..cab1b8a 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -128,7 +128,7 @@ static void insertGroups(TQMap<TQString, TQString> *a, TQString cats)
packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, const TQString &version) {
TQString name( pname);
bool installed = false;
- kpackage->setStatus(i18n("Getting package info"));
+ kpackage->settqStatus(i18n("Getting package info"));
kdDebug() << "Looking at package " << pname << endl;
@@ -145,7 +145,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
cmd += name;
TQStringList list = kpty->run(cmd);
- int last_dir = name.find('/');
+ int last_dir = name.tqfind('/');
if (last_dir != -1) {
a["filename"] = name.mid(last_dir+1);
a["base"] = name.left(last_dir + 1);
@@ -205,7 +205,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
}
a["description"] = desc;
} else {
- kpackage->setStatus(TQString::null);
+ kpackage->settqStatus(TQString());
return 0;
}
@@ -213,7 +213,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
ret->packageState = installed? packageInfo::INSTALLED : packageInfo::AVAILABLE;
ret->fixup();
if (!installed) ret->smerge(typeID);
- kpackage->setStatus(TQString::null);
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -234,7 +234,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
// Run pkg_info on the package name to get the file list.
// The file list is returned on stdout, one per line.
- kpackage->setStatus(i18n("Getting file list"));
+ kpackage->settqStatus(i18n("Getting file list"));
TQStringList ret;
@@ -249,7 +249,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
} else {
if (!p->hasProperty("name")) {
ret.append(i18n("Can't find package name!"));
- kpackage->setStatus(TQString::null);
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
ret = list;
- kpackage->setStatus(TQString::null);
+ kpackage->settqStatus(TQString());
return ret;
}
@@ -335,7 +335,7 @@ TQStringList fbsdInterface::FindFile(const TQString &, bool) {
bool fbsdInterface::parseName(const TQString &name, TQString *n, TQString *v) {
int m1;
- m1 = name.findRev('-');
+ m1 = name.tqfindRev('-');
if (m1 <= 0) return false;
*n = name.left(m1);
*v = name.right(name.length() - m1 - 1);
@@ -347,7 +347,7 @@ void fbsdInterface::addNV(TQMap<TQString, TQString> &d, const TQString &name) {
if (!parseName(name, &n, &v)) {
n = name;
- v = TQString::null;
+ v = TQString();
}
d.insert("name", n);
@@ -394,7 +394,7 @@ void fbsdInterface::listPackages(TQPtrList<packageInfo> *pki) {
listInstalledPackages(pki);
- TQDictIterator<bsdPortsIndexItem> it( ports ); // See QDictIterator
+ TQDictIterator<bsdPortsIndexItem> it( ports ); // See TQDictIterator
for( ; it.current(); ++it ) {
bsdPortsIndexItem *scan = it.current();
if (!scan->installed /*&& scan->bin */) {
@@ -482,7 +482,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
parseItem(it, name, value, INFO_SEPARATOR, list); // Information
parseItem(it, name, value, INFO_SEPARATOR, list); // Path
- int pos = value.findRev('/');
+ int pos = value.tqfindRev('/');
value.truncate(pos);
a["group"] = value;
} else {
@@ -498,7 +498,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
// Open a pipe to a pkg_info process in order to read the comment, name
// and description for the packages.
- kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
+ kpackage->settqStatus(i18n("Querying BSD packages database for installed packages"));
TQString cmd = PKG_INFO_BIN;
cmd += " -acdl ";
@@ -527,8 +527,8 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
// Find the last word on this line (which should be the package name) minus a trailing :.
TQString pkg = name.section(' ',-1);
if (pkg.isEmpty()) {
- KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").arg(value), TRUE);
- kpackage->setStatus(TQString::null);
+ KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
+ kpackage->settqStatus(TQString());
return;
} else {
if (pkg[pkg.length()-1] == ':') {
@@ -577,11 +577,11 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
}
-bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *parent, char *desc, bool binaries, const TQString &dname) : bin(binaries), port(!binaries), installed(false) {
+bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *tqparent, char *desc, bool binaries, const TQString &dname) : bin(binaries), port(!binaries), installed(false) {
fields = TQStringList::split('|', desc, TRUE);
TQString name = fields[NAME];
- bsdPortsIndexItem *port = parent->ports[name];
+ bsdPortsIndexItem *port = tqparent->ports[name];
if (port) {
port->bin = port->bin || bin;
port->port = port->port || port;
@@ -600,7 +600,7 @@ bsdPortsIndexItem::bsdPortsIndexItem(fbsdInterface *parent, char *desc, bool bin
}
-void bsdPortsIndexItem::processFile(fbsdInterface *parent, const TQString &fname, bool binaries, const TQString &dname) {
+void bsdPortsIndexItem::processFile(fbsdInterface *tqparent, const TQString &fname, bool binaries, const TQString &dname) {
// Read the file in to a buffer and null terminate it.
struct stat s;
@@ -627,11 +627,11 @@ void bsdPortsIndexItem::processFile(fbsdInterface *parent, const TQString &fname
// Go through each line and create a new bsdPortsIndexItem.
char *line = strtok(index, "\n");
while (line != 0) {
- bsdPortsIndexItem *i = new bsdPortsIndexItem(parent, line, binaries, dname + "/All");
+ bsdPortsIndexItem *i = new bsdPortsIndexItem(tqparent, line, binaries, dname + "/All");
if (i->fields[NAME].isEmpty()) {
delete i;
} else {
- parent->ports.insert(i->fields[NAME] , i);
+ tqparent->ports.insert(i->fields[NAME] , i);
}
line = strtok(0, "\n");
}
diff --git a/kpackage/fbsdInterface.h b/kpackage/fbsdInterface.h
index 4966711..800ef04 100644
--- a/kpackage/fbsdInterface.h
+++ b/kpackage/fbsdInterface.h
@@ -47,6 +47,7 @@ class bsdPortsIndexItem;
class fbsdInterface : public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
fbsdInterface();
@@ -117,7 +118,7 @@ public:
*
* dname is the name of the base directory of this ports/packages tree.
*/
- bsdPortsIndexItem(fbsdInterface *parent, char *desc, bool binaries, const TQString &dname);
+ bsdPortsIndexItem(fbsdInterface *tqparent, char *desc, bool binaries, const TQString &dname);
/** @short true if this has a binary packages. */
bool bin;
@@ -145,7 +146,7 @@ public:
* binaries should be true if the file is an index for packages, false for ports.
* dname is the base directory.
*/
- static void processFile(fbsdInterface *parent, const TQString &fname, bool binaries, const TQString &dname);
+ static void processFile(fbsdInterface *tqparent, const TQString &fname, bool binaries, const TQString &dname);
private:
unsigned int name_hash;
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 9b51944..651b50f 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -43,17 +43,17 @@
extern pkgInterface *kpinterface[];
extern Opts *opts;
-FindF::FindF(TQWidget *parent)
- : KDialogBase(parent, "find_file", false,
+FindF::FindF(TQWidget *tqparent)
+ : KDialogBase(tqparent, "find_file", false,
i18n("Find File"),
User1 | Close, User1, true,
- KGuiItem(i18n("&Find"),"filefind"))
+ KGuiItem(i18n("&Find"),"filetqfind"))
{
tick = UserIcon("ptick");
TQFrame *page = makeMainWidget();
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(TQ_StrongFocus);
TQVBoxLayout* vtop = new TQVBoxLayout( page, 10, 10, "vtop");
TQFrame *frame1 = new TQGroupBox(i18n("Find Package"), page, "frame1");
@@ -68,7 +68,7 @@ FindF::FindF(TQWidget *parent)
value->setFocus();
TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1);
- valueLabel->setAlignment( AlignRight );
+ valueLabel->tqsetAlignment( AlignRight );
tab = new KListView(frame1, "tab");
connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
@@ -81,7 +81,7 @@ FindF::FindF(TQWidget *parent)
tab->setAllColumnsShowFocus(TRUE);
tab->setSorting(1);
- if (kpackage->management->dirInstPackages->find("apt-file/deb")) {
+ if (kpackage->management->dirInstPackages->tqfind("apt-file/deb")) {
searchAll = new TQCheckBox(i18n("Also search uninstalled packages"), frame1, "searchAll");
} else {
searchAll = new TQCheckBox(i18n("Also search uninstalled packages (apt-file needs to be installed)"), frame1, "searchAll");
@@ -150,11 +150,11 @@ void FindF::doFind(const TQString &str)
cnt++;
for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) {
- if ((*it).find("diversion by") >= 0) {
+ if ((*it).tqfind("diversion by") >= 0) {
new TQListViewItem(tab, "", *it);
}
- int t1 = (*it).find('\t');
+ int t1 = (*it).tqfind('\t');
TQString s1 = (*it).left(t1);
TQString s2 = (*it).right((*it).length()-t1);
s2 = s2.stripWhiteSpace();
@@ -162,7 +162,7 @@ void FindF::doFind(const TQString &str)
TQListViewItem *ql = new TQListViewItem(tab, "", kpinterface[i]->name, kpinterface[i]->head, s1, s2);
TQString tx = s1 + kpinterface[i]->typeID;
- if (kpackage->management->dirInstPackages->find(tx)) {
+ if (kpackage->management->dirInstPackages->tqfind(tx)) {
ql->setPixmap(0,tick);
}
}
@@ -193,7 +193,7 @@ void FindF::search(TQListViewItem *item)
s = s.stripWhiteSpace();
kdDebug() << "searchF=" << s << "\n";
- p = s.find(',');
+ p = s.tqfind(',');
if (p > 0) {
s.truncate(p);
}
diff --git a/kpackage/findf.h b/kpackage/findf.h
index 62b8a0e..cee118d 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -33,7 +33,7 @@
// Standard Headers
#include <stdio.h>
-// Qt Headers
+// TQt Headers
#include <tqdir.h>
#include <tqwidget.h>
#include <tqframe.h>
@@ -52,10 +52,11 @@
class FindF : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FindF ( TQWidget *parent = 0);
+ FindF ( TQWidget *tqparent = 0);
~FindF();
void resizeEvent(TQResizeEvent *);
void dropEvent(TQDropEvent *);
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 448b74c..22eaefc 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -39,7 +39,7 @@
Should we care about the world-file?
- Read masked packages from /usr/portage/profiles/package.mask
+ Read tqmasked packages from /usr/portage/profiles/package.tqmask
Use flags and CFLAGS?
@@ -69,7 +69,7 @@ Gentoo::Gentoo()
archesPossible << "~x86" << "x86";
portageDir="/usr/portage/";
- TQFile f(portageDir+"profiles/package.mask");
+ TQFile f(portageDir+"profiles/package.tqmask");
if (f.open(IO_ReadOnly))
{
TQTextStream stream( &f );
@@ -124,7 +124,7 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQString sline = i18n("Looking for Gentoo packages: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
TQFile f(portageDir+"profiles/categories");
@@ -181,14 +181,14 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
continue;
}
- for (TQStringList::Iterator maskIt = packageMask.begin(); maskIt != packageMask.end(); ++maskIt)
+ for (TQStringList::Iterator tqmaskIt = packageMask.begin(); tqmaskIt != packageMask.end(); ++tqmaskIt)
{
// FIXME Should all be handled, just not implemented yet
- if ((*maskIt).startsWith("<") || (*maskIt).startsWith("=") || (*maskIt).startsWith("~") || (*maskIt).startsWith(">"))
+ if ((*tqmaskIt).startsWith("<") || (*tqmaskIt).startsWith("=") || (*tqmaskIt).startsWith("~") || (*tqmaskIt).startsWith(">"))
continue;
- if (*category+"/"+name == *maskIt)
+ if (*category+"/"+name == *tqmaskIt)
{
- kdDebug() << "Package: " << name << "-" << version << " is masked" << endl;
+ kdDebug() << "Package: " << name << "-" << version << " is tqmasked" << endl;
isMasked = true;
break;
}
diff --git a/kpackage/gentooInterface.h b/kpackage/gentooInterface.h
index 1a99f56..02ddbb4 100644
--- a/kpackage/gentooInterface.h
+++ b/kpackage/gentooInterface.h
@@ -26,6 +26,7 @@
class Gentoo : public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
Gentoo();
diff --git a/kpackage/kio.h b/kpackage/kio.h
index 6e3a414..94bb16b 100644
--- a/kpackage/kio.h
+++ b/kpackage/kio.h
@@ -37,9 +37,10 @@
#include "../config.h"
#include <kio/job.h>
-class Kio: public QObject
+class Kio: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Kio();
@@ -53,9 +54,10 @@ private slots:
void slotIOJobFinished( KIO::Job *job );
};
-class Kiod: public QObject
+class Kiod: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Kiod();
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 29de45f..31a9efc 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -103,7 +103,7 @@ bool KISS::isType(char *buf, const TQString &)
{
if (hasProgram) {
TQString tmp = buf;
- if (tmp.find("perl",0,false) >= 0)
+ if (tmp.tqfind("perl",0,false) >= 0)
return true;
else
return false;
@@ -116,11 +116,11 @@ bool KISS::parseName(const TQString& name, TQString *n, TQString *v)
{
int d1, d2, s1;
- s1 = name.findRev('.');
+ s1 = name.tqfindRev('.');
if (s1 > 0) {
- d2 = name.findRev('-',s1-1);
+ d2 = name.tqfindRev('-',s1-1);
if (d2 > 0) {
- d1 = name.findRev('_',d2-1);
+ d1 = name.tqfindRev('_',d2-1);
if (d1 < 0)
d1 = d2;
*n = name.left(d1);
@@ -143,13 +143,13 @@ void KISS::listInstalledPackages(TQPtrList<packageInfo> *pki)
if (!reader.start(0,FALSE))
return;
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
vb = "" ;
int sc, sp = 0;
- while ((sc = reader.buf.find("\n\n",sp)) >= 0) {
+ while ((sc = reader.buf.tqfind("\n\n",sp)) >= 0) {
if (sc+1 == (signed int)reader.buf.length())
break;
p = collectInfo(reader.buf.mid(sp,sc-sp).ascii());
diff --git a/kpackage/kissInterface.h b/kpackage/kissInterface.h
index 1f411eb..78d594c 100644
--- a/kpackage/kissInterface.h
+++ b/kpackage/kissInterface.h
@@ -43,6 +43,7 @@ class cacheObj;
class KISS: public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
KISS();
diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp
index 23eb15f..bd6062a 100644
--- a/kpackage/kpPty.cpp
+++ b/kpackage/kpPty.cpp
@@ -257,7 +257,7 @@ void kpPty::breakUpCmd(const TQString &cmd)
if ((*it)[0] == '\'') { // Start of quoted string
s = *it;
if ((*it)[lastPt] == '\'') { // Also End of quoted string
- s.replace("'","");
+ s.tqreplace("'","");
(*pty) << s;
quote = FALSE;
} else {
@@ -266,7 +266,7 @@ void kpPty::breakUpCmd(const TQString &cmd)
}
} else if ((*it)[lastPt] == '\'') { // End of quoted string
s += *it;
- s.replace("'","");
+ s.tqreplace("'","");
(*pty) << s;
quote = FALSE;
} else if (quote) {
@@ -345,7 +345,7 @@ void kpPty::finish(int ret)
if (!retList.empty()) {
int p;
l = retList.fromLast();
- if ((p = (*l).find("RESULT=")) >= 0) {
+ if ((p = (*l).tqfind("RESULT=")) >= 0) {
ret = (*l).mid(p+7).toInt(0,10);
retList.remove(l); // Remove return code
} else {
@@ -356,7 +356,7 @@ void kpPty::finish(int ret)
if (!retList.empty()) {
l = retList.begin();
if ( l != retList.end()) {
- if ((*l).find("RESULT=") >= 0) {
+ if ((*l).tqfind("RESULT=") >= 0) {
retList.remove(l); // Remove command at start
}
}
@@ -396,7 +396,7 @@ void kpPty::readLines()
stext.truncate(stext.length()-1);
}
- i = stext.findRev('\r');
+ i = stext.tqfindRev('\r');
if (i > -1) {
stext = stext.mid(i+1);
}
diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h
index bf303f2..327f3ec 100644
--- a/kpackage/kpPty.h
+++ b/kpackage/kpPty.h
@@ -40,6 +40,7 @@
class kpKProcIO: public KProcIO
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -51,8 +52,9 @@ public:
//////////////////////////////////////////////////////////////////////////////
-class kpPty: public QObject
+class kpPty: public TQObject
{ Q_OBJECT
+ TQ_OBJECT
public:
kpPty();
~kpPty();
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index aab6ab8..c91f1a2 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -38,13 +38,13 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) :
- TQTextEdit(parent,name)
+kpTerm::kpTerm(kpPty *pt, TQWidget * tqparent, const char * name ) :
+ TQTextEdit(tqparent,name)
{
pty = pt;
setFont(KGlobalSettings::fixedFont());
// setMinimumWidth(fontMetrics().maxWidth()*80 +
- // minimumSizeHint().width());
+ // tqminimumSizeHint().width());
setWordWrap(NoWrap);
setReadOnly(TRUE);
}
@@ -111,13 +111,13 @@ void kpTerm::textIn(const TQString &stext, bool bNewLine)
TQRegExp chrs("[\\010\\012\\015]");
TQString del = "\010";
// kdDebug() << "Tin=[" << stext << "]\n";
- if (stext.find(chrs) < 0) {
+ if (stext.tqfind(chrs) < 0) {
insert( stext );
} else {
int p;
int op = 0;
- while ((p = stext.find(chrs,op)) >= 0) {
+ while ((p = stext.tqfind(chrs,op)) >= 0) {
if (p != op) {
insert( stext.mid(op, p-op));
}
@@ -169,8 +169,8 @@ void kpTerm::slotResult(TQStringList &rlist, int ret)
// Dialog window for password prompt
//
//////////////////////////////////////////////////////////////////////////////
-kpRun::kpRun( TQWidget *parent)
- : KDialogBase(parent, "kpRun", true, TQString::null,
+kpRun::kpRun( TQWidget *tqparent)
+ : KDialogBase(tqparent, "kpRun", true, TQString(),
Cancel, Cancel, true )
{
TQVBox *page = makeVBoxMainWidget();
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index 00ac57a..5bebd02 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -42,12 +42,13 @@
#include <kpPty.h>
//////////////////////////////////////////////////////////////////////////////
-class kpTerm: public QTextEdit
+class kpTerm: public TQTextEdit
{
Q_OBJECT
+ TQ_OBJECT
public:
- kpTerm(kpPty *pt, TQWidget * parent=0, const char * name=0);
+ kpTerm(kpPty *pt, TQWidget * tqparent=0, const char * name=0);
void keyPressEvent ( TQKeyEvent * e );
bool run(const TQString &cmd, TQStringList &r);
void doConnect();
@@ -72,9 +73,10 @@ signals:
class kpRun: public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- kpRun(TQWidget *parent = 0);
+ kpRun(TQWidget *tqparent = 0);
bool run(TQString cmd, TQString title);
void addText(const TQStringList &ret);
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index c5dd2eb..670b4b6 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -93,93 +93,93 @@ KPKG::KPKG(KConfig *_config)
void KPKG::setupMenu()
{
- pack_open = KStdAction::open(kpackage, TQT_SLOT(fileOpen()),
+ pack_open = KStdAction::open(TQT_TQOBJECT(kpackage), TQT_SLOT(fileOpen()),
actionCollection());
- recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)),
+ recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)),
actionCollection());
recent->loadEntries( config );
- pack_find = new KAction( i18n("Find &Package..."), "find",
- KStdAccel::shortcut(KStdAccel::Find), kpackage,
- TQT_SLOT(find()), actionCollection(), "pack_find");
+ pack_tqfind = new KAction( i18n("Find &Package..."), "tqfind",
+ KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(kpackage),
+ TQT_SLOT(tqfind()), actionCollection(), "pack_tqfind");
- pack_findf = new KAction( i18n("Find &File..."), "filefind",
- 0, kpackage,
+ pack_findf = new KAction( i18n("Find &File..."), "filetqfind",
+ 0, TQT_TQOBJECT(kpackage),
TQT_SLOT(findf()), actionCollection(), "pack_findf");
kpack_reload = new KAction( i18n("&Reload"), "reload",
- KStdAccel::shortcut(KStdAccel::Reload), kpackage,
+ KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(kpackage),
TQT_SLOT(reload()), actionCollection(), "kpack_reload");
- (void) KStdAction::quit(kpackage, TQT_SLOT(fileQuit()),
+ (void) KStdAction::quit(TQT_TQOBJECT(kpackage), TQT_SLOT(fileQuit()),
actionCollection());
- pack_prev = KStdAction::back(kpackage->management->treeList, TQT_SLOT(previous()),
+ pack_prev = KStdAction::back(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(previous()),
actionCollection(),"pack_prev");
- pack_next = KStdAction::forward(kpackage->management->treeList, TQT_SLOT(next()),
+ pack_next = KStdAction::forward(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(next()),
actionCollection(),"pack_next");
(void) (new KAction( i18n("&Expand Tree"), "ftout",
- 0, kpackage,
+ 0, TQT_TQOBJECT(kpackage),
TQT_SLOT(expandTree()), actionCollection(), "kpack_expand"));
(void) (new KAction( i18n("&Collapse Tree"), "ftin",
- 0, kpackage,
+ 0, TQT_TQOBJECT(kpackage),
TQT_SLOT(collapseTree()), actionCollection(), "kpack_collapse"));
- (void) (new KAction( i18n("Clear &Marked"), TQString::null,
- 0, kpackage,
+ (void) (new KAction( i18n("Clear &Marked"), TQString(),
+ 0, TQT_TQOBJECT(kpackage),
TQT_SLOT(clearMarked()), actionCollection(), "kpack_clear"));
- (void) (new KAction( i18n("Mark &All"), TQString::null,
- 0, kpackage,
+ (void) (new KAction( i18n("Mark &All"), TQString(),
+ 0, TQT_TQOBJECT(kpackage),
TQT_SLOT(markAll()), actionCollection(), "kpack_markall"));
- pack_install = new KAction( i18n("&Install"), TQString::null,
- 0, kpackage->management,
+ pack_install = new KAction( i18n("&Install"), TQString(),
+ 0, TQT_TQOBJECT(kpackage->management),
TQT_SLOT(installSingleClicked()), actionCollection(), "install_single");
pack_install->setEnabled(false);
kpackage->management->setInstallAction(pack_install);
- pack_uninstall = new KAction( i18n("&Uninstall"), TQString::null,
- 0, kpackage->management,
+ pack_uninstall = new KAction( i18n("&Uninstall"), TQString(),
+ 0, TQT_TQOBJECT(kpackage->management),
TQT_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single");
pack_uninstall->setEnabled(false);
kpackage->management->setUninstallAction(pack_uninstall);
- (void) (new KAction( i18n("&Install Marked"), TQString::null,
- 0, kpackage->management,
+ (void) (new KAction( i18n("&Install Marked"), TQString(),
+ 0, TQT_TQOBJECT(kpackage->management),
TQT_SLOT(installMultClicked()), actionCollection(), "install_marked"));
- (void) (new KAction( i18n("&Uninstall Marked"), TQString::null,
- 0, kpackage->management,
+ (void) (new KAction( i18n("&Uninstall Marked"), TQString(),
+ 0, TQT_TQOBJECT(kpackage->management),
TQT_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked"));
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars( this, TQT_SLOT(configureToolBars()),
+ KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()),
actionCollection());
- KStdAction::saveOptions( this, TQT_SLOT(saveSettings()), actionCollection());
+ KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT(saveSettings()), actionCollection());
KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) (new KAction( i18n("Configure &KPackage..."), "configure",
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(setOptions()), actionCollection(), "kpack_options"));
- (void) (new KAction( i18n("Clear Package &Folder Cache"), TQString::null,
- 0, this,
+ (void) (new KAction( i18n("Clear Package &Folder Cache"), TQString(),
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(clearDCache()), actionCollection(), "clear_dcache"));
- (void) (new KAction( i18n("Clear &Package Cache"), TQString::null,
- 0, this,
+ (void) (new KAction( i18n("Clear &Package Cache"), TQString(),
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(clearPCache()), actionCollection(), "clear_pcache"));
int i;
@@ -196,7 +196,7 @@ void KPKG::setupMenu()
void KPKG::disableMenu()
{
pack_open->setEnabled(false);
- pack_find->setEnabled(false);
+ pack_tqfind->setEnabled(false);
pack_findf->setEnabled(false);
kpack_reload->setEnabled(false);
recent->setEnabled(false);
@@ -205,7 +205,7 @@ void KPKG::disableMenu()
void KPKG::enableMenu()
{
pack_open->setEnabled(true);
- pack_find->setEnabled(true);
+ pack_tqfind->setEnabled(true);
pack_findf->setEnabled(true);
kpack_reload->setEnabled(true);
recent->setEnabled(true);
@@ -302,8 +302,8 @@ bool KPKG::queryClose() {
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *parent)
- : TQWidget(parent)
+KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *tqparent)
+ : TQWidget(tqparent)
{
// Save copy of config
@@ -485,9 +485,9 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname)
}
}
fclose(file);
- KpMsgE(i18n("Unknown package type: %1").arg(fname),TRUE);
+ KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE);
} else {
- KpMsgE(i18n("File not found: %1").arg(fname),TRUE);
+ KpMsgE(i18n("File not found: %1").tqarg(fname),TRUE);
}
return 0;
@@ -585,7 +585,7 @@ TQString KPACKAGE::getFileName(const KURL & url, TQString &cacheName )
TQString fname = "";
if ( !url.isValid() ) {
- KpMsgE(i18n("Malformed URL: %1").arg(url.url()),TRUE);
+ KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE);
} else {
// Just a usual file ?
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
} else {
save_url = url;
- setStatus(i18n("Starting KIO"));
+ settqStatus(i18n("Starting KIO"));
Kio kio;
if (kio.download(url, cf)) {
- setStatus(i18n("KIO finished"));
+ settqStatus(i18n("KIO finished"));
TQFileInfo fi(cf);
if (!(fi.exists() && fi.size() > 0)) {
unlink(TQFile::encodeName(cf));
@@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
return cf;
}
} else {
- setStatus(i18n("KIO failed"));
+ settqStatus(i18n("KIO failed"));
return "";
}
}
@@ -672,7 +672,7 @@ void KPACKAGE::fileOpenUrl(){
bool ok;
- TQString url = KInputDialog::getText( TQString::null,
+ TQString url = KInputDialog::getText( TQString(),
i18n( "Open location:" ), save_url.prettyURL(), &ok, this );
if ( ok )
@@ -682,7 +682,7 @@ void KPACKAGE::fileOpenUrl(){
}
}
-void KPACKAGE::find(){
+void KPACKAGE::tqfind(){
if (srchdialog)
srchdialog->show();
else
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
openNetFiles(list.toStringList());
}
-void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar
+void KPACKAGE::settqStatus(const TQString &s) // set the text in the status bar
{
status->setText(s);
kapp->processEvents(); // refresh the screen
}
-TQString KPACKAGE::getStatus() // get the text in the status bar
+TQString KPACKAGE::gettqStatus() // get the text in the status bar
{
if(status)
return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 7fda9bb..dcb55fa 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -51,7 +51,7 @@ class Options;
class pkgInterface;
class managementWidget;
class KAccel;
-class QDropEevnt;
+class TQDropEevnt;
class KRecentFilesAction;
class KAction;
class kpRun;
@@ -60,13 +60,14 @@ class kpRun;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-class KPACKAGE : public QWidget
+class KPACKAGE : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
///////////// METHODS ------------------------------------------------------
public:
- KPACKAGE(KConfig *_config, TQWidget *parent);
+ KPACKAGE(KConfig *_config, TQWidget *tqparent);
// Constructor
~KPACKAGE();
@@ -76,13 +77,13 @@ public:
OPEN_READONLY = 2,
OPEN_INSERT = 4 };
- void setStatus(const TQString &s);
+ void settqStatus(const TQString &s);
// this sets the status bar's string to s
void setPercent(int x);
// this set the status bar's progress to x
- TQString getStatus();
+ TQString gettqStatus();
// this gets the current status string on the status bar
// void setMode(int newmode, pkgInterface *type, int refresh);
@@ -158,7 +159,7 @@ public slots:
void fileOpenUrl();
// menu item FIle->OpenUrl
- void find();
+ void tqfind();
// search for package
void findf();
@@ -222,13 +223,14 @@ private:
class KPKG : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
enum { Tback = 1,
Tforward = 2,
Tfileopen = 3,
Tftout = 4,
Tftin = 5,
- Tfind = 6,
+ Ttqfind = 6,
Tfindf = 7,
Treload = 8
};
@@ -276,7 +278,7 @@ private:
TQStrList recent_files;
KAction *pack_open;
- KAction *pack_find;
+ KAction *pack_tqfind;
KAction *pack_findf;
KAction *kpack_reload;
KAction *pack_prev;
diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp
index 5b7d76c..cf9014e 100644
--- a/kpackage/kplview.cpp
+++ b/kpackage/kplview.cpp
@@ -43,8 +43,8 @@
#define MPOS 1
-KpTreeList::KpTreeList( TQWidget *parent ) :
-KListView (parent)
+KpTreeList::KpTreeList( TQWidget *tqparent ) :
+KListView (tqparent)
{
markPkg = 0;
setShowSortIndicator(true);
@@ -97,7 +97,7 @@ void KpTreeList::contentsMousePressEvent ( TQMouseEvent * e )
{
bool markUpdate = false;
- if (e->button() == LeftButton) {
+ if (e->button() == Qt::LeftButton) {
if (inMark(e->x())) {
TQPoint vp = contentsToViewport(e->pos());
KpTreeListItem *i = ( KpTreeListItem *)itemAt( vp );
@@ -430,7 +430,7 @@ bool KpTreeList::searchChild(KpTreeListItem *it)
TQString s = it->text(0);
// kdDebug() << "s='" << s << "'='" << searchStr << "\n";
if ((it->childCount() == 0) && (it->info->display(treeType)) &&
- (searchSubstr ? s.contains(searchStr,FALSE) : s == searchStr)) {
+ (searchSubstr ? s.tqcontains(searchStr,FALSE) : s == searchStr)) {
searchResult = it;
return TRUE;
}
@@ -458,7 +458,7 @@ KpTreeListItem *KpTreeList::changePack(KpTreeListItem *searchResult, bool push)
TQListViewItem *i;
i = searchResult;
- while ((i = i->parent())) {
+ while ((i = i->tqparent())) {
i->setOpen(TRUE);
}
if (push) {
@@ -510,7 +510,7 @@ void KpTreeList::previous()
void KpTreeList::stackRemove(KpTreeListItem *pack)
{
- int n = stack.find(pack);
+ int n = stack.tqfind(pack);
if (n >= 0) {
if (n == 0) {
kpkg->disablePrevious();
@@ -571,14 +571,14 @@ void KpTreeList::readTreeConfig()
//////////////////////////////////////////////////////////////////////////////
-KpTreeListItem::KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo,
+KpTreeListItem::KpTreeListItem( TQListViewItem *tqparent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1, TQString label2 ,
TQString label3 , TQString label4 ,
TQString label5 , TQString label6 ,
TQString label7 , TQString label8
-) : TQListViewItem(parent, label1, label2, label3, label4, label5,
+) : TQListViewItem(tqparent, label1, label2, label3, label4, label5,
label6, label7, label8)
{
info = pinfo;
@@ -588,13 +588,13 @@ KpTreeListItem::KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo,
setPixmap(1,info->interface->markUnInst);
}
-KpTreeListItem::KpTreeListItem( KListView *parent, packageInfo* pinfo,
+KpTreeListItem::KpTreeListItem( KListView *tqparent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1, TQString label2 ,
TQString label3 , TQString label4 ,
TQString label5 , TQString label6 ,
TQString label7 , TQString label8
-) : TQListViewItem(parent, label1, label2, label3, label4, label5,
+) : TQListViewItem(tqparent, label1, label2, label3, label4, label5,
label6, label7, label8)
{
info = pinfo;
@@ -650,11 +650,11 @@ int KpTreeListItem::compare( TQListViewItem *i, int col, bool ascending ) const
TQString k, j;
j = key( col, ascending );
- j = j.replace(' ','0');
+ j = j.tqreplace(' ','0');
j = j.rightJustify(6,'0');
k = i->key( col, ascending );
- k = k.replace(' ','0');
+ k = k.tqreplace(' ','0');
k = k.rightJustify(6,'0');
// kdDebug() << k <<"=" << j << "\n";
diff --git a/kpackage/kplview.h b/kpackage/kplview.h
index 1bbd08f..3f8a7a7 100644
--- a/kpackage/kplview.h
+++ b/kpackage/kplview.h
@@ -31,7 +31,7 @@
#include "../config.h"
// Standard Headers
-// Qt Headers
+// TQt Headers
#include <tqframe.h>
#include <tqpushbutton.h>
#include <tqptrlist.h>
@@ -50,9 +50,10 @@ class packageDisplayWidget;
class KpTreeList: public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- KpTreeList ( TQWidget * parent = 0);
+ KpTreeList ( TQWidget * tqparent = 0);
void contentsMousePressEvent ( TQMouseEvent * e );
@@ -152,10 +153,10 @@ signals:
};
////////////////////////////////////////////////////////////////////////
-class KpTreeListItem : public QListViewItem
+class KpTreeListItem : public TQListViewItem
{
public:
- KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo,
+ KpTreeListItem( TQListViewItem *tqparent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1 = 0, TQString label2 = 0,
TQString label3 = 0, TQString label4 = 0,
@@ -163,7 +164,7 @@ public:
TQString label7 = 0, TQString label8 = 0);
- KpTreeListItem( KListView *parent, packageInfo* pinfo,
+ KpTreeListItem( KListView *tqparent, packageInfo* pinfo,
const TQPixmap& thePixmap,
TQString label1 = 0, TQString label2 = 0,
TQString label3 = 0, TQString label4 = 0,
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index e8dbcb6..2d30f5b 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -52,8 +52,8 @@
extern Opts *opts;
-KpListViewSearchLine::KpListViewSearchLine(TQWidget *parent, KpTreeList *listView)
- :KListViewSearchLine(parent, listView)
+KpListViewSearchLine::KpListViewSearchLine(TQWidget *tqparent, KpTreeList *listView)
+ :KListViewSearchLine(tqparent, listView)
{
list = listView;
}
@@ -72,8 +72,8 @@ void KpListViewSearchLine::updateSearch(const TQString &s)
// constructor -- initialise variables
-managementWidget::managementWidget(TQWidget *parent)
- : TQFrame(parent)
+managementWidget::managementWidget(TQWidget *tqparent)
+ : TQFrame(tqparent)
{
install_action = 0;
uninstall_action = 0;
@@ -114,7 +114,7 @@ void managementWidget::setupWidgets()
TQTab t;
top = new TQBoxLayout(this,TQBoxLayout::TopToBottom);
- vPan = new TQSplitter(TQSplitter::Horizontal, this);
+ vPan = new TQSplitter(Qt::Horizontal, this);
top->addWidget(vPan);
// the left panel
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
connect(linstButton,TQT_SIGNAL(clicked()),
TQT_SLOT(installMultClicked()));
- leftbox->addLayout(lbuttons,0); // top level layout as child
+ leftbox->addLayout(lbuttons,0); // top level tqlayout as child
- // Setup the `buttons' layout
+ // Setup the `buttons' tqlayout
lbuttons->addWidget(linstButton,1,AlignBottom);
lbuttons->addWidget(luinstButton,1,AlignBottom);
lbuttons->addStretch(1);
@@ -200,11 +200,11 @@ void managementWidget::setupWidgets()
TQT_SLOT(installSingleClicked()));
- // Setup the `right panel' layout
+ // Setup the `right panel' tqlayout
rightbox->addWidget(packageDisplay,10);
- rightbox->addLayout(rbuttons,0); // top level layout as child
+ rightbox->addLayout(rbuttons,0); // top level tqlayout as child
- // Setup the `buttons' layout
+ // Setup the `buttons' tqlayout
rbuttons->addWidget(instButton,1);
rbuttons->addWidget(uinstButton,1);
rbuttons->addStretch(1);
@@ -289,7 +289,7 @@ void managementWidget::setupInstButton()
void managementWidget::arrangeWidgets()
{
- // this is done automatically by the layout managers
+ // this is done automatically by the tqlayout managers
}
void managementWidget::tabChanged(int tab)
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
packageInfo *i;
int n = 0;
- kpackage->setStatus(i18n("Building package tree"));
+ kpackage->settqStatus(i18n("Building package tree"));
kpackage->setPercent(0);
treeList->setSorting(-1);
@@ -378,7 +378,7 @@ void managementWidget::rebuildListTree()
treeList->setSorting(0);
kpackage->setPercent(100); // set the progress
- kpackage->setStatus("");
+ kpackage->settqStatus("");
checkMarked();
}
@@ -623,7 +623,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
if (install) {
if (pnew) {
if (pnew->packageState != packageInfo::BAD_INSTALL) {
- ptree = dirInstPackages->find(pkgId); // remove installed entry
+ ptree = dirInstPackages->tqfind(pkgId); // remove installed entry
dirInstPackages->remove(pkgId);
if (ptree) {
if (ptree->getItem()) {
@@ -632,7 +632,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
}
}
- ptree = dirUninstPackages->find(pkgId); // remove uninstalled entry
+ ptree = dirUninstPackages->tqfind(pkgId); // remove uninstalled entry
if (ptree) {
ptree->packageState = packageInfo::HIDDEN;
if (ptree->getItem()) {
@@ -665,7 +665,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
} else {
kdDebug() << "DEL=" << name << endl;
}
- packageInfo *pb = dirUninstPackages->find(pkgId);
+ packageInfo *pb = dirUninstPackages->tqfind(pkgId);
if (pb) { // available package matching the one just uninstalled
pb->packageState = packageInfo::NEW;
q = pb->place(treeList,TRUE);
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index 6e65372..56fcfb5 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -42,7 +42,7 @@
#include "../config.h"
// Standard Headers
-// Qt Headers
+// TQt Headers
#include <tqframe.h>
#include <tqpushbutton.h>
#include <tqptrlist.h>
@@ -71,28 +71,30 @@ class managementWidget;
class KpListViewSearchLine : public KListViewSearchLine
{
Q_OBJECT
+ TQ_OBJECT
public:
- KpListViewSearchLine(TQWidget *parent, KpTreeList *listView);
+ KpListViewSearchLine(TQWidget *tqparent, KpTreeList *listView);
~KpListViewSearchLine();
- void updateSearch(const TQString &s = TQString::null);
+ void updateSearch(const TQString &s = TQString());
private:
KpTreeList *list;
};
-class managementWidget : public QFrame
+class managementWidget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
///////////// METHODS ------------------------------------------------------
public:
- managementWidget(TQWidget *parent);
+ managementWidget(TQWidget *tqparent);
// Constructor
~managementWidget();
@@ -179,10 +181,10 @@ private:
// This widget displays the package info / file-list
TQBoxLayout *top, *leftbox, *rightbox, *lbuttons, *rbuttons;
- // These are the geometry managers
+ // These are the tqgeometry managers
TQFrame *leftpanel, *rightpanel;
- // frame to put QBox in
+ // frame to put TQBox in
TQTabWidget *ltab;
// tab between various treelist displays
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 8d86470..16cf61f 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -53,8 +53,8 @@
extern Opts *opts;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-Options::Options(TQWidget *parent)
- : KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, parent, 0, false){
+Options::Options(TQWidget *tqparent)
+ : KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, tqparent, 0, false){
fRemote = false;
@@ -96,8 +96,8 @@ Options::Options(TQWidget *parent)
} else {
msgStr = kpinterface[i]->name;
msgStr = i18n("%1: %2 not found")
- .arg(kpinterface[i]->name)
- .arg(kpinterface[i]->errExe);
+ .tqarg(kpinterface[i]->name)
+ .tqarg(kpinterface[i]->errExe);
}
packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box");
packageHandle[i] = new TQCheckBox(i18n("Enable"), packageBox[i]);
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
vp->addWidget(pcache[2]);
TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
- cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+ cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
cachedir = new KURLRequester("", cd, "cachedir");
}
@@ -395,7 +395,7 @@ void Opts::readSettings(const TQString &initHost)
// kdDebug() << "readSettings: " << initHost << "\n";
hostList = config->readListEntry("Host_list");
- if (!initHost.isEmpty() && !hostList.contains(initHost)) {
+ if (!initHost.isEmpty() && !hostList.tqcontains(initHost)) {
hostList.prepend(initHost);
config->writeEntry("Host_list", hostList);
}
diff --git a/kpackage/options.h b/kpackage/options.h
index 96da8e6..037bb55 100644
--- a/kpackage/options.h
+++ b/kpackage/options.h
@@ -34,7 +34,7 @@
// Standard Headers
#include <stdio.h>
-// Qt Headers
+// TQt Headers
#include <tqdir.h>
#include <tqwidget.h>
#include <tqfiledialog.h>
@@ -62,10 +62,11 @@ class TQRadioButton;
class Options : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- Options ( TQWidget *parent = 0);
+ Options ( TQWidget *tqparent = 0);
~Options();
void restore();
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index 6eabc9d..707959f 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -31,7 +31,7 @@
// Standard headers
#include <stdio.h>
-// Qt headers
+// TQt headers
#include <tqapplication.h>
#include <tqfileinfo.h>
@@ -55,8 +55,8 @@
extern Opts *opts;
// constructor
-packageDisplayWidget::packageDisplayWidget(TQWidget *parent)
- : TQTabWidget(parent)
+packageDisplayWidget::packageDisplayWidget(TQWidget *tqparent)
+ : TQTabWidget(tqparent)
{
// Initially we're not dealing with any package
package=NULL;
@@ -186,7 +186,7 @@ void packageDisplayWidget::changePackage(packageInfo *p)
if (package && package != p) {
- if (!package->getItem() && !kpackage->management->allPackages->find(package)) {
+ if (!package->getItem() && !kpackage->management->allPackages->tqfind(package)) {
delete package;
package = 0;
}
@@ -203,7 +203,7 @@ void packageDisplayWidget::changePackage(packageInfo *p)
if (np) {
TQMap<TQString, TQString>::Iterator it; // update info entries in p
for ( it = np->info.begin(); it != np->info.end(); ++it ) {
- package->info.replace(it.key(),it.data());
+ package->info.tqreplace(it.key(),it.data());
}
package->interface = np->interface;
delete np;
@@ -249,7 +249,7 @@ void packageDisplayWidget::updateChangeLog()
lines = package->interface->getChangeLog(package);
- changeLog->setTextFormat(Qt::LogText);
+ changeLog->setTextFormat(TQt::LogText);
changeLog->hide();
if (lines.count() > 1) {
changeLog->setText("");
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
TQStringList errorfiles;
// set the status
- kpackage->setStatus(i18n("Updating File List"));
+ kpackage->settqStatus(i18n("Updating File List"));
// clear the file list
fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
errorfiles = package->interface->verify(package, files);
}
- kpackage->setStatus(i18n("Updating File List"));
+ kpackage->settqStatus(i18n("Updating File List"));
uint c=0, p=0;
uint step = (files.count() / 100) + 1;
@@ -363,7 +363,7 @@ void packageDisplayWidget::updateFileList()
kpackage->setPercent(100);
}
- kpFileList::kpFileList(TQWidget* parent, packageDisplayWidget* parent2) : KListView(parent)
+ kpFileList::kpFileList(TQWidget* tqparent, packageDisplayWidget* tqparent2) : KListView(tqparent)
{
hide();
addColumn("name");
@@ -372,9 +372,9 @@ void packageDisplayWidget::updateFileList()
this, TQT_SLOT( openContext(KListView *, TQListViewItem *, const TQPoint &)) );
FileListMenu = new KPopupMenu();
- openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQT_SLOT(__openBindingWith()));
+ openwith = FileListMenu->insertItem(i18n("&Open With..."),tqparent2,TQT_SLOT(__openBindingWith()));
- pkDisplay = parent2;
+ pkDisplay = tqparent2;
}
diff --git a/kpackage/packageDisplay.h b/kpackage/packageDisplay.h
index e504dec..e761820 100644
--- a/kpackage/packageDisplay.h
+++ b/kpackage/packageDisplay.h
@@ -5,7 +5,7 @@
// package.
//
// Package information will be displayed using (another) sub-widget
-// that is inherited from a QTableView.
+// that is inherited from a TQTableView.
//
// The file list will be displayed using a tree list.
//
@@ -41,7 +41,7 @@
#define PACKAGEDISPLAY_H
#include "../config.h"
-// Qt Headers
+// TQt Headers
#include <tqframe.h>
#include <tqtabbar.h>
#include <tqtabwidget.h>
@@ -57,10 +57,11 @@ class packageDisplayWidget;
class kpFileList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- kpFileList(TQWidget* parent, packageDisplayWidget* parent2);
+ kpFileList(TQWidget* tqparent, packageDisplayWidget* tqparent2);
TQString item2Path(TQListViewItem *it);
@@ -82,14 +83,15 @@ public slots:
};
-class packageDisplayWidget : public QTabWidget
+class packageDisplayWidget : public TQTabWidget
{
Q_OBJECT
+ TQ_OBJECT
friend class kpFileList;
///////////// METHODS ------------------------------------------------------
public:
- packageDisplayWidget(TQWidget *parent=0);
+ packageDisplayWidget(TQWidget *tqparent=0);
// Constructor
~packageDisplayWidget();
diff --git a/kpackage/packageInfo.cpp b/kpackage/packageInfo.cpp
index 6ea0ffa..e9d1e14 100644
--- a/kpackage/packageInfo.cpp
+++ b/kpackage/packageInfo.cpp
@@ -66,7 +66,7 @@ packageInfo::packageInfo(TQMap<TQString, TQString> _info, pkgInterface *type)
item = NULL;
packageState = UNSET;
updated = FALSE;
- url = TQString::null;
+ url = TQString();
}
// Another constructor, for a packge with a url
@@ -86,7 +86,7 @@ TQString packageInfo::getProperty(const TQString &property)
{
TQString result = info[property];
if (result.isEmpty()) {
- return TQString::null;
+ return TQString();
}
return result;
}
@@ -209,7 +209,7 @@ int packageInfo::getDigElement(const TQString &str, int *pos)
int val = 0;
if ((s[0] >= '0') && (s[0] <= '9')) {
- nf = s.find(ndig);
+ nf = s.tqfind(ndig);
if (nf >= 0) {
val = s.left(nf).toInt();
} else {
@@ -230,11 +230,11 @@ TQString packageInfo::getNdigElement(const TQString &string, int *pos)
TQString s(string);
if (*pos < 0)
- return TQString::null;
+ return TQString();
s = s.mid(*pos);
if (s.isEmpty())
- return TQString::null;
+ return TQString();
TQString str;
int nf = 0;
@@ -242,7 +242,7 @@ TQString packageInfo::getNdigElement(const TQString &string, int *pos)
TQRegExp idig("[0-9]");
if ((s[0] < '0') || (s[0] > '9') ) {
- nf = s.find(idig);
+ nf = s.tqfind(idig);
if (nf < 0)
nf = s.length();
str = s.left(nf);
@@ -305,7 +305,7 @@ int packageInfo::pnewer(const TQString &s, const TQString &sp)
static bool split(TQString orig, char seperator, TQString &first, TQString &second)
{
- int pos = orig.find(seperator);
+ int pos = orig.tqfind(seperator);
if (pos > 0) {
first = orig.mid(0,pos);
second = orig.mid(pos+1);
@@ -387,11 +387,11 @@ bool packageInfo::display(int treeType)
}
//////////////////////////////////////////////////////////////////////
-// Place the package in a QListView
+// Place the package in a TQListView
KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
{
- KpTreeListItem *search = tree->firstChild(), *parent=NULL, *child=NULL;
+ KpTreeListItem *search = tree->firstChild(), *tqparent=NULL, *child=NULL;
TQString qtmp, tmp;
bool doit = FALSE;
@@ -410,23 +410,23 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
KpTreeListItem *group;
if( search && (group=findGroup(*it, search)) ) {
- parent = group;
- parent->setOpen(TRUE);
+ tqparent = group;
+ tqparent->setOpen(TRUE);
search = group->firstChild();
} else {
- if (parent) {
- group = new KpTreeListItem(parent, 0, interface->folder, *it);
+ if (tqparent) {
+ group = new KpTreeListItem(tqparent, 0, interface->folder, *it);
} else {
group = new KpTreeListItem(tree, 0, interface->folder, *it);
}
- parent = group;
- parent->setOpen(TRUE);
+ tqparent = group;
+ tqparent->setOpen(TRUE);
search = NULL;
}
cnt++;
}
- tmp = *info.find("name");
+ tmp = *info.tqfind("name");
if(item)
delete item;
@@ -480,13 +480,13 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
if (child) {
item = new KpTreeListItem(child, this, pic, tmp, "", summary, sz, ver, over);
} else {
- item = new KpTreeListItem(parent, this, pic, tmp, "", summary, sz, ver, over);
+ item = new KpTreeListItem(tqparent, this, pic, tmp, "", summary, sz, ver, over);
}
if (insertI) {
- parent->setOpen(TRUE);
+ tqparent->setOpen(TRUE);
} else {
- parent->setOpen(FALSE);
+ tqparent->setOpen(FALSE);
}
return item;
@@ -497,7 +497,7 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI)
//////////////////////////////////////////////////////////////////////
-// Get the QListViewItem
+// Get the TQListViewItem
KpTreeListItem *packageInfo::getItem()
{
return item;
@@ -509,7 +509,7 @@ bool packageInfo::smerge( const TQString &exp) {
TQDict<packageInfo> *dirInfoPackages = kpackage->management->dirInfoPackages;
TQString pname = getProperty("name") + exp;
- packageInfo *pi = dirInfoPackages->find(pname);
+ packageInfo *pi = dirInfoPackages->tqfind(pname);
if (pi) {
TQMap<TQString,TQString>::Iterator it;
@@ -554,7 +554,7 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp,
bool shouldUpdate = TRUE;
bool hidden = FALSE;
- packageInfo *pi = dirInstPackages->find(pname);
+ packageInfo *pi = dirInstPackages->tqfind(pname);
if (pi) { // installed version exists
if ((pi->packageState != BAD_INSTALL)
&& (pi->packageState != NOLIST)) {
@@ -564,14 +564,14 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp,
}
}
- packageInfo *pu = dirUninstPackages->find(pname);
+ packageInfo *pu = dirUninstPackages->tqfind(pname);
if (pu) { // available version exists
if ((pu->packageState != BAD_INSTALL)
&& (pu->packageState != NOLIST)) {
if (newer(pu) >= 0) {
shouldUpdate = FALSE;
} else if (!installed) { // If older available package exists, remove it
- dirUninstPackages->remove(*(pu->info.find("name")));
+ dirUninstPackages->remove(*(pu->info.tqfind("name")));
pki->remove(pu);
}
}
@@ -606,7 +606,7 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp,
TQString group = getProperty("group");
if (group == "NEW") {
if (pi->hasProperty("group")) {
- info.replace("group",
+ info.tqreplace("group",
pi->getProperty("group") );
}
}
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 2e1aca7..c613a23 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -37,8 +37,8 @@
#include "managementWidget.h"
packagePropertiesWidget::packagePropertiesWidget
- (TQWidget *parent)
- : KTextBrowser(parent)
+ (TQWidget *tqparent)
+ : KTextBrowser(tqparent)
{
TQDict<TQString> trl(53);
TQStringList pList();
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
// hide();
package=NULL;
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
setBackgroundColor(cg.base());
initTranslate();
}
@@ -126,7 +126,7 @@ void packagePropertiesWidget::changePackage(packageInfo *p)
// append other properties to end
TQMap<TQString, TQString>::Iterator it;
for ( it = p->info.begin(); it != p->info.end(); ++it ) {
- if (!trl.find(it.key())) {
+ if (!trl.tqfind(it.key())) {
if (!it.data().isEmpty())
cList.append(it.key());
}
@@ -154,11 +154,11 @@ void packagePropertiesWidget::changePackage(packageInfo *p)
stmp += "</td><td>";
TQString f = p->getProperty(*s);
if (*s == "maintainer" || *s == "packager") {
- f.replace(TQRegExp("<"),"&lt;");
- f.replace(TQRegExp(">"),"&gt;");
+ f.tqreplace(TQRegExp("<"),"&lt;");
+ f.tqreplace(TQRegExp(">"),"&gt;");
}
if (*s == "filename") {
- int p = f.findRev("/");
+ int p = f.tqfindRev("/");
if (p >= 0) {
f.insert(p+1,"\n");
};
@@ -211,7 +211,7 @@ void packagePropertiesWidget::dor(const TQString &f) {
}
void packagePropertiesWidget::delement(const TQString &f) {
- int n = f.find("(");
+ int n = f.tqfind("(");
if (n < 0) {
n = f.length();
}
@@ -222,9 +222,9 @@ void packagePropertiesWidget::delement(const TQString &f) {
TQString us = uf + package->interface->typeID;
bool inst = false, uninst = false;
- if (kpackage->management->dirInstPackages->find(us)) {
+ if (kpackage->management->dirInstPackages->tqfind(us)) {
inst = true;
- } else if (kpackage->management->dirUninstPackages->find(us)) {
+ } else if (kpackage->management->dirUninstPackages->tqfind(us)) {
uninst = true;
}
@@ -242,7 +242,7 @@ void packagePropertiesWidget::delement(const TQString &f) {
if (uninst)
stmp += "</i>";
if (n < (signed)f.length())
- stmp += f.mid(n).replace(TQRegExp("<"),"&lt;");
+ stmp += f.mid(n).tqreplace(TQRegExp("<"),"&lt;");
}
void packagePropertiesWidget::setSource(const TQString &name) {
@@ -262,12 +262,12 @@ void packagePropertiesWidget::setSource(const TQString &name) {
}
TQString ind = s + package->interface->typeID;
- packageInfo *p = kpackage->management->dirInstPackages->find(ind);
+ packageInfo *p = kpackage->management->dirInstPackages->tqfind(ind);
if (p) {
kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0);
} else {
kdDebug() << "nfound=" << ind << endl;
- p = kpackage->management->dirUninstPackages->find(ind);
+ p = kpackage->management->dirUninstPackages->tqfind(ind);
if (p) {
kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0);
} else {
diff --git a/kpackage/packageProperties.h b/kpackage/packageProperties.h
index e5532f3..aca2103 100644
--- a/kpackage/packageProperties.h
+++ b/kpackage/packageProperties.h
@@ -35,7 +35,7 @@
// Standard Headers
-// Qt Headers
+// TQt Headers
#include <tqpainter.h>
#include <tqstringlist.h>
#include <tqregexp.h>
@@ -52,10 +52,11 @@ class packageInfo;
class packagePropertiesWidget : public KTextBrowser
{
Q_OBJECT
+ TQ_OBJECT
///////////// METHODS ------------------------------------------------------
public:
- packagePropertiesWidget(TQWidget *parent=0);
+ packagePropertiesWidget(TQWidget *tqparent=0);
// constructor
~packagePropertiesWidget();
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index 7382ff5..b59901d 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
packageInfo *p;
TQString sline( queryMsg + fname );
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
@@ -156,21 +156,21 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
if (d.exists()) {
if ( d.isReadable() ) {
TQString pn;
- const QFileInfoList *list = d.entryInfoList();
- QFileInfoListIterator it( *list ); // create list iterator
+ const TQFileInfoList *list = d.entryInfoList();
+ TQFileInfoListIterator it( *list ); // create list iterator
TQFileInfo *fi; // pointer for traversing
while ( (fi=it.current()) ) { // for each entry...
if ( fi->isDir() ) {
// entry is a subdir
- if ( fi->fileName() != TQString::fromLatin1(".") &&
- fi->fileName() != TQString::fromLatin1("..") )
+ if ( fi->fileName() != TQString::tqfromLatin1(".") &&
+ fi->fileName() != TQString::tqfromLatin1("..") )
{
- // not current dir and not parent dir
+ // not current dir and not tqparent dir
// -> recursive call:
listDir( pki, dir + "/" + fi->fileName(), dir + "/" + fi->fileName(), subdirs );
} else {
- // current dir or parent dir
+ // current dir or tqparent dir
// -> notihng to do
;
}
@@ -197,7 +197,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
}
} else {
// directory is not readable
- kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").arg(d.absPath() ) << endl;
+ kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
}
} else {
TQFile f(fname);
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
unlink(TQFile::encodeName(tmpf));
if (kpkg)
- kpackage->setStatus(i18n("Starting Kio"));
+ kpackage->settqStatus(i18n("Starting Kio"));
Kio kio;
if (kio.download(url, tmpf)) {
if (kpkg)
- kpackage->setStatus(i18n("Kio finished"));
+ kpackage->settqStatus(i18n("Kio finished"));
TQFileInfo f(tmpf);
if (!(f.exists() && f.size() > 0)) {
unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
}
} else {
if (kpkg)
- kpackage->setStatus(i18n("Kio failed"));
+ kpackage->settqStatus(i18n("Kio failed"));
return "";
}
} else {
@@ -287,7 +287,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
if ((res = cacheObj::newDCache(url, cp->cacheFile, tmpDir))) {
if (res < 0)
- return TQString::null;
+ return TQString();
Kiod kiod;
if (kiod.listDir(url,tmpDir, cp->subdirs)) {
@@ -297,9 +297,9 @@ TQString pkgInterface::getDir(cacheObj *cp) {
cl.write();
return tmpDir;
} else {
- KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
+ KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
unlink(tmpDir.ascii());
- return TQString::null;
+ return TQString();
}
} else {
return tmpDir;
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
uint step = (files.count() / 100) + 1;
- kpackage->setStatus(i18n("Verifying"));
+ kpackage->settqStatus(i18n("Verifying"));
kpackage->setPercent(0);
for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/pkgInterface.h b/kpackage/pkgInterface.h
index 839ada2..0346f81 100644
--- a/kpackage/pkgInterface.h
+++ b/kpackage/pkgInterface.h
@@ -66,9 +66,10 @@ public:
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-class pkgInterface: public QObject
+class pkgInterface: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
pkgInterface();
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index bf3975e..c1be713 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -47,8 +47,8 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *parent, const TQString &caption)
- : KDialog(parent,0,TRUE)
+pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *tqparent, const TQString &caption)
+ : KDialog(tqparent,0,TRUE)
{
// setFrameStyle(TQFrame::Raised | TQFrame::Panel);
@@ -102,38 +102,38 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
- // Do the layout
- vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
- vlayout->addWidget(title,0);
+ // Do the tqlayout
+ vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+ vtqlayout->addWidget(title,0);
{
- hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
+ htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
{
- layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
+ tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
packages = new KListView(this);
- layout->addWidget(packages,20);
+ tqlayout->addWidget(packages,20);
packages->addColumn(i18n("PACKAGES"),200);
connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
this, TQT_SLOT(slotSearch( TQListViewItem * )));
- layout->addStretch(1);
+ tqlayout->addStretch(1);
for (i = 0; i < bnumber; i++) {
- layout->addWidget(Boxs[i],1);
+ tqlayout->addWidget(Boxs[i],1);
}
- layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+ tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
- TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
- slayout->addStretch(1);
- slayout->addWidget(Keep, 1);
- slayout->addStretch(1);
+ TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
+ stqlayout->addStretch(1);
+ stqlayout->addWidget(Keep, 1);
+ stqlayout->addStretch(1);
- layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+ tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
- layout->addLayout(buttons);
+ tqlayout->addLayout(buttons);
buttons->addWidget(installButton,2);
buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
}
{
term = new kpTerm(kpty,this);
- hlayout->addWidget(term, 1000);
+ htqlayout->addWidget(term, 1000);
}
}
resize(800, 400);
@@ -188,9 +188,9 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
plist.append(*it);
TQString dirIndex = *it + pkgInt->typeID;
if (installer) {
- pk = kpackage->management->dirUninstPackages->find(dirIndex);
+ pk = kpackage->management->dirUninstPackages->tqfind(dirIndex);
} else {
- pk = kpackage->management->dirInstPackages->find(dirIndex);
+ pk = kpackage->management->dirInstPackages->tqfind(dirIndex);
}
if (pk) {
// kdDebug() << "FF=" << dirIndex << "\n";
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
}
}
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
title->setText(s);
for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
@@ -302,7 +302,7 @@ void pkgOptions::cancelButtonClicked()
}
void pkgOptions::closeEvent ( TQCloseEvent * e ) {
- kdDebug() << "pkgOptions::QCloseEvent\n";
+ kdDebug() << "pkgOptions::TQCloseEvent\n";
terminate();
TQWidget::closeEvent (e);
@@ -342,8 +342,8 @@ void pkgOptions::getKeep()
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *parent):
- pkgOptions(pkg, parent, i18n("Install"))
+pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *tqparent):
+ pkgOptions(pkg, tqparent, i18n("Install"))
{
insType = i18n("Install");
installer = TRUE;
@@ -357,8 +357,8 @@ TQString pkgOptionsI::doPackages(int installFlags, TQPtrList<packageInfo> *p, bo
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *parent):
- pkgOptions(pkg, parent, i18n("Uninstall"))
+pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *tqparent):
+ pkgOptions(pkg, tqparent, i18n("Uninstall"))
{
insType = i18n("Uninstall");
installer = FALSE;
diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h
index 1cf8d94..02a830f 100644
--- a/kpackage/pkgOptions.h
+++ b/kpackage/pkgOptions.h
@@ -32,7 +32,7 @@
#define PKGINSTALL_OPTIONS
#include "../config.h"
-// Qt headers
+// TQt headers
#include <tqframe.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
@@ -52,8 +52,9 @@ class KPushButton;
class pkgOptions : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- pkgOptions( pkgInterface *pki, TQWidget *parent=0, const TQString &caption=TQString::null);
+ pkgOptions( pkgInterface *pki, TQWidget *tqparent=0, const TQString &caption=TQString());
~pkgOptions();
bool setup(TQPtrList<packageInfo> *pl, const TQString &type);
@@ -103,8 +104,8 @@ signals:
void finished(int refresh);
protected:
- // The layout managers
- TQBoxLayout *layout, *hlayout, *vlayout;
+ // The tqlayout managers
+ TQBoxLayout *tqlayout, *htqlayout, *vtqlayout;
// Sub widgets
TQPushButton *installButton;
@@ -133,8 +134,9 @@ protected:
class pkgOptionsI: public pkgOptions
{
Q_OBJECT
+ TQ_OBJECT
public:
- pkgOptionsI(pkgInterface *pkg, TQWidget *parent = 0);
+ pkgOptionsI(pkgInterface *pkg, TQWidget *tqparent = 0);
TQString doPackages(int installFlags, TQPtrList<packageInfo> *p, bool &test);
};
@@ -143,8 +145,9 @@ public:
class pkgOptionsU: public pkgOptions
{
Q_OBJECT
+ TQ_OBJECT
public:
- pkgOptionsU(pkgInterface *pkg, TQWidget *parent = 0);
+ pkgOptionsU(pkgInterface *pkg, TQWidget *tqparent = 0);
TQString doPackages(int installFlags, TQPtrList<packageInfo> *p, bool &test);
};
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 568e651..da3bc98 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -32,11 +32,11 @@
#include <tqlabel.h>
#include <kdebug.h>
-Modal::Modal(TQString msg, TQWidget *parent, const char * name )
- : KDialog( parent, name, TRUE )
+Modal::Modal(TQString msg, TQWidget *tqparent, const char * name )
+ : KDialog( tqparent, name, TRUE )
{
TQLabel *line1 = new TQLabel(msg,this);
- line1->setAlignment(AlignCenter);
+ line1->tqsetAlignment(AlignCenter);
line1->setAutoResize(true);
}
@@ -136,13 +136,13 @@ int procbuf::start (TQString msg, bool errorDlg,
<< " exit=" << proc->exitStatus() << endl;
if (timed) {
kdDebug() << "timeout..................\n";
- KpMsg("Error",i18n("Timeout: %1").arg(timeMsg), TRUE);
+ KpMsg("Error",i18n("Timeout: %1").tqarg(timeMsg), TRUE);
delete proc; proc = 0;
return 0;
} else {
if (!proc->normalExit() || proc->exitStatus()) {
if (errorDlg) {
- KpMsg("Error",i18n("Kprocess error:%1").arg(buf), TRUE);
+ KpMsg("Error",i18n("Kprocess error:%1").tqarg(buf), TRUE);
}
delete proc; proc = 0;
return 0;
diff --git a/kpackage/procbuf.h b/kpackage/procbuf.h
index be5bad3..b7dfcac 100644
--- a/kpackage/procbuf.h
+++ b/kpackage/procbuf.h
@@ -37,14 +37,16 @@
class Modal : public KDialog {
Q_OBJECT
+ TQ_OBJECT
public:
- Modal(TQString msg, TQWidget *parent, const char * name );
+ Modal(TQString msg, TQWidget *tqparent, const char * name );
void terminate();
};
-class procbuf: public QObject
+class procbuf: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
procbuf();
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 8096a78..b9d6e5c 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -93,7 +93,7 @@ RPM::RPM():pkgInterface()
infoList.append("buildtime/%{BUILDTIME:date}");
infoList.append("size/%{SIZE}");
infoList.append("provides/[%{PROVIDES}, ]");
- infoList.append("requires/[%{REQUIRENAME} (%{REQUIREFLAGS:depflags} %{REQUIREVERSION}), ]");
+ infoList.append("requires/[%{RETQUIRENAME} (%{RETQUIREFLAGS:depflags} %{RETQUIREVERSION}), ]");
infoList.append("description/[%{DESCRIPTION}]");
hasProgram = ifExe("rpm");
@@ -118,13 +118,13 @@ bool RPM::parseName(const TQString &name, TQString *n, TQString *v)
{
int d1, d2, s1, s2;
- s2 = name.findRev('.');
+ s2 = name.tqfindRev('.');
if (s2 > 0) {
- s1 = name.findRev('.',s2-1);
+ s1 = name.tqfindRev('.',s2-1);
if (s1 > 0) {
- d2 = name.findRev('-',s1-1);
+ d2 = name.tqfindRev('-',s1-1);
if (d2 > 0) {
- d1 = name.findRev('-',d2-1);
+ d1 = name.tqfindRev('-',d2-1);
if (d1 < 0)
d1 = d2;
*n = name.left(d1);
@@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQString cmd = "rpm -q -a";
cmd += packageQuery();
- kpackage->setStatus(i18n("Querying RPM package list"));
+ kpackage->settqStatus(i18n("Querying RPM package list"));
kpackage->setPercent(0);
TQStringList list = kpty->run(cmd);
- kpackage->setStatus(i18n("Processing RPM package list"));
+ kpackage->settqStatus(i18n("Processing RPM package list"));
// kdDebug() << "P=" << list.count() <<"\n";
kpackage->setPercent(50);
@@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
}
list.clear();
- kpackage->setStatus(i18n("DEB APT"));
+ kpackage->settqStatus(i18n("DEB APT"));
kpackage->setPercent(100);
}
@@ -231,8 +231,8 @@ packageInfo* RPM::collectInfo(TQStringList &ln) {
} else if (name == "buildtime") {
a.insert("build-time", value);
} else if (name == "requires") {
- value = value.replace(TQRegExp("\\(\\)"),"");
- value = value.replace(TQRegExp("\\( \\)"),"");
+ value = value.tqreplace(TQRegExp("\\(\\)"),"");
+ value = value.tqreplace(TQRegExp("\\( \\)"),"");
value = value.stripWhiteSpace();
if (value.endsWith(",")) {
value.truncate(value.length()-1);
@@ -242,18 +242,18 @@ packageInfo* RPM::collectInfo(TQStringList &ln) {
int s = 0, n;
TQString t;
- if (!(*a.find("name")).isEmpty()) {
- while ((n = value.find(",",s)) > 0) {
+ if (!(*a.tqfind("name")).isEmpty()) {
+ while ((n = value.tqfind(",",s)) > 0) {
t = value.mid(s,n-s);
t = t.stripWhiteSpace();
if (!t.isEmpty())
- provides.insert(t,new TQString(*a.find("name")));
+ provides.insert(t,new TQString(*a.tqfind("name")));
s = n+1;
}
t = value.mid(s);
t = t.stripWhiteSpace();
if (!t.isEmpty())
- provides.insert(t,new TQString(*a.find("name")));
+ provides.insert(t,new TQString(*a.tqfind("name")));
value = value.stripWhiteSpace();
if (value.endsWith(",")) {
@@ -464,7 +464,7 @@ void RPM::collectDepends(packageInfo *p, const TQString &name, int src)
if (list.count() > 0) {
TQStringList::Iterator it = list.begin();
- int pt = (*it).find(":");
+ int pt = (*it).tqfind(":");
if (pt > 0) {
TQString s = (*it).mid(pt+1);
if (!s.isEmpty()) {
@@ -602,10 +602,10 @@ TQStringList RPM::FindFile(const TQString &name, bool) {
list.clear();
} else {
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
- int p = (*it).find(" ");
- int nm = (*it).find(name,p);
+ int p = (*it).tqfind(" ");
+ int nm = (*it).tqfind(name,p);
if (nm >= 0) {
- (*it).replace(p, 1, "\t");
+ (*it).tqreplace(p, 1, "\t");
retlist.append(*it);
}
}
@@ -617,7 +617,7 @@ TQStringList RPM::FindFile(const TQString &name, bool) {
//////////////////////////////////////////////////////////////////////////////
TQString RPM::quotePath( const TQString &path) {
TQString s = path;
- s = s.replace(" ","\\ ");
+ s = s.tqreplace(" ","\\ ");
return ( "'" + s + "'" );
}
diff --git a/kpackage/rpmInterface.h b/kpackage/rpmInterface.h
index a7db803..e551ca3 100644
--- a/kpackage/rpmInterface.h
+++ b/kpackage/rpmInterface.h
@@ -41,6 +41,7 @@ class cacheObj;
class RPM : public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
RPM();
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 2f774bf..8477473 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -35,15 +35,15 @@
#include <tqframe.h>
#include <tqgroupbox.h>
-Search::Search(TQWidget *parent, const char * name)
- : KDialogBase(parent, name, false,
+Search::Search(TQWidget *tqparent, const char * name)
+ : KDialogBase(tqparent, name, false,
i18n("Find Package"),
User1 | Close, User1, true,
- KGuiItem( i18n("&Find"), "find"))
+ KGuiItem( i18n("&Find"), "tqfind"))
{
TQFrame *page = makeMainWidget();
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(TQ_StrongFocus);
TQVBoxLayout* vtop = new TQVBoxLayout( page, 10, 10, "vtop");
@@ -54,7 +54,7 @@ Search::Search(TQWidget *parent, const char * name)
value = new TQLineEdit( frame1, "v");
vf->addWidget(value,0);
value->setFocus();
- value->setFixedHeight(value->sizeHint().height());
+ value->setFixedHeight(value->tqsizeHint().height());
value->setMinimumWidth(250);
connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &)));
@@ -64,13 +64,13 @@ Search::Search(TQWidget *parent, const char * name)
substr = new TQCheckBox(i18n("Sub string"), frame1, "substr");
substr->setChecked(TRUE);
hc->addWidget(substr,1,AlignLeft);
- substr->setFixedSize(substr->sizeHint());
+ substr->setFixedSize(substr->tqsizeHint());
hc->addStretch(1);
wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
wrap->setChecked(TRUE);
hc->addWidget(wrap,1,AlignRight);
- wrap->setFixedSize(wrap->sizeHint());
+ wrap->setFixedSize(wrap->tqsizeHint());
enableButton( User1, false );
@@ -104,7 +104,7 @@ void Search::ok_slot()
}
if (pkg == 0)
KpMsg(i18n("Note"),
- i18n("%1 was not found.").arg(to_find),TRUE);
+ i18n("%1 was not found.").tqarg(to_find),TRUE);
}
void Search::done_slot()
diff --git a/kpackage/search.h b/kpackage/search.h
index 28f5195..8d289c0 100644
--- a/kpackage/search.h
+++ b/kpackage/search.h
@@ -46,10 +46,11 @@ class TQCheckBox;
class Search : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- Search ( TQWidget *parent = 0, const char * name=0);
+ Search ( TQWidget *tqparent = 0, const char * name=0);
~Search();
private:
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index 6e6d993..49e7c64 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -148,7 +148,7 @@ bool SLACK::isType(char *buf, const TQString &)
bool SLACK::parseName(const TQString &name, TQString *n, TQString *v)
{
int s1;
- s1 = name.findRev('.');
+ s1 = name.tqfindRev('.');
if (s1 > 0) {
*n = name.left(s1);
v = new TQString("");
@@ -206,11 +206,11 @@ void SLACK::listInstalledPackages(TQPtrList<packageInfo> *pki)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
- const QFileInfoList *list = d.entryInfoList();
+ const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
- QFileInfoListIterator it( *list ); // create list iterator
+ TQFileInfoListIterator it( *list ); // create list iterator
TQFileInfo *fi; // pointer for traversing
kpackage->setPercent(0);
@@ -224,7 +224,7 @@ void SLACK::listInstalledPackages(TQPtrList<packageInfo> *pki)
fn = dr + fi->fileName();
file = fopen(TQFile::encodeName(fn),"r");
if (file) {
- vb = TQString::null;
+ vb = TQString();
while (fgets(linebuf,sizeof(linebuf),file)) {
if (strcmp(linebuf,FILELIST)) {
vb += linebuf;
@@ -260,7 +260,7 @@ void SLACK::listPackList(TQPtrList<packageInfo> *pki, const TQString &s, cacheO
TQString sline = i18n("Querying SLACK package list: ");
sline += cp->location;
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
kpackage->setPercent(0);
np = 0;
@@ -318,7 +318,7 @@ packageInfo *SLACK::getPackageInfo(char mode, const TQString &name, const TQStri
fn = DIR + name;
file = fopen(TQFile::encodeName(fn),"r");
if (file) {
- vb = TQString::null;
+ vb = TQString();
while (fgets(linebuf,sizeof(linebuf),file)) {
if (strcmp(linebuf,FILELIST)) {
vb += linebuf;
@@ -432,15 +432,15 @@ packageInfo *SLACK::collectInfo(const char *_inp, int insState)
} else if (!strcmp("package location",str)) {
TQString sl = xstr;
if (insState != INSTALLED) {
- int sls = sl.findRev("/");
+ int sls = sl.tqfindRev("/");
if (sls >= 0) {
TQRegExp num("[0-9][0-9]*");
- int slf = sl.find(num,sls);
+ int slf = sl.tqfind(num,sls);
if (slf >= 0) {
sls++;
TQString gt = sl.mid(sls,slf-sls);
- if (trl->find(gt)) {
- gt = *trl->find(gt);
+ if (trl->tqfind(gt)) {
+ gt = *trl->tqfind(gt);
}
a.insert("group",gt);
}
@@ -619,11 +619,11 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
TQDir d(DIR);
if (d.exists()) {
TQString sline = i18n("Querying SLACK package list: ");
- kpackage->setStatus(sline);
+ kpackage->settqStatus(sline);
- const QFileInfoList *list = d.entryInfoList();
+ const TQFileInfoList *list = d.entryInfoList();
int count = list->count();
- QFileInfoListIterator it( *list ); // create list iterator
+ TQFileInfoListIterator it( *list ); // create list iterator
TQFileInfo *fi; // pointer for traversing
kpackage->setPercent(0);
@@ -643,7 +643,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
}
}
while (fgets(linebuf,sizeof(linebuf),file)) {
- if (TQString::fromLocal8Bit(linebuf).find(name) != -1) {
+ if (TQString(TQString::fromLocal8Bit(linebuf)).tqfind(name) != -1) {
st = "/";
st += linebuf;
st.truncate(st.length() -1);
diff --git a/kpackage/slackInterface.h b/kpackage/slackInterface.h
index f6ed3fc..7f754f0 100644
--- a/kpackage/slackInterface.h
+++ b/kpackage/slackInterface.h
@@ -41,6 +41,7 @@ class cacheObj;
class SLACK: public pkgInterface
{
Q_OBJECT
+ TQ_OBJECT
public:
SLACK();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 60e43e4..ba33f06 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -40,9 +40,9 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-apanel::apanel( TQWidget *parent,
+apanel::apanel( TQWidget *tqparent,
const char * name )
- : TQWidget( parent, name )
+ : TQWidget( tqparent, name )
{
puse = 0;
@@ -99,8 +99,8 @@ void apanel::clear()
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-dpanel::dpanel( TQWidget *parent, const char * name )
- : TQWidget( parent, name )
+dpanel::dpanel( TQWidget *tqparent, const char * name )
+ : TQWidget( tqparent, name )
{
puse = 0;
psubdirs = 0;
@@ -120,8 +120,8 @@ dpanel::dpanel( TQWidget *parent, const char * name )
}
dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
- TQWidget *parent, const char * name )
- : TQWidget( parent, name )
+ TQWidget *tqparent, const char * name )
+ : TQWidget( tqparent, name )
{
filter = Pfilter;
puse = 0;
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
if (bsubdirs) {
psubdirs = new TQCheckBox(i18n("Subfolders"),this);
- psubdirs->setFixedSize(psubdirs->sizeHint());
+ psubdirs->setFixedSize(psubdirs->tqsizeHint());
pack->addWidget(psubdirs,0);
}
@@ -272,9 +272,9 @@ void updateLoc::doBase(const TQString & bmsg)
if (haveBase) {
fbase = new TQGroupBox(bmsg, this);
fbase->setColumnLayout(0, Qt::Vertical );
- fbase->layout()->setSpacing( KDialog::spacingHint() );
- fbase->layout()->setMargin( KDialog::marginHint() );
- vbase = new TQVBoxLayout(fbase->layout());
+ fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
+ fbase->tqlayout()->setMargin( KDialog::marginHint() );
+ vbase = new TQVBoxLayout(fbase->tqlayout());
vf->addWidget(fbase,1);
base = new dpanel(fbase);
vbase->addWidget(base,0);
@@ -410,10 +410,10 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons
TQGroupBox *floc = new TQGroupBox(lmsg, this);
floc->setColumnLayout(0, Qt::Vertical );
- floc->layout()->setSpacing( KDialog::spacingHint() );
- floc->layout()->setMargin( KDialog::marginHint() );
+ floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+ floc->tqlayout()->setMargin( KDialog::marginHint() );
vf->addWidget(floc,1);
- TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+ TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
for (int i = 0; i < numLines; i++) {
dp[i] = new dpanel(base, filter, subdirs, floc);
@@ -452,7 +452,7 @@ void pdUpdateLoc::applyS(LcacheObj *slist)
if (dp[i]->getUse()) {
t = dp[i]->getText();
if (!t.isEmpty()) {
- CObj = new cacheObj(haveBase ? base->getText() : TQString::null,
+ CObj = new cacheObj(haveBase ? base->getText() : TQString(),
t, cn + pn.setNum(i), "", dp[i]->getSubdirs());
slist->append(CObj);
// printf("T=%s\n",t.data());
@@ -547,10 +547,10 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const
for (int i = 0; i < numLines; i++) {
TQGroupBox *floc = new TQGroupBox(*kcIt, this);
floc->setColumnLayout(0, Qt::Vertical );
- floc->layout()->setSpacing( KDialog::spacingHint() );
- floc->layout()->setMargin( KDialog::marginHint() );
+ floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+ floc->tqlayout()->setMargin( KDialog::marginHint() );
vf->addWidget(floc,1);
- TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+ TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
combo[i] = new KComboBox( true, floc);
KCompletion *comp = combo[i]->completionObject();
diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h
index d9879f3..c8ae61d 100644
--- a/kpackage/updateLoc.h
+++ b/kpackage/updateLoc.h
@@ -34,7 +34,7 @@
// Standard Headers
#include <stdio.h>
-// Qt Headers
+// TQt Headers
#include <tqdir.h>
#include <tqwidget.h>
#include <tqframe.h>
@@ -57,14 +57,15 @@ class KComboBox;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-class dpanel : public QWidget
+class dpanel : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- dpanel(TQWidget *parent, const char * name = 0);
+ dpanel(TQWidget *tqparent, const char * name = 0);
dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs,
- TQWidget *parent, const char * name = 0);
+ TQWidget *tqparent, const char * name = 0);
~dpanel();
@@ -94,12 +95,13 @@ private:
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-class apanel : public QWidget
+class apanel : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- apanel( TQWidget *parent, const char * name = 0 );
+ apanel( TQWidget *tqparent, const char * name = 0 );
~apanel();
@@ -123,9 +125,10 @@ private:
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-class updateLoc : public QWidget
+class updateLoc : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -158,6 +161,7 @@ public:
class aUpdateLoc : public updateLoc
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -197,6 +201,7 @@ private:
class pdUpdateLoc : public updateLoc
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -238,6 +243,7 @@ private:
class cUpdateLoc : public updateLoc
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -279,6 +285,7 @@ private:
class Locations : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
Locations( const TQString &msg);
diff --git a/ksysv/ActionList.cpp b/ksysv/ActionList.cpp
index 21caa93..a5eba09 100644
--- a/ksysv/ActionList.cpp
+++ b/ksysv/ActionList.cpp
@@ -147,8 +147,8 @@ void CompoundAction::undo()
// ActionList //
//////////////////////////////////
-ActionList::ActionList (TQObject* parent, const char* name)
- : TQObject(parent, name)
+ActionList::ActionList (TQObject* tqparent, const char* name)
+ : TQObject(tqparent, name)
{
setAutoDelete(false);
}
diff --git a/ksysv/ActionList.h b/ksysv/ActionList.h
index 5f5a047..2b4549e 100644
--- a/ksysv/ActionList.h
+++ b/ksysv/ActionList.h
@@ -106,9 +106,10 @@ private:
class ActionList : public TQObject, private TQPtrStack<KSVAction>
{
Q_OBJECT
+ TQ_OBJECT
public:
- ActionList (TQObject* parent, const char* name);
+ ActionList (TQObject* tqparent, const char* name);
virtual ~ActionList ();
KSVAction* top () const { return TQPtrStack<KSVAction>::top(); }
diff --git a/ksysv/Data.cpp b/ksysv/Data.cpp
index 5b8221c..dd5ecba 100644
--- a/ksysv/Data.cpp
+++ b/ksysv/Data.cpp
@@ -12,7 +12,7 @@ KSVData::KSVData ()
}
KSVData::KSVData (const TQString& file, const TQString& path,
- const TQString& label, Q_INT8 nr)
+ const TQString& label, TQ_INT8 nr)
: mPath (path),
mLabel (label), mFilename (file)
{
@@ -129,7 +129,7 @@ void KSVData::setRunlevel (const TQString& s)
mRunlevel = s;
}
-void KSVData::setNumber (Q_INT8 nr)
+void KSVData::setNumber (TQ_INT8 nr)
{
if (!mNrChanged && mNr != nr)
{
diff --git a/ksysv/Data.h b/ksysv/Data.h
index a942b12..3ce788a 100644
--- a/ksysv/Data.h
+++ b/ksysv/Data.h
@@ -9,7 +9,7 @@ class KSVData
{
public:
KSVData ();
- KSVData (const TQString& file, const TQString& path, const TQString& label, Q_INT8 nr);
+ KSVData (const TQString& file, const TQString& path, const TQString& label, TQ_INT8 nr);
KSVData (const KSVData& rhs);
inline ~KSVData () {}
@@ -23,14 +23,14 @@ public:
inline const TQString& label () const { return mLabel; }
inline const TQString& filename () const { return mFilename; }
inline const TQString& runlevel () const { return mRunlevel; }
- inline Q_INT8 number () const { return mNr; }
+ inline TQ_INT8 number () const { return mNr; }
inline const TQString& numberString () const { return mNumberString; }
inline const TQString& oldLabel () const { return mOldLabel; }
inline const TQString& oldFilename () const { return mOldFilename; }
inline const TQString& originalRunlevel () const { return mOldFilename; }
- inline Q_INT8 oldNumber () const { return mOldNr; }
+ inline TQ_INT8 oldNumber () const { return mOldNr; }
inline bool numberChanged () const { return mNrChanged; }
inline bool labelChanged () const { return mLabelChanged; }
@@ -47,7 +47,7 @@ public:
void setFilename (const TQString&);
void setRunlevel (const TQString&);
void setOriginalRunlevel (const TQString&);
- void setNumber (Q_INT8 nr);
+ void setNumber (TQ_INT8 nr);
void setChanged (bool);
private:
@@ -58,11 +58,11 @@ private:
TQString mLabel;
TQString mFilename;
TQString mRunlevel;
- Q_INT8 mNr;
+ TQ_INT8 mNr;
TQString mOldLabel;
TQString mOldFilename;
TQString mOriginalRunlevel;
- Q_INT8 mOldNr;
+ TQ_INT8 mOldNr;
bool mNrChanged;
bool mLabelChanged;
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 434d051..3535317 100644
--- a/ksysv/IOCore.cpp
+++ b/ksysv/IOCore.cpp
@@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ
if (!dir.remove(info.fileName(), FALSE))
{
rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>")
- .arg(info.fileName())
- .arg(dir.path())
- .arg(strerror(errno)));
+ .tqarg(info.fileName())
+ .tqarg(dir.path())
+ .tqarg(strerror(errno)));
plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n")
- .arg(info.fileName())
- .arg(dir.path())
- .arg(strerror(errno)));
+ .tqarg(info.fileName())
+ .tqarg(dir.path())
+ .tqarg(strerror(errno)));
}
else
{
rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>")
- .arg(info.fileName())
- .arg(dir.path());
+ .tqarg(info.fileName())
+ .tqarg(dir.path());
plain = i18n("removed %1 from %2\n")
- .arg(info.fileName())
- .arg(dir.path());
+ .tqarg(info.fileName())
+ .tqarg(dir.path());
}
}
@@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr)
void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
TQString& rich, TQString& plain)
{
- const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label());
- const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel);
+ const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label());
+ const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel);
const TQString symbol = symPath + symName;
TQString target = data.filename();
@@ -92,27 +92,27 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start,
if (symlink(target.local8Bit(), symbol.local8Bit()) == 0)
{
- rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath);
- plain = i18n("created %1 in %2\n").arg(symName).arg(symPath);
+ rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath);
+ plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath);
}
else
{
rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>")
- .arg(symName)
- .arg(symPath)
- .arg(strerror(errno));
+ .tqarg(symName)
+ .tqarg(symPath)
+ .tqarg(strerror(errno));
plain = i18n("FAILED to create %1 in %2: \"%3\"\n")
- .arg(symName)
- .arg(symPath)
- .arg(strerror(errno));
+ .tqarg(symName)
+ .tqarg(symPath)
+ .tqarg(strerror(errno));
}
}
TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
{
if (TQDir::isRelativePath(from) || TQDir::isRelativePath(to))
- return TQString::null;
+ return TQString();
int pos = 0;
const int f_length = from.length();
@@ -121,7 +121,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
while (pos > -1)
{
const int old = pos + 1;
- const int res = from.find('/', old);
+ const int res = from.tqfind('/', old);
int length = 0;
@@ -143,7 +143,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to)
while (pos > -1)
{
const int old = pos + 1;
- const int res = to.find('/', old);
+ const int res = to.tqfind('/', old);
int length = 0;
@@ -184,7 +184,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
if (magic != "KSysV")
return false;
- Q_INT32 version = 0;
+ TQ_INT32 version = 0;
s >> version;
if (version != 3)
@@ -201,13 +201,13 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s,
s >> rlMagic;
s >> section;
- if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i))
+ if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i))
return false;
if (section != "START")
return false;
- Q_INT32 numberOfItems;
+ TQ_INT32 numberOfItems;
s >> numberOfItems;
KSVData data;
@@ -236,18 +236,18 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
KSVDragList** start,
KSVDragList** stop)
{
- Q_INT32 version = 3;
+ TQ_INT32 version = 3;
s << TQCString("KSysV")
<< version
- << TQDateTime::currentDateTime(); // save date
+ << TQDateTime::tqcurrentDateTime(); // save date
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- Q_INT32 numberOfItems = start[i]->childCount();
+ TQ_INT32 numberOfItems = start[i]->childCount();
- s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i)
- << TQString::fromLatin1 ("START")
+ s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i)
+ << TQString::tqfromLatin1 ("START")
<< numberOfItems;
for (TQListViewItemIterator it (start[i]);
@@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
numberOfItems = stop[i]->childCount();
- s << TQString::fromLatin1 ("STOP")
+ s << TQString::tqfromLatin1 ("STOP")
<< numberOfItems;
for (TQListViewItemIterator it (stop[i]);
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 75572b9..b7a7617 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -72,8 +72,8 @@
#include "ActionList.h"
#include "TopWidget.h"
-KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent, const char* name)
- : TQSplitter (TQSplitter::Vertical, parent, name),
+KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* tqparent, const char* name)
+ : TQSplitter (Qt::Vertical, tqparent, name),
startRL (new KSVDragList*[ksv::runlevelNumber]),
stopRL (new KSVDragList*[ksv::runlevelNumber]),
conf(KSVConfig::self()),
@@ -84,12 +84,12 @@ KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent, const cha
{
setOpaqueResize( KGlobalSettings::opaqueResize() );
- KXMLGUIFactory* factory = parent->factory();
- mItemMenu = static_cast<KPopupMenu*> (factory->container ("item_menu", parent));
+ KXMLGUIFactory* factory = tqparent->factory();
+ mItemMenu = static_cast<KPopupMenu*> (factory->container ("item_menu", tqparent));
mItemMenu->insertTitle (i18n ("Runlevel Menu"), -1, 0);
- mContextMenu = static_cast<KPopupMenu*> (factory->container ("list_menu", parent));
+ mContextMenu = static_cast<KPopupMenu*> (factory->container ("list_menu", tqparent));
mContextMenu->insertTitle (i18n ("Runlevel Menu"), -1, 0);
- mScriptMenu = static_cast<KPopupMenu*> (factory->container ("script_menu", parent));
+ mScriptMenu = static_cast<KPopupMenu*> (factory->container ("script_menu", tqparent));
mScriptMenu->insertTitle (i18n ("Services Menu"), -1, 0);
mScroller = new KScroller (this);
@@ -175,7 +175,7 @@ void KSVContent::updateRunlevelsAfterChange ()
}
// refresh GUI
- qApp->processEvents();
+ tqApp->processEvents();
scripts->setFocus();
@@ -251,9 +251,9 @@ void KSVContent::initLList()
mRunlevels[i]->setSpacing (KDialog::spacingHint());
// create TQString for label
- TQString _label (i18n("Runlevel &%1").arg(i));
+ TQString _label (i18n("Runlevel &%1").tqarg(i));
// and for the name
- TQString _name (i18n("Runlevel %1").arg(i));
+ TQString _name (i18n("Runlevel %1").tqarg(i));
TQVBox* startBox = new TQVBox (mRunlevels[i]);
TQWhatsThis::add (startBox,
@@ -262,7 +262,7 @@ void KSVContent::initLList()
"determines the order in which the services are started. " \
"You can arrange them via drag and drop, as long as a suitable " \
"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
- "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
+ "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
TQLabel* rlL = new TQLabel(_label, startBox);
new TQLabel(i18n("Start"), startBox);
@@ -280,7 +280,7 @@ void KSVContent::initLList()
"determines the order in which the services are stopped. " \
"You can arrange them via drag and drop, as long as a suitable " \
"<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \
- "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i));
+ "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i));
// create the "STOP" list:
stopRL[i] = new KSVDragList(stopBox, (_name + " STOP").latin1());
@@ -307,8 +307,8 @@ void KSVContent::initLList()
this, TQT_SLOT(fwdUndoAction(KSVAction*)));
// add text-diplay widget
- textDisplay = new TQTextEdit( TQString::null, TQString::null, this, "TextDisplayWidget" );
- textDisplay->setTextFormat( Qt::RichText );
+ textDisplay = new TQTextEdit( TQString(), TQString(), this, "TextDisplayWidget" );
+ textDisplay->setTextFormat( TQt::RichText );
textDisplay->setReadOnly( true );
for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -351,9 +351,9 @@ void KSVContent::initLList()
// use this loop for setting tooltips
startRL[i]->setToolTip (i18n("Drag here to start services\n" \
- "when entering runlevel %1").arg(i));
+ "when entering runlevel %1").tqarg(i));
stopRL[i]->setToolTip (i18n("Drag here to stop services\n" \
- "when entering runlevel %1").arg(i));
+ "when entering runlevel %1").tqarg(i));
for (int j = 0; j < ksv::runlevelNumber; ++j)
{
@@ -384,8 +384,8 @@ void KSVContent::initScripts() {
scriptDir.setSorting (TQDir::Name);
- // const QFileInfoList *scriptList = scriptDir.entryInfoList();
- QFileInfoListIterator it (*scriptDir.entryInfoList());
+ // const TQFileInfoList *scriptList = scriptDir.entryInfoList();
+ TQFileInfoListIterator it (*scriptDir.entryInfoList());
KCompletion* comp = ksv::serviceCompletion();
comp->clear ();
@@ -407,7 +407,7 @@ void KSVContent::initScripts() {
++it;
// keep GUI alive
- qApp->processEvents();
+ tqApp->processEvents();
}
scripts->setEnabled(true);
@@ -422,7 +422,7 @@ void KSVContent::initRunlevels()
startRL[i]->clear();
stopRL[i]->clear();
- const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").arg(i);
+ const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(i);
if (!TQDir(_path).exists())
continue;
@@ -431,8 +431,8 @@ void KSVContent::initRunlevels()
d.setFilter( TQDir::Files );
d.setSorting( TQDir::Name );
- const QFileInfoList *rlList = d.entryInfoList();
- QFileInfoListIterator it( *rlList ); // create list iterator
+ const TQFileInfoList *rlList = d.entryInfoList();
+ TQFileInfoListIterator it( *rlList ); // create list iterator
TQFileInfo* fi; // pointer for traversing
while ( (fi=it.current()) )
@@ -441,7 +441,7 @@ void KSVContent::initRunlevels()
++it; // goto next list element
// keep GUI alive
- qApp->processEvents();
+ tqApp->processEvents();
}
}
}
@@ -476,8 +476,8 @@ void KSVContent::slotWriteSysV()
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- appendLog(i18n("<rl>RUNLEVEL %1</rl>").arg(i),
- i18n("** RUNLEVEL %1 **").arg(i));
+ appendLog(i18n("<rl>RUNLEVEL %1</rl>").tqarg(i),
+ i18n("** RUNLEVEL %1 **").tqarg(i));
clearRL(i); // rm changed/deleted entries
@@ -512,7 +512,7 @@ void KSVContent::writeToDisk(const KSVData& _w, int _rl, bool _start) {
appendLog(rich, plain);
}
-void KSVContent::repaintRunlevels ()
+void KSVContent::tqrepaintRunlevels ()
{
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
@@ -525,7 +525,7 @@ void KSVContent::repaintRunlevels ()
void KSVContent::clearRL(int _rl)
{
- TQString path = conf->runlevelPath() + TQString("/rc%1.d").arg(_rl);
+ TQString path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(_rl);
TQDir dir (path);
@@ -539,7 +539,7 @@ void KSVContent::clearRL(int _rl)
if (d->newEntry() && d->originalRunlevel() != startRL[_rl]->name())
break;
- TQFileInfo file (path + TQString("/S%1%2").arg(d->numberString()).arg(d->label()));
+ TQFileInfo file (path + TQString("/S%1%2").tqarg(d->numberString()).tqarg(d->label()));
TQString rich, plain;
ksv::IO::removeFile (file, dir, rich, plain);
@@ -547,7 +547,7 @@ void KSVContent::clearRL(int _rl)
}
// keep GUI alive
- qApp->processEvents();
+ tqApp->processEvents();
for (TQPtrListIterator<KSVData> it (stopRL[_rl]->getDeletedItems());
(d = it.current());
@@ -557,7 +557,7 @@ void KSVContent::clearRL(int _rl)
if (d->newEntry() && d->originalRunlevel() != stopRL[_rl]->name())
break;
- TQFileInfo file (path + TQString("/K%1%2").arg(d->numberString()).arg(d->label()));
+ TQFileInfo file (path + TQString("/K%1%2").tqarg(d->numberString()).tqarg(d->label()));
TQString rich, plain;
ksv::IO::removeFile (file, dir, rich, plain);
@@ -565,7 +565,7 @@ void KSVContent::clearRL(int _rl)
}
// keep GUI alive
- qApp->processEvents();
+ tqApp->processEvents();
}
void KSVContent::infoOnData (KSVItem* item)
@@ -613,12 +613,12 @@ void KSVContent::stopService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path),
- i18n("** Stopping %1 **").arg(path));
+ appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").tqarg(path),
+ i18n("** Stopping %1 **").tqarg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
- // notify parent
+ // notify tqparent
emit sigRun(path + i18n(" stop"));
}
@@ -639,12 +639,12 @@ void KSVContent::startService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path),
- i18n("** Starting %1 **").arg(path));
+ appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").tqarg(path),
+ i18n("** Starting %1 **").tqarg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
- // notify parent
+ // notify tqparent
emit sigRun(path + i18n(" start"));
}
@@ -679,12 +679,12 @@ void KSVContent::restartService (const TQString& path)
connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
// refresh textDisplay
- appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path),
- i18n("** Re-starting %1 **").arg(path));
+ appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").tqarg(path),
+ i18n("** Re-starting %1 **").tqarg(path));
_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
- // notify parent
+ // notify tqparent
emit sigRun(path + i18n(" restart"));
}
@@ -856,7 +856,7 @@ void KSVContent::pasteAppend()
{
KSVData data;
- if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
+ if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
{
KSVAction* action = 0L;
@@ -1059,25 +1059,25 @@ void KSVContent::openWith (int index)
void KSVContent::calcMinSize ()
{
// Cryptic code alert: Changing w or h will change mMinSize
- QCOORD& w = mMinSize.rwidth();
- QCOORD& h = mMinSize.rheight();
+ TQCOORD& w = mMinSize.rwidth();
+ TQCOORD& h = mMinSize.rheight();
- w = 2 * KDialog::marginHint() + mScriptBox->sizeHint().width();
- h = 2 * KDialog::marginHint() + mScriptBox->sizeHint().height();
+ w = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().width();
+ h = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().height();
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
if (mRunlevels[i]->isHidden())
continue;
- w += KDialog::spacingHint() + mRunlevels[i]->sizeHint().width();
- h = kMax (h, mRunlevels[i]->sizeHint().height());
+ w += KDialog::spacingHint() + mRunlevels[i]->tqsizeHint().width();
+ h = kMax (h, mRunlevels[i]->tqsizeHint().height());
}
- mContent->layout()->setEnabled(false);
+ mContent->tqlayout()->setEnabled(false);
mContent->setMinimumSize(mMinSize);
mScroller->updateScrollBars();
- mContent->layout()->setEnabled(true);
+ mContent->tqlayout()->setEnabled(true);
}
void KSVContent::mergeLoadedPackage (TQValueList<KSVData>* start,
diff --git a/ksysv/OldView.h b/ksysv/OldView.h
index e2e765c..b667839 100644
--- a/ksysv/OldView.h
+++ b/ksysv/OldView.h
@@ -44,12 +44,13 @@ class KSVItem;
class KSVAction;
class KSVTopLevel;
-class KSVContent : public QSplitter
+class KSVContent : public TQSplitter
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent = 0, const char* name = 0);
+ KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* tqparent = 0, const char* name = 0);
~KSVContent();
KSVDragList* getOrigin();
@@ -112,7 +113,7 @@ private slots:
void updateServicesAfterChange (const TQString&);
void updateRunlevelsAfterChange ();
- void repaintRunlevels ();
+ void tqrepaintRunlevels ();
void openWith ();
void openWith (int index);
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index b2ad038..759fbd8 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -28,17 +28,17 @@
#include "PreferencesDialog.h"
-KSVPreferences::KSVPreferences (TQWidget* parent)
+KSVPreferences::KSVPreferences (TQWidget* tqparent)
: KDialogBase (IconList, i18n("Configure"), Help|Ok|Apply|Cancel, Ok,
- parent, "KSysV Preferences", true, true),
+ tqparent, "KSysV Preferences", true, true),
mConfig (KSVConfig::self())
{
- setMinimumSize (sizeHint ());
+ setMinimumSize (tqsizeHint ());
/**
* Look & Feel Page
*/
- TQFrame* lafPage = addPage (i18n ("Look & Feel"), TQString::null, DesktopIcon ("colorize", 32));
+ TQFrame* lafPage = addPage (i18n ("Look & Feel"), TQString(), DesktopIcon ("colorize", 32));
mLookAndFeel = new KSVLookAndFeel (lafPage);
connect( mLookAndFeel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
@@ -48,7 +48,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
// /**
// * Colors Page
// */
-// TQFrame* colorPage = addPage (i18n("Colors"), TQString::null, DesktopIcon ("colorize", 32));
+// TQFrame* colorPage = addPage (i18n("Colors"), TQString(), DesktopIcon ("colorize", 32));
// mColorConfig = new KSVColorConfig(colorPage);
// TQVBoxLayout* colorLayout = new TQVBoxLayout(colorPage);
@@ -57,7 +57,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
// /**
// * Fonts Page
// */
-// TQFrame* fontPage = addPage (i18n("Fonts"), TQString::null, DesktopIcon ("fonts", 32));
+// TQFrame* fontPage = addPage (i18n("Fonts"), TQString(), DesktopIcon ("fonts", 32));
// mFontConfig = new KSVFontConfig(fontPage);
// TQVBoxLayout* fontLayout = new TQVBoxLayout (fontPage);
@@ -66,7 +66,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
/**
* Paths Page
*/
- TQFrame* pathPage = addPage (i18n ("Paths"), TQString::null, DesktopIcon ("kfm", 32));
+ TQFrame* pathPage = addPage (i18n ("Paths"), TQString(), DesktopIcon ("kfm", 32));
mPathConfig = new KSVPathConfig(pathPage);
connect( mPathConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
diff --git a/ksysv/PreferencesDialog.h b/ksysv/PreferencesDialog.h
index a061331..7486911 100644
--- a/ksysv/PreferencesDialog.h
+++ b/ksysv/PreferencesDialog.h
@@ -17,6 +17,7 @@ class KSVConfig;
class KSVPreferences : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
static KSVPreferences* self ();
@@ -52,7 +53,7 @@ private slots:
private:
friend class KSVTopLevel;
- KSVPreferences (TQWidget* parent);
+ KSVPreferences (TQWidget* tqparent);
void setConfig ();
bool checkPaths();
void reReadMessages();
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index 62f4a65..bab4d44 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -21,9 +21,9 @@
#include "Data.h"
#include "Properties.h"
-KSVServicePropertiesDialog::KSVServicePropertiesDialog (KSVData& data, TQWidget* parent)
+KSVServicePropertiesDialog::KSVServicePropertiesDialog (KSVData& data, TQWidget* tqparent)
: KPropertiesDialog (KURL(data.filenameAndPath()),
- parent, "KSVServicePropertiesDialog", true, false),
+ tqparent, "KSVServicePropertiesDialog", true, false),
mData (data)
{
KSVServicesPage* page = new KSVServicesPage (data, this);
@@ -48,13 +48,13 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props)
desc->setSpacing (1);
TQLabel* label = new TQLabel(i18n("Description:"), desc);
- label->setFixedHeight (label->sizeHint().height());
+ label->setFixedHeight (label->tqsizeHint().height());
TQString text;
ksv::getServiceDescription (data.filename(), text);
- mDesc = new TQTextView (TQString("<p>%1</p>").arg (text), TQString::null, desc);
+ mDesc = new TQTextView (TQString("<p>%1</p>").arg (text), TQString(), desc);
- TQButtonGroup* buttons = new TQButtonGroup (1, Vertical, i18n ("Actions"), mPage);
+ TQButtonGroup* buttons = new TQButtonGroup (1,Qt::Vertical, i18n ("Actions"), mPage);
TQPushButton* b = new TQPushButton (i18n ("&Edit"), buttons);
connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doEdit()));
@@ -100,8 +100,8 @@ void KSVServicePropertiesDialog::doRestart ()
}
-KSVEntryPropertiesDialog::KSVEntryPropertiesDialog (KSVData& data, TQWidget* parent)
- : KPropertiesDialog (data.label(), parent, "KSVEntryPropertiesDialog", true),
+KSVEntryPropertiesDialog::KSVEntryPropertiesDialog (KSVData& data, TQWidget* tqparent)
+ : KPropertiesDialog (data.label(), tqparent, "KSVEntryPropertiesDialog", true),
mData (data)
{
KSVEntryPage* page1 = new KSVEntryPage (data, this);
diff --git a/ksysv/Properties.h b/ksysv/Properties.h
index 603cb98..b9d7a66 100644
--- a/ksysv/Properties.h
+++ b/ksysv/Properties.h
@@ -17,9 +17,10 @@ class KSVData;
class KSVServicePropertiesDialog : public KPropertiesDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVServicePropertiesDialog (KSVData& data, TQWidget* parent);
+ KSVServicePropertiesDialog (KSVData& data, TQWidget* tqparent);
virtual ~KSVServicePropertiesDialog ();
signals:
@@ -42,9 +43,10 @@ private:
class KSVEntryPropertiesDialog : public KPropertiesDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVEntryPropertiesDialog (KSVData& data, TQWidget* parent);
+ KSVEntryPropertiesDialog (KSVData& data, TQWidget* tqparent);
virtual ~KSVEntryPropertiesDialog ();
signals:
@@ -66,6 +68,7 @@ private:
class KSVEntryPage : public KPropsDlgPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KSVEntryPage (KSVData& data, KPropertiesDialog* props);
@@ -91,6 +94,7 @@ private:
class KSVServicesPage : public KPropsDlgPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KSVServicesPage (KSVData& data, KPropertiesDialog* props);
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index bac5b30..391fe3f 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -15,8 +15,8 @@
#include <tqlabel.h>
RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString& runlevelPath,
- TQWidget* parent, const char* name)
- : KAuthIcon (parent, name),
+ TQWidget* tqparent, const char* name)
+ : KAuthIcon (tqparent, name),
mTimer (new TQTimer (this)),
mServicesInfo (new TQFileInfo (servicesPath)),
mRLInfo (new TQFileInfo* [ksv::runlevelNumber]),
@@ -37,14 +37,14 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
lockBox->setMargin (1);
lockBox->setFrameStyle (TQFrame::NoFrame);
- lockBox->setFixedSize (lockBox->sizeHint());
+ lockBox->setFixedSize (lockBox->tqsizeHint());
connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent()));
mTimer->start (mInterval);
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").arg(i));
+ mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").tqarg(i));
}
updateStatus();
@@ -122,7 +122,7 @@ void RunlevelAuthIcon::setRunlevelPath (const TQString& path)
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- mRLInfo[i]->setFile ((path + "/rc%1.d").arg(i));
+ mRLInfo[i]->setFile ((path + "/rc%1.d").tqarg(i));
}
mTimer->start(mInterval);
diff --git a/ksysv/RunlevelAuthIcon.h b/ksysv/RunlevelAuthIcon.h
index 172f6be..ff514a5 100644
--- a/ksysv/RunlevelAuthIcon.h
+++ b/ksysv/RunlevelAuthIcon.h
@@ -10,11 +10,12 @@ class TQFileInfo;
class RunlevelAuthIcon : public KAuthIcon
{
Q_OBJECT
- Q_PROPERTY (int refreshInterval READ refreshInterval WRITE setRefreshInterval)
+ TQ_OBJECT
+ TQ_PROPERTY (int refreshInterval READ refreshInterval WRITE setRefreshInterval)
public:
RunlevelAuthIcon (const TQString& scriptPath, const TQString& runlevelPath,
- TQWidget* parent = 0L, const char* name = 0L);
+ TQWidget* tqparent = 0L, const char* name = 0L);
virtual ~RunlevelAuthIcon ();
diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index 4b7d4ef..aac5bca 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -25,11 +25,11 @@
#include "ksvdraglist.h"
#include "ServiceDlg.h"
-#define MIN_SIZE(A) A->setMinimumSize(A->sizeHint())
+#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint())
ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
- TQWidget* parent, const char* name)
- : KDialogBase (parent, name, false, action, Apply|Close, Apply, true)
+ TQWidget* tqparent, const char* name)
+ : KDialogBase (tqparent, name, false, action, Apply|Close, Apply, true)
{
TQWidget* page = new TQWidget (this);
@@ -40,14 +40,14 @@ ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
MIN_SIZE(desc);
desc->setBuddy(mServices);
MIN_SIZE(mServices);
- mServices->setMinimumWidth(mServices->minimumSize().width() * 2);
+ mServices->setMinimumWidth(mServices->tqminimumSize().width() * 2);
TQBoxLayout* serv_layout = new TQHBoxLayout();
top->addLayout (serv_layout);
serv_layout->addWidget(desc);
serv_layout->addWidget(mServices);
- setFixedSize (sizeHint());
+ setFixedSize (tqsizeHint());
}
ServiceDlg::~ServiceDlg()
diff --git a/ksysv/ServiceDlg.h b/ksysv/ServiceDlg.h
index 432a934..2cec43e 100644
--- a/ksysv/ServiceDlg.h
+++ b/ksysv/ServiceDlg.h
@@ -26,10 +26,11 @@ class TQComboBox;
class ServiceDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ServiceDlg (const TQString& action, const TQString& label,
- TQWidget* parent = 0, const char* name = 0);
+ TQWidget* tqparent = 0, const char* name = 0);
virtual ~ServiceDlg();
int count() const;
diff --git a/ksysv/SpinBox.cpp b/ksysv/SpinBox.cpp
index fd93954..fae199b 100644
--- a/ksysv/SpinBox.cpp
+++ b/ksysv/SpinBox.cpp
@@ -7,8 +7,8 @@
#include "ksv_core.h"
#include "SpinBox.h"
-KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name)
- : TQSpinBox (0, 99, 1, parent, name),
+KSVSpinBox::KSVSpinBox (TQWidget* tqparent, const char* name)
+ : TQSpinBox (0, 99, 1, tqparent, name),
KCompletionBase (),
mClearedSelection (false)
{
@@ -67,7 +67,7 @@ bool KSVSpinBox::eventFilter (TQObject* o, TQEvent* e)
Q_UNUSED(o);
if (e->type() == TQEvent::KeyPress)
{
- TQKeyEvent* ke = static_cast<TQKeyEvent*> (e);
+ TQKeyEvent* ke = TQT_TQKEYEVENT(e);
switch (ke->key())
{
diff --git a/ksysv/SpinBox.h b/ksysv/SpinBox.h
index c48f09e..ce679bb 100644
--- a/ksysv/SpinBox.h
+++ b/ksysv/SpinBox.h
@@ -10,9 +10,10 @@
class KSVSpinBox : public TQSpinBox, public KCompletionBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVSpinBox (TQWidget* parent, const char* name = 0L);
+ KSVSpinBox (TQWidget* tqparent, const char* name = 0L);
virtual ~KSVSpinBox ();
virtual bool eventFilter (TQObject*, TQEvent*);
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 6b2e675..7f33abc 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -1,5 +1,5 @@
/*
- Requires the Qt widget libraries, available at no cost at
+ Requires the TQt widget libraries, available at no cost at
http://www.troll.no
Copyright (C) 1997-2000 Peter Putzer
@@ -87,12 +87,12 @@
#include <tqlabel.h>
#include <kstatusbar.h>
-namespace Status
+namespace tqStatus
{
enum {
Changed, Checklist, Writable
};
-} // namespace Status
+} // namespace tqStatus
KSVTopLevel::KSVTopLevel()
: KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose),
@@ -113,8 +113,8 @@ KSVTopLevel::KSVTopLevel()
mOpenWith (0L), mOpenDefault (0L),
- mUndoList (new ActionList (this, "UndoList")),
- mRedoList (new ActionList (this, "RedoList")),
+ mUndoList (new ActionList (TQT_TQOBJECT(this), "UndoList")),
+ mRedoList (new ActionList (TQT_TQOBJECT(this), "RedoList")),
mStartDlg (new ServiceDlg (i18n("Start Service"),
i18n("&Choose which service to start:"),
this)),
@@ -211,18 +211,18 @@ void KSVTopLevel::initActions ()
KActionCollection* coll = actionCollection();
// setup File menu
- mFileRevert = KStdAction::revert (this, TQT_SLOT (slotClearChanges()), coll);
+ mFileRevert = KStdAction::revert (TQT_TQOBJECT(this), TQT_SLOT (slotClearChanges()), coll);
mFileRevert->setText (i18n("Re&vert Configuration"));
- mFileLoad = KStdAction::open (this, TQT_SLOT (load()), coll);
+ mFileLoad = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (load()), coll);
mFileLoad->setText (i18n ("&Open..."));
- mFileSave = KStdAction::save(this, TQT_SLOT(slotAcceptChanges()), coll);
+ mFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotAcceptChanges()), coll);
mFileSave->setText (i18n("&Save Configuration"));
- mFileSaveAs = KStdAction::saveAs (this, TQT_SLOT (saveAs ()), coll);
+ mFileSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (saveAs ()), coll);
- mFileSaveLog = KStdAction::save (this, TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log");
+ mFileSaveLog = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log");
mFileSaveLog->setText (i18n("Save &Log..."));
mFileSaveLog->setShortcut (Key_L+CTRL);
mFileSaveLog->setEnabled (false);
@@ -230,29 +230,29 @@ void KSVTopLevel::initActions ()
// disabled due to complexity
// mFilePrint = KStdAction::print (this, TQT_SLOT (print()), coll);
- mFilePrintLog = KStdAction::print(this, TQT_SLOT(printLog()), coll, "ksysv_print_log");
+ mFilePrintLog = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printLog()), coll, "ksysv_print_log");
mFilePrintLog->setText( i18n("&Print Log..."));
mFilePrintLog->setEnabled (false);
- mFileQuit = KStdAction::quit(this, TQT_SLOT(close()), coll);
+ mFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), coll);
// setup Edit menu
- mEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), coll);
+ mEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), coll);
mEditUndo->setEnabled (false);
- mEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), coll);
+ mEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), coll);
mEditUndo->setEnabled (false);
- mEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), coll);
- mEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), coll);
- mEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), coll);
- mPasteAppend = KStdAction::paste (this, TQT_SLOT (pasteAppend()),
+ mEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), coll);
+ mEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), coll);
+ mEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), coll);
+ mPasteAppend = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (pasteAppend()),
coll, "ksysv_paste_append");
mEditProperties = new KAction (i18n("P&roperties"), 0,
- this, TQT_SLOT(properties()),
+ TQT_TQOBJECT(this), TQT_SLOT(properties()),
coll, "ksysv_properties");
mOpenDefault = new KAction (i18n ("&Open"), 0,
- this, TQT_SLOT (editService()),
+ TQT_TQOBJECT(this), TQT_SLOT (editService()),
coll, "ksysv_open_service");
mOpenWith = new KActionMenu (i18n ("Open &With"), coll, "ksysv_open_with");
@@ -260,30 +260,30 @@ void KSVTopLevel::initActions ()
// setup Settings menu
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings (this, TQT_SLOT(configureKeys()), coll);
- KStdAction::configureToolbars (this, TQT_SLOT(configureToolbars()), coll);
- KStdAction::saveOptions(this, TQT_SLOT(saveOptions()), coll);
- KStdAction::preferences(this, TQT_SLOT(slotShowConfig()), coll);
+ KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), coll);
+ KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), coll);
+ KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), coll);
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), coll);
mOptionsToggleLog = new KToggleAction (i18n("Show &Log"), "toggle_log", 0,
- this, TQT_SLOT (toggleLog()),
+ TQT_TQOBJECT(this), TQT_SLOT (toggleLog()),
coll, "ksysv_toggle_log");
mOptionsToggleLog->setCheckedState(i18n("Hide &Log"));
// setup Tools menu
mToolsStartService = new KToggleAction (i18n("&Start Service..."), "ksysv_start", 0,
- mStartDlg, TQT_SLOT (toggle()),
+ TQT_TQOBJECT(mStartDlg), TQT_SLOT (toggle()),
coll, "ksysv_start_service");
mToolsStopService = new KToggleAction (i18n("&Stop Service..."), "ksysv_stop", 0,
- mStopDlg, TQT_SLOT (toggle()),
+ TQT_TQOBJECT(mStopDlg), TQT_SLOT (toggle()),
coll, "ksysv_stop_service");
mToolsRestartService = new KToggleAction (i18n("&Restart Service..."), 0,
- mRestartDlg, TQT_SLOT (toggle()),
+ TQT_TQOBJECT(mRestartDlg), TQT_SLOT (toggle()),
coll, "ksysv_restart_service");
mToolsEditService = new KToggleAction (i18n("&Edit Service..."), 0,
- mEditDlg, TQT_SLOT (toggle()),
+ TQT_TQOBJECT(mEditDlg), TQT_SLOT (toggle()),
coll, "ksysv_edit_service");
createGUI(xmlFile());
@@ -426,16 +426,16 @@ void KSVTopLevel::initStatusBar()
"or ask your sysadmin to install %1 <em>suid</em> or " \
"<em>sgid</em>.</p><p>The latter way is <strong>not</strong> "\
"recommended though, due to security issues.</p>")
- .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName()));
+ .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName()));
- authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
- visBox->setMinimumSize (visBox->minimumSizeHint());
+ authIconBox->setMinimumSize (authIconBox->tqminimumSizeHint());
+ visBox->setMinimumSize (visBox->tqminimumSizeHint());
status->addWidget (authIconBox, 0, false);
- status->insertItem ("", Status::Changed, 100);
+ status->insertItem ("", tqStatus::Changed, 100);
status->addWidget (visBox, 0, true);
- status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter);
+ status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter);
}
void KSVTopLevel::slotShowConfig()
@@ -454,7 +454,7 @@ void KSVTopLevel::slotShowConfig()
this, TQT_SLOT (updateRunlevelsPath ()));
connect (mPreferences, TQT_SIGNAL (updateFonts ()),
- mView, TQT_SLOT (repaintRunlevels ()));
+ mView, TQT_SLOT (tqrepaintRunlevels ()));
}
// mPreferences->setInitialSize (TQSize (400,300), true);
@@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions()
void KSVTopLevel::slotUpdateRunning (const TQString& text)
{
- statusBar()->changeItem(text, Status::Changed);
+ statusBar()->changeItem(text, tqStatus::Changed);
}
void KSVTopLevel::editCut() {
@@ -508,7 +508,7 @@ void KSVTopLevel::editCut() {
if (list && list->currentItem())
{
KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L);
- kapp->clipboard()->setData (mime);
+ kapp->tqclipboard()->setData (mime);
KSVData data = *list->currentItem()->data();
delete list->currentItem();
@@ -525,7 +525,7 @@ void KSVTopLevel::editCopy()
if (list)
{
KSVDrag* mime = new KSVDrag (*static_cast<KSVItem*> (list->currentItem()), 0L, 0L);
- kapp->clipboard()->setData (mime);
+ kapp->tqclipboard()->setData (mime);
}
}
@@ -537,7 +537,7 @@ void KSVTopLevel::editPaste()
{
KSVData data;
- if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
+ if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
{
KSVAction* action = 0L;
@@ -563,7 +563,7 @@ void KSVTopLevel::setChanged (bool val)
mFileSave->setEnabled (val);
// update statusbar
- statusBar()->changeItem(val ? i18n(" Changed") : TQString::null, Status::Changed);
+ statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed);
// clear messages
statusBar()->clear();
@@ -651,7 +651,7 @@ void KSVTopLevel::print()
// .arg (ksv::hostname()));
// y += fm.lineSpacing();
-// p.drawText (10, y, TQDateTime::currentDateTime().toString());
+// p.drawText (10, y, TQDateTime::tqcurrentDateTime().toString());
// y += fm.lineSpacing() * 2; // an extra empty line
// for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -659,7 +659,7 @@ void KSVTopLevel::print()
// p.setFont (TQFont("courier", 16, TQFont::Bold));
// TQFontMetrics fm = p.fontMetrics();
-// p.drawText (10, y, i18n ("Runlevel %1").arg(i));
+// p.drawText (10, y, i18n ("Runlevel %1").tqarg(i));
// y += fm.lineSpacing();
// checkPage
@@ -725,7 +725,7 @@ void KSVTopLevel::print()
// // if (line.isNull())
// // line = " ";
-// // line.replace( TQRegExp("\t"), " " );
+// // line.tqreplace( TQRegExp("\t"), " " );
// // strncpy(buf,line.data(),160);
@@ -766,22 +766,22 @@ void KSVTopLevel::printLog()
{
TQSimpleRichText rheading (i18n("<h1>KDE Sys-V Init Editor Log</h1>"),
- TQFont("times"), TQString::null, ksv::styleSheet(),
+ TQFont("times"), TQString(), ksv::styleSheet(),
TQMimeSourceFactory::defaultFactory());
rheading.setWidth (&p, width);
int tmp_h = rheading.height();
TQRegion region (0, y, width, tmp_h);
- rheading.draw (&p, 0, y, region, colorGroup(), 0L);
+ rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L);
y += tmp_h;
- TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
- TQFont("times"), TQString::null, ksv::styleSheet(),
+ TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())),
+ TQFont("times"), TQString(), ksv::styleSheet(),
TQMimeSourceFactory::defaultFactory());
rdate.setWidth (&p, width);
tmp_h = rdate.height();
TQRegion r2 (0, y, width, tmp_h);
- rdate.draw (&p, 0, y, r2, colorGroup(), 0L);
+ rdate.draw (&p, 0, y, r2, tqcolorGroup(), 0L);
y += tmp_h;
}
@@ -790,7 +790,7 @@ void KSVTopLevel::printLog()
{
while (y < height)
{
- TQSimpleRichText rich (*line, TQFont("times"), TQString::null, ksv::styleSheet(),
+ TQSimpleRichText rich (*line, TQFont("times"), TQString(), ksv::styleSheet(),
TQMimeSourceFactory::defaultFactory());
rich.setWidth (&p, width);
@@ -799,7 +799,7 @@ void KSVTopLevel::printLog()
break;
TQRegion region (0, y, width, tmp_h);
- rich.draw (&p, 0, y, region, colorGroup(), 0L);
+ rich.draw (&p, 0, y, region, tqcolorGroup(), 0L);
y += tmp_h;
++line;
@@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit ()
}
else
{
- TQMimeSource* mime = kapp->clipboard()->data();
+ TQMimeSource* mime = kapp->tqclipboard()->data();
if (mime && mime->provides ("application/x-ksysv"))
setPaste (true);
@@ -938,7 +938,7 @@ void KSVTopLevel::slotSaveLog()
s << "KDE System V Init Editor"
<< endl
- << TQDateTime::currentDateTime().toString()
+ << TQDateTime::tqcurrentDateTime().toString()
<< endl << endl
<< mView->log()
<< endl;
diff --git a/ksysv/TopWidget.h b/ksysv/TopWidget.h
index e39a944..517be58 100644
--- a/ksysv/TopWidget.h
+++ b/ksysv/TopWidget.h
@@ -39,6 +39,7 @@ class RunlevelAuthIcon;
class KSVTopLevel : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
KSVTopLevel();
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 8edc980..7053ceb 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -4,13 +4,13 @@
<include location="global">klocale.h</include>
<pixmapfunction>DesktopIcon</pixmapfunction>
<widget>
- <class>QWizard</class>
+ <class>TQWizard</class>
<property stdset="1">
<name>name</name>
<cstring>ConfigWizard</cstring>
</property>
<property stdset="1">
- <name>geometry</name>
+ <name>tqgeometry</name>
<rect>
<x>0</x>
<y>0</y>
@@ -23,13 +23,13 @@
<string>Configuration Wizard</string>
</property>
<property>
- <name>layoutMargin</name>
+ <name>tqlayoutMargin</name>
</property>
<property>
- <name>layoutSpacing</name>
+ <name>tqlayoutSpacing</name>
</property>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mOSPage</cstring>
@@ -48,7 +48,7 @@
<number>0</number>
</property>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_2</cstring>
@@ -59,7 +59,7 @@
</property>
</widget>
<widget>
- <class>QFrame</class>
+ <class>TQFrame</class>
<property stdset="1">
<name>name</name>
<cstring>mOSSpacer</cstring>
@@ -81,7 +81,7 @@
</property>
</widget>
<widget>
- <class>QButtonGroup</class>
+ <class>TQButtonGroup</class>
<property stdset="1">
<name>name</name>
<cstring>mOSBox</cstring>
@@ -100,7 +100,7 @@
<number>6</number>
</property>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>RadioButton7</cstring>
@@ -111,7 +111,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>RadioButton8</cstring>
@@ -137,7 +137,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -147,7 +147,7 @@
</vbox>
</widget>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mDistributionPage</cstring>
@@ -166,7 +166,7 @@
<number>0</number>
</property>
<widget>
- <class>QButtonGroup</class>
+ <class>TQButtonGroup</class>
<property stdset="1">
<name>name</name>
<cstring>mDistributionBox</cstring>
@@ -185,7 +185,7 @@
<number>6</number>
</property>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib1</cstring>
@@ -200,7 +200,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib2</cstring>
@@ -211,7 +211,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib3</cstring>
@@ -222,7 +222,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib4</cstring>
@@ -233,7 +233,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib5</cstring>
@@ -244,7 +244,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib6</cstring>
@@ -255,7 +255,7 @@
</property>
</widget>
<widget>
- <class>QRadioButton</class>
+ <class>TQRadioButton</class>
<property stdset="1">
<name>name</name>
<cstring>mDistrib7</cstring>
@@ -281,7 +281,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@
</vbox>
</widget>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mPathsPage</cstring>
@@ -310,16 +310,16 @@
<number>0</number>
</property>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mServicesLayout</cstring>
</property>
<property>
- <name>layoutMargin</name>
+ <name>tqlayoutMargin</name>
</property>
<property>
- <name>layoutSpacing</name>
+ <name>tqlayoutSpacing</name>
</property>
<vbox>
<property stdset="1">
@@ -331,7 +331,7 @@
<number>0</number>
</property>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>mServicesLabel</cstring>
@@ -346,7 +346,7 @@
</property>
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mServicesButtonLayout</cstring>
@@ -367,7 +367,7 @@
<cstring>mServicesPath</cstring>
</property>
<property stdset="1">
- <name>minimumSize</name>
+ <name>tqminimumSize</name>
<size>
<width>100</width>
<height>0</height>
@@ -390,7 +390,7 @@
</property>
</widget>
<widget>
- <class>QPushButton</class>
+ <class>TQPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>mBrowseServices</cstring>
@@ -409,7 +409,7 @@
</vbox>
</widget>
<widget>
- <class>QFrame</class>
+ <class>TQFrame</class>
<property stdset="1">
<name>name</name>
<cstring>mSpacer</cstring>
@@ -430,7 +430,7 @@
</sizepolicy>
</property>
<property stdset="1">
- <name>minimumSize</name>
+ <name>tqminimumSize</name>
<size>
<width>0</width>
<height>10</height>
@@ -438,7 +438,7 @@
</property>
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mRunlevelLayout</cstring>
@@ -453,7 +453,7 @@
<number>0</number>
</property>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>mRunlevelLabel</cstring>
@@ -468,7 +468,7 @@
</property>
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>TQLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mRunlevelButtonLayout</cstring>
@@ -489,7 +489,7 @@
<cstring>mRunlevelPath</cstring>
</property>
<property stdset="1">
- <name>minimumSize</name>
+ <name>tqminimumSize</name>
<size>
<width>100</width>
<height>0</height>
@@ -512,7 +512,7 @@
</property>
</widget>
<widget>
- <class>QPushButton</class>
+ <class>TQPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>mBrowseRunlevel</cstring>
@@ -544,7 +544,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -554,7 +554,7 @@
</vbox>
</widget>
<widget>
- <class>QWidget</class>
+ <class>TQWidget</class>
<property stdset="1">
<name>name</name>
<cstring>mFinishedPage</cstring>
@@ -573,7 +573,7 @@
<number>0</number>
</property>
<widget>
- <class>QLabel</class>
+ <class>TQLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
@@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. &lt;b&gt;Press&
<enum>RichText</enum>
</property>
<property stdset="1">
- <name>alignment</name>
+ <name>tqalignment</name>
<set>AlignTop|AlignLeft</set>
</property>
<property>
diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp
index 7b3a421..1b98fa4 100644
--- a/ksysv/kdltooltip.cpp
+++ b/ksysv/kdltooltip.cpp
@@ -21,9 +21,9 @@
#include "ksvdraglist.h"
#include "kdltooltip.h"
-KDLToolTip::KDLToolTip (KSVDragList *parent, TQToolTipGroup* group)
- : TQToolTip(parent, group),
- mParent (parent)
+KDLToolTip::KDLToolTip (KSVDragList *tqparent, TQToolTipGroup* group)
+ : TQToolTip(tqparent, group),
+ mParent (tqparent)
{
}
@@ -39,10 +39,10 @@ void KDLToolTip::maybeTip (const TQPoint& p)
TQString text;
TQRect rect;
- const TQRect vert = mParent->verticalScrollBar()->geometry();
- const TQRect horiz = mParent->horizontalScrollBar()->geometry();
+ const TQRect vert = mParent->verticalScrollBar()->tqgeometry();