summaryrefslogtreecommitdiffstats
path: root/kcontrol/samba
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/samba')
-rw-r--r--kcontrol/samba/kcmsambaimports.cpp2
-rw-r--r--kcontrol/samba/kcmsambaimports.h2
-rw-r--r--kcontrol/samba/kcmsambalog.cpp26
-rw-r--r--kcontrol/samba/kcmsambalog.h2
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp22
-rw-r--r--kcontrol/samba/kcmsambastatistics.h6
-rw-r--r--kcontrol/samba/ksmbstatus.cpp12
-rw-r--r--kcontrol/samba/ksmbstatus.h4
-rw-r--r--kcontrol/samba/main.cpp2
9 files changed, 39 insertions, 39 deletions
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index c25867fa5..b4553c6a8 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -56,7 +56,7 @@ ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name
" resource is mounted.") );
timer.start(10000);
- TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()));
+ TQObject::connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList()));
updateList();
}
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 0897af021..7b8732c9f 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -30,7 +30,7 @@
class ImportsView: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0);
virtual ~ImportsView() {};
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index c25a01113..fdb21bb1e 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -59,7 +59,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
subLayout->addWidget(&showConnClose,1,0);
subLayout->addWidget(&showFileOpen,0,1);
subLayout->addWidget(&showFileClose,1,1);
- mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
+ mainLayout->addWidget(&updateButton,0,TQt::AlignLeft);
TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
" your samba log file in a friendly layout. Check that the correct log"
@@ -90,8 +90,8 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
logFileName.setURL("/var/log/samba.log");
- viewHistory.setAllColumnsShowFocus(TRUE);
- viewHistory.setFocusPolicy(TQ_ClickFocus);
+ viewHistory.setAllColumnsShowFocus(true);
+ viewHistory.setFocusPolicy(TQWidget::ClickFocus);
viewHistory.setShowSortIndicator(true);
viewHistory.addColumn(i18n("Date & Time"),130);
@@ -108,12 +108,12 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
" If the list is empty, try clicking the \"Update\" button. The samba"
" log file will be read and the list refreshed.") );
- showConnOpen.setChecked(TRUE);
- showConnClose.setChecked(TRUE);
- showFileOpen.setChecked(FALSE);
- showFileClose.setChecked(FALSE);
+ showConnOpen.setChecked(true);
+ showConnClose.setChecked(true);
+ showFileOpen.setChecked(false);
+ showFileClose.setChecked(false);
- connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
+ connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList()));
emit contentsChanged(&viewHistory,0,0);
label.setMinimumSize(label.sizeHint());
@@ -132,10 +132,10 @@ void LogView::loadSettings()
configFile->setGroup(LOGGROUPNAME);
logFileName.setURL(configFile->readPathEntry( "SambaLogFile", "/var/log/samba.log"));
- showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", TRUE));
- showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", FALSE));
- showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", TRUE));
- showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", FALSE));
+ showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", true));
+ showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", false));
+ showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", true));
+ showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", false));
}
void LogView::saveSettings()
@@ -161,7 +161,7 @@ void LogView::updateList()
TQFile logFile(logFileName.url());
if (logFile.open(IO_ReadOnly))
{
- TQApplication::setOverrideCursor(tqwaitCursor);
+ TQApplication::setOverrideCursor(TQt::waitCursor);
viewHistory.clear();
filesCount=0;
connectionsCount=0;
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index c3c8c07ea..99a259ddf 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -38,7 +38,7 @@
class LogView: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
virtual ~LogView() {};
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 3b77dbc9f..650c43a05 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -59,8 +59,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this );
expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
- viewStatistics->setAllColumnsShowFocus(TRUE);
- viewStatistics->setFocusPolicy(TQ_ClickFocus);
+ viewStatistics->setAllColumnsShowFocus(true);
+ viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
viewStatistics->setShowSortIndicator(true);
viewStatistics->addColumn(i18n("Nr"),30);
@@ -73,8 +73,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
eventCb->insertItem(i18n("Connection"));
eventCb->insertItem(i18n("File Access"));
- expandedInfoCb->setChecked(FALSE);
- expandedUserCb->setChecked(FALSE);
+ expandedInfoCb->setChecked(false);
+ expandedUserCb->setChecked(false);
clearStatistics();
serviceLe->setText("*");
hostLe->setText("*");
@@ -116,8 +116,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
subLayout->addWidget(expandedInfoCb,3,1);
subLayout->addWidget(expandedUserCb,3,2);
- connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics()));
- connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate()));
+ connect(clearButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearStatistics()));
+ connect(calcButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(calculate()));
setListInfo(0,0,0);
}
@@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
void StatisticsView::calculate()
{
if (dataList==0) return;
- TQApplication::setOverrideCursor(tqwaitCursor);
+ TQApplication::setOverrideCursor(TQt::waitCursor);
int connCount(0);
if (eventCb->currentText()==i18n("Connection"))
connCount=1;
@@ -142,8 +142,8 @@ void StatisticsView::calculate()
if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked()))
{
SambaLog sLog;
- TQRegExp rService(serviceLe->text(),FALSE,TRUE);
- TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+ TQRegExp rService(serviceLe->text(),false,true);
+ TQRegExp rHost(hostLe->text(),false,true);
TQString item2, item3;
TQListViewItem* item=dataList->firstChild();
while (item!=0)
@@ -194,8 +194,8 @@ void StatisticsView::calculate()
{
calcCount++;
int count(0);
- TQRegExp rService(serviceLe->text(),FALSE,TRUE);
- TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+ TQRegExp rService(serviceLe->text(),false,true);
+ TQRegExp rHost(hostLe->text(),false,true);
TQListViewItem* item=dataList->firstChild();
while (item!=0)
{
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 4b6ad6211..cf7817ce5 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -50,7 +50,7 @@ class LogItem
LogItem():name(""), accessed(),count(0) {};
LogItem(TQString n, TQString a):name(n), accessed(), count(1)
{
- accessed.setAutoDelete(TRUE);
+ accessed.setAutoDelete(true);
accessed.append(new SmallLogItem(a));
};
TQString name;
@@ -66,7 +66,7 @@ class SambaLog
public:
SambaLog()
{
- items.setAutoDelete(TRUE);
+ items.setAutoDelete(true);
};
TQPtrList<LogItem> items;
void addItem (TQString share, TQString host);
@@ -77,7 +77,7 @@ class SambaLog
class StatisticsView: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
virtual ~StatisticsView() {};
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index abd423d13..e51a3c137 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -70,7 +70,7 @@ NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name )
timer = new TQTimer(this);
timer->start(15000);
- TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+ TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
update();
}
@@ -175,8 +175,8 @@ void NetMon::update()
nrpid=0;
process->setEnvironment("PATH", path);
connect(process,
- TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+ TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
*process << "smbstatus";
if (!process->start(TDEProcess::Block,TDEProcess::Stdout))
version->setText(i18n("Error: Unable to run smbstatus"));
@@ -200,12 +200,12 @@ void NetMon::update()
showmountProc=new TDEProcess();
showmountProc->setEnvironment("PATH", path);
*showmountProc<<"showmount"<<"-a"<<"localhost";
- connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+ connect(showmountProc,TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
//without this timer showmount hangs up to 5 minutes
//if the portmapper daemon isn't running
- TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
+ TQTimer::singleShot(5000,this,TQ_SLOT(killShowmount()));
//kdDebug()<<"starting kill timer with 5 seconds"<<endl;
- connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount()));
+ connect(showmountProc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(killShowmount()));
if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount
{
delete showmountProc;
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index f787293ae..41eba7207 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -21,7 +21,7 @@
#include <tqtimer.h>
#include <tqlabel.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tqcstring.h>
#include <tqlistview.h>
#include <tdeconfig.h>
@@ -34,7 +34,7 @@ class TDEProcess;
class NetMon : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0);
void saveSettings() {};
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index d5af28c1a..4bb099fae 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -66,7 +66,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
tabs.addTab(&imports,i18n("&Imports"));
tabs.addTab(&logView,i18n("&Log"));
tabs.addTab(&statisticsView,i18n("&Statistics"));
- connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int)));
+ connect(&logView,TQ_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQ_SLOT(setListInfo(TQListView *, int, int)));
setButtons(Help);
load();