summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-07-28 02:56:18 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-07-28 03:17:51 +0200
commitcf4f444abb13028e2378e300f8c6d3a44f699f5d (patch)
tree1bd57816a1e63b405b64ec901687f7f126b9b5d2
parent75346893bd6bbd2760dc36e95226515f42ed3f59 (diff)
downloadkshutdown-cf4f444a.tar.gz
kshutdown-cf4f444a.zip
Initial TQt conversion
-rw-r--r--acinclude.m448
-rw-r--r--kshutdown/actions.cpp46
-rw-r--r--kshutdown/actions.h26
-rw-r--r--kshutdown/appobserver.cpp42
-rw-r--r--kshutdown/appobserver.h26
-rw-r--r--kshutdown/configuration.cpp2
-rw-r--r--kshutdown/configuration.h6
-rw-r--r--kshutdown/confirmation.cpp24
-rw-r--r--kshutdown/confirmation.h2
-rw-r--r--kshutdown/extras.cpp42
-rw-r--r--kshutdown/extras.h24
-rw-r--r--kshutdown/kshutdowniface.h2
-rw-r--r--kshutdown/kshutdowniface_skel.cpp28
-rw-r--r--kshutdown/kshutdowniface_stub.cpp60
-rw-r--r--kshutdown/kshutdowniface_stub.h6
-rw-r--r--kshutdown/links.cpp50
-rw-r--r--kshutdown/links.h28
-rw-r--r--kshutdown/mactioneditdialog.cpp50
-rw-r--r--kshutdown/mactioneditdialog.h14
-rw-r--r--kshutdown/main.cpp20
-rw-r--r--kshutdown/miscutils.cpp44
-rw-r--r--kshutdown/miscutils.h30
-rw-r--r--kshutdown/mmainwindow.cpp130
-rw-r--r--kshutdown/mmainwindow.h28
-rw-r--r--kshutdown/mmessagedialog.cpp40
-rw-r--r--kshutdown/mmessagedialog.h8
-rw-r--r--kshutdown/msettingsdialog.cpp116
-rw-r--r--kshutdown/msettingsdialog.h16
-rw-r--r--kshutdown/mstatstab.cpp38
-rw-r--r--kshutdown/mstatstab.h16
-rw-r--r--kshutdown/msystemtray.cpp12
-rw-r--r--kshutdown/msystemtray.h6
-rw-r--r--kshutdown/mtip.cpp12
-rw-r--r--kshutdown/mtip.h8
-rw-r--r--kshutdown/progressbar.cpp22
-rw-r--r--kshutdown/progressbar.h8
-rw-r--r--kshutdown/systemconfig.cpp24
-rw-r--r--kshutdown/systemconfig.h10
-rw-r--r--kshutdownlockout/lockout.cpp22
-rw-r--r--kshutdownlockout/lockout.h6
40 files changed, 571 insertions, 571 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d674ff8..ca6efb6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1060,7 +1060,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes=""
x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
+ dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@@ -1092,19 +1092,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
+#include <ntqglobal.h>
+#include <ntqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
+#include <ntqevent.h>
+#include <ntqstring.h>
+#include <ntqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
#error 1
#endif
EOF
@@ -1113,8 +1113,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
+#include <ntqcursor.h>
+#include <ntqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@@ -1201,22 +1201,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
+ kde_qt_verstring="TQT_VERSION >= 222"
else
- kde_qt_verstring="QT_VERSION >= 200"
+ kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+ kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@@ -1325,7 +1325,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""
dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
@@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
+dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1449,9 +1449,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
- kde_qt_header=qstyle.h
+ kde_qt_header=ntqstyle.h
else
- kde_qt_header=qglobal.h
+ kde_qt_header=ntqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@@ -2034,7 +2034,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
- #include <qdom.h>
+ #include <ntqdom.h>
],
[
QDomDocument doc;
@@ -2595,7 +2595,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
-[#include <qapplication.h>],
+[#include <ntqapplication.h>],
[
int argc;
char** argv;
@@ -3397,7 +3397,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
-#include <qglobal.h>
+#include <ntqglobal.h>
#if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */
/* if Q_EXPORT is nonempty, this will break compilation */
@@ -4635,7 +4635,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
-#include <qstring.h>
+#include <ntqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@@ -5480,7 +5480,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
+AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@@ -5501,7 +5501,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)
diff --git a/kshutdown/actions.cpp b/kshutdown/actions.cpp
index 926a46b..1a987a2 100644
--- a/kshutdown/actions.cpp
+++ b/kshutdown/actions.cpp
@@ -26,8 +26,8 @@
#include "msystemtray.h"
#include "systemconfig.h"
-#include <qimage.h>
-#include <qtimer.h>
+#include <ntqimage.h>
+#include <ntqtimer.h>
#include <dcopclient.h>
#include <kdebug.h>
@@ -42,7 +42,7 @@ Action::~Action()
{
}
-QString Action::actionToConfigGroup(const Type action) const
+TQString Action::actionToConfigGroup(const Type action) const
{
switch (action)
{
@@ -50,7 +50,7 @@ QString Action::actionToConfigGroup(const Type action) const
case Reboot: return "Reboot";
case LockScreen: return "Lock Screen";
case Logout: return "Logout";
- default: return QString::null;
+ default: return TQString::null;
}
}
@@ -102,7 +102,7 @@ bool Action::exec(const Type action, const bool stopTimer)
_totalExit = false;
Method method = Method_KDE;
- QString command;
+ TQString command;
if (!isEnabled(action))
return false; // error
@@ -195,7 +195,7 @@ bool Action::exec(const Type action, const bool stopTimer)
return false; // error
}
-bool Action::execConfirm(const Type action, const QString &delay)
+bool Action::execConfirm(const Type action, const TQString &delay)
{
if (
(action != LockScreen) && // no confirmation for "Lock Session"
@@ -211,19 +211,19 @@ bool Action::execCurrent()
return exec(_current);
}
-QString Action::getCurrentName() const
+TQString Action::getCurrentName() const
{
return getName(_current);
}
-QPixmap Action::getIcon(const Type action) const
+TQPixmap Action::getIcon(const Type action) const
{
- QMapIterator<Type, QPixmap> i = iconCache->find(action);
+ TQMapIterator<Type, TQPixmap> i = iconCache->find(action);
return (i == iconCache->end()) ? SmallIcon("misc") : i.data();
}
-QString Action::getIconName(const Type action) const
+TQString Action::getIconName(const Type action) const
{
switch (action)
{
@@ -238,18 +238,18 @@ QString Action::getIconName(const Type action) const
}
}
-QString Action::getMethod(const Action::Type action, Method &method, QString &command)
+TQString Action::getMethod(const Action::Type action, Method &method, TQString &command)
{
- QString group = actionToConfigGroup(action);
+ TQString group = actionToConfigGroup(action);
if (group.isNull())
{
// kdDebug() << "Action::getMethod: No group in config for action " << action << endl;
- return QString::null;
+ return TQString::null;
}
- QString defaultCommand;
+ TQString defaultCommand;
switch (action)
{
case ShutDown:
@@ -265,7 +265,7 @@ QString Action::getMethod(const Action::Type action, Method &method, QString &co
defaultCommand = DEFAULT_LOGOUT_COMMAND;
break;
default:
- defaultCommand = QString::null;
+ defaultCommand = TQString::null;
}
KConfig *conf = kshutdownrc->config();
@@ -303,7 +303,7 @@ QString Action::getMethod(const Action::Type action, Method &method, QString &co
return defaultCommand;
}
-void Action::setMethod(const QString &group, const Method method, const QString &command) const
+void Action::setMethod(const TQString &group, const Method method, const TQString &command) const
{
KConfig *conf = kshutdownrc->config();
conf->setGroup(group);
@@ -312,7 +312,7 @@ void Action::setMethod(const QString &group, const Method method, const QString
conf->writeEntry("Method", method);
}
-QString Action::getName(const Type action) const
+TQString Action::getName(const Type action) const
{
switch (action)
{
@@ -330,7 +330,7 @@ QString Action::getName(const Type action) const
bool Action::isEnabled(const Type action)
{
Method m = Method_KDE;
- QString c = QString::null;
+ TQString c = TQString::null;
switch (action)
{
case Nothing:
@@ -363,7 +363,7 @@ void Action::totalExec()
}
Action::Action()
- : QObject(ks_main),
+ : TQObject(ks_main),
_active(false),
_testMode(false),
_totalExit(false),
@@ -371,7 +371,7 @@ Action::Action()
{
// NOTE: compatible with the standard KDE logout dialog
// NOTE: sync. with panel applet
- iconCache = new QMap<Type, QPixmap>();
+ iconCache = new TQMap<Type, TQPixmap>();
#define KS_ADD_ICON(action) \
iconCache->insert(action, SmallIcon(getIconName(action)));
KS_ADD_ICON(Nothing);
@@ -384,7 +384,7 @@ Action::Action()
bool Action::lockScreen() {
Method method;
- QString command;
+ TQString command;
getMethod(LockScreen, method, command);
MiscUtils::runCommandBeforeAction("Lock Screen");
if (method == Method_KDE) {
@@ -397,8 +397,8 @@ bool Action::lockScreen() {
// this is a modified "void Lockout::lock()"
// from the "Lock/Logout Applet" (lockout.cpp [3.1.4])
- QCString kdesktop("kdesktop");
- int kshutdown_screen_number = qt_xscreen();
+ TQCString kdesktop("kdesktop");
+ int kshutdown_screen_number = tqt_xscreen();
if (kshutdown_screen_number)
kdesktop.sprintf("kdesktop-screen-%d", kshutdown_screen_number);
diff --git a/kshutdown/actions.h b/kshutdown/actions.h
index 238ae09..55cf717 100644
--- a/kshutdown/actions.h
+++ b/kshutdown/actions.h
@@ -23,7 +23,7 @@
#include <kapplication.h>
// default external commands
-const QString
+const TQString
DEFAULT_LOCK_SCREEN_COMMAND("xscreensaver-command -lock"),
// TODO: 2.0: logout command for GNOME (gnome-session-save --kill?)
DEFAULT_LOGOUT_COMMAND(""),
@@ -32,10 +32,10 @@ const QString
#define ks_actions Action::getInstance()
-class QPixmap;
+class TQPixmap;
/** @short An action manager. */
-class Action: public QObject
+class Action: public TQObject
{
Q_OBJECT
public:
@@ -67,7 +67,7 @@ public:
/**
* Converts @p action value to the configuration group name.
*/
- QString actionToConfigGroup(const Type action) const;
+ TQString actionToConfigGroup(const Type action) const;
/**
* Returns @c true if the current action is active.
@@ -110,7 +110,7 @@ public:
* @param action An action to execute
* @param delay A selected delay
*/
- bool execConfirm(const Type action, const QString &delay = QString::null);
+ bool execConfirm(const Type action, const TQString &delay = TQString::null);
/**
* Executes the current action without confirmation.
@@ -120,17 +120,17 @@ public:
/**
* Returns the current action name as text.
*/
- QString getCurrentName() const;
+ TQString getCurrentName() const;
/**
* Returns an icon for @p action.
*/
- QPixmap getIcon(const Type action) const;
+ TQPixmap getIcon(const Type action) const;
/**
* Returns an icon name for @p action.
*/
- QString getIconName(const Type action) const;
+ TQString getIconName(const Type action) const;
/**
* Initializes and return singleton instance of the @c Action class.
@@ -150,10 +150,10 @@ public:
* @retval command A command to run
* @return A default command
*/
- QString getMethod(
+ TQString getMethod(
const Type action,
Method &method,
- QString &command
+ TQString &command
);
/**
@@ -162,13 +162,13 @@ public:
* @param method A new method
* @param command A new command
*/
- void setMethod(const QString &group, const Method method, const QString &command) const;
+ void setMethod(const TQString &group, const Method method, const TQString &command) const;
/**
* Returns an action name as text.
* @param action An action
*/
- QString getName(const Type action) const;
+ TQString getName(const Type action) const;
/** Returns @c true if @p action is @b not disabled by KIOSK. */
bool isEnabled(const Type action);
@@ -203,7 +203,7 @@ private:
_active,
_testMode,
_totalExit;
- QMap<Type, QPixmap> *iconCache;
+ TQMap<Type, TQPixmap> *iconCache;
Type _current;
Action();
bool lockScreen();
diff --git a/kshutdown/appobserver.cpp b/kshutdown/appobserver.cpp
index b029e45..b83c0bd 100644
--- a/kshutdown/appobserver.cpp
+++ b/kshutdown/appobserver.cpp
@@ -26,10 +26,10 @@
#include <errno.h>
#include <signal.h>
-#include <qcombobox.h>
-#include <qlistbox.h>
-#include <qprocess.h>
-#include <qwhatsthis.h>
+#include <ntqcombobox.h>
+#include <ntqlistbox.h>
+#include <ntqprocess.h>
+#include <ntqwhatsthis.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -42,40 +42,40 @@
// public
-AppObserver::AppObserver(QWidget *parent)
- : QHBox(parent),
- _processesMap(new QMap<int, Process>()),
+AppObserver::AppObserver(TQWidget *parent)
+ : TQHBox(parent),
+ _processesMap(new TQMap<int, Process>()),
_process(0),
- _buf(QString::null)
+ _buf(TQString::null)
{
setName("AppObserver");
// refresh button
b_refresh = new KPushButton(this, "KPushButton::b_refresh");
b_refresh->setIconSet(SmallIcon("reload"));
- b_refresh->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred));
+ b_refresh->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
MiscUtils::setHint(b_refresh, i18n("Refresh the list of processes"));
connect(b_refresh, SIGNAL(clicked()), SLOT(slotRefresh()));
// processes combo box
- cb_processes = new QComboBox(this, "QComboBox::cb_processes");
+ cb_processes = new TQComboBox(this, "TQComboBox::cb_processes");
cb_processes->setFocusPolicy(StrongFocus);
MiscUtils::setHint(cb_processes, i18n("List of the running processes"));
// kill button
b_kill = new KPushButton(SmallIcon("editdelete"), i18n("Kill"), this, "KPushButton::b_kill");
- b_kill->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred));
+ b_kill->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
MiscUtils::setHint(b_kill, i18n("Kill the selected process"));
connect(b_kill, SIGNAL(clicked()), SLOT(slotKill()));
}
-QString AppObserver::getInfo() const
+TQString AppObserver::getInfo() const
{
int index = cb_processes->currentItem();
- QMapIterator<int, Process> i = _processesMap->find(index);
+ TQMapIterator<int, Process> i = _processesMap->find(index);
if (i == _processesMap->end())
- return QString::null;
+ return TQString::null;
return i18n("Waiting for \"%1\"").arg(i.data().command);
}
@@ -84,7 +84,7 @@ bool AppObserver::isSelectedProcessRunning() const
{
// TODO: 2.0: common code
int index = cb_processes->currentItem();
- QMapIterator<int, Process> i = _processesMap->find(index);
+ TQMapIterator<int, Process> i = _processesMap->find(index);
if (i == _processesMap->end())
return false;
@@ -125,13 +125,13 @@ void AppObserver::refresh()
cb_processes->setEnabled(false);
b_kill->setEnabled(false);
- _buf = QString::null;
+ _buf = TQString::null;
cb_processes->clear();
_processesMap->clear();
if (!_process)
{
- _process = new QProcess(this);
+ _process = new TQProcess(this);
connect(_process, SIGNAL(processExited()), SLOT(slotProcessExit()));
connect(_process, SIGNAL(readyReadStdout()), SLOT(slotReadStdout()));
}
@@ -182,7 +182,7 @@ void AppObserver::setWidgetsEnabled(const bool yes) const
void AppObserver::slotKill()
{
int index = cb_processes->currentItem();
- QMapIterator<int, Process> i = _processesMap->find(index);
+ TQMapIterator<int, Process> i = _processesMap->find(index);
// FIXME: 2.0: error message
if (i != _processesMap->end())
{
@@ -232,8 +232,8 @@ void AppObserver::slotProcessExit()
int index = 0;
int line = 0;
Process p;
- QStringList list = QStringList::split(" ", _buf.simplifyWhiteSpace());
- for (QStringList::Iterator i = list.begin(); i != list.end(); ++i)
+ TQStringList list = TQStringList::split(" ", _buf.simplifyWhiteSpace());
+ for (TQStringList::Iterator i = list.begin(); i != list.end(); ++i)
{
switch (line)
{
@@ -254,7 +254,7 @@ void AppObserver::slotProcessExit()
p.command = *i;
_processesMap->insert(index, p);
// kdDebug() << "USER=" << p.user << " PID=" << p.pid << " COMMAND=" << p.command << endl;
- QString text = QString("%1 (pid %2, %3)")
+ TQString text = TQString("%1 (pid %2, %3)")
.arg(p.command)
.arg(p.pid)
.arg(p.user);
diff --git a/kshutdown/appobserver.h b/kshutdown/appobserver.h
index 77b0f3d..dbfb321 100644
--- a/kshutdown/appobserver.h
+++ b/kshutdown/appobserver.h
@@ -22,10 +22,10 @@
#include <sys/types.h>
-#include <qhbox.h>
+#include <ntqhbox.h>
-class QComboBox;
-class QProcess;
+class TQComboBox;
+class TQProcess;
class KPushButton;
@@ -37,14 +37,14 @@ class Process
private:
friend class AppObserver;
pid_t pid; /**< A process ID. */
- QString command; /**< A process command (e.g. "firefox"). */
- QString user; /**< An owner of the process (e.g. "root"). */
+ TQString command; /**< A process command (e.g. "firefox"). */
+ TQString user; /**< An owner of the process (e.g. "root"). */
};
/**
* An application observer/killer (stupid name ;-).
*/
-class AppObserver: public QHBox
+class AppObserver: public TQHBox
{
Q_OBJECT
public:
@@ -52,13 +52,13 @@ public:
* Constructor.
* @param parent A parent widget
*/
- AppObserver(QWidget *parent);
+ AppObserver(TQWidget *parent);
/**
* Returns textual information about the current state,
- * or @c QString::null.
+ * or @c TQString::null.
*/
- QString getInfo() const;
+ TQString getInfo() const;
/**
* Returns @c true if selected process exists.
@@ -85,10 +85,10 @@ private:
KPushButton
*b_kill,
*b_refresh;
- QComboBox *cb_processes;
- QMap<int, Process> *_processesMap;
- QProcess *_process;
- QString _buf;
+ TQComboBox *cb_processes;
+ TQMap<int, Process> *_processesMap;
+ TQProcess *_process;
+ TQString _buf;
private slots:
void slotKill();
void slotProcessExit();
diff --git a/kshutdown/configuration.cpp b/kshutdown/configuration.cpp
index 0514aa9..e632d76 100644
--- a/kshutdown/configuration.cpp
+++ b/kshutdown/configuration.cpp
@@ -51,7 +51,7 @@ Config::Config()
i = addItemInt("general_delay_type", generalDelayType, MMainWindow::DelayType_TimeFromNow, "DelayType");
i->setMinValue(MMainWindow::DelayType_Now);
i->setMaxValue(MMainWindow::DelayType_OnAppExit);
- addItemDateTime("general_date_time", generalDateTime, QDateTime::currentDateTime(), "DelayTime");
+ addItemDateTime("general_date_time", generalDateTime, TQDateTime::currentDateTime(), "DelayTime");
// progress bar
setCurrentGroup("Progress Bar");
diff --git a/kshutdown/configuration.h b/kshutdown/configuration.h
index d5d39fb..dd84803 100644
--- a/kshutdown/configuration.h
+++ b/kshutdown/configuration.h
@@ -37,19 +37,19 @@ public:
// automation
bool cdTrayClose;
ItemBool *i_cdTrayClose;
- QString cdTrayCloseCommand;
+ TQString cdTrayCloseCommand;
ItemString *i_cdTrayCloseCommand;
// custom message
bool customMessageEnabled;
ItemBool *i_customMessageEnabled;
- QString customMessageCommand;
+ TQString customMessageCommand;
ItemString *i_customMessageCommand;
// general
int generalAction;
int generalDelayType;
- QDateTime generalDateTime;
+ TQDateTime generalDateTime;
// progress bar
bool progressBarEnabled;
diff --git a/kshutdown/confirmation.cpp b/kshutdown/confirmation.cpp
index 4f295d0..1084cbb 100644
--- a/kshutdown/confirmation.cpp
+++ b/kshutdown/confirmation.cpp
@@ -31,11 +31,11 @@
// public
-bool Confirmation::confirm(const Action::Type action, const QString &delay)
+bool Confirmation::confirm(const Action::Type action, const TQString &delay)
{
KWin::setOnDesktop(ks_main->winId(), KWin::currentDesktop());
- QWidget *parent;
+ TQWidget *parent;
if (ks_main->isVisible())
parent = ks_main;
else if (MSystemTray::isInstance() && ks_tray->isVisible())
@@ -44,18 +44,18 @@ bool Confirmation::confirm(const Action::Type action, const QString &delay)
parent = 0;
/*
- QWidget *background = new QWidget(0, "QWidget::background", Qt::WType_Popup);
- background->setBackgroundMode(Qt::NoBackground);
+ TQWidget *background = new TQWidget(0, "TQWidget::background", TQt::WType_Popup);
+ background->setBackgroundMode(TQt::NoBackground);
background->setGeometry(kapp->desktop()->geometry());
// Take screenshot - based on the aKregator's TrayIcon::takeScreenshot() (trayicon.cpp)
// and "ksmserver/shutdown.cpp".
- QPixmap shot = QPixmap::grabWindow(
- qt_xrootwin(),
+ TQPixmap shot = TQPixmap::grabWindow(
+ tqt_xrootwin(),
0, 0, // x, y
kapp->desktop()->width(), kapp->desktop()->height()
);
- QImage shotImage = shot.convertToImage();
- KImageEffect::flatten(shotImage, Qt::green, Qt::black);
+ TQImage shotImage = shot.convertToImage();
+ KImageEffect::flatten(shotImage, TQt::green, TQt::black);
bitBlt(background, 0, 0, &shotImage);
background->show();
*/
@@ -73,8 +73,8 @@ bool Confirmation::confirm(const Action::Type action, const QString &delay)
KGuiItem(i18n("&Cancel"), SmallIcon("button_cancel"))
);
bool checkboxResultDummy = false;
- QString selectedTime = delay.isNull() ? i18n("Unknown") : delay;
- QString text =
+ TQString selectedTime = delay.isNull() ? i18n("Unknown") : delay;
+ TQString text =
i18n("Are you sure?<br><br>Selected Action: <b>%1</b><br>Selected Time: <b>%2</b>")
.arg(ks_actions->getName(action))
.arg(selectedTime);
@@ -85,8 +85,8 @@ bool Confirmation::confirm(const Action::Type action, const QString &delay)
dialog,
MainBarIcon(ks_actions->getIconName(action), 32),
MiscUtils::HTML(text),
- QStringList(),
- QString::null,
+ TQStringList(),
+ TQString::null,
&checkboxResultDummy,
KMessageBox::Notify
) == KDialogBase::Yes);
diff --git a/kshutdown/confirmation.h b/kshutdown/confirmation.h
index 9af26c2..4c168fe 100644
--- a/kshutdown/confirmation.h
+++ b/kshutdown/confirmation.h
@@ -32,7 +32,7 @@ public:
* @param delay A selected delay
* @return @c true if action has been confirmed; otherwise @c false
*/
- static bool confirm(const Action::Type action, const QString &delay);
+ static bool confirm(const Action::Type action, const TQString &delay);
};
#endif // __CONFIRMATION_H__
diff --git a/kshutdown/extras.cpp b/kshutdown/extras.cpp
index bef2262..599fc6b 100644
--- a/kshutdown/extras.cpp
+++ b/kshutdown/extras.cpp
@@ -23,7 +23,7 @@
#include "miscutils.h"
#include "mmainwindow.h"
-#include <qdir.h>
+#include <ntqdir.h>
#include <kdebug.h>
#include <kdesktopfile.h>
@@ -49,13 +49,13 @@ Extras::~Extras()
delete _menu;
}
-void Extras::createButton(QWidget *parent)
+void Extras::createButton(TQWidget *parent)
{
_button = new KPushButton(parent, "KPushButton::_button");
_button->hide();
_button->setPopup(_menu);
MiscUtils::setHint(_button, i18n("More actions..."));
- setAction(QString::null, QString::null); /* evil */
+ setAction(TQString::null, TQString::null); /* evil */
}
bool Extras::execAction() const
@@ -73,16 +73,16 @@ bool Extras::execAction() const
return true; // ok
}
-QString Extras::getActionDescription() const
+TQString Extras::getActionDescription() const
{
return
_description.isEmpty()
- ? QString::null
+ ? TQString::null
// "Substitute characters at the middle of a string by \"...\""
: KStringHandler::csqueeze(_description, 100);
}
-void Extras::setAction(const QString &fileToExecute, const QString &description, QIconSet *icon)
+void Extras::setAction(const TQString &fileToExecute, const TQString &description, TQIconSet *icon)
{
_description = description;
_fileToExecute = fileToExecute;
@@ -104,7 +104,7 @@ void Extras::setAction(const QString &fileToExecute, const QString &description,
// private
Extras::Extras()
- : QObject(ks_main, "Extras"),
+ : TQObject(ks_main, "Extras"),
_idToFileMap(0) // initialized in getIdToFileMap()
{
_menu = new KPopupMenu(0, "KPopupMenu::_menu");
@@ -113,19 +113,19 @@ Extras::Extras()
}
// TODO: 2.0: recent items
-void Extras::buildMenu(KPopupMenu *parentMenu, const QString &subdir)
+void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir)
{
int id;
- QDir d(subdir);
- QFileInfo fi;
- QString
+ TQDir d(subdir);
+ TQFileInfo fi;
+ TQString
description,
icon,
mimeType,
name,
path;
- QStringList list = d.entryList(QDir::DefaultFilter, QDir::Name | QDir::DirsFirst);
+ TQStringList list = d.entryList(TQDir::DefaultFilter, TQDir::Name | TQDir::DirsFirst);
list.remove(".");
list.remove("..");
@@ -223,7 +223,7 @@ bool Extras::execFile() const
// HACK: It seems that KRun::runURL sometimes does not work for hibernate :/ ?
- QFileInfo fi(_fileToExecute);
+ TQFileInfo fi(_fileToExecute);
if (fi.fileName() == "hibernate.desktop") {
kdDebug() << "Extras::execFile(): Using hacked run..." << endl;
@@ -241,10 +241,10 @@ bool Extras::execFile() const
}
}
-QMap<int, QString> *Extras::getIdToFileMap()
+TQMap<int, TQString> *Extras::getIdToFileMap()
{
if (!_idToFileMap)
- _idToFileMap = new QMap<int, QString>;
+ _idToFileMap = new TQMap<int, TQString>;
return _idToFileMap;
}
@@ -275,10 +275,10 @@ void Extras::slotModify()
void Extras::slotActivated(int id)
{
- QMap<int, QString>::iterator i = getIdToFileMap()->find(id);
+ TQMap<int, TQString>::iterator i = getIdToFileMap()->find(id);
if (i == getIdToFileMap()->end())
{
- setAction(QString::null, QString::null);
+ setAction(TQString::null, TQString::null);
KMessageBox::error(
0,
"Internal error!\nSelected menu item is broken.",
@@ -293,14 +293,14 @@ void Extras::slotActivated(int id)
void Extras::slotShowMenu()
{
- setAction(QString::null, QString::null);
+ setAction(TQString::null, TQString::null);
_menu->clear(); // reset menu
getIdToFileMap()->clear(); // reset map
- QStringList extrasDirs(KGlobal::dirs()->findDirs("data", "kshutdown/extras"));
- QStringList::ConstIterator
+ TQStringList extrasDirs(KGlobal::dirs()->findDirs("data", "kshutdown/extras"));
+ TQStringList::ConstIterator
begin = extrasDirs.begin(),
end = extrasDirs.end();
- for (QStringList::ConstIterator it = begin; it != end; ++it)
+ for (TQStringList::ConstIterator it = begin; it != end; ++it)
{
if ((it != begin) && (_menu->count() > 0))
_menu->insertSeparator();
diff --git a/kshutdown/extras.h b/kshutdown/extras.h
index 58297cd..4aab74c 100644
--- a/kshutdown/extras.h
+++ b/kshutdown/extras.h
@@ -20,8 +20,8 @@
#ifndef __EXTRAS_H__
#define __EXTRAS_H__
-#include <qobject.h>
-#include <qiconset.h>
+#include <ntqobject.h>
+#include <ntqiconset.h>
class KPopupMenu;
class KPushButton;
@@ -29,7 +29,7 @@ class KPushButton;
#define ks_extras Extras::getInstance()
/** @short Extras - user commands stored in "extras" directory. */
-class Extras: public QObject
+class Extras: public TQObject
{
Q_OBJECT
public:
@@ -47,7 +47,7 @@ public:
* Creates the @b Extras button.
* @param parent A parent widget
*/
- void createButton(QWidget *parent);
+ void createButton(TQWidget *parent);
/**
* Executes an "extras" action previously selected from the menu.
@@ -58,13 +58,13 @@ public:
/**
* Returns a file name which will be executed by @ref execAction.
*/
- inline QString fileToExecute() const { return _fileToExecute; }
+ inline TQString fileToExecute() const { return _fileToExecute; }
/**
* Returns a full description of the action,
- * or @c QString::null if no action.
+ * or @c TQString::null if no action.
*/
- QString getActionDescription() const;
+ TQString getActionDescription() const;
/**
* Initializes and returns the instance of the "extras" manager.
@@ -77,13 +77,13 @@ public:
return _instance;
}
- void setAction(const QString &fileToExecute, const QString &description, QIconSet *icon = 0);
+ void setAction(const TQString &fileToExecute, const TQString &description, TQIconSet *icon = 0);
private:
static Extras *_instance;
KPopupMenu *_menu;
KPushButton *_button;
- QMap<int, QString> *_idToFileMap;
- QString
+ TQMap<int, TQString> *_idToFileMap;
+ TQString
_description,
_fileToExecute;
Extras();
@@ -93,10 +93,10 @@ private:
* @param parentMenu A parent menu
* @param subdir A subdirectory
*/
- void buildMenu(KPopupMenu *parentMenu, const QString &subdir);
+ void buildMenu(KPopupMenu *parentMenu, const TQString &subdir);
bool execFile() const;
- QMap<int, QString> *getIdToFileMap();
+ TQMap<int, TQString> *getIdToFileMap();
public slots:
/**
* Opens the "extras" directory in the @b Konqueror.
diff --git a/kshutdown/kshutdowniface.h b/kshutdown/kshutdowniface.h
index 2a72c75..354da44 100644
--- a/kshutdown/kshutdowniface.h
+++ b/kshutdown/kshutdowniface.h
@@ -76,7 +76,7 @@ k_dcop:
* (e.g. "Idle", "Busy", "1 minute warning", etc).
* Can be used in Karamba themes, for example.
*/
- virtual QString getStatusInfo() = 0;
+ virtual TQString getStatusInfo() = 0;
/**
* Hides the main window and its system tray icon.
diff --git a/kshutdown/kshutdowniface_skel.cpp b/kshutdown/kshutdowniface_skel.cpp
index d267d86..e0b169b 100644
--- a/kshutdown/kshutdowniface_skel.cpp
+++ b/kshutdown/kshutdowniface_skel.cpp
@@ -9,7 +9,7 @@
#include "kshutdowniface.h"
#include <kdatastream.h>
-#include <qasciidict.h>
+#include <ntqasciidict.h>
static const int KShutdownIface_fhash = 13;
@@ -21,7 +21,7 @@ static const char* const KShutdownIface_ftable[12][3] = {
{ "bool", "lockScreen()", "lockScreen()" },
{ "bool", "logout()", "logout()" },
{ "ASYNC", "configure()", "configure()" },
- { "QString", "getStatusInfo()", "getStatusInfo()" },
+ { "TQString", "getStatusInfo()", "getStatusInfo()" },
{ "void", "makeInvisible()", "makeInvisible()" },
{ "ASYNC", "makeVisible()", "makeVisible()" },
{ "ASYNC", "setTestMode(bool)", "setTestMode(bool yes)" },
@@ -41,11 +41,11 @@ static const int KShutdownIface_ftable_hiddens[11] = {
0,
};
-bool KShutdownIface::process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData)
+bool KShutdownIface::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)
{
- static QAsciiDict<int>* fdict = 0;
+ static TQAsciiDict<int>* fdict = 0;
if ( !fdict ) {
- fdict = new QAsciiDict<int>( KShutdownIface_fhash, true, false );
+ fdict = new TQAsciiDict<int>( KShutdownIface_fhash, true, false );
for ( int i = 0; KShutdownIface_ftable[i][1]; i++ )
fdict->insert( KShutdownIface_ftable[i][1], new int( i ) );
}
@@ -57,36 +57,36 @@ bool KShutdownIface::process(const QCString &fun, const QByteArray &data, QCStri
} break;
case 1: { // bool shutDown()
replyType = KShutdownIface_ftable[1][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << shutDown( );
} break;
case 2: { // bool shutdown()
replyType = KShutdownIface_ftable[2][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << shutdown( );
} break;
case 3: { // bool reboot()
replyType = KShutdownIface_ftable[3][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << reboot( );
} break;
case 4: { // bool lockScreen()
replyType = KShutdownIface_ftable[4][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << lockScreen( );
} break;
case 5: { // bool logout()
replyType = KShutdownIface_ftable[5][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << logout( );
} break;
case 6: { // void configure()
replyType = KShutdownIface_ftable[6][0];
configure( );
} break;
- case 7: { // QString getStatusInfo()
+ case 7: { // TQString getStatusInfo()
replyType = KShutdownIface_ftable[7][0];
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << getStatusInfo( );
} break;
case 8: { // void makeInvisible()
@@ -99,7 +99,7 @@ bool KShutdownIface::process(const QCString &fun, const QByteArray &data, QCStri
} break;
case 10: { // void setTestMode(bool)
bool arg0;
- QDataStream arg( data, IO_ReadOnly );
+ TQDataStream arg( data, IO_ReadOnly );
if (arg.atEnd()) return false;
arg >> arg0;
replyType = KShutdownIface_ftable[10][0];
@@ -124,7 +124,7 @@ QCStringList KShutdownIface::functions()
for ( int i = 0; KShutdownIface_ftable[i][2]; i++ ) {
if (KShutdownIface_ftable_hiddens[i])
continue;
- QCString func = KShutdownIface_ftable[i][0];
+ TQCString func = KShutdownIface_ftable[i][0];
func += ' ';
func += KShutdownIface_ftable[i][2];
funcs << func;
diff --git a/kshutdown/kshutdowniface_stub.cpp b/kshutdown/kshutdowniface_stub.cpp
index 9187c8c..b94de1d 100644
--- a/kshutdown/kshutdowniface_stub.cpp
+++ b/kshutdown/kshutdowniface_stub.cpp
@@ -12,12 +12,12 @@
#include <kdatastream.h>
-KShutdownIface_stub::KShutdownIface_stub( const QCString& app, const QCString& obj )
+KShutdownIface_stub::KShutdownIface_stub( const TQCString& app, const TQCString& obj )
: DCOPStub( app, obj )
{
}
-KShutdownIface_stub::KShutdownIface_stub( DCOPClient* client, const QCString& app, const QCString& obj )
+KShutdownIface_stub::KShutdownIface_stub( DCOPClient* client, const TQCString& app, const TQCString& obj )
: DCOPStub( client, app, obj )
{
}
@@ -33,7 +33,7 @@ void KShutdownIface_stub::cancel()
setStatus( CallFailed );
return;
}
- QByteArray data;
+ TQByteArray data;
dcopClient()->send( app(), obj(), "cancel()", data );
setStatus( CallSucceeded );
}
@@ -45,11 +45,11 @@ bool KShutdownIface_stub::shutDown()
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "shutDown()", data, replyType, replyData ) ) {
if ( replyType == "bool" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -68,11 +68,11 @@ bool KShutdownIface_stub::shutdown()
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "shutdown()", data, replyType, replyData ) ) {
if ( replyType == "bool" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -91,11 +91,11 @@ bool KShutdownIface_stub::reboot()
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "reboot()", data, replyType, replyData ) ) {
if ( replyType == "bool" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -114,11 +114,11 @@ bool KShutdownIface_stub::lockScreen()
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "lockScreen()", data, replyType, replyData ) ) {
if ( replyType == "bool" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -137,11 +137,11 @@ bool KShutdownIface_stub::logout()
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "logout()", data, replyType, replyData ) ) {
if ( replyType == "bool" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -159,23 +159,23 @@ void KShutdownIface_stub::configure()
setStatus( CallFailed );
return;
}
- QByteArray data;
+ TQByteArray data;
dcopClient()->send( app(), obj(), "configure()", data );
setStatus( CallSucceeded );
}
-QString KShutdownIface_stub::getStatusInfo()
+TQString KShutdownIface_stub::getStatusInfo()
{
- QString result;
+ TQString result;
if ( !dcopClient() ) {
setStatus( CallFailed );
return result;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "getStatusInfo()", data, replyType, replyData ) ) {
- if ( replyType == "QString" ) {
- QDataStream _reply_stream( replyData, IO_ReadOnly );
+ if ( replyType == "TQString" ) {
+ TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
} else {
@@ -193,8 +193,8 @@ void KShutdownIface_stub::makeInvisible()
setStatus( CallFailed );
return;
}
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if ( dcopClient()->call( app(), obj(), "makeInvisible()", data, replyType, replyData ) ) {
setStatus( CallSucceeded );
} else {
@@ -208,7 +208,7 @@ void KShutdownIface_stub::makeVisible()
setStatus( CallFailed );
return;
}
- QByteArray data;
+ TQByteArray data;
dcopClient()->send( app(), obj(), "makeVisible()", data );
setStatus( CallSucceeded );
}
@@ -219,8 +219,8 @@ void KShutdownIface_stub::setTestMode( bool arg0 )
setStatus( CallFailed );
return;
}
- QByteArray data;
- QDataStream arg( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream arg( data, IO_WriteOnly );
arg << arg0;
dcopClient()->send( app(), obj(), "setTestMode(bool)", data );
setStatus( CallSucceeded );
diff --git a/kshutdown/kshutdowniface_stub.h b/kshutdown/kshutdowniface_stub.h
index 889f3bf..f433424 100644
--- a/kshutdown/kshutdowniface_stub.h
+++ b/kshutdown/kshutdowniface_stub.h
@@ -16,8 +16,8 @@
class KShutdownIface_stub : virtual public DCOPStub
{
public:
- KShutdownIface_stub( const QCString& app, const QCString& id );
- KShutdownIface_stub( DCOPClient* client, const QCString& app, const QCString& id );
+ KShutdownIface_stub( const TQCString& app, const TQCString& id );
+ KShutdownIface_stub( DCOPClient* client, const TQCString& app, const TQCString& id );
explicit KShutdownIface_stub( const DCOPRef& ref );
virtual ASYNC cancel();
virtual bool shutDown();
@@ -26,7 +26,7 @@ public:
virtual bool lockScreen();
virtual bool logout();
virtual ASYNC configure();
- virtual QString getStatusInfo();
+ virtual TQString getStatusInfo();
virtual void makeInvisible();
virtual ASYNC makeVisible();
virtual ASYNC setTestMode( bool yes );
diff --git a/kshutdown/links.cpp b/kshutdown/links.cpp
index f1ce810..3c28f52 100644
--- a/kshutdown/links.cpp
+++ b/kshutdown/links.cpp
@@ -21,9 +21,9 @@
#include "links.h"
#include "miscutils.h"
-#include <qcombobox.h>
-#include <qfile.h>
-#include <qlabel.h>
+#include <ntqcombobox.h>
+#include <ntqfile.h>
+#include <ntqlabel.h>
#include <kapplication.h>
#include <kdesktopfile.h>
@@ -36,8 +36,8 @@
// public
-Links::Links(QWidget *parent)
- : QVBox(parent, "Links")
+Links::Links(TQWidget *parent)
+ : TQVBox(parent, "Links")
{
setSpacing(5);
int alignment = AlignVCenter;
@@ -45,11 +45,11 @@ Links::Links(QWidget *parent)
// location
- QHBox *w_location = new QHBox(this);
+ TQHBox *w_location = new TQHBox(this);
w_location->setSpacing(5);
- QLabel *l_location = new QLabel(i18n("Location where to create the link:"), w_location);
+ TQLabel *l_location = new TQLabel(i18n("Location where to create the link:"), w_location);
l_location->setAlignment(alignment);
- cb_location = new QComboBox(w_location, "QComboBox::cb_location");
+ cb_location = new TQComboBox(w_location, "TQComboBox::cb_location");
cb_location->setFocusPolicy(StrongFocus);
cb_location->insertItem(SmallIcon("desktop"), i18n("Desktop"));
cb_location->insertItem(SmallIcon("kmenu"), i18n("K Menu"));
@@ -57,11 +57,11 @@ Links::Links(QWidget *parent)
connect(cb_location, SIGNAL(activated(int)), SLOT(slotActivated(int)));
// type
- QHBox *w_type = new QHBox(this);
+ TQHBox *w_type = new TQHBox(this);
w_type->setSpacing(5);
- QLabel *l_type = new QLabel(i18n("Type of the link:"), w_type);
+ TQLabel *l_type = new TQLabel(i18n("Type of the link:"), w_type);
l_type->setAlignment(alignment);
- cb_type = new QComboBox(w_type, "QComboBox::cb_type");
+ cb_type = new TQComboBox(w_type, "TQComboBox::cb_type");
cb_type->setFocusPolicy(StrongFocus);
cb_type->insertItem(kapp->miniIcon(), "KShutDown");
@@ -82,7 +82,7 @@ Links::Links(QWidget *parent)
updateAddRemoveButton();
}
-void Links::createLink(const QString &path, const QString &command, const QString &icon, const QString &name, const QString &comment)
+void Links::createLink(const TQString &path, const TQString &command, const TQString &icon, const TQString &name, const TQString &comment)
{
if (path.isNull())
return;
@@ -99,7 +99,7 @@ void Links::createLink(const QString &path, const QString &command, const QStrin
df->writeEntry("Type", "Application");
delete df;
- if (!QFile::exists(path))
+ if (!TQFile::exists(path))
{
KMessageBox::error(
0,
@@ -108,9 +108,9 @@ void Links::createLink(const QString &path, const QString &command, const QStrin
}
}
-void Links::removeLink(const QString &path)
+void Links::removeLink(const TQString &path)
{
- if (QFile::exists(path) && !QFile::remove(path))
+ if (TQFile::exists(path) && !TQFile::remove(path))
{
KMessageBox::error(
0,
@@ -121,9 +121,9 @@ void Links::removeLink(const QString &path)
// private
-QString Links::getCurrentLocationPath() const
+TQString Links::getCurrentLocationPath() const
{
- QString path;
+ TQString path;
switch (cb_location->currentItem())
{
case 0:
@@ -133,7 +133,7 @@ QString Links::getCurrentLocationPath() const
path = locateLocal("apps", "") + "/";
break;
default:
- return QString::null;
+ return TQString::null;
}
switch (cb_type->currentItem())
{
@@ -143,11 +143,11 @@ QString Links::getCurrentLocationPath() const
case 3: return path += "kshutdown-reboot.desktop";
case 4: return path += "kshutdown-lock.desktop";
case 5: return path += "kshutdown-logout.desktop";
- default: return QString::null;
+ default: return TQString::null;
}
}
-QString Links::getCurrentTypeCommand() const
+TQString Links::getCurrentTypeCommand() const
{
switch (cb_type->currentItem())
{
@@ -157,11 +157,11 @@ QString Links::getCurrentTypeCommand() const
case 3: return "kshutdown --confirm --reboot";
case 4: return "kshutdown --confirm --lock";
case 5: return "kshutdown --confirm --logout";
- default: return QString::null;
+ default: return TQString::null;
}
}
-QString Links::getCurrentTypeIcon() const
+TQString Links::getCurrentTypeIcon() const
{
switch (cb_type->currentItem())
{
@@ -172,12 +172,12 @@ QString Links::getCurrentTypeIcon() const
case 3: return "reload";
case 4: return "lock";
case 5: return "undo";
- default: return QString::null;
+ default: return TQString::null;
}
}
void Links::updateAddRemoveButton() {
- if (QFile::exists(getCurrentLocationPath())) {
+ if (TQFile::exists(getCurrentLocationPath())) {
b_addRemoveLink->setIconSet(SmallIcon("editdelete"));
b_addRemoveLink->setText(i18n("Remove Link"));
}
@@ -194,7 +194,7 @@ void Links::slotActivated(int/* index*/) {
}
void Links::slotAddRemoveLink() {
- if (QFile::exists(getCurrentLocationPath())) {
+ if (TQFile::exists(getCurrentLocationPath())) {
removeLink(getCurrentLocationPath());
}
else {
diff --git a/kshutdown/links.h b/kshutdown/links.h
index c9ef90c..91bb756 100644
--- a/kshutdown/links.h
+++ b/kshutdown/links.h
@@ -20,13 +20,13 @@
#ifndef __LINKS_H__
#define __LINKS_H__
-#include <qvbox.h>
+#include <ntqvbox.h>
class KPushButton;
-class QComboBox;
+class TQComboBox;
/** @short A link creator/remover. */
-class Links: public QVBox
+class Links: public TQVBox
{
Q_OBJECT
public:
@@ -34,7 +34,7 @@ public:
* Constructor.
* @param parent A parent widget
*/
- Links(QWidget *parent);
+ Links(TQWidget *parent);
/**
* Creates a new <b>.desktop</b> file.
@@ -45,26 +45,26 @@ public:
* @param comment A comment
*/
static void createLink(
- const QString &path,
- const QString &command,
- const QString &icon,
- const QString &name,
- const QString &comment
+ const TQString &path,
+ const TQString &command,
+ const TQString &icon,
+ const TQString &name,
+ const TQString &comment
);
/**
* Removes a <b>.desktop</b> file.
* @param path A <b>.desktop</b> file to remove
*/
- static void removeLink(const QString &path);
+ static void removeLink(const TQString &path);
private:
KPushButton *b_addRemoveLink;
- QComboBox
+ TQComboBox
*cb_location,
*cb_type;
- QString getCurrentLocationPath() const;
- QString getCurrentTypeCommand() const;
- QString getCurrentTypeIcon() const;
+ TQString getCurrentLocationPath() const;
+ TQString getCurrentTypeCommand() const;
+ TQString getCurrentTypeIcon() const;
void updateAddRemoveButton();
private slots:
void slotActivated(int index);
diff --git a/kshutdown/mactioneditdialog.cpp b/kshutdown/mactioneditdialog.cpp
index 555ad0a..000fc96 100644
--- a/kshutdown/mactioneditdialog.cpp
+++ b/kshutdown/mactioneditdialog.cpp
@@ -22,21 +22,21 @@
#include "miscutils.h"
#include "mtip.h"
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
+#include <ntqhbox.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqvbox.h>
+#include <ntqvgroupbox.h>
+#include <ntqwhatsthis.h>
#include <klineedit.h>
#include <klocale.h>
#include <knuminput.h>
#include <kpushbutton.h>
-MActionEditDialog::MActionEditDialog(QWidget *parent, Action::Type action)
+MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
: KDialogBase(
parent,
"MActionEditDialog",
@@ -49,42 +49,42 @@ MActionEditDialog::MActionEditDialog(QWidget *parent, Action::Type action)
_action(action),
_userCommand("")
{
- QVBox *main = new QVBox(this);
+ TQVBox *main = new TQVBox(this);
setMainWidget(main);
// title
- l_title = new QLabel(main);
- QFont f = QFont(l_title->font());
+ l_title = new TQLabel(main);
+ TQFont f = TQFont(l_title->font());
f.setPointSize(16);
l_title->setFont(f);
l_title->setMargin(10);
- QHBox *gb_south = new QHBox(main);
+ TQHBox *gb_south = new TQHBox(main);
gb_south->setSpacing(5);
- QVBox *gb_widgets = new QVBox(gb_south);
+ TQVBox *gb_widgets = new TQVBox(gb_south);
- QVGroupBox *gb_method = new QVGroupBox(i18n("Method"), gb_widgets);
+ TQVGroupBox *gb_method = new TQVGroupBox(i18n("Method"), gb_widgets);
// method label
- QLabel *l_method = new QLabel(i18n("Select a method:"), gb_method);
+ TQLabel *l_method = new TQLabel(i18n("Select a method:"), gb_method);
// method combo box
- _methods = new QComboBox(gb_method, "QComboBox::_methods");
+ _methods = new TQComboBox(gb_method, "TQComboBox::_methods");
_methods->setFocusPolicy(StrongFocus);
_methods->insertItem(i18n("KDE (default)"));
l_method->setBuddy(_methods);
connect(_methods, SIGNAL(activated(int)), SLOT(slotMethodChange(int)));
// command label
- l_command = new QLabel(i18n("Enter a custom command:"), gb_method);
+ l_command = new TQLabel(i18n("Enter a custom command:"), gb_method);
// command edit line
in_command = new KLineEdit(gb_method, "KLineEdit::in_command");
l_command->setBuddy(in_command);
- QVGroupBox *gb_commandBeforeAction = new QVGroupBox(i18n("Command before action"), gb_widgets);
- c_runCommandBeforeAction = new QCheckBox(i18n("Run command"), gb_commandBeforeAction);
+ TQVGroupBox *gb_commandBeforeAction = new TQVGroupBox(i18n("Command before action"), gb_widgets);
+ c_runCommandBeforeAction = new TQCheckBox(i18n("Run command"), gb_commandBeforeAction);
i_commandBeforeAction = new KLineEdit(gb_commandBeforeAction, "KLineEdit::i_commandBeforeAction");
i_commandBeforeActionPause = new KIntNumInput(gb_commandBeforeAction, "KIntNumInput::i_commandBeforeActionPause");
i_commandBeforeActionPause->setLabel(i18n("Pause after run command:"));
@@ -124,11 +124,11 @@ MActionEditDialog::MActionEditDialog(QWidget *parent, Action::Type action)
connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked()));
Action::Method m = Action::Method_KDE;
- QString c;
- QString group = ks_actions->actionToConfigGroup(_action);
+ TQString c;
+ TQString group = ks_actions->actionToConfigGroup(_action);
_methods->insertItem(ks_actions->getMethod(_action, m, c));
- QString s = ks_actions->getName(_action);
+ TQString s = ks_actions->getName(_action);
l_title->setText(s);
setCaption(s);
@@ -196,8 +196,8 @@ void MActionEditDialog::slotMethodChange(int index)
void MActionEditDialog::slotOKClicked()
{
Action::Method m;
- QString c;
- QString group = ks_actions->actionToConfigGroup(_action);
+ TQString c;
+ TQString group = ks_actions->actionToConfigGroup(_action);
// method
m = (Action::Method)_methods->currentItem();
diff --git a/kshutdown/mactioneditdialog.h b/kshutdown/mactioneditdialog.h
index afd851c..27147df 100644
--- a/kshutdown/mactioneditdialog.h
+++ b/kshutdown/mactioneditdialog.h
@@ -24,8 +24,8 @@
#include <kdialogbase.h>
-class QCheckBox;
-class QComboBox;
+class TQCheckBox;
+class TQComboBox;
class KIntNumInput;
class KLineEdit;
@@ -44,20 +44,20 @@ public:
* @param parent A parent widget
* @param action An action type to edit
*/
- MActionEditDialog(QWidget *parent, const Action::Type action);
+ MActionEditDialog(TQWidget *parent, const Action::Type action);
/** Destructor. */
virtual ~MActionEditDialog();
private:
Action::Type _action;
- QComboBox *_methods;
- QLabel
+ TQComboBox *_methods;
+ TQLabel
*l_command,
*l_title;
- QString _userCommand;
+ TQString _userCommand;
KLineEdit *in_command;
// command before action
- QCheckBox *c_runCommandBeforeAction;
+ TQCheckBox *c_runCommandBeforeAction;
KLineEdit *i_commandBeforeAction;
KIntNumInput *i_commandBeforeActionPause;
KPushButton *b_testCommandBeforeAction;
diff --git a/kshutdown/main.cpp b/kshutdown/main.cpp
index 4372136..44286d7 100644
--- a/kshutdown/main.cpp
+++ b/kshutdown/main.cpp
@@ -24,7 +24,7 @@
#include "mmainwindow.h"
#include "msystemtray.h"
-#include <qfileinfo.h>
+#include <ntqfileinfo.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
@@ -34,7 +34,7 @@
// 0.1.x, 0.3.x, etc - Unstable, Beta
// 0.2.x, 0.4.x, etc - Stable
-QString version = "1.0.4";
+TQString version = "1.0.4";
KAboutData aboutData(
"kshutdown", // internal name
@@ -107,7 +107,7 @@ private:
isTimeArg,
now,
timeArgIsValid;
- QString timeArg;
+ TQString timeArg;
int doExecAction(const Action::Type action);
int doProcessArgs(const KCmdLineArgs *args);
};
@@ -211,7 +211,7 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
// read time arg.
bool absoluteTime = false;
int minutes = 0;
- QDateTime dt = QDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
if (args->count()) {
timeArg = args->arg(0); // first arg. is a "time" arg.
if (!timeArg.isEmpty()) {
@@ -233,7 +233,7 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
else {
absoluteTime = true;
// FIXME: 2.0: AM/PM
- QTime t = QTime::fromString(timeArg);
+ TQTime t = TQTime::fromString(timeArg);
if (t.isValid() && !t.isNull()) { // HH:MM[:SS]?
ok = true;
dt.setTime(t);
@@ -298,7 +298,7 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
else
{
ks_main->setDelayType(MMainWindow::DelayType_TimeFromNow);
- ks_main->setTime(QTime().addSecs(minutes * 60));
+ ks_main->setTime(TQTime().addSecs(minutes * 60));
}
}
ks_main->makeVisible();
@@ -308,16 +308,16 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
// extra
if (args->isSet("extra")) {
- QString extrasCommand = args->getOption("extra");
+ TQString extrasCommand = args->getOption("extra");
if (!extrasCommand.isEmpty()) {
- QFileInfo extra(extrasCommand);
+ TQFileInfo extra(extrasCommand);
if (extra.exists()) {
ks_extras->setAction(extra.filePath(), extra.baseName());
return doExecAction(Action::Extras);
}
else {
- qWarning("ERROR: File \"%s\" does not exist", extrasCommand.latin1());
+ tqWarning("ERROR: File \"%s\" does not exist", extrasCommand.latin1());
}
}
@@ -368,7 +368,7 @@ int main(int argc, char **argv)
aboutData.addCredit("Paulo Zambon", "Portuguese Brazil translation", "pzambon ( at ) astornet.com.br");
aboutData.addCredit("Philipp Weissenbacher");
aboutData.addCredit("Piotr Budny");
- aboutData.addCredit("Quique", "Spanish translation", "quique ( at ) sindominio.net");
+ aboutData.addCredit("Quique", "Spanish translation", "tquique ( at ) sindominio.net");
aboutData.addCredit("Robert Kratky", "Czech translation", "kratky ( at ) rob.cz");
aboutData.addCredit("Romain Beauxis", "Debian Package", "", "http://www.cti.ecp.fr/~beauxir5/debian/");
aboutData.addCredit("Spider (ALT Linux)", "Russian translation");
diff --git a/kshutdown/miscutils.cpp b/kshutdown/miscutils.cpp
index f16238d..e2083b1 100644
--- a/kshutdown/miscutils.cpp
+++ b/kshutdown/miscutils.cpp
@@ -24,9 +24,9 @@
#include "mmainwindow.h"
#include "msystemtray.h"
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <ntqlayout.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
#include <kaction.h>
#include <kdebug.h>
@@ -47,9 +47,9 @@ void MiscUtils::closeCDTray()
runShellCommand(kshutdownrc->cdTrayCloseCommand, KProcess::Block);
}
-void MiscUtils::customMessage(const QString &text, const QString &testCommand)
+void MiscUtils::customMessage(const TQString &text, const TQString &testCommand)
{
- QString c;
+ TQString c;
if (testCommand.isNull())
c = kshutdownrc->customMessageCommand;
else
@@ -64,7 +64,7 @@ void MiscUtils::customMessage(const QString &text, const QString &testCommand)
}
}
-QString MiscUtils::formatDateTime(const int secs, const QString &format)
+TQString MiscUtils::formatDateTime(const int secs, const TQString &format)
{
if ((secs >= 86400) || (secs < 0)) // 24h
return ">24";
@@ -72,7 +72,7 @@ QString MiscUtils::formatDateTime(const int secs, const QString &format)
int h = secs / 3600;
int m = (secs / 60) % 60;
int s = secs % 60;
- QTime t(h, m, s);
+ TQTime t(h, m, s);
if (format.isNull())
return t.toString();
@@ -80,9 +80,9 @@ QString MiscUtils::formatDateTime(const int secs, const QString &format)
return t.toString(format);
}
-QString MiscUtils::formatDateTime(const QDateTime &dt)
+TQString MiscUtils::formatDateTime(const TQDateTime &dt)
{
- QDateTime now = QDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
return
dt.toString(
@@ -93,7 +93,7 @@ QString MiscUtils::formatDateTime(const QDateTime &dt)
" (+" + formatDateTime(now.secsTo(dt), "hh:mm") + ")";
}
-bool MiscUtils::isRestricted(const QString &key)
+bool MiscUtils::isRestricted(const TQString &key)
{
return !kapp->authorize("kshutdown_" + key);
}
@@ -123,7 +123,7 @@ void MiscUtils::notifyUser(const int secs)
}
}
-void MiscUtils::passiveMessage(const QString &text, QWidget *parent) {
+void MiscUtils::passiveMessage(const TQString &text, TQWidget *parent) {
KPassivePopup *popup = KPassivePopup::message(
"KShutDown",
text,
@@ -138,13 +138,13 @@ void MiscUtils::plug(const KAction *action, KPushButton *pushButton) {
pushButton->disconnect(); // disconnect all
pushButton->connect(pushButton, SIGNAL(clicked()), action, SLOT(activate()));
pushButton->setIconSet(action->iconSet());
- QString text = action->text();
+ TQString text = action->text();
if (text.contains("%1"))
text = text.arg(action->shortcutText());
pushButton->setText(text);
}
-bool MiscUtils::runCommand(const QString &command)
+bool MiscUtils::runCommand(const TQString &command)
{
pid_t pid = KRun::run(command, KURL::List());
@@ -156,7 +156,7 @@ bool MiscUtils::runCommand(const QString &command)
return false; // error
}
-void MiscUtils::runCommandBeforeAction(const QString &configEntry)
+void MiscUtils::runCommandBeforeAction(const TQString &configEntry)
{
KConfig *conf = kshutdownrc->config();
@@ -168,14 +168,14 @@ void MiscUtils::runCommandBeforeAction(const QString &configEntry)
if (!conf->readBoolEntry("RunCommandBeforeAction", false))
return;
- QString command = conf->readEntry("CommandBeforeAction", "");
+ TQString command = conf->readEntry("CommandBeforeAction", "");
int pause = conf->readNumEntry("CommandBeforeActionPause", 10);
if ((pause < 0) || (pause > 300))
pause = 10;
runShellCommand(command, KProcess::DontCare, pause);
}
-bool MiscUtils::runShellCommand(const QString &command, const KProcess::RunMode mode, const int pause)
+bool MiscUtils::runShellCommand(const TQString &command, const KProcess::RunMode mode, const int pause)
{
if (command.isEmpty())
return false;
@@ -215,25 +215,25 @@ void MiscUtils::setAutostart(const bool yes) {
config->writeEntry("Autostart", yes);
}
-void MiscUtils::setHint(QWidget *widget, const QString &value)
+void MiscUtils::setHint(TQWidget *widget, const TQString &value)
{
- QToolTip::add(widget, value);
- QWhatsThis::add(widget, value);
+ TQToolTip::add(widget, value);
+ TQWhatsThis::add(widget, value);
}
-void MiscUtils::showRunErrorMessage(const QString &command)
+void MiscUtils::showRunErrorMessage(const TQString &command)
{
notifyUser("kshutdown-runerror", i18n("Could not run \"%1\"!").arg(command));
}
-void MiscUtils::showTestMessage(const QString &message)
+void MiscUtils::showTestMessage(const TQString &message)
{
KMessageBox::information(0, message, i18n("Test"));
}
// private
-void MiscUtils::notifyUser(const QString &name, const QString &text)
+void MiscUtils::notifyUser(const TQString &name, const TQString &text)
{
WId id;
if (MSystemTray::isInstance())
diff --git a/kshutdown/miscutils.h b/kshutdown/miscutils.h
index db2eb47..91fb5a0 100644
--- a/kshutdown/miscutils.h
+++ b/kshutdown/miscutils.h
@@ -20,7 +20,7 @@
#ifndef __MISCUTILS_H__
#define __MISCUTILS_H__
-#include <qdatetime.h>
+#include <ntqdatetime.h>
#include <kprocess.h>
@@ -41,7 +41,7 @@ public:
* @param text A text to display
* @param testCommand A command to execute (used internally in settings dialog to test entered command)
*/
- static void customMessage(const QString &text, const QString &testCommand = QString::null);
+ static void customMessage(const TQString &text, const TQString &testCommand = TQString::null);
/**
* Converts seconds to time string.
@@ -49,20 +49,20 @@ public:
* @param format A date/time format
* @return Converted seconds or ">24", if @p secs >= 86400
*/
- static QString formatDateTime(const int secs, const QString &format = QString::null);
+ static TQString formatDateTime(const int secs, const TQString &format = TQString::null);
/**
* Converts seconds to time string.
* @param dt A date/time to convert
* @return Converted seconds or ">24", if @p secs >= 86400
*/
- static QString formatDateTime(const QDateTime &dt);
+ static TQString formatDateTime(const TQDateTime &dt);
- inline static QString HTML(const QString &text) {
+ inline static TQString HTML(const TQString &text) {
return ("<qt>" + text + "</qt>");
}
- inline static QString HTML(QString &text) {
+ inline static TQString HTML(TQString &text) {
text.prepend("<qt>");
text.append("</qt>");
@@ -75,7 +75,7 @@ public:
* (usually /usr/share/config/kshutdownrc).
* See Handbook (F1) for details.
*/
- static bool isRestricted(const QString &key);
+ static bool isRestricted(const TQString &key);
/**
* Visual and sound notifications.
@@ -83,7 +83,7 @@ public:
*/
static void notifyUser(const int secs);
- static void passiveMessage(const QString &text, QWidget *parent = 0);
+ static void passiveMessage(const TQString &text, TQWidget *parent = 0);
static void plug(const KAction *action, KPushButton *pushButton);
@@ -92,13 +92,13 @@ public:
* @param command A command to execute
* @return @c true if successfull; otherwise @c false
*/
- static bool runCommand(const QString &command);
+ static bool runCommand(const TQString &command);
/**
* Executes a shell command before the specified action.
* @param configEntry A configuration entry (e.g. <i>"Shut Down"</i>)
*/
- static void runCommandBeforeAction(const QString &configEntry);
+ static void runCommandBeforeAction(const TQString &configEntry);
/**
* Executes a shell command.
@@ -107,29 +107,29 @@ public:
* @param pause A timeout in seconds (no timeout by default)
* @return @c true if successfull; otherwise @c false
*/
- static bool runShellCommand(const QString &command, const KProcess::RunMode mode = KProcess::DontCare, const int pause = -1);
+ static bool runShellCommand(const TQString &command, const KProcess::RunMode mode = KProcess::DontCare, const int pause = -1);
static void setAutostart(const bool yes);
/**
* Sets "tool tip text" and "what's this text" of @p widget to @p value.
*/
- static void setHint(QWidget *widget, const QString &value);
+ static void setHint(TQWidget *widget, const TQString &value);
/**
* Displays a "KRun" error message in a passive message.
* @param command A command that failed
*/
- static void showRunErrorMessage(const QString &command);
+ static void showRunErrorMessage(const TQString &command);
/**
* Displays an information if KShutDown is in the <b>Test Mode</b>.
* @param message A message to display
*/
- static void showTestMessage(const QString &message);
+ static void showTestMessage(const TQString &message);
private:
- static void notifyUser(const QString &name, const QString &text);
+ static void notifyUser(const TQString &name, const TQString &text);
};
#endif // __MISCUTILS_H__
diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp
index dea27fc..150c896 100644
--- a/kshutdown/mmainwindow.cpp
+++ b/kshutdown/mmainwindow.cpp
@@ -30,15 +30,15 @@
#include "progressbar.h"
#include "systemconfig.h"
-#include <qdatetimeedit.h>
-#include <qfile.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <ntqdatetimeedit.h>
+#include <ntqfile.h>
+#include <ntqhbox.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqtimer.h>
+#include <ntqtooltip.h>
+#include <ntqvgroupbox.h>
+#include <ntqwhatsthis.h>
#include <dcopclient.h>
#include <kaction.h>
@@ -70,11 +70,11 @@ MMainWindow::MMainWindow()
connect(kapp, SIGNAL(aboutToQuit()), SLOT(slotAboutToQuit()));
// init date/time
- dt_end = QDateTime();
- dt_start = QDateTime();
+ dt_end = TQDateTime();
+ dt_start = TQDateTime();
// action timeout timer
- _timer = new QTimer(this);
+ _timer = new TQTimer(this);
connect(_timer, SIGNAL(timeout()), SLOT(slotCheckTime()));
// init widgets
@@ -89,21 +89,21 @@ MMainWindow::MMainWindow()
KConfig *config = kapp->config();
config->setGroup("Extras");
- QString extrasCommand = config->readEntry("Command", QString::null);
- QString extrasDescription = config->readEntry("Description", QString::null);
- if (!extrasCommand.isEmpty() || QFile::exists(extrasCommand)) {
+ TQString extrasCommand = config->readEntry("Command", TQString::null);
+ TQString extrasDescription = config->readEntry("Description", TQString::null);
+ if (!extrasCommand.isEmpty() || TQFile::exists(extrasCommand)) {
setAction(Action::Extras);
- QIconSet extrasIcon;
- QString mimeType;
+ TQIconSet extrasIcon;
+ TQString mimeType;
mimeType = KMimeType::findByPath(extrasCommand)->name();
if (mimeType != "application/x-desktop")
- extrasIcon = QIconSet(KMimeType::pixmapForURL(KURL::fromPathOrURL(extrasCommand)));
+ extrasIcon = TQIconSet(KMimeType::pixmapForURL(KURL::fromPathOrURL(extrasCommand)));
else {
// application/x-desktop
KDesktopFile *desktopFile = new KDesktopFile(extrasCommand, true);
if (desktopFile->getConfigState() != KConfigBase::NoAccess)
- extrasIcon = QIconSet(SmallIcon(desktopFile->readIcon()));
+ extrasIcon = TQIconSet(SmallIcon(desktopFile->readIcon()));
delete desktopFile;
}
ks_extras->setAction(extrasCommand, extrasDescription, &extrasIcon);
@@ -161,26 +161,26 @@ void MMainWindow::setDelayType(const DelayType value)
l_statusLine->hide();
break;
case DelayType_TimeFromNow:
- QWhatsThis::add(_dateTimeEdit, i18n("Enter hour and minute."));
+ TQWhatsThis::add(_dateTimeEdit, i18n("Enter hour and minute."));
_dateTimeEdit->dateEdit()->setEnabled(false);
_dateTimeEdit->timeEdit()->setEnabled(true);
- _dateTimeEdit->timeEdit()->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes);
- _dateTimeEdit->timeEdit()->setTime(QTime());
+ _dateTimeEdit->timeEdit()->setDisplay(TQTimeEdit::Hours | TQTimeEdit::Minutes);
+ _dateTimeEdit->timeEdit()->setTime(TQTime());
_dateTimeEdit->show();
_appObserver->hide();
l_statusLine->show();
break;
case DelayType_DateTime:
- QWhatsThis::add(_dateTimeEdit, i18n("Enter date and time."));
+ TQWhatsThis::add(_dateTimeEdit, i18n("Enter date and time."));
_dateTimeEdit->dateEdit()->setEnabled(true);
_dateTimeEdit->timeEdit()->setEnabled(true);
_dateTimeEdit->timeEdit()->setDisplay(
KGlobal::locale()->use12Clock()
- ? (QTimeEdit::Hours | QTimeEdit::Minutes | QTimeEdit::AMPM)
- : (QTimeEdit::Hours | QTimeEdit::Minutes)
+ ? (TQTimeEdit::Hours | TQTimeEdit::Minutes | TQTimeEdit::AMPM)
+ : (TQTimeEdit::Hours | TQTimeEdit::Minutes)
);
- _dateTimeEdit->dateEdit()->setDate(QDate::currentDate());
- _dateTimeEdit->timeEdit()->setTime(QTime::currentTime());
+ _dateTimeEdit->dateEdit()->setDate(TQDate::currentDate());
+ _dateTimeEdit->timeEdit()->setTime(TQTime::currentTime());
_dateTimeEdit->show();
_appObserver->hide();
l_statusLine->show();
@@ -194,9 +194,9 @@ void MMainWindow::setDelayType(const DelayType value)
}
}
-void MMainWindow::setTime(const QTime &time)
+void MMainWindow::setTime(const TQTime &time)
{
- _dateTimeEdit->timeEdit()->setTime(QTime(time.hour(), time.minute(), 0));
+ _dateTimeEdit->timeEdit()->setTime(TQTime(time.hour(), time.minute(), 0));
}
void MMainWindow::setAction(const Action::Type action)
@@ -230,7 +230,7 @@ void MMainWindow::setAction(const Action::Type action)
}
}
-void MMainWindow::setDate(const QDate &date)
+void MMainWindow::setDate(const TQDate &date)
{
_dateTimeEdit->dateEdit()->setDate(date);
}
@@ -292,8 +292,8 @@ void MMainWindow::start(const bool confirmation) {
if ((_delayType != DelayType_OnAppExit) && (dt_end < dt_start))
{
- QString selDT = i18n("Selected date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_end, false, true)+ "</b>");
- QString curDT = i18n("Current date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_start, false, true) + "</b>");
+ TQString selDT = i18n("Selected date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_end, false, true)+ "</b>");
+ TQString curDT = i18n("Current date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_start, false, true) + "</b>");
cancel();
KMessageBox::error(
@@ -323,7 +323,7 @@ void MMainWindow::start(const bool confirmation) {
if (_delayType == DelayType_OnAppExit)
{
_timer->start(2000);
- setCaptions(QString::null, _appObserver->getInfo());
+ setCaptions(TQString::null, _appObserver->getInfo());
}
else
{
@@ -392,7 +392,7 @@ void MMainWindow::configure()
_showMinimizeInfo = true;
}
-QString MMainWindow::getStatusInfo()
+TQString MMainWindow::getStatusInfo()
{
return caption();
}
@@ -423,11 +423,11 @@ void MMainWindow::setTestMode(bool yes)
MiscUtils::customMessage(ks_actions->testMode() ? i18n("Test mode enabled") : i18n("Test mode disabled"));
}
-QString MMainWindow::getTimeInfo()
+TQString MMainWindow::getTimeInfo()
{
// start time = now
- dt_start.setDate(QDate::currentDate());
- dt_start.setTime(QTime::currentTime());
+ dt_start.setDate(TQDate::currentDate());
+ dt_start.setTime(TQTime::currentTime());
// end time = start time
dt_end.setDate(dt_start.date());
dt_end.setTime(dt_start.time());
@@ -460,7 +460,7 @@ QString MMainWindow::getTimeInfo()
return i18n("No Delay");
if (_delayType == DelayType_OnAppExit)
- return QString::null;
+ return TQString::null;
return MiscUtils::formatDateTime(dt_end.addSecs(1));
}
@@ -582,81 +582,81 @@ void MMainWindow::initActions()
_globalAccel->insert(
"kshutdown_shutdown",
ks_actions->getName(Action::ShutDown),
- QString(),
+ TQString(),
0, 0, ks_actions, SLOT(slotShutDown())
);
_globalAccel->insert(
"kshutdown_reboot",
ks_actions->getName(Action::Reboot),
- QString(),
+ TQString(),
0, 0, ks_actions, SLOT(slotReboot())
);
_globalAccel->insert(
"kshutdown_lockscreen",
ks_actions->getName(Action::LockScreen),
- QString(),
+ TQString(),
0, 0, ks_actions, SLOT(slotLockScreen())
);
_globalAccel->insert(
"kshutdown_logout",
ks_actions->getName(Action::Logout),
- QString(),
+ TQString(),
0, 0, ks_actions, SLOT(slotLogout())
);
_globalAccel->readSettings();
_globalAccel->updateConnections();
}
-QWidget *MMainWindow::initWidgets()
+TQWidget *MMainWindow::initWidgets()
{
- QWidget *w = new QWidget(this);
- QVBoxLayout *l = new QVBoxLayout(w, 5);
+ TQWidget *w = new TQWidget(this);
+ TQVBoxLayout *l = new TQVBoxLayout(w, 5);
- QVGroupBox *gb_actions = new QVGroupBox(i18n("Select an &action to perform"), w);
+ TQVGroupBox *gb_actions = new TQVGroupBox(i18n("Select an &action to perform"), w);
gb_actions->setInsideSpacing(0);
// actions combo box
- cb_actions = new QComboBox(gb_actions, "QComboBox::cb_actions");
+ cb_actions = new TQComboBox(gb_actions, "TQComboBox::cb_actions");
cb_actions->setFocusPolicy(StrongFocus);
cb_actions->insertItem(ks_actions->getIcon(Action::ShutDown), ks_actions->getName(Action::ShutDown));
cb_actions->insertItem(ks_actions->getIcon(Action::Reboot), ks_actions->getName(Action::Reboot));
cb_actions->insertItem(ks_actions->getIcon(Action::LockScreen), ks_actions->getName(Action::LockScreen));
cb_actions->insertItem(ks_actions->getIcon(Action::Logout), ks_actions->getName(Action::Logout));
cb_actions->insertItem(ks_actions->getIcon(Action::Extras), i18n("Extras"));
- QWhatsThis::add(cb_actions, i18n("Select an action to perform at the selected time."));
+ TQWhatsThis::add(cb_actions, i18n("Select an action to perform at the selected time."));
connect(cb_actions, SIGNAL(activated(int)), SLOT(slotActionChange(int)));
// extras
ks_extras->createButton(gb_actions);
- QVGroupBox *gb_delayValues = new QVGroupBox(i18n("S&elect a time"), w);
+ TQVGroupBox *gb_delayValues = new TQVGroupBox(i18n("S&elect a time"), w);
gb_delayValues->setInsideSpacing(0);
// delay type combo box
- cb_delayTypes = new QComboBox(gb_delayValues, "QComboBox::cb_delayTypes");
+ cb_delayTypes = new TQComboBox(gb_delayValues, "TQComboBox::cb_delayTypes");
cb_delayTypes->setFocusPolicy(StrongFocus);
cb_delayTypes->insertItem(SmallIcon("messagebox_warning"), i18n("No Delay"));
cb_delayTypes->insertItem(SmallIcon("clock"), i18n("Time From Now (HH:MM)"));
cb_delayTypes->insertItem(SmallIcon("date"), i18n("At Date/Time"));
cb_delayTypes->insertItem(SmallIcon("misc"), i18n("When selected application exit"));
if (MiscUtils::isRestricted("tab_time"))
- QWhatsThis::add(cb_delayTypes, i18n("Disabled by the Administrator."));
+ TQWhatsThis::add(cb_delayTypes, i18n("Disabled by the Administrator."));
else
- QWhatsThis::add(cb_delayTypes, i18n("Select the type of delay."));
+ TQWhatsThis::add(cb_delayTypes, i18n("Select the type of delay."));
connect(cb_delayTypes, SIGNAL(activated(int)), SLOT(slotDelayTypeChange(int)));
// date/time edit
- _dateTimeEdit = new QDateTimeEdit(gb_delayValues, "QDateTimeEdit::_dateTimeEdit");
+ _dateTimeEdit = new TQDateTimeEdit(gb_delayValues, "TQDateTimeEdit::_dateTimeEdit");
_dateTimeEdit->setAutoAdvance(true);
- _dateTimeEdit->dateEdit()->setMinValue(QDate::currentDate());
- setDate(QDate::currentDate());
- connect(_dateTimeEdit, SIGNAL(valueChanged(const QDateTime &)), SLOT(slotUpdateTimeInfo()));
+ _dateTimeEdit->dateEdit()->setMinValue(TQDate::currentDate());
+ setDate(TQDate::currentDate());
+ connect(_dateTimeEdit, SIGNAL(valueChanged(const TQDateTime &)), SLOT(slotUpdateTimeInfo()));
// app observer/killer
_appObserver = new AppObserver(gb_delayValues);
// status line
- l_statusLine = new QLabel(gb_delayValues);
- QWhatsThis::add(l_statusLine, i18n("Selected time."));
+ l_statusLine = new TQLabel(gb_delayValues);
+ TQWhatsThis::add(l_statusLine, i18n("Selected time."));
l->addWidget(gb_actions);
l->addWidget(gb_delayValues);
@@ -664,17 +664,17 @@ QWidget *MMainWindow::initWidgets()
// start/stop action button
b_startStop = new KPushButton(w, "KPushButton::b_startStop");
- b_startStop->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
+ b_startStop->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
b_startStop->setDefault(true); // enter key
l->addWidget(b_startStop);
return w;
}
-void MMainWindow::setCaptions(const QString &remainingTime, const QString &selectedTime)
+void MMainWindow::setCaptions(const TQString &remainingTime, const TQString &selectedTime)
{
// window tool tip
- QString s;
+ TQString s;
if (ks_actions->active())
{
if (remainingTime.isNull())
@@ -701,13 +701,13 @@ void MMainWindow::setCaptions(const QString &remainingTime, const QString &selec
s = "";
}
if (MSystemTray::isInstance()) {
- QToolTip::add(
+ TQToolTip::add(
ks_tray,
MiscUtils::HTML("<b>KShutDown</b><br>" + s)
);
}
if (ProgressBar::isInstance()) {
- QToolTip::add(
+ TQToolTip::add(
ProgressBar::getInstance(),
MiscUtils::HTML("<b>KShutDown</b><br>" + s)
);
@@ -791,7 +791,7 @@ void MMainWindow::slotCheckTime()
// check timeout
- QDateTime now = QDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
int curSec = now.time().second();
@@ -869,7 +869,7 @@ void MMainWindow::slotActionChange(int index)
{
setAction((Action::Type)(index + 1)); // 0 = What_Nothing
if (ks_actions->current() != Action::Extras)
- ks_extras->setAction(QString::null, QString::null);
+ ks_extras->setAction(TQString::null, TQString::null);
}
void MMainWindow::slotCheckSystemConfig()
diff --git a/kshutdown/mmainwindow.h b/kshutdown/mmainwindow.h
index badbe8e..0ee8c6b 100644
--- a/kshutdown/mmainwindow.h
+++ b/kshutdown/mmainwindow.h
@@ -23,14 +23,14 @@
#include "actions.h"
#include "kshutdowniface.h"
-#include <qdatetime.h>
+#include <ntqdatetime.h>
#include <kmainwindow.h>
class AppObserver;
-class QDateTimeEdit;
-class QLabel;
+class TQDateTimeEdit;
+class TQLabel;
class KGlobalAccel;
class KPushButton;
@@ -65,13 +65,13 @@ public:
void setDelayType(const DelayType value);
/** Sets editor time to @p time. */
- void setTime(const QTime &time);
+ void setTime(const TQTime &time);
/** Returns the main window widget. Accessed via the @c ks_main macro. */
inline static MMainWindow *getInstance() { return _instance; }
/** Sets editor date to @p date. */
- void setDate(const QDate &date);
+ void setDate(const TQDate &date);
/**
* Activates the selected action.
@@ -99,7 +99,7 @@ public:
virtual bool logout();
// misc:
virtual void configure();
- virtual QString getStatusInfo();
+ virtual TQString getStatusInfo();
virtual void makeInvisible();
virtual void makeVisible();
virtual void setTestMode(bool yes);
@@ -121,34 +121,34 @@ private:
int _oldSec;
AppObserver *_appObserver;
- QDateTimeEdit *_dateTimeEdit;
+ TQDateTimeEdit *_dateTimeEdit;
KPushButton *b_startStop;
// points to the main window widget (this)
static MMainWindow *_instance;
- QComboBox
+ TQComboBox
*cb_actions,
*cb_delayTypes;
- QDateTime
+ TQDateTime
dt_end, // end date/time
dt_start; // start date/time
- QLabel *l_statusLine;
- QTimer *_timer; // timeout timer
+ TQLabel *l_statusLine;
+ TQTimer *_timer; // timeout timer
DelayType _delayType;
- QString getTimeInfo();
+ TQString getTimeInfo();
void initMainMenu();
void initActions();
- QWidget *initWidgets();
+ TQWidget *initWidgets();
/**
* Sets window and system tray captions.
* @param remainingTime A remaining time
* @param selectedTime A selected time
*/
- void setCaptions(const QString &remainingTime = QString::null, const QString &selectedTime = QString::null);
+ void setCaptions(const TQString &remainingTime = TQString::null, const TQString &selectedTime = TQString::null);
void setWidgetsEnabled(const bool yes);
diff --git a/kshutdown/mmessagedialog.cpp b/kshutdown/mmessagedialog.cpp
index 4a02f73..ff80ea9 100644
--- a/kshutdown/mmessagedialog.cpp
+++ b/kshutdown/mmessagedialog.cpp
@@ -21,12 +21,12 @@
#include "mmainwindow.h"
#include "mmessagedialog.h"
-#include <qdatetime.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlcdnumber.h>
-#include <qtimer.h>
+#include <ntqdatetime.h>
+#include <ntqhbox.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlcdnumber.h>
+#include <ntqtimer.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -39,7 +39,7 @@
MMessageDialog *MMessageDialog::_instance = 0;
-MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecute, const QString &text)
+MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecute, const TQString &text)
: KDialog(ks_main, "MMessageDialog", true),
_dialogDelay(delay),
_lastTime(-1),
@@ -50,32 +50,32 @@ MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecu
setPaletteForegroundColor(black);
// main layout
- QVBoxLayout *l = new QVBoxLayout(this, 5);
+ TQVBoxLayout *l = new TQVBoxLayout(this, 5);
// message text
- QLabel *t_message = new QLabel(this);
- QFont f = QFont(t_message->font());
+ TQLabel *t_message = new TQLabel(this);
+ TQFont f = TQFont(t_message->font());
f.setPointSize(16);
t_message->setFont(f);
t_message->setPaletteBackgroundColor(yellow);
t_message->setPaletteForegroundColor(black);
t_message->setAlignment(AlignCenter);
- t_message->setFrameShape(QFrame::StyledPanel);
- t_message->setFrameShadow(QFrame::Plain);
+ t_message->setFrameShape(TQFrame::StyledPanel);
+ t_message->setFrameShadow(TQFrame::Plain);
t_message->setLineWidth(4);
t_message->setMargin(20);
- t_message->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding));
+ t_message->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
t_message->setText(text);
// bottom layout
- QHBox *bottomBox = new QHBox(this);
+ TQHBox *bottomBox = new TQHBox(this);
bottomBox->setSpacing(5);
// seconds
- l_seconds = new QLCDNumber(bottomBox);
+ l_seconds = new TQLCDNumber(bottomBox);
l_seconds->display(_dialogDelay);
- l_seconds->setFrameShape(QFrame::NoFrame);
- l_seconds->setSegmentStyle(QLCDNumber::Flat);
+ l_seconds->setFrameShape(TQFrame::NoFrame);
+ l_seconds->setSegmentStyle(TQLCDNumber::Flat);
MiscUtils::setHint(l_seconds, i18n("Remaining time."));
// continue button
@@ -88,7 +88,7 @@ MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecu
b_continue->setPaletteForegroundColor(black);
connect(b_continue, SIGNAL(clicked()), SLOT(slotAccept()));
b_continue->setEnabled(false);
- QTimer::singleShot(2000, this, SLOT(slotEnableContinue()));
+ TQTimer::singleShot(2000, this, SLOT(slotEnableContinue()));
// cancel button
KPushButton *b_cancel = new KPushButton(KStdGuiItem::cancel(), bottomBox, "KPushButton::b_cancel");
@@ -101,7 +101,7 @@ MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecu
l->addWidget(bottomBox);
// init time checker
- _checkTimer = new QTimer(this);
+ _checkTimer = new TQTimer(this);
connect(_checkTimer, SIGNAL(timeout()), SLOT(slotCheckTime()));
_checkTimer->start(500);
@@ -158,7 +158,7 @@ void MMessageDialog::slotEnableContinue() {
void MMessageDialog::slotCheckTime()
{
- QTime t = QTime::currentTime();
+ TQTime t = TQTime::currentTime();
if (t.second() == _lastTime)
return;
diff --git a/kshutdown/mmessagedialog.h b/kshutdown/mmessagedialog.h
index 3e74c57..826922c 100644
--- a/kshutdown/mmessagedialog.h
+++ b/kshutdown/mmessagedialog.h
@@ -24,7 +24,7 @@
#include <kdialog.h>
-class QLCDNumber;
+class TQLCDNumber;
class KPushButton;
@@ -40,7 +40,7 @@ public:
* or after timeout
* @param text A message text
*/
- MMessageDialog(const int delay, const Action::Type actionToExecute, const QString &text);
+ MMessageDialog(const int delay, const Action::Type actionToExecute, const TQString &text);
/**
* Destructor.
@@ -56,8 +56,8 @@ private:
Action::Type _action;
KPushButton *b_continue;
static MMessageDialog *_instance;
- QLCDNumber *l_seconds;
- QTimer *_checkTimer;
+ TQLCDNumber *l_seconds;
+ TQTimer *_checkTimer;
private slots:
void slotAccept();
void slotEnableContinue();
diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp
index eb3b97a..0503ee7 100644
--- a/kshutdown/msettingsdialog.cpp
+++ b/kshutdown/msettingsdialog.cpp
@@ -28,17 +28,17 @@
#include "mtip.h"
#include "systemconfig.h"
-#include <qcheckbox.h>
-#include <qfile.h>
-#include <qhbox.h>
-#include <qhbuttongroup.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qtooltip.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <ntqcheckbox.h>
+#include <ntqfile.h>
+#include <ntqhbox.h>
+#include <ntqhbuttongroup.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqradiobutton.h>
+#include <ntqtooltip.h>
+#include <ntqvgroupbox.h>
+#include <ntqwhatsthis.h>
#include <kconfigdialogmanager.h>
#include <kiconloader.h>
@@ -58,7 +58,7 @@ MSettingsDialog *MSettingsDialog::_instance = 0;
// public
-MSettingsDialog::MSettingsDialog(QWidget *parent)
+MSettingsDialog::MSettingsDialog(TQWidget *parent)
: KDialogBase(
IconList,
i18n("Settings"),
@@ -85,7 +85,7 @@ MSettingsDialog::MSettingsDialog(QWidget *parent)
connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked()));
// lock after login
- c_autoLock->setChecked(QFile::exists(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"));
+ c_autoLock->setChecked(TQFile::exists(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"));
setInitialSize(configDialogSize("Settings Dialog"));
showPage(_lastPage); // restore last page
@@ -100,13 +100,13 @@ MSettingsDialog::~MSettingsDialog()
// private
-QFrame *MSettingsDialog::addPage(const QString &itemName, const QString &iconName)
+TQFrame *MSettingsDialog::addPage(const TQString &itemName, const TQString &iconName)
{
- return KDialogBase::addPage(itemName, QString::null, MainBarIcon(iconName, 32));
+ return KDialogBase::addPage(itemName, TQString::null, MainBarIcon(iconName, 32));
}
-bool MSettingsDialog::disabledByAdmin(const QString &key, QFrame *page,
- QBoxLayout *pageLayout) const
+bool MSettingsDialog::disabledByAdmin(const TQString &key, TQFrame *page,
+ TQBoxLayout *pageLayout) const
{
if (MiscUtils::isRestricted("settings_" + key))
{
@@ -127,12 +127,12 @@ bool MSettingsDialog::disabledByAdmin(const QString &key, QFrame *page,
void MSettingsDialog::initActionsPage()
{
_actionsPage = addPage(i18n("Actions"), "kshutdown");
- QVBoxLayout *l = new QVBoxLayout(_actionsPage, 5);
+ TQVBoxLayout *l = new TQVBoxLayout(_actionsPage, 5);
if (disabledByAdmin("actions", _actionsPage, l))
return;
- QVGroupBox *gb_general = new QVGroupBox(i18n("Actions"), _actionsPage);
+ TQVGroupBox *gb_general = new TQVGroupBox(i18n("Actions"), _actionsPage);
_actions = new KListView(gb_general, "KListView::_actions");
_actions->setAllColumnsShowFocus(true);
@@ -156,8 +156,8 @@ void MSettingsDialog::initActionsPage()
_shutDownItem = new KListViewItem(_actions, ks_actions->getName(Action::ShutDown));
_shutDownItem->setPixmap(0, ks_actions->getIcon(Action::ShutDown));
- connect(_actions, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), SLOT(slotEditAction()));
- connect(_actions, SIGNAL(spacePressed(QListViewItem *)), SLOT(slotEditAction()));
+ connect(_actions, SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), SLOT(slotEditAction()));
+ connect(_actions, SIGNAL(spacePressed(TQListViewItem *)), SLOT(slotEditAction()));
// edit action
KPushButton *b_editAction = new KPushButton(SmallIcon("edit"), i18n("Edit..."), gb_general, "KPushButton::b_editAction");
connect(b_editAction, SIGNAL(clicked()), SLOT(slotEditAction()));
@@ -165,7 +165,7 @@ void MSettingsDialog::initActionsPage()
KPushButton *b_checkSystemConfig = new KPushButton(SmallIcon("button_ok"), i18n("Check System Configuration"), gb_general, "KPushButton::b_checkSystemConfig");
connect(b_checkSystemConfig, SIGNAL(clicked()), SLOT(slotCheckSystemConfig()));
- QVGroupBox *gb_extras = new QVGroupBox(i18n("Extras Menu"), _actionsPage);
+ TQVGroupBox *gb_extras = new TQVGroupBox(i18n("Extras Menu"), _actionsPage);
KPushButton *b_modifyExtras = new KPushButton(SmallIcon("edit"), i18n("Modify..."), gb_extras, "KPushButton::b_modifyExtras");
if (!ks_actions->isEnabled(Action::Extras))
gb_extras->hide();
@@ -184,18 +184,18 @@ void MSettingsDialog::initActionsPage()
void MSettingsDialog::initAdvancedPage()
{
_advancedPage = addPage(i18n("Advanced"), "misc");
- QVBoxLayout *l = new QVBoxLayout(_advancedPage, 5);
+ TQVBoxLayout *l = new TQVBoxLayout(_advancedPage, 5);
// after login
- QVGroupBox *gb_afterLogin = new QVGroupBox(i18n("After Login"), _advancedPage);
- c_autoLock = new QCheckBox(i18n("Lock screen"), gb_afterLogin);
+ TQVGroupBox *gb_afterLogin = new TQVGroupBox(i18n("After Login"), _advancedPage);
+ c_autoLock = new TQCheckBox(i18n("Lock screen"), gb_afterLogin);
connect(c_autoLock, SIGNAL(clicked()), SLOT(slotConfigChanged()));
// cd tray close
- QVGroupBox *gb_cdTrayClose = new QVGroupBox(i18n("Before Logout"), _advancedPage);
- QCheckBox *c_cdTrayClose = new QCheckBox(i18n("Close CD-ROM Tray"), gb_cdTrayClose, "kcfg_cd_tray_close");
- QHBox *cdTrayCloseBox = new QHBox(gb_cdTrayClose);
- QLabel *l_cdTrayCloseCommand = new QLabel(i18n("Command:"), cdTrayCloseBox);
+ TQVGroupBox *gb_cdTrayClose = new TQVGroupBox(i18n("Before Logout"), _advancedPage);
+ TQCheckBox *c_cdTrayClose = new TQCheckBox(i18n("Close CD-ROM Tray"), gb_cdTrayClose, "kcfg_cd_tray_close");
+ TQHBox *cdTrayCloseBox = new TQHBox(gb_cdTrayClose);
+ TQLabel *l_cdTrayCloseCommand = new TQLabel(i18n("Command:"), cdTrayCloseBox);
// FIXME: 2.0: disable "in_cdTrayCloseCommand" if "c_cdTrayClose" is not checked
// TODO: 2.0: "Test" button
KLineEdit *in_cdTrayCloseCommand = new KLineEdit(cdTrayCloseBox, "kcfg_cd_tray_close_command");
@@ -217,10 +217,10 @@ void MSettingsDialog::initAdvancedPage()
void MSettingsDialog::initGeneralPage()
{
_generalPage = addPage(i18n("General"), "misc");
- QVBoxLayout *l = new QVBoxLayout(_generalPage, 5);
+ TQVBoxLayout *l = new TQVBoxLayout(_generalPage, 5);
// problems
- QVGroupBox *gb_problems = new QVGroupBox(i18n("Common Problems"), _generalPage);
+ TQVGroupBox *gb_problems = new TQVGroupBox(i18n("Common Problems"), _generalPage);
KURLLabel *ul_shutDownProblem = new KURLLabel(gb_problems);
ul_shutDownProblem->setText(i18n("\"Turn Off Computer\" does not work"));
@@ -231,17 +231,17 @@ void MSettingsDialog::initGeneralPage()
connect(ul_trayMessageProblem, SIGNAL(leftClickedURL()), SLOT(slotTrayMessageProblem()));
// links
- QVGroupBox *gb_links = new QVGroupBox(i18n("Add/Remove Links"), _generalPage);
+ TQVGroupBox *gb_links = new TQVGroupBox(i18n("Add/Remove Links"), _generalPage);
new Links(gb_links);
// system tray
- gb_systemTray = new QHButtonGroup(i18n("Show System Tray Icon"), _generalPage, "kcfg_system_tray");
- QRadioButton *rb_systemTray;
- rb_systemTray = new QRadioButton(i18n("Always"), gb_systemTray);
+ gb_systemTray = new TQHButtonGroup(i18n("Show System Tray Icon"), _generalPage, "kcfg_system_tray");
+ TQRadioButton *rb_systemTray;
+ rb_systemTray = new TQRadioButton(i18n("Always"), gb_systemTray);
MiscUtils::setHint(rb_systemTray, i18n("Tray icon will be always visible."));
- rb_systemTray = new QRadioButton(i18n("If Active"), gb_systemTray);
+ rb_systemTray = new TQRadioButton(i18n("If Active"), gb_systemTray);
MiscUtils::setHint(rb_systemTray, i18n("Tray icon will be visible only if KShutDown is active."));
- rb_systemTray = new QRadioButton(i18n("Never"), gb_systemTray);
+ rb_systemTray = new TQRadioButton(i18n("Never"), gb_systemTray);
MiscUtils::setHint(rb_systemTray, i18n("Tray icon will be always hidden."));
l->addWidget(gb_problems);
@@ -249,7 +249,7 @@ void MSettingsDialog::initGeneralPage()
l->addWidget(gb_systemTray);
// karamba info
- QString karambaThemes = locate("appdata", "karamba/kshutdown-48x48.png");
+ TQString karambaThemes = locate("appdata", "karamba/kshutdown-48x48.png");
if (!karambaThemes.isNull())
{
int i = karambaThemes.findRev("/");
@@ -258,12 +258,12 @@ void MSettingsDialog::initGeneralPage()
MTip *t_karamba = new MTip(MTip::Info, _generalPage);
/* TODO: 2.0: superkaramba integration
t_karamba->disconnect(
- t_karamba, SIGNAL(linkClicked(const QString &)),
- t_karamba, SLOT(openLink(const QString &))
+ t_karamba, SIGNAL(linkClicked(const TQString &)),
+ t_karamba, SLOT(openLink(const TQString &))
);
t_karamba->connect(
- t_karamba, SIGNAL(linkClicked(const QString &)),
- this, SLOT(slotOpenKarambaLink(const QString &))
+ t_karamba, SIGNAL(linkClicked(const TQString &)),
+ this, SLOT(slotOpenKarambaLink(const TQString &))
);
*/
karambaThemes = karambaThemes.left(i);
@@ -283,16 +283,16 @@ void MSettingsDialog::initGeneralPage()
void MSettingsDialog::initMessagesPage()
{
_messagesPage = addPage(i18n("Messages"), "messagebox_warning");
- QVBoxLayout *l = new QVBoxLayout(_messagesPage, 5);
+ TQVBoxLayout *l = new TQVBoxLayout(_messagesPage, 5);
KTabWidget *t_messages = new KTabWidget(_messagesPage);
t_messages->setFocusPolicy(StrongFocus);
// warning message:
- QWidget *w_warning = new QWidget(_messagesPage);
- QVBoxLayout *l_warning = new QVBoxLayout(w_warning, 5);
+ TQWidget *w_warning = new TQWidget(_messagesPage);
+ TQVBoxLayout *l_warning = new TQVBoxLayout(w_warning, 5);
// enabled/info
- QCheckBox *c_warningMessageEnabled = new QCheckBox(i18n("Display a warning message before action"), w_warning, "kcfg_warning_message_enabled");
+ TQCheckBox *c_warningMessageEnabled = new TQCheckBox(i18n("Display a warning message before action"), w_warning, "kcfg_warning_message_enabled");
// slider
in_warningMessageDelay = new KIntNumInput(w_warning, "kcfg_warning_message_delay");
in_warningMessageDelay->setSuffix(" " + i18n("minute(s)"));
@@ -300,8 +300,8 @@ void MSettingsDialog::initMessagesPage()
KPushButton *b_warningMessageTest = new KPushButton(KStdGuiItem::test(), w_warning, "KPushButton::b_warningMessageTest");
connect(b_warningMessageTest, SIGNAL(clicked()), SLOT(slotWarningMessageTest()));
- QLabel *l_warningText = new QLabel(i18n("Recommended"), w_warning);
- l_warningText->setFont(QFont(l_warningText->font().family(), l_warningText->font().pointSize(), QFont::Bold));
+ TQLabel *l_warningText = new TQLabel(i18n("Recommended"), w_warning);
+ l_warningText->setFont(TQFont(l_warningText->font().family(), l_warningText->font().pointSize(), TQFont::Bold));
l_warning->addWidget(l_warningText);
l_warning->addWidget(c_warningMessageEnabled);
@@ -312,10 +312,10 @@ void MSettingsDialog::initMessagesPage()
t_messages->addTab(w_warning, i18n("Warning Message"));
// custom message:
- QWidget *w_customMessage = new QWidget(_messagesPage);
- QVBoxLayout *l_customMessage = new QVBoxLayout(w_customMessage, 5);
- QCheckBox *c_customMessageEnabled = new QCheckBox(i18n("Enabled"), w_customMessage, "kcfg_custom_message_enabled");
- QLabel *l_customMessageCommand = new QLabel(i18n("A shell command to execute:"), w_customMessage);
+ TQWidget *w_customMessage = new TQWidget(_messagesPage);
+ TQVBoxLayout *l_customMessage = new TQVBoxLayout(w_customMessage, 5);
+ TQCheckBox *c_customMessageEnabled = new TQCheckBox(i18n("Enabled"), w_customMessage, "kcfg_custom_message_enabled");
+ TQLabel *l_customMessageCommand = new TQLabel(i18n("A shell command to execute:"), w_customMessage);
in_customMessageCommand = new KLineEdit(w_customMessage, "kcfg_custom_message_command");
MiscUtils::setHint(
in_customMessageCommand,
@@ -347,8 +347,8 @@ void MSettingsDialog::initMessagesPage()
t_messages->addTab(w_customMessage, i18n("Custom Message"));
// progress bar
- QVGroupBox *w_progressBar = new QVGroupBox(i18n("Progress Bar"), _messagesPage);
- new QCheckBox(i18n("Enabled"), w_progressBar, "kcfg_progress_bar_enabled");
+ TQVGroupBox *w_progressBar = new TQVGroupBox(i18n("Progress Bar"), _messagesPage);
+ new TQCheckBox(i18n("Enabled"), w_progressBar, "kcfg_progress_bar_enabled");
// re-enable messages
b_enableAllMessages = new KPushButton(i18n("Re-enable All Message Boxes"), _messagesPage, "KPushButton::b_enableAllMessages");
@@ -420,7 +420,7 @@ void MSettingsDialog::updateItem(KListViewItem *item)
return;
Action::Method method = Action::Method_KDE;
- QString
+ TQString
command,
group = ks_actions->actionToConfigGroup(action);
@@ -439,12 +439,12 @@ void MSettingsDialog::updateItem(KListViewItem *item)
conf->setGroup(group);
if (conf->readBoolEntry("RunCommandBeforeAction", false))
{
- QString cmd = conf->readEntry("CommandBeforeAction", "");
+ TQString cmd = conf->readEntry("CommandBeforeAction", "");
int pause = conf->readNumEntry("CommandBeforeActionPause", 10);
if (pause == 0)
cmd += " [" + i18n("No pause") + "]";
else
- cmd += " [" + i18n("Pause: %1").arg(QString::number(pause) + "s") + "]";
+ cmd += " [" + i18n("Pause: %1").arg(TQString::number(pause) + "s") + "]";
item->setText(2, cmd);
}
else
@@ -479,7 +479,7 @@ void MSettingsDialog::slotEditAction()
return;
MActionEditDialog *dialog = new MActionEditDialog(this, itemToActionType(item));
- if (dialog->exec() == QDialog::Accepted)
+ if (dialog->exec() == TQDialog::Accepted)
{
updateItem(item);
slotConfigChanged();
diff --git a/kshutdown/msettingsdialog.h b/kshutdown/msettingsdialog.h
index 6f3fec3..64d27dc 100644
--- a/kshutdown/msettingsdialog.h
+++ b/kshutdown/msettingsdialog.h
@@ -24,8 +24,8 @@
#include <kdialogbase.h>
-class QCheckBox;
-class QHButtonGroup;
+class TQCheckBox;
+class TQHButtonGroup;
class KConfigDialogManager;
class KIntNumInput;
@@ -43,7 +43,7 @@ public:
* Constructor. Creates a new modal settings dialog.
* @param parent A parent widget
*/
- MSettingsDialog(QWidget *parent);
+ MSettingsDialog(TQWidget *parent);
/**
* Destructor.
@@ -79,15 +79,15 @@ private:
*_rebootItem,
*_shutDownItem;
KPushButton *b_enableAllMessages;
- QCheckBox *c_autoLock;
- QFrame
+ TQCheckBox *c_autoLock;
+ TQFrame
*_actionsPage,
*_advancedPage,
*_generalPage,
*_messagesPage;
- QHButtonGroup *gb_systemTray;
+ TQHButtonGroup *gb_systemTray;
- QFrame *addPage(const QString &itemName, const QString &iconName);
+ TQFrame *addPage(const TQString &itemName, const TQString &iconName);
/**
* Returns @c true if page has been disabled by the administrator (Kiosk mode).
@@ -95,7 +95,7 @@ private:
* @param page A dialog page
* @param pageLayout A dialog page layout
*/
- bool disabledByAdmin(const QString &key, QFrame *page = 0, QBoxLayout *pageLayout = 0) const;
+ bool disabledByAdmin(const TQString &key, TQFrame *page = 0, TQBoxLayout *pageLayout = 0) const;
void initActionsPage();
void initAdvancedPage();
diff --git a/kshutdown/mstatstab.cpp b/kshutdown/mstatstab.cpp
index 8062798..7b559b3 100644
--- a/kshutdown/mstatstab.cpp
+++ b/kshutdown/mstatstab.cpp
@@ -22,13 +22,13 @@
#include "miscutils.h"
#include "mstatstab.h"
-#include <qcheckbox.h>
-#include <qprocess.h>
-#include <qregexp.h>
-#include <qtextedit.h>
-#include <qvbox.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <ntqcheckbox.h>
+#include <ntqprocess.h>
+#include <ntqregexp.h>
+#include <ntqtextedit.h>
+#include <ntqvbox.h>
+#include <ntqvgroupbox.h>
+#include <ntqwhatsthis.h>
#include <kiconloader.h>
#include <klocale.h>
@@ -47,25 +47,25 @@ MStatsTab::MStatsTab()
Close | Details,
Close // default button
),
- _buf(QString::null)
+ _buf(TQString::null)
{
- _process = new QProcess(this);
+ _process = new TQProcess(this);
connect(_process, SIGNAL(processExited()), SLOT(slotProcessExit()));
connect(_process, SIGNAL(readyReadStdout()), SLOT(slotReadStdout()));
- QVBox *main = new QVBox(this);
+ TQVBox *main = new TQVBox(this);
setMainWidget(main);
// output
- te_output = new QTextEdit(main, "QTextEdit::te_output");
+ te_output = new TQTextEdit(main, "TQTextEdit::te_output");
te_output->setMinimumSize(640, 320);
te_output->setPaletteBackgroundColor(white);
te_output->setPaletteForegroundColor(black);
te_output->setReadOnly(true);
te_output->setTextFormat(RichText); // allow HTML tags
- te_output->setWordWrap(QTextEdit::NoWrap);
+ te_output->setWordWrap(TQTextEdit::NoWrap);
// based on the "Linux User's Manual" (man w)
- QWhatsThis::add(
+ TQWhatsThis::add(
te_output,
MiscUtils::HTML(i18n(
"This view displays information about the users currently on the " \
@@ -74,20 +74,20 @@ MStatsTab::MStatsTab()
))
);
- QHBox *buttons = new QHBox(main);
+ TQHBox *buttons = new TQHBox(main);
// refresh
b_refresh = new KPushButton(SmallIcon("reload"), i18n("Refresh"), buttons, "KPushButton::b_refresh");
connect(b_refresh, SIGNAL(clicked()), SLOT(slotRefresh()));
// options
- QVGroupBox *options = new QVGroupBox(i18n("Options"), main);
+ TQVGroupBox *options = new TQVGroupBox(i18n("Options"), main);
// long format
- c_longFormat = new QCheckBox(i18n("More information"), options);
+ c_longFormat = new TQCheckBox(i18n("More information"), options);
c_longFormat->setChecked(kshutdownrc->statsLongFormat);
connect(c_longFormat, SIGNAL(clicked()), SLOT(slotRefresh()));
MiscUtils::setHint(c_longFormat, i18n("Show login time, JCPU and PCPU times."));
// toggle from field
- c_toggleFromField = new QCheckBox(i18n("Toggle \"FROM\""), options);
+ c_toggleFromField = new TQCheckBox(i18n("Toggle \"FROM\""), options);
c_toggleFromField->setChecked(kshutdownrc->statsToggleFromField);
MiscUtils::setHint(c_toggleFromField, i18n("Toggle the \"FROM\" (remote hostname) field."));
connect(c_toggleFromField, SIGNAL(clicked()), SLOT(slotRefresh()));
@@ -104,7 +104,7 @@ MStatsTab::~MStatsTab()
// protected
-void MStatsTab::keyPressEvent(QKeyEvent *e) {
+void MStatsTab::keyPressEvent(TQKeyEvent *e) {
// Ctrl+R, F5 = Refresh
if (
b_refresh->isEnabled() &&
@@ -140,7 +140,7 @@ void MStatsTab::slotProcessExit() {
_buf.replace(text, "<font color=\"#a0a0a0\">" text "</font>");
#define KS_WARNING(text) \
- _buf.replace(QRegExp("\\b" text "\\b"), "<font color=\"#ff0000\">" text "</font>");
+ _buf.replace(TQRegExp("\\b" text "\\b"), "<font color=\"#ff0000\">" text "</font>");
// underline header
KS_HEADER("USER")
diff --git a/kshutdown/mstatstab.h b/kshutdown/mstatstab.h
index 94ca43f..3ec8a8d 100644
--- a/kshutdown/mstatstab.h
+++ b/kshutdown/mstatstab.h
@@ -22,9 +22,9 @@
#include <kdialogbase.h>
-class QCheckBox;
-class QProcess;
-class QTextEdit;
+class TQCheckBox;
+class TQProcess;
+class TQTextEdit;
class KPushButton;
@@ -54,16 +54,16 @@ public:
return _instance;
}
protected:
- void keyPressEvent(QKeyEvent *e);
+ void keyPressEvent(TQKeyEvent *e);
private:
KPushButton *b_refresh;
static MStatsTab *_instance;
- QCheckBox
+ TQCheckBox
*c_longFormat,
*c_toggleFromField;
- QProcess *_process;
- QString _buf;
- QTextEdit *te_output;
+ TQProcess *_process;
+ TQString _buf;
+ TQTextEdit *te_output;
void killProcess() const;
private slots:
void slotProcessExit();
diff --git a/kshutdown/msystemtray.cpp b/kshutdown/msystemtray.cpp
index f1a9a6e..5731842 100644
--- a/kshutdown/msystemtray.cpp
+++ b/kshutdown/msystemtray.cpp
@@ -22,7 +22,7 @@
#include "mmainwindow.h"
#include "msystemtray.h"
-#include <qtimer.h>
+#include <ntqtimer.h>
#include <kaction.h>
#include <kdebug.h>
@@ -37,7 +37,7 @@ const double
KS_TRAY_FADE_CHANGE = 0.05f,
KS_TRAY_FADE_MAX = 0.7f;
const int KS_TRAY_FADE_TIMEOUT = 50;
-const QColor KS_TRAY_FADE_COLOR = Qt::yellow;
+const TQColor KS_TRAY_FADE_COLOR = TQt::yellow;
MSystemTray::Mode MSystemTray::_mode = Always;
MSystemTray *MSystemTray::_instance = 0;
@@ -56,7 +56,7 @@ void MSystemTray::flashIcon()
{
if (_saveIcon)
delete _saveIcon;
- _saveIcon = new QPixmap();
+ _saveIcon = new TQPixmap();
*_saveIcon = *pixmap();
_flashCount = 0;
setPixmap(*_flashIcon);
@@ -114,7 +114,7 @@ void MSystemTray::setMode(const Mode mode)
// protected
-void MSystemTray::mousePressEvent(QMouseEvent *e)
+void MSystemTray::mousePressEvent(TQMouseEvent *e)
{
// middle mouse button - display actions menu
// TODO: 2.0: configure middle button action
@@ -139,11 +139,11 @@ MSystemTray::MSystemTray()
// TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?)
// init fade timer
- _fadeTimer = new QTimer(this);
+ _fadeTimer = new TQTimer(this);
connect(_fadeTimer, SIGNAL(timeout()), SLOT(slotFade()));
// init flash timer
- _flashTimer = new QTimer(this);
+ _flashTimer = new TQTimer(this);
connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
// init icons
diff --git a/kshutdown/msystemtray.h b/kshutdown/msystemtray.h
index 6424639..db9fa66 100644
--- a/kshutdown/msystemtray.h
+++ b/kshutdown/msystemtray.h
@@ -89,7 +89,7 @@ protected:
* Overriden to handle middle button click; displays the actions menu.
* @param e A mouse event
*/
- virtual void mousePressEvent(QMouseEvent *e);
+ virtual void mousePressEvent(TQMouseEvent *e);
private:
// icon stuff
bool
@@ -99,8 +99,8 @@ private:
int _flashCount;
KPixmap *_flashIcon;
static Mode _mode;
- QPixmap *_saveIcon;
- QTimer
+ TQPixmap *_saveIcon;
+ TQTimer
*_fadeTimer,
*_flashTimer;
static MSystemTray *_instance;
diff --git a/kshutdown/mtip.cpp b/kshutdown/mtip.cpp
index e571b42..0ccfcab 100644
--- a/kshutdown/mtip.cpp
+++ b/kshutdown/mtip.cpp
@@ -20,13 +20,13 @@
#include "miscutils.h"
#include "mtip.h"
-#include <qtooltip.h>
+#include <ntqtooltip.h>
#include <kiconloader.h>
// public
-MTip::MTip(const TipType tipType, QWidget *parent)
+MTip::MTip(const TipType tipType, TQWidget *parent)
: KActiveLabel(parent, "MTip")
{
setFrameStyle(StyledPanel | Sunken);
@@ -38,10 +38,10 @@ MTip::~MTip()
{
}
-void MTip::setTipText(const QString &value)
+void MTip::setTipText(const TQString &value)
{
// valign and "center" ?
- QString leftCell;
+ TQString leftCell;
if (_iconPath.isEmpty()) {
leftCell = "";
}
@@ -69,7 +69,7 @@ void MTip::setTipType(const TipType value)
break;
case Normal:
_iconPath = getIconPath("messagebox_info");
- setPaletteBackgroundColor(QToolTip::palette().active().background());
+ setPaletteBackgroundColor(TQToolTip::palette().active().background());
setPaletteForegroundColor(black);
break;
case Warning:
@@ -84,7 +84,7 @@ void MTip::setTipType(const TipType value)
// private
-QString MTip::getIconPath(const QString &name) const
+TQString MTip::getIconPath(const TQString &name) const
{
return KGlobal::iconLoader()->iconPath(name, KIcon::NoGroup, KIcon::SizeLarge);
}
diff --git a/kshutdown/mtip.h b/kshutdown/mtip.h
index 4de2fb3..e688048 100644
--- a/kshutdown/mtip.h
+++ b/kshutdown/mtip.h
@@ -40,7 +40,7 @@ public:
* @param tipType A tip type
* @param parent A parent widget
*/
- MTip(const TipType tipType, QWidget *parent);
+ MTip(const TipType tipType, TQWidget *parent);
/**
* Destructor.
@@ -50,16 +50,16 @@ public:
/**
* Sets tip text to @p value.
*/
- void setTipText(const QString &value);
+ void setTipText(const TQString &value);
/**
* Sets tip type to @p value.
*/
void setTipType(const TipType value);
private:
- QString _iconPath;
+ TQString _iconPath;
TipType _type;
- QString getIconPath(const QString &name) const;
+ TQString getIconPath(const TQString &name) const;
};
#endif // __MTIP_H__
diff --git a/kshutdown/progressbar.cpp b/kshutdown/progressbar.cpp
index 96a9136..da2d8b1 100644
--- a/kshutdown/progressbar.cpp
+++ b/kshutdown/progressbar.cpp
@@ -17,9 +17,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-#include <qpainter.h>
+#include <ntqapplication.h>
+#include <ntqdesktopwidget.h>
+#include <ntqpainter.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -42,7 +42,7 @@ void ProgressBar::setPosition(const Position value) {
kshutdownrc->progressBarPosition = value;
_position = value;
- QDesktopWidget *desktop = QApplication::desktop();
+ TQDesktopWidget *desktop = TQApplication::desktop();
resize(desktop->width() - 4, height());
switch (_position) {
case TOP:
@@ -88,7 +88,7 @@ void ProgressBar::setValues(const int complete, const int total) {
// protected
-void ProgressBar::mousePressEvent(QMouseEvent *e) {
+void ProgressBar::mousePressEvent(TQMouseEvent *e) {
// kdDebug() << "ProgressBar::mousePressEvent" << endl;
if (e->button() == RightButton) {
// TODO: 2.0: color configuration
@@ -105,28 +105,28 @@ void ProgressBar::mousePressEvent(QMouseEvent *e) {
popup->popup(e->globalPos());
e->accept();
}
- QWidget::mousePressEvent(e);
+ TQWidget::mousePressEvent(e);
}
-void ProgressBar::paintEvent(QPaintEvent *) {
+void ProgressBar::paintEvent(TQPaintEvent *) {
// kdDebug() << "ProgressBar::paintEvent" << endl;
- QPainter g(this);
+ TQPainter g(this);
int w = width();
int h = height();
- g.fillRect(0, 0, w, h, QBrush(backgroundColor()));
+ g.fillRect(0, 0, w, h, TQBrush(backgroundColor()));
if ((_complete <= 0) || (_total <= 0))
return;
w = (int)((float)w * ((float)_complete * 100.0f / (float)_total) / 100.0f);
- g.fillRect(0, 0, w, h, QBrush(foregroundColor()));
+ g.fillRect(0, 0, w, h, TQBrush(foregroundColor()));
}
// private
ProgressBar::ProgressBar()
- : QWidget(
+ : TQWidget(
0,
"ProgressBar",
WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM
diff --git a/kshutdown/progressbar.h b/kshutdown/progressbar.h
index 8a040d0..f8e8f7f 100644
--- a/kshutdown/progressbar.h
+++ b/kshutdown/progressbar.h
@@ -20,11 +20,11 @@
#ifndef __PROGRESSBAR_H__
#define __PROGRESSBAR_H__
-#include <qwidget.h>
+#include <ntqwidget.h>
#include "progressbar.h"
-class ProgressBar: public QWidget {
+class ProgressBar: public TQWidget {
Q_OBJECT
public:
enum Position { TOP, BOTTOM };
@@ -50,8 +50,8 @@ public:
void setProgress(const int complete);
void setValues(const int complete, const int total);
protected:
- void mousePressEvent(QMouseEvent *e);
- void paintEvent(QPaintEvent *);
+ void mousePressEvent(TQMouseEvent *e);
+ void paintEvent(TQPaintEvent *);
private:
int _complete;
int _total;
diff --git a/kshutdown/systemconfig.cpp b/kshutdown/systemconfig.cpp
index 6b919e0..4a1ff78 100644
--- a/kshutdown/systemconfig.cpp
+++ b/kshutdown/systemconfig.cpp
@@ -22,8 +22,8 @@
#include "miscutils.h"
#include "systemconfig.h"
-#include <qfileinfo.h>
-#include <qheader.h>
+#include <ntqfileinfo.h>
+#include <ntqheader.h>
#include <kapplication.h>
#include <kiconloader.h>
@@ -44,7 +44,7 @@ bool SystemConfig::canShutDown()
/*
if (_canShutDown == -1)
{
- QCString XDM_MANAGED = ::getenv("XDM_MANAGED");
+ TQCString XDM_MANAGED = ::getenv("XDM_MANAGED");
if (XDM_MANAGED.contains("maysd") || XDM_MANAGED.contains("classic"))
_canShutDown = 1;
@@ -57,7 +57,7 @@ bool SystemConfig::canShutDown()
return _canShutDown == 1;
}
-void SystemConfig::check(QWidget *parent)
+void SystemConfig::check(TQWidget *parent)
{
SystemConfig *systemConfig = new SystemConfig(parent);
systemConfig->exec();
@@ -66,7 +66,7 @@ void SystemConfig::check(QWidget *parent)
// private
-SystemConfig::SystemConfig(QWidget *parent)
+SystemConfig::SystemConfig(TQWidget *parent)
: KDialogBase(
parent,
"SystemConfig", // name
@@ -84,8 +84,8 @@ SystemConfig::SystemConfig(QWidget *parent)
_messages->addColumn("");
_messages->addColumn(i18n("Message"));
_messages->header()->setClickEnabled(false);
- connect(_messages, SIGNAL(executed(QListViewItem *)), SLOT(slotExecuted(QListViewItem *)));
- connect(_messages, SIGNAL(spacePressed(QListViewItem *)), SLOT(slotExecuted(QListViewItem *)));
+ connect(_messages, SIGNAL(executed(TQListViewItem *)), SLOT(slotExecuted(TQListViewItem *)));
+ connect(_messages, SIGNAL(spacePressed(TQListViewItem *)), SLOT(slotExecuted(TQListViewItem *)));
setMainWidget(_messages);
_shutdownAllowItem = add(Info, i18n("Tip: Click here if you have problem with the \"/sbin/shutdown\" command."));
@@ -100,7 +100,7 @@ SystemConfig::SystemConfig(QWidget *parent)
add(OK, i18n("No problems were found."));
}
-KListViewItem *SystemConfig::add(const Type type, const QString &message)
+KListViewItem *SystemConfig::add(const Type type, const TQString &message)
{
KListViewItem *item = new KListViewItem(_messages);
item->setMultiLinesEnabled(true);
@@ -122,9 +122,9 @@ KListViewItem *SystemConfig::add(const Type type, const QString &message)
return item;
}
-void SystemConfig::checkFile(const QString &file)
+void SystemConfig::checkFile(const TQString &file)
{
- QFileInfo program(file);
+ TQFileInfo program(file);
if (!program.exists())
{
@@ -141,7 +141,7 @@ void SystemConfig::checkFile(const QString &file)
void SystemConfig::checkKDE()
{
- QCString KDE_FULL_SESSION = ::getenv("KDE_FULL_SESSION");
+ TQCString KDE_FULL_SESSION = ::getenv("KDE_FULL_SESSION");
if (KDE_FULL_SESSION != "true")
{
add(Warning, i18n("It seems that this is not a KDE full session.\nKShutDown was designed to work with KDE.\nHowever, you can customize Actions in the KShutDown settings dialog\n(Settings -> Configure KShutDown... -> Actions)."));
@@ -168,7 +168,7 @@ void SystemConfig::checkKDM()
// private slots
-void SystemConfig::slotExecuted(QListViewItem *item)
+void SystemConfig::slotExecuted(TQListViewItem *item)
{
if (!item)
return;
diff --git a/kshutdown/systemconfig.h b/kshutdown/systemconfig.h
index 6fd3729..7f79ab0 100644
--- a/kshutdown/systemconfig.h
+++ b/kshutdown/systemconfig.h
@@ -39,7 +39,7 @@ public:
* Shows a modal dialog, and checks the system configuration.
* @param parent A parent widget
*/
- static void check(QWidget *parent);
+ static void check(TQWidget *parent);
private:
enum Type { Info, OK, Warning };
static int _canShutDown;
@@ -48,13 +48,13 @@ private:
KListViewItem
*_kdmNotDetected,
*_shutdownAllowItem;
- SystemConfig(QWidget *parent);
- KListViewItem *add(const Type type, const QString &message);
- void checkFile(const QString &file);
+ SystemConfig(TQWidget *parent);
+ KListViewItem *add(const Type type, const TQString &message);
+ void checkFile(const TQString &file);
void checkKDE();
void checkKDM();
private slots:
- void slotExecuted(QListViewItem *item);
+ void slotExecuted(TQListViewItem *item);
};
#endif // __SYSTEMCONFIG_H__
diff --git a/kshutdownlockout/lockout.cpp b/kshutdownlockout/lockout.cpp
index 6fd7085..af336ea 100644
--- a/kshutdownlockout/lockout.cpp
+++ b/kshutdownlockout/lockout.cpp
@@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "lockout.h"
-#include <qlayout.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <ntqlayout.h>
+#include <ntqtoolbutton.h>
+#include <ntqtooltip.h>
#include <dcopclient.h>
#include <kaction.h>
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet *init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
{
// share i18n with KShutDown
KGlobal::locale()->insertCatalogue("kshutdown");
@@ -68,7 +68,7 @@ extern "C"
// public
-Lockout::Lockout(const QString& configFile, QWidget *parent)
+Lockout::Lockout(const TQString& configFile, TQWidget *parent)
: KPanelApplet(
configFile,
KPanelApplet::Normal,
@@ -91,14 +91,14 @@ Lockout::Lockout(const QString& configFile, QWidget *parent)
pm_actions->insertSeparator();
_configureKShutDownAction->plug(pm_actions);
- QVBoxLayout *layout = new QVBoxLayout(this);
- QToolButton *button = new QToolButton(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ TQToolButton *button = new TQToolButton(this);
button->setAutoRaise(true);
button->setBackgroundMode(X11ParentRelative);
button->setPixmap(SmallIcon("exit"));
button->setPopupDelay(100);
button->setMinimumSize(button->pixmap()->size());
- button->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ button->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
connect(button, SIGNAL(clicked()), this, SLOT(slotShowKShutDown()));
button->setPopup(pm_actions);
@@ -113,7 +113,7 @@ Lockout::Lockout(const QString& configFile, QWidget *parent)
kapp->dcopClient()->attach();
connect(kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged()));
- QToolTip::add(
+ TQToolTip::add(
this,
"<qt>" \
"<b>KShutDown</b><br><br>" +
@@ -139,7 +139,7 @@ int Lockout::widthForHeight(int/* height*/) const
// private
-void Lockout::callKShutDown(const QCString &function) {
+void Lockout::callKShutDown(const TQCString &function) {
DCOPClient *client = kapp->dcopClient();
if (!client->isApplicationRegistered("kshutdown")) {
// run KShutDown
@@ -194,7 +194,7 @@ void Lockout::initActions() {
);
}
-void Lockout::runCommand(const QString &command) {
+void Lockout::runCommand(const TQString &command) {
pid_t pid = KRun::run(command, KURL::List());
if (!pid)
KMessageBox::error(0, i18n("Could not run KShutDown!"));
diff --git a/kshutdownlockout/lockout.h b/kshutdownlockout/lockout.h
index faecd58..444d489 100644
--- a/kshutdownlockout/lockout.h
+++ b/kshutdownlockout/lockout.h
@@ -18,7 +18,7 @@ public:
* @param configFile A configuration file (provided by the Kicker)
* @param parent A parent widget
*/
- Lockout(const QString& configFile, QWidget *parent = 0);
+ Lockout(const TQString& configFile, TQWidget *parent = 0);
/**
* Destructor.
@@ -42,9 +42,9 @@ private:
*_logoutAction,
*_rebootAction,
*_shutDownAction;
- void callKShutDown(const QCString &function);
+ void callKShutDown(const TQCString &function);
void initActions();
- void runCommand(const QString &command);
+ void runCommand(const TQString &command);
private slots:
void slotCancel();
void slotConfigureKShutDown();