summaryrefslogtreecommitdiffstats
path: root/ksysv
diff options
context:
space:
mode:
Diffstat (limited to 'ksysv')
-rw-r--r--ksysv/ActionList.h2
-rw-r--r--ksysv/OldView.cpp178
-rw-r--r--ksysv/OldView.h2
-rw-r--r--ksysv/PreferencesDialog.cpp8
-rw-r--r--ksysv/PreferencesDialog.h2
-rw-r--r--ksysv/Properties.cpp22
-rw-r--r--ksysv/Properties.h8
-rw-r--r--ksysv/RunlevelAuthIcon.cpp2
-rw-r--r--ksysv/RunlevelAuthIcon.h2
-rw-r--r--ksysv/ServiceDlg.h2
-rw-r--r--ksysv/SpinBox.cpp10
-rw-r--r--ksysv/SpinBox.h2
-rw-r--r--ksysv/TopWidget.cpp138
-rw-r--r--ksysv/TopWidget.h2
-rw-r--r--ksysv/kscroller.cpp12
-rw-r--r--ksysv/kscroller.h2
-rw-r--r--ksysv/ksvapplication.h2
-rw-r--r--ksysv/ksvconfigwizard.cpp4
-rw-r--r--ksysv/ksvconfigwizard.h2
-rw-r--r--ksysv/ksvdrag.h2
-rw-r--r--ksysv/ksvdraglist.cpp10
-rw-r--r--ksysv/ksvdraglist.h2
-rw-r--r--ksysv/ksvlookandfeel.h2
-rw-r--r--ksysv/ksvmiscconfig.h2
-rw-r--r--ksysv/ksvpathconfig.h2
-rw-r--r--ksysv/lookandfeelconfig.ui4
-rw-r--r--ksysv/main.cpp2
-rw-r--r--ksysv/miscconfig.ui4
-rw-r--r--ksysv/pathconfig.ui14
-rw-r--r--ksysv/trash.h2
30 files changed, 221 insertions, 227 deletions
diff --git a/ksysv/ActionList.h b/ksysv/ActionList.h
index 4af1f84..68290f5 100644
--- a/ksysv/ActionList.h
+++ b/ksysv/ActionList.h
@@ -105,7 +105,7 @@ private:
class ActionList : public TQObject, private TQPtrStack<KSVAction>
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 37dd2d4..5825f6f 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -73,7 +73,7 @@
#include "TopWidget.h"
KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const char* name)
- : TQSplitter (Qt::Vertical, parent, name),
+ : TQSplitter (TQt::Vertical, parent, name),
startRL (new KSVDragList*[ksv::runlevelNumber]),
stopRL (new KSVDragList*[ksv::runlevelNumber]),
conf(KSVConfig::self()),
@@ -102,12 +102,12 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c
// watch services dir
KDirWatch* dirwatch = KDirWatch::self();
dirwatch->addDir (conf->scriptPath ());
- connect (dirwatch, TQT_SIGNAL (dirty (const TQString&)),
- this, TQT_SLOT (updateServicesAfterChange (const TQString&)));
- connect (dirwatch, TQT_SIGNAL (created (const TQString&)),
- this, TQT_SLOT (updateServicesAfterChange (const TQString&)));
- connect (dirwatch, TQT_SIGNAL (deleted (const TQString&)),
- this, TQT_SLOT (updateServicesAfterChange (const TQString&)));
+ connect (dirwatch, TQ_SIGNAL (dirty (const TQString&)),
+ this, TQ_SLOT (updateServicesAfterChange (const TQString&)));
+ connect (dirwatch, TQ_SIGNAL (created (const TQString&)),
+ this, TQ_SLOT (updateServicesAfterChange (const TQString&)));
+ connect (dirwatch, TQ_SIGNAL (deleted (const TQString&)),
+ this, TQ_SLOT (updateServicesAfterChange (const TQString&)));
setSizes(KSVContent::panningFactorToSplitter (conf->panningFactor()));
@@ -126,7 +126,7 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c
textDisplay->setStyleSheet (ksv::styleSheet());
// Open With... menu
- connect (mOpenWithMenu, TQT_SIGNAL (activated (int)), this, TQT_SLOT (openWith (int)));
+ connect (mOpenWithMenu, TQ_SIGNAL (activated (int)), this, TQ_SLOT (openWith (int)));
calcMinSize();
}
@@ -219,25 +219,25 @@ void KSVContent::initLList()
servL->setBuddy(scripts);
// doubleclick && return
- connect (scripts, TQT_SIGNAL(executed(TQListViewItem*)),
- this, TQT_SLOT(slotScriptProperties(TQListViewItem*)));
- connect (scripts, TQT_SIGNAL (returnPressed (TQListViewItem*)),
- this, TQT_SLOT (slotScriptProperties (TQListViewItem*)));
+ connect (scripts, TQ_SIGNAL(executed(TQListViewItem*)),
+ this, TQ_SLOT(slotScriptProperties(TQListViewItem*)));
+ connect (scripts, TQ_SIGNAL (returnPressed (TQListViewItem*)),
+ this, TQ_SLOT (slotScriptProperties (TQListViewItem*)));
// context menus
- connect (scripts, TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
- this, TQT_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect (scripts, TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
+ this, TQ_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
// for cut & copy
- connect (scripts, TQT_SIGNAL (newOrigin ()),
- this, TQT_SLOT (fwdOrigin ()));
+ connect (scripts, TQ_SIGNAL (newOrigin ()),
+ this, TQ_SLOT (fwdOrigin ()));
// for origin updates
- connect (scripts, TQT_SIGNAL (newOrigin (KSVDragList*)),
- this, TQT_SLOT (fwdOrigin (KSVDragList*)));
+ connect (scripts, TQ_SIGNAL (newOrigin (KSVDragList*)),
+ this, TQ_SLOT (fwdOrigin (KSVDragList*)));
trash = new KSVTrash(mScriptBox, "Trash");
- connect (trash, TQT_SIGNAL (undoAction (KSVAction*)), this, TQT_SLOT (fwdUndoAction (KSVAction*)));
+ connect (trash, TQ_SIGNAL (undoAction (KSVAction*)), this, TQ_SLOT (fwdUndoAction (KSVAction*)));
TQWhatsThis::add (trash,
i18n ("<p>You can drag services from a runlevel onto " \
"the <img src=\"small|trash\"/> <strong>trashcan</strong> to " \
@@ -290,21 +290,21 @@ void KSVContent::initLList()
rlL->setBuddy(startRL[i]);
// for cut'n'paste
- connect (startRL[i], TQT_SIGNAL (newOrigin ()),
- this, TQT_SLOT (fwdOrigin ()));
- connect (startRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)),
- this, TQT_SLOT (fwdOrigin (KSVDragList*)));
-
- connect (stopRL[i], TQT_SIGNAL (newOrigin ()),
- this, TQT_SLOT (fwdOrigin ()));
- connect (stopRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)),
- this, TQT_SLOT (fwdOrigin (KSVDragList*)));
+ connect (startRL[i], TQ_SIGNAL (newOrigin ()),
+ this, TQ_SLOT (fwdOrigin ()));
+ connect (startRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)),
+ this, TQ_SLOT (fwdOrigin (KSVDragList*)));
+
+ connect (stopRL[i], TQ_SIGNAL (newOrigin ()),
+ this, TQ_SLOT (fwdOrigin ()));
+ connect (stopRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)),
+ this, TQ_SLOT (fwdOrigin (KSVDragList*)));
}
lay->addStretch(1);
- connect (scripts, TQT_SIGNAL(undoAction(KSVAction*)),
- this, TQT_SLOT(fwdUndoAction(KSVAction*)));
+ connect (scripts, TQ_SIGNAL(undoAction(KSVAction*)),
+ this, TQ_SLOT(fwdUndoAction(KSVAction*)));
// add text-diplay widget
textDisplay = new TQTextEdit( TQString(), TQString(), this, "TextDisplayWidget" );
@@ -313,41 +313,41 @@ void KSVContent::initLList()
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
- connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin()));
- connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin()));
+ connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin()));
+ connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin()));
- connect (startRL[i], TQT_SIGNAL(undoAction(KSVAction*)),
- this, TQT_SLOT(fwdUndoAction(KSVAction*)));
- connect (stopRL[i], TQT_SIGNAL(undoAction(KSVAction*)),
- this, TQT_SLOT(fwdUndoAction(KSVAction*)));
+ connect (startRL[i], TQ_SIGNAL(undoAction(KSVAction*)),
+ this, TQ_SLOT(fwdUndoAction(KSVAction*)));
+ connect (stopRL[i], TQ_SIGNAL(undoAction(KSVAction*)),
+ this, TQ_SLOT(fwdUndoAction(KSVAction*)));
// doubleclick && return
- connect (startRL[i], TQT_SIGNAL(executed(TQListViewItem*)),
- this, TQT_SLOT(slotDoubleClick(TQListViewItem*)));
- connect (stopRL[i], TQT_SIGNAL(executed(TQListViewItem*)),
- this, TQT_SLOT(slotDoubleClick(TQListViewItem*)));
- connect (startRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)),
- this, TQT_SLOT(slotDoubleClick(TQListViewItem*)));
- connect (stopRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)),
- this, TQT_SLOT(slotDoubleClick(TQListViewItem*)));
+ connect (startRL[i], TQ_SIGNAL(executed(TQListViewItem*)),
+ this, TQ_SLOT(slotDoubleClick(TQListViewItem*)));
+ connect (stopRL[i], TQ_SIGNAL(executed(TQListViewItem*)),
+ this, TQ_SLOT(slotDoubleClick(TQListViewItem*)));
+ connect (startRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ this, TQ_SLOT(slotDoubleClick(TQListViewItem*)));
+ connect (stopRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ this, TQ_SLOT(slotDoubleClick(TQListViewItem*)));
// context menus
- connect (startRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
- this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
- connect (stopRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
- this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect (startRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
+ this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect (stopRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
+ this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
// cannot generate sorting number
- connect (startRL[i], TQT_SIGNAL(cannotGenerateNumber()),
- this, TQT_SLOT(fwdCannotGenerateNumber()));
- connect (stopRL[i], TQT_SIGNAL(cannotGenerateNumber()),
- this, TQT_SLOT(fwdCannotGenerateNumber()));
+ connect (startRL[i], TQ_SIGNAL(cannotGenerateNumber()),
+ this, TQ_SLOT(fwdCannotGenerateNumber()));
+ connect (stopRL[i], TQ_SIGNAL(cannotGenerateNumber()),
+ this, TQ_SLOT(fwdCannotGenerateNumber()));
// connecting origin things for "Scripts", too
- connect (scripts, TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin()));
- connect (scripts, TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin()));
- connect (startRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin()));
- connect (stopRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin()));
+ connect (scripts, TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin()));
+ connect (scripts, TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin()));
+ connect (startRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin()));
+ connect (stopRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin()));
// use this loop for setting tooltips
startRL[i]->setToolTip (i18n("Drag here to start services\n" \
@@ -359,11 +359,11 @@ void KSVContent::initLList()
{
if (i != j)
{
- connect (startRL[i], TQT_SIGNAL (newOrigin()), startRL[j], TQT_SLOT (slotNewOrigin()));
- connect (stopRL[i], TQT_SIGNAL (newOrigin()), stopRL[j], TQT_SLOT (slotNewOrigin()));
+ connect (startRL[i], TQ_SIGNAL (newOrigin()), startRL[j], TQ_SLOT (slotNewOrigin()));
+ connect (stopRL[i], TQ_SIGNAL (newOrigin()), stopRL[j], TQ_SLOT (slotNewOrigin()));
- connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[j], TQT_SLOT(slotNewOrigin()));
- connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[j], TQT_SLOT(slotNewOrigin()));
+ connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[j], TQ_SLOT(slotNewOrigin()));
+ connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[j], TQ_SLOT(slotNewOrigin()));
}
}
}
@@ -574,14 +574,14 @@ void KSVContent::infoOnData (KSVItem* item)
KSVData newState = oldState;
KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, kapp->mainWidget());
- connect (props, TQT_SIGNAL (editService (const TQString&)),
- this, TQT_SLOT (editService (const TQString&)));
- connect (props, TQT_SIGNAL (startService (const TQString&)),
- this, TQT_SLOT (startService (const TQString&)));
- connect (props, TQT_SIGNAL (stopService (const TQString&)),
- this, TQT_SLOT (stopService (const TQString&)));
- connect (props, TQT_SIGNAL (restartService (const TQString&)),
- this, TQT_SLOT (restartService (const TQString&)));
+ connect (props, TQ_SIGNAL (editService (const TQString&)),
+ this, TQ_SLOT (editService (const TQString&)));
+ connect (props, TQ_SIGNAL (startService (const TQString&)),
+ this, TQ_SLOT (startService (const TQString&)));
+ connect (props, TQ_SIGNAL (stopService (const TQString&)),
+ this, TQ_SLOT (stopService (const TQString&)));
+ connect (props, TQ_SIGNAL (restartService (const TQString&)),
+ this, TQ_SLOT (restartService (const TQString&)));
int res = props->exec();
@@ -608,9 +608,9 @@ void KSVContent::stopService (const TQString& path)
*_proc << path << "stop";
- connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
- connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
- connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*)));
+ connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
// refresh textDisplay
appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path),
@@ -634,9 +634,9 @@ void KSVContent::startService (const TQString& path)
*_proc << path << "start";
- connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
- connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
- connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*)));
+ connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
// refresh textDisplay
appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path),
@@ -674,9 +674,9 @@ void KSVContent::restartService (const TQString& path)
*_proc << path << "restart";
- connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitDuringRestart(TDEProcess*)));
- connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
- connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitDuringRestart(TDEProcess*)));
+ connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
// refresh textDisplay
appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path),
@@ -716,14 +716,14 @@ void KSVContent::slotScriptProperties(TQListViewItem* item)
KSVServicePropertiesDialog* prop =
new KSVServicePropertiesDialog (*static_cast<KSVItem*> (item)->data(), kapp->mainWidget());
- connect (prop, TQT_SIGNAL (editService (const TQString&)),
- this, TQT_SLOT (editService (const TQString&)));
- connect (prop, TQT_SIGNAL (startService (const TQString&)),
- this, TQT_SLOT (startService (const TQString&)));
- connect (prop, TQT_SIGNAL (stopService (const TQString&)),
- this, TQT_SLOT (stopService (const TQString&)));
- connect (prop, TQT_SIGNAL (restartService (const TQString&)),
- this, TQT_SLOT (restartService (const TQString&)));
+ connect (prop, TQ_SIGNAL (editService (const TQString&)),
+ this, TQ_SLOT (editService (const TQString&)));
+ connect (prop, TQ_SIGNAL (startService (const TQString&)),
+ this, TQ_SLOT (startService (const TQString&)));
+ connect (prop, TQ_SIGNAL (stopService (const TQString&)),
+ this, TQ_SLOT (stopService (const TQString&)));
+ connect (prop, TQ_SIGNAL (restartService (const TQString&)),
+ this, TQ_SLOT (restartService (const TQString&)));
prop->exec();
@@ -737,9 +737,9 @@ void KSVContent::slotExitDuringRestart( TDEProcess* proc )
// signals connected that screw up our output
proc->clearArguments();
- connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
- connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
- connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*)));
+ connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+ connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
@@ -1026,7 +1026,7 @@ void KSVContent::popupServicesMenu (TDEListView*, TQListViewItem* i, const TQPoi
if (i >= 1)
mOpenWithMenu->insertSeparator();
- mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQT_SLOT (openWith()));
+ mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQ_SLOT (openWith()));
mScriptMenu->exec (p, 1);
}
diff --git a/ksysv/OldView.h b/ksysv/OldView.h
index 53eeb7a..617eb88 100644
--- a/ksysv/OldView.h
+++ b/ksysv/OldView.h
@@ -46,7 +46,7 @@ class KSVTopLevel;
class KSVContent : public TQSplitter
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 8189924..c830a34 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -40,7 +40,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
*/
TQFrame* lafPage = addPage (i18n ("Look & Feel"), TQString(), DesktopIcon ("colorize", 32));
mLookAndFeel = new KSVLookAndFeel (lafPage);
- connect( mLookAndFeel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mLookAndFeel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
TQVBoxLayout* lafLayout = new TQVBoxLayout (lafPage);
lafLayout->addWidget (mLookAndFeel);
@@ -68,7 +68,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
*/
TQFrame* pathPage = addPage (i18n ("Paths"), TQString(), DesktopIcon ("kfm", 32));
mPathConfig = new KSVPathConfig(pathPage);
- connect( mPathConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mPathConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
TQVBoxLayout *pathLayout = new TQVBoxLayout (pathPage);
pathLayout->addWidget (mPathConfig);
@@ -79,12 +79,12 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
TQFrame* miscPage = addPage (i18n ("Miscellaneous"), i18n("Settings Not Fitting Anywhere Else"),
DesktopIcon ("misc", 32));
mMiscConfig = new KSVMiscConfig(miscPage);
- connect( mMiscConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+ connect( mMiscConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
TQVBoxLayout *miscLayout = new TQVBoxLayout (miscPage);
miscLayout->addWidget (mMiscConfig);
- connect (mMiscConfig->mShowAll, TQT_SIGNAL (clicked()), this, TQT_SLOT (showAllMessages()));
+ connect (mMiscConfig->mShowAll, TQ_SIGNAL (clicked()), this, TQ_SLOT (showAllMessages()));
reReadConfig();
enableButton( Apply, false );
diff --git a/ksysv/PreferencesDialog.h b/ksysv/PreferencesDialog.h
index 40b27c3..62660fd 100644
--- a/ksysv/PreferencesDialog.h
+++ b/ksysv/PreferencesDialog.h
@@ -16,7 +16,7 @@ class KSVConfig;
class KSVPreferences : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index 6b7b378..dd5fccd 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -54,21 +54,21 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props)
ksv::getServiceDescription (data.filename(), text);
mDesc = new TQTextView (TQString("<p>%1</p>").arg (text), TQString(), desc);
- TQButtonGroup* buttons = new TQButtonGroup (1,Qt::Vertical, i18n ("Actions"), mPage);
+ TQButtonGroup* buttons = new TQButtonGroup (1,TQt::Vertical, i18n ("Actions"), mPage);
TQPushButton* b = new TQPushButton (i18n ("&Edit"), buttons);
- connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doEdit()));
+ connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doEdit()));
TQFrame* spacer = new TQFrame (buttons);
spacer->setMinimumWidth (KDialog::spacingHint());
b = new TQPushButton (i18n ("&Start"), buttons);
- connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStart()));
+ connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStart()));
b = new TQPushButton (i18n ("S&top"), buttons);
- connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStop()));
+ connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStop()));
b = new TQPushButton (i18n ("&Restart"), buttons);
- connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doRestart()));
+ connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doRestart()));
}
KSVServicesPage::~KSVServicesPage ()
@@ -150,12 +150,12 @@ KSVEntryPage::KSVEntryPage (KSVData& data, KPropertiesDialog* props)
top->addWidget (mNumberEdit, 2, 1);
top->addWidget (iconLabel, 3, 0);
- connect (mServiceEdit, TQT_SIGNAL (textChanged (const TQString&)),
- this, TQT_SLOT (emitChanged()));
- connect (mLabelEdit, TQT_SIGNAL (textChanged (const TQString&)),
- this, TQT_SLOT (emitChanged()));
- connect (mNumberEdit, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (emitChanged()));
+ connect (mServiceEdit, TQ_SIGNAL (textChanged (const TQString&)),
+ this, TQ_SLOT (emitChanged()));
+ connect (mLabelEdit, TQ_SIGNAL (textChanged (const TQString&)),
+ this, TQ_SLOT (emitChanged()));
+ connect (mNumberEdit, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (emitChanged()));
}
KSVEntryPage::~KSVEntryPage ()
diff --git a/ksysv/Properties.h b/ksysv/Properties.h
index 9816478..d7df744 100644
--- a/ksysv/Properties.h
+++ b/ksysv/Properties.h
@@ -16,7 +16,7 @@ class KSVData;
class KSVServicePropertiesDialog : public KPropertiesDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -42,7 +42,7 @@ private:
class KSVEntryPropertiesDialog : public KPropertiesDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -67,7 +67,7 @@ private:
class KSVEntryPage : public KPropsDlgPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -93,7 +93,7 @@ private:
class KSVServicesPage : public KPropsDlgPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index 6199e16..2093464 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -39,7 +39,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
lockBox->setFrameStyle (TQFrame::NoFrame);
lockBox->setFixedSize (lockBox->sizeHint());
- connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent()));
+ connect (mTimer, TQ_SIGNAL (timeout()), this, TQ_SLOT (timerEvent()));
mTimer->start (mInterval);
for (int i = 0; i < ksv::runlevelNumber; ++i)
diff --git a/ksysv/RunlevelAuthIcon.h b/ksysv/RunlevelAuthIcon.h
index 2ecda60..323fef4 100644
--- a/ksysv/RunlevelAuthIcon.h
+++ b/ksysv/RunlevelAuthIcon.h
@@ -9,7 +9,7 @@ class TQFileInfo;
class RunlevelAuthIcon : public KAuthIcon
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY (int refreshInterval READ refreshInterval WRITE setRefreshInterval)
diff --git a/ksysv/ServiceDlg.h b/ksysv/ServiceDlg.h
index 0b84b19..2c1f622 100644
--- a/ksysv/ServiceDlg.h
+++ b/ksysv/ServiceDlg.h
@@ -25,7 +25,7 @@ class TQComboBox;
class ServiceDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/SpinBox.cpp b/ksysv/SpinBox.cpp
index cb56bbe..9e52fd0 100644
--- a/ksysv/SpinBox.cpp
+++ b/ksysv/SpinBox.cpp
@@ -17,10 +17,10 @@ KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name)
editor()->installEventFilter (this);
- connect (editor(), TQT_SIGNAL (textChanged (const TQString&)),
- comp, TQT_SLOT (slotMakeCompletion (const TQString&)));
- connect (comp, TQT_SIGNAL (match (const TQString&)),
- this, TQT_SLOT (handleMatch (const TQString&)));
+ connect (editor(), TQ_SIGNAL (textChanged (const TQString&)),
+ comp, TQ_SLOT (slotMakeCompletion (const TQString&)));
+ connect (comp, TQ_SIGNAL (match (const TQString&)),
+ this, TQ_SLOT (handleMatch (const TQString&)));
}
KSVSpinBox::~KSVSpinBox ()
@@ -67,7 +67,7 @@ bool KSVSpinBox::eventFilter (TQObject* o, TQEvent* e)
Q_UNUSED(o);
if (e->type() == TQEvent::KeyPress)
{
- TQKeyEvent* ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent* ke = static_cast<TQKeyEvent*>(e);
switch (ke->key())
{
diff --git a/ksysv/SpinBox.h b/ksysv/SpinBox.h
index 00369d3..55aae77 100644
--- a/ksysv/SpinBox.h
+++ b/ksysv/SpinBox.h
@@ -9,7 +9,7 @@
class KSVSpinBox : public TQSpinBox, public TDECompletionBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 2dfa585..88c5c2b 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -113,8 +113,8 @@ KSVTopLevel::KSVTopLevel()
mOpenWith (0L), mOpenDefault (0L),
- mUndoList (new ActionList (TQT_TQOBJECT(this), "UndoList")),
- mRedoList (new ActionList (TQT_TQOBJECT(this), "RedoList")),
+ mUndoList (new ActionList (this, "UndoList")),
+ mRedoList (new ActionList (this, "RedoList")),
mStartDlg (new ServiceDlg (i18n("Start Service"),
i18n("&Choose which service to start:"),
this)),
@@ -139,27 +139,27 @@ KSVTopLevel::KSVTopLevel()
setCentralWidget(mView);
// ensure that the statusbar gets updated correctly
- connect (mView, TQT_SIGNAL(sigRun(const TQString&)), this, TQT_SLOT(slotUpdateRunning(const TQString&)));
- connect (mView, TQT_SIGNAL(sigStop()), statusBar(), TQT_SLOT(clear()));
- connect (mView, TQT_SIGNAL(cannotGenerateNumber()), this, TQT_SLOT(catchCannotGenerateNumber()));
- connect (mView, TQT_SIGNAL(undoAction(KSVAction*)), this, TQT_SLOT(pushUndoAction(KSVAction*)));
- connect (mView, TQT_SIGNAL(logChanged()), this, TQT_SLOT(enableLogActions()));
+ connect (mView, TQ_SIGNAL(sigRun(const TQString&)), this, TQ_SLOT(slotUpdateRunning(const TQString&)));
+ connect (mView, TQ_SIGNAL(sigStop()), statusBar(), TQ_SLOT(clear()));
+ connect (mView, TQ_SIGNAL(cannotGenerateNumber()), this, TQ_SLOT(catchCannotGenerateNumber()));
+ connect (mView, TQ_SIGNAL(undoAction(KSVAction*)), this, TQ_SLOT(pushUndoAction(KSVAction*)));
+ connect (mView, TQ_SIGNAL(logChanged()), this, TQ_SLOT(enableLogActions()));
// cut & copy
- connect (mView, TQT_SIGNAL (newOrigin()),
- this, TQT_SLOT (dispatchEdit()));
+ connect (mView, TQ_SIGNAL (newOrigin()),
+ this, TQ_SLOT (dispatchEdit()));
// undo
- connect (mUndoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableUndo()));
- connect (mUndoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableUndo()));
+ connect (mUndoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableUndo()));
+ connect (mUndoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableUndo()));
// and redo
- connect (mRedoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableRedo()));
- connect (mRedoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableRedo()));
+ connect (mRedoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableRedo()));
+ connect (mRedoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableRedo()));
// paste
- connect (kapp->clipboard(), TQT_SIGNAL (dataChanged()),
- this, TQT_SLOT (dispatchEdit()));
+ connect (kapp->clipboard(), TQ_SIGNAL (dataChanged()),
+ this, TQ_SLOT (dispatchEdit()));
// init mView according to saved preferences
slotReadConfig();
@@ -186,23 +186,23 @@ KSVTopLevel::~KSVTopLevel()
void KSVTopLevel::initTools()
{
- connect (mStartDlg, TQT_SIGNAL(doAction(const TQString&)),
- mView, TQT_SLOT(startService(const TQString&)));
- connect (mStopDlg, TQT_SIGNAL(doAction(const TQString&)),
- mView, TQT_SLOT(editService(const TQString&)));
- connect (mRestartDlg, TQT_SIGNAL(doAction(const TQString&)),
- mView, TQT_SLOT(restartService(const TQString&)));
- connect (mEditDlg, TQT_SIGNAL(doAction(const TQString&)),
- mView, TQT_SLOT(editService(const TQString&)));
-
- connect (mStartDlg, TQT_SIGNAL (display (bool)),
- this, TQT_SLOT (dispatchStartService (bool)));
- connect (mStopDlg, TQT_SIGNAL (display (bool)),
- this, TQT_SLOT (dispatchStopService (bool)));
- connect (mRestartDlg, TQT_SIGNAL (display (bool)),
- this, TQT_SLOT (dispatchRestartService (bool)));
- connect (mEditDlg, TQT_SIGNAL (display (bool)),
- this, TQT_SLOT (dispatchEditService (bool)));
+ connect (mStartDlg, TQ_SIGNAL(doAction(const TQString&)),
+ mView, TQ_SLOT(startService(const TQString&)));
+ connect (mStopDlg, TQ_SIGNAL(doAction(const TQString&)),
+ mView, TQ_SLOT(editService(const TQString&)));
+ connect (mRestartDlg, TQ_SIGNAL(doAction(const TQString&)),
+ mView, TQ_SLOT(restartService(const TQString&)));
+ connect (mEditDlg, TQ_SIGNAL(doAction(const TQString&)),
+ mView, TQ_SLOT(editService(const TQString&)));
+
+ connect (mStartDlg, TQ_SIGNAL (display (bool)),
+ this, TQ_SLOT (dispatchStartService (bool)));
+ connect (mStopDlg, TQ_SIGNAL (display (bool)),
+ this, TQ_SLOT (dispatchStopService (bool)));
+ connect (mRestartDlg, TQ_SIGNAL (display (bool)),
+ this, TQ_SLOT (dispatchRestartService (bool)));
+ connect (mEditDlg, TQ_SIGNAL (display (bool)),
+ this, TQ_SLOT (dispatchEditService (bool)));
}
@@ -211,48 +211,48 @@ void KSVTopLevel::initActions ()
TDEActionCollection* coll = actionCollection();
// setup File menu
- mFileRevert = KStdAction::revert (TQT_TQOBJECT(this), TQT_SLOT (slotClearChanges()), coll);
+ mFileRevert = KStdAction::revert (this, TQ_SLOT (slotClearChanges()), coll);
mFileRevert->setText (i18n("Re&vert Configuration"));
- mFileLoad = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (load()), coll);
+ mFileLoad = KStdAction::open (this, TQ_SLOT (load()), coll);
mFileLoad->setText (i18n ("&Open..."));
- mFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotAcceptChanges()), coll);
+ mFileSave = KStdAction::save(this, TQ_SLOT(slotAcceptChanges()), coll);
mFileSave->setText (i18n("&Save Configuration"));
- mFileSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (saveAs ()), coll);
+ mFileSaveAs = KStdAction::saveAs (this, TQ_SLOT (saveAs ()), coll);
- mFileSaveLog = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log");
+ mFileSaveLog = KStdAction::save (this, TQ_SLOT(slotSaveLog()), coll, "ksysv_save_log");
mFileSaveLog->setText (i18n("Save &Log..."));
mFileSaveLog->setShortcut (Key_L+CTRL);
mFileSaveLog->setEnabled (false);
// disabled due to complexity
- // mFilePrint = KStdAction::print (this, TQT_SLOT (print()), coll);
+ // mFilePrint = KStdAction::print (this, TQ_SLOT (print()), coll);
- mFilePrintLog = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printLog()), coll, "ksysv_print_log");
+ mFilePrintLog = KStdAction::print(this, TQ_SLOT(printLog()), coll, "ksysv_print_log");
mFilePrintLog->setText( i18n("&Print Log..."));
mFilePrintLog->setEnabled (false);
- mFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), coll);
+ mFileQuit = KStdAction::quit(this, TQ_SLOT(close()), coll);
// setup Edit menu
- mEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), coll);
+ mEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), coll);
mEditUndo->setEnabled (false);
- mEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), coll);
+ mEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), coll);
mEditUndo->setEnabled (false);
- mEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), coll);
- mEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), coll);
- mEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), coll);
- mPasteAppend = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (pasteAppend()),
+ mEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), coll);
+ mEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), coll);
+ mEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), coll);
+ mPasteAppend = KStdAction::paste (this, TQ_SLOT (pasteAppend()),
coll, "ksysv_paste_append");
mEditProperties = new TDEAction (i18n("P&roperties"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(properties()),
+ this, TQ_SLOT(properties()),
coll, "ksysv_properties");
mOpenDefault = new TDEAction (i18n ("&Open"), 0,
- TQT_TQOBJECT(this), TQT_SLOT (editService()),
+ this, TQ_SLOT (editService()),
coll, "ksysv_open_service");
mOpenWith = new TDEActionMenu (i18n ("Open &With"), coll, "ksysv_open_with");
@@ -260,30 +260,30 @@ void KSVTopLevel::initActions ()
// setup Settings menu
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), coll);
- KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), coll);
- KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), coll);
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), coll);
+ KStdAction::keyBindings (this, TQ_SLOT(configureKeys()), coll);
+ KStdAction::configureToolbars (this, TQ_SLOT(configureToolbars()), coll);
+ KStdAction::saveOptions(this, TQ_SLOT(saveOptions()), coll);
+ KStdAction::preferences(this, TQ_SLOT(slotShowConfig()), coll);
mOptionsToggleLog = new TDEToggleAction (i18n("Show &Log"), "toggle_log", 0,
- TQT_TQOBJECT(this), TQT_SLOT (toggleLog()),
+ this, TQ_SLOT (toggleLog()),
coll, "ksysv_toggle_log");
mOptionsToggleLog->setCheckedState(i18n("Hide &Log"));
// setup Tools menu
mToolsStartService = new TDEToggleAction (i18n("&Start Service..."), "ksysv_start", 0,
- TQT_TQOBJECT(mStartDlg), TQT_SLOT (toggle()),
+ mStartDlg, TQ_SLOT (toggle()),
coll, "ksysv_start_service");
mToolsStopService = new TDEToggleAction (i18n("&Stop Service..."), "ksysv_stop", 0,
- TQT_TQOBJECT(mStopDlg), TQT_SLOT (toggle()),
+ mStopDlg, TQ_SLOT (toggle()),
coll, "ksysv_stop_service");
mToolsRestartService = new TDEToggleAction (i18n("&Restart Service..."), 0,
- TQT_TQOBJECT(mRestartDlg), TQT_SLOT (toggle()),
+ mRestartDlg, TQ_SLOT (toggle()),
coll, "ksysv_restart_service");
mToolsEditService = new TDEToggleAction (i18n("&Edit Service..."), 0,
- TQT_TQOBJECT(mEditDlg), TQT_SLOT (toggle()),
+ mEditDlg, TQ_SLOT (toggle()),
coll, "ksysv_edit_service");
createGUI(xmlFile());
@@ -393,7 +393,7 @@ void KSVTopLevel::initStatusBar()
TQHBox* visBox = new TQHBox (status, "visBox");
TQButtonGroup* group = new TQButtonGroup (this, "visButtonGroup");
group->hide();
- connect (group, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (toggleRunlevel (int)));
+ connect (group, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (toggleRunlevel (int)));
TQWhatsThis::add (visBox, i18n ("<p>Click on the checkboxes to <strong>show</strong> or "\
"<strong>hide</strong> runlevels.</p> " \
@@ -416,8 +416,8 @@ void KSVTopLevel::initStatusBar()
TQWidget* strut = new TQWidget (authIconBox, "Strut");
strut->setFixedWidth (KDialog::spacingHint());
mAuth = new RunlevelAuthIcon (mConfig->scriptPath(), mConfig->runlevelPath(), authIconBox);
- connect (mAuth, TQT_SIGNAL (authChanged(bool)), mView, TQT_SLOT(multiplexEnabled(bool)));
- connect (mAuth, TQT_SIGNAL (authChanged(bool)), this, TQT_SLOT(writingEnabled(bool)));
+ connect (mAuth, TQ_SIGNAL (authChanged(bool)), mView, TQ_SLOT(multiplexEnabled(bool)));
+ connect (mAuth, TQ_SIGNAL (authChanged(bool)), this, TQ_SLOT(writingEnabled(bool)));
TQWhatsThis::add (authIconBox, i18n ("<p>If the lock is closed <img src=\"user|ksysv_locked\"/>, "\
"you don't have the right " \
@@ -444,17 +444,17 @@ void KSVTopLevel::slotShowConfig()
{
mPreferences = KSVPreferences::self();
- connect (mPreferences, TQT_SIGNAL (updateColors ()),
- this, TQT_SLOT (updateColors ()));
+ connect (mPreferences, TQ_SIGNAL (updateColors ()),
+ this, TQ_SLOT (updateColors ()));
- connect (mPreferences, TQT_SIGNAL (updateServicesPath ()),
- this, TQT_SLOT (updateServicesPath ()));
+ connect (mPreferences, TQ_SIGNAL (updateServicesPath ()),
+ this, TQ_SLOT (updateServicesPath ()));
- connect (mPreferences, TQT_SIGNAL (updateRunlevelsPath ()),
- this, TQT_SLOT (updateRunlevelsPath ()));
+ connect (mPreferences, TQ_SIGNAL (updateRunlevelsPath ()),
+ this, TQ_SLOT (updateRunlevelsPath ()));
- connect (mPreferences, TQT_SIGNAL (updateFonts ()),
- mView, TQT_SLOT (repaintRunlevels ()));
+ connect (mPreferences, TQ_SIGNAL (updateFonts ()),
+ mView, TQ_SLOT (repaintRunlevels ()));
}
// mPreferences->setInitialSize (TQSize (400,300), true);
@@ -981,7 +981,7 @@ void KSVTopLevel::configureKeys ()
void KSVTopLevel::configureToolbars ()
{
KEditToolbar dlg(filteredActions(), xmlFile(), true, this);
- connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+ connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
dlg.exec();
}
diff --git a/ksysv/TopWidget.h b/ksysv/TopWidget.h
index 522d535..4fe17e5 100644
--- a/ksysv/TopWidget.h
+++ b/ksysv/TopWidget.h
@@ -38,7 +38,7 @@ class RunlevelAuthIcon;
class KSVTopLevel : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 0c18b25..58cb254 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -26,8 +26,8 @@ public:
KScroller::KScroller (TQWidget* parent, const char* name)
: TQFrame (parent, name),
d (new KScrollerPrivate()),
- mVertical (new TQScrollBar (Qt::Vertical, this)),
- mHorizontal (new TQScrollBar (Qt::Horizontal, this)),
+ mVertical (new TQScrollBar (TQt::Vertical, this)),
+ mHorizontal (new TQScrollBar (TQt::Horizontal, this)),
mCornerWidget (new TQWidget (this)),
mContent (0L),
mVerticalOld (0),
@@ -37,10 +37,10 @@ KScroller::KScroller (TQWidget* parent, const char* name)
mVertical->hide();
mHorizontal->hide();
- connect (mVertical, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (scrollVertical (int)));
- connect (mHorizontal, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (scrollHorizontal (int)));
+ connect (mVertical, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (scrollVertical (int)));
+ connect (mHorizontal, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (scrollHorizontal (int)));
}
KScroller::~KScroller ()
diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h
index 0a573c2..bc59b69 100644
--- a/ksysv/kscroller.h
+++ b/ksysv/kscroller.h
@@ -15,7 +15,7 @@ class TQScrollBar;
*/
class KScroller : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvapplication.h b/ksysv/ksvapplication.h
index 35ce616..5da7ab6 100644
--- a/ksysv/ksvapplication.h
+++ b/ksysv/ksvapplication.h
@@ -7,7 +7,7 @@
class KSVApplication : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp
index 54450fa..86aaf24 100644
--- a/ksysv/ksvconfigwizard.cpp
+++ b/ksysv/ksvconfigwizard.cpp
@@ -55,8 +55,8 @@ KSVConfigWizard::KSVConfigWizard (TQWidget* parent, const char* name, bool modal
setFinishEnabled (mFinishedPage, true);
// some connections
- connect (this, TQT_SIGNAL (selected (const TQString&)),
- this, TQT_SLOT (selectedPage (const TQString&)));
+ connect (this, TQ_SIGNAL (selected (const TQString&)),
+ this, TQ_SLOT (selectedPage (const TQString&)));
// hide cancel-button
cancelButton()->hide();
diff --git a/ksysv/ksvconfigwizard.h b/ksysv/ksvconfigwizard.h
index 7f74840..b37a7cf 100644
--- a/ksysv/ksvconfigwizard.h
+++ b/ksysv/ksvconfigwizard.h
@@ -31,7 +31,7 @@
class KSVConfigWizard : public ConfigWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h
index 6e39591..ac2c368 100644
--- a/ksysv/ksvdrag.h
+++ b/ksysv/ksvdrag.h
@@ -11,7 +11,7 @@ class TQWidget;
class KSVDrag : public TQDragObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index 6b3c41f..077bad4 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -229,7 +229,7 @@ TQPixmap KSVItem::paintDragIcon (const TQFont& font, const TQColorGroup&) const
label());
TQBrush brush (color0);
- brush.setStyle(Qt::Dense5Pattern);
+ brush.setStyle(TQt::Dense5Pattern);
p.fillRect (0, 0, width, height, brush);
p.end();
@@ -358,8 +358,8 @@ KSVDragList::KSVDragList ( TQWidget* parent, const char* name )
mRMList.setAutoDelete(true);
// catch drops
- connect (this, TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)),
- this, TQT_SLOT (drop (TQDropEvent*, TQListViewItem*)));
+ connect (this, TQ_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)),
+ this, TQ_SLOT (drop (TQDropEvent*, TQListViewItem*)));
}
KSVDragList::~KSVDragList()
@@ -373,8 +373,8 @@ KSVDragList::~KSVDragList()
void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8 nr)
{
KSVItem* tmp = new KSVItem(this, file, path, name, nr);
- tmp->setRunlevel(TQT_TQOBJECT(this)->name());
- tmp->setOriginalRunlevel(TQT_TQOBJECT(this)->name());
+ tmp->setRunlevel(this->name());
+ tmp->setOriginalRunlevel(this->name());
tmp->setIcon (mIcon);
diff --git a/ksysv/ksvdraglist.h b/ksysv/ksvdraglist.h
index 6c75706..842c685 100644
--- a/ksysv/ksvdraglist.h
+++ b/ksysv/ksvdraglist.h
@@ -151,7 +151,7 @@ private:
class KSVDragList : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvlookandfeel.h b/ksysv/ksvlookandfeel.h
index 12ea083..fc1e32a 100644
--- a/ksysv/ksvlookandfeel.h
+++ b/ksysv/ksvlookandfeel.h
@@ -11,7 +11,7 @@
#include <tqfont.h>
class KSVLookAndFeel : public LookAndFeel
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvmiscconfig.h b/ksysv/ksvmiscconfig.h
index b6a2b4b..a11dbbd 100644
--- a/ksysv/ksvmiscconfig.h
+++ b/ksysv/ksvmiscconfig.h
@@ -29,7 +29,7 @@
class KSVMiscConfig : public MiscConfiguration
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/ksvpathconfig.h b/ksysv/ksvpathconfig.h
index 42973b0..8ae2c34 100644
--- a/ksysv/ksvpathconfig.h
+++ b/ksysv/ksvpathconfig.h
@@ -29,7 +29,7 @@
class KSVPathConfig : public PathConfiguration
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 5046fc7..0a095e3 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -490,11 +490,11 @@
<includes>
<include location="global" impldecl="in declaration">tdelocale.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected">chooseNumberFont()</slot>
<slot access="protected">chooseServiceFont()</slot>
<slot access="protected">slotChanged()</slot>
-</Q_SLOTS>
+</slots>
<pixmapfunction>DesktopIcon</pixmapfunction>
<layoutdefaults spacing="6" margin="11"/>
<includes>
diff --git a/ksysv/main.cpp b/ksysv/main.cpp
index f7e4df2..ad7f8bf 100644
--- a/ksysv/main.cpp
+++ b/ksysv/main.cpp
@@ -53,7 +53,7 @@ static void myMessageOutput( TQtMsgType type, const char *msg )
int main( int argc, char **argv ) {
// install own message handler that ignores debug-msg when DEBUG is not defined
- tqInstallMsgHandler(myMessageOutput);
+ qInstallMsgHandler(myMessageOutput);
TDEAboutData about("ksysv", I18N_NOOP("SysV-Init Editor"), KSYSV_VERSION_STRING,
I18N_NOOP ("Editor for Sys-V like init configurations"),
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index 3ee6b0f..fee98a5 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -179,8 +179,8 @@
<includes>
<include location="global" impldecl="in declaration">tdelocale.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotChanged()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 0273f2b..10d2cd0 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -278,20 +278,14 @@
<tabstop>mBrowseRunlevel</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">tdelocale.h</include>
<include location="global" impldecl="in declaration">kdialog.h</include>
+ <include location="global" impldecl="in declaration">tdelocale.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected">browseServices()</slot>
<slot access="protected">browseRunlevels()</slot>
<slot access="protected">slotChanged()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
-<includes>
- <include location="global" impldecl="in implementation">klineedit.h</include>
-</includes>
</UI>
diff --git a/ksysv/trash.h b/ksysv/trash.h
index d848790..da6423a 100644
--- a/ksysv/trash.h
+++ b/ksysv/trash.h
@@ -27,7 +27,7 @@ class KSVAction;
class KSVTrash : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:30:46 +0000