summaryrefslogtreecommitdiffstats
path: root/kcontrol/samba
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/samba
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/samba')
-rw-r--r--kcontrol/samba/kcmsambaimports.cpp14
-rw-r--r--kcontrol/samba/kcmsambaimports.h2
-rw-r--r--kcontrol/samba/kcmsambalog.cpp18
-rw-r--r--kcontrol/samba/kcmsambalog.h4
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp44
-rw-r--r--kcontrol/samba/kcmsambastatistics.h2
-rw-r--r--kcontrol/samba/ksmbstatus.cpp20
-rw-r--r--kcontrol/samba/ksmbstatus.h2
8 files changed, 53 insertions, 53 deletions
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index fd31f7800..0c9a5d3fd 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -74,16 +74,16 @@ void ImportsView::updateList()
if (e!=0)
{
s=buf;
- if ((s.contains(" nfs ")) || (s.contains(" smbfs ")))
+ if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs ")))
{
- strSource=s.left(s.find(" on /"));
- strMount=s.mid(s.find(" on /")+4,s.length());
- if ((s.contains(" nfs ")) || (s.contains("/remote on ")))
+ strSource=s.left(s.tqfind(" on /"));
+ strMount=s.mid(s.tqfind(" on /")+4,s.length());
+ if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on ")))
strType="NFS";
- else if (s.contains(" smbfs "))
+ else if (s.tqcontains(" smbfs "))
strType="SMB";
- int pos(strMount.find(" type "));
- if (pos==-1) pos=strMount.find(" read/");
+ int pos(strMount.tqfind(" type "));
+ if (pos==-1) pos=strMount.tqfind(" read/");
strMount=strMount.left(pos);
new TQListViewItem(&list,strType,strSource,strMount);
};
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 56ddb5f36..51b83bd3c 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -28,7 +28,7 @@
#include <tqlistview.h>
#include <kconfig.h>
-class ImportsView: public QWidget
+class ImportsView: public TQWidget
{
Q_OBJECT
public:
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 224bc6fa2..8b56a9fe0 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
logFileName.setURL("/var/log/samba.log");
viewHistory.setAllColumnsShowFocus(TRUE);
- viewHistory.setFocusPolicy(TQWidget::ClickFocus);
+ viewHistory.setFocusPolicy(TQ_ClickFocus);
viewHistory.setShowSortIndicator(true);
viewHistory.addColumn(i18n("Date & Time"),130);
@@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
emit contentsChanged(&viewHistory,0,0);
- label.setMinimumSize(label.sizeHint());
- logFileName.setMinimumSize(250,logFileName.sizeHint().height());
+ label.setMinimumSize(label.tqsizeHint());
+ logFileName.setMinimumSize(250,logFileName.tqsizeHint().height());
viewHistory.setMinimumSize(425,200);
- showConnOpen.setMinimumSize(showConnOpen.sizeHint());
- showConnClose.setMinimumSize(showConnClose.sizeHint());
- showFileOpen.setMinimumSize(showFileOpen.sizeHint());
- showFileClose.setMinimumSize(showFileClose.sizeHint());
- updateButton.setFixedSize(updateButton.sizeHint());
+ showConnOpen.setMinimumSize(showConnOpen.tqsizeHint());
+ showConnClose.setMinimumSize(showConnClose.tqsizeHint());
+ showFileOpen.setMinimumSize(showFileOpen.tqsizeHint());
+ showFileClose.setMinimumSize(showFileClose.tqsizeHint());
+ updateButton.setFixedSize(updateButton.tqsizeHint());
}
void LogView::loadSettings()
@@ -161,7 +161,7 @@ void LogView::updateList()
TQFile logFile(logFileName.url());
if (logFile.open(IO_ReadOnly))
{
- TQApplication::setOverrideCursor(waitCursor);
+ TQApplication::setOverrideCursor(tqwaitCursor);
viewHistory.clear();
filesCount=0;
connectionsCount=0;
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index d0b427d48..b7d236325 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -35,7 +35,7 @@
#define LOGGROUPNAME "SambaLogFileSettings"
-class LogView: public QWidget
+class LogView: public TQWidget
{
Q_OBJECT
public:
@@ -57,7 +57,7 @@ class LogView: public QWidget
void contentsChanged(TQListView* list, int nrOfFiles, int nrOfConnections);
};
-class QListViewItemX:public QListViewItem
+class QListViewItemX:public TQListViewItem
{
public:
//a faster constructor saves a lot time
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index f75fd72e5..0070e4723 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
viewStatistics->setAllColumnsShowFocus(TRUE);
- viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
+ viewStatistics->setFocusPolicy(TQ_ClickFocus);
viewStatistics->setShowSortIndicator(true);
viewStatistics->addColumn(i18n("Nr"),30);
@@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
hostLe->setText("*");
viewStatistics->setMinimumSize(375,200);
- connectionsL->setMinimumSize(connectionsL->sizeHint());
- filesL->setMinimumSize(filesL->sizeHint());
- eventL->setMinimumSize(eventL->sizeHint());
- eventCb->setMinimumSize(eventCb->sizeHint());
- hostL->setMinimumSize(hostL->sizeHint());
- hostLe->setMinimumSize(120,hostLe->sizeHint().height());
- serviceL->setMinimumSize(serviceL->sizeHint());
- serviceLe->setMinimumSize(120,serviceLe->sizeHint().height());
- calcButton->setMinimumSize(calcButton->sizeHint());
- clearButton->setMinimumSize(clearButton->sizeHint());
- expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
- expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
+ connectionsL->setMinimumSize(connectionsL->tqsizeHint());
+ filesL->setMinimumSize(filesL->tqsizeHint());
+ eventL->setMinimumSize(eventL->tqsizeHint());
+ eventCb->setMinimumSize(eventCb->tqsizeHint());
+ hostL->setMinimumSize(hostL->tqsizeHint());
+ hostLe->setMinimumSize(120,hostLe->tqsizeHint().height());
+ serviceL->setMinimumSize(serviceL->tqsizeHint());
+ serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height());
+ calcButton->setMinimumSize(calcButton->tqsizeHint());
+ clearButton->setMinimumSize(clearButton->tqsizeHint());
+ expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint());
+ expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint());
TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
@@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
void StatisticsView::calculate()
{
if (dataList==0) return;
- TQApplication::setOverrideCursor(waitCursor);
+ TQApplication::setOverrideCursor(tqwaitCursor);
int connCount(0);
if (eventCb->currentText()==i18n("Connection"))
connCount=1;
@@ -150,8 +150,8 @@ void StatisticsView::calculate()
{
if (connCount)
{
- if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
- && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
+ && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
{
if (expandedInfoCb->isChecked()) item2=item->text(2);
else item2=serviceLe->text();
@@ -163,8 +163,8 @@ void StatisticsView::calculate()
}
else
{
- if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
- && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
+ && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
{
if (expandedInfoCb->isChecked()) item2=item->text(2);
else item2=serviceLe->text();
@@ -201,14 +201,14 @@ void StatisticsView::calculate()
{
if (connCount)
{
- if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
- && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
+ && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
count++;
}
else
{
- if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
- && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
+ && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
count++;
};
item=item->nextSibling();
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 81af9131c..64c6026ad 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -75,7 +75,7 @@ class SambaLog
LogItem* itemInList(TQString name);
};
-class StatisticsView: public QWidget
+class StatisticsView: public TQWidget
{
Q_OBJECT
public:
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index c94bc5129..b36d5325b 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -31,8 +31,8 @@
#include "ksmbstatus.moc"
-#define Before(ttf,in) in.left(in.find(ttf))
-#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
+#define Before(ttf,in) in.left(in.tqfind(ttf))
+#define After(ttf,in) (in.tqcontains(ttf)?TQString(in.mid(in.tqfind(ttf)+TQString(ttf).length())):TQString(""))
NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
: TQWidget(parent, name)
@@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
void NetMon::processNFSLine(char *bufline, int)
{
TQCString line(bufline);
- if (line.contains(":/"))
+ if (line.tqcontains(":/"))
new TQListViewItem(list,"NFS",After(":",line),Before(":/",line));
}
@@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int)
rownumber++;
if (rownumber == 2)
version->setText(bufline); // second line = samba version
- if ((readingpart==header) && line.contains("Service"))
+ if ((readingpart==header) && line.tqcontains("Service"))
{
- iUser=line.find("uid");
- iGroup=line.find("gid");
- iPid=line.find("pid");
- iMachine=line.find("machine");
+ iUser=line.tqfind("uid");
+ iGroup=line.tqfind("gid");
+ iPid=line.tqfind("pid");
+ iMachine=line.tqfind("machine");
}
- else if ((readingpart==header) && (line.contains("---")))
+ else if ((readingpart==header) && (line.tqcontains("---")))
{
readingpart=connexions;
}
@@ -111,7 +111,7 @@ void NetMon::processSambaLine(char *bufline, int)
}
else if (readingpart==connexions)
readingpart=locked_files;
- else if ((readingpart==locked_files) && (line.find("No ")==0))
+ else if ((readingpart==locked_files) && (line.tqfind("No ")==0))
readingpart=finished;
else if (readingpart==locked_files)
{
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index 50caf64de..a38eca897 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -32,7 +32,7 @@ class TQListView;
class TQListViewItem;
class KProcess;
-class NetMon : public QWidget
+class NetMon : public TQWidget
{
Q_OBJECT
public: