Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 50 insertions, 50 deletions

diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS
index 71854fa7a..0bebeaa06 100644
--- a/kcontrol/samba/AUTHORS
+++ b/kcontrol/samba/AUTHORS
@@ -1,4 +1,4 @@
-Samba tqStatus Module:
+Samba Status Module:
 
   Michael Glauche <glauche@isa.rwth-aachen.de>
 
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index 8540fc4b2..fd31f7800 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -74,13 +74,13 @@ void ImportsView::updateList()
       if (e!=0)
       {
          s=buf;
-         if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs ")))
+         if ((s.contains(" nfs ")) || (s.contains(" smbfs ")))
          {
             strSource=s.left(s.find(" on /"));
             strMount=s.mid(s.find(" on /")+4,s.length());
-            if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on ")))
+            if ((s.contains(" nfs ")) || (s.contains("/remote on ")))
                strType="NFS";
-            else if (s.tqcontains(" smbfs "))
+            else if (s.contains(" smbfs "))
                strType="SMB";
             int pos(strMount.find(" type "));
             if (pos==-1) pos=strMount.find(" read/");
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 935944ea5..224bc6fa2 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -62,7 +62,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
    mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
 
    TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
-     " your samba log file in a friendly tqlayout. Check that the correct log"
+     " your samba log file in a friendly layout. Check that the correct log"
      " file for your computer is listed here. If you need to, correct the name"
      " or location of the log file, and then click the \"Update\" button.") );
 
@@ -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.tqsizeHint());
-   logFileName.setMinimumSize(250,logFileName.tqsizeHint().height());
+   label.setMinimumSize(label.sizeHint());
+   logFileName.setMinimumSize(250,logFileName.sizeHint().height());
    viewHistory.setMinimumSize(425,200);
-   showConnOpen.setMinimumSize(showConnOpen.tqsizeHint());
-   showConnClose.setMinimumSize(showConnClose.tqsizeHint());
-   showFileOpen.setMinimumSize(showFileOpen.tqsizeHint());
-   showFileClose.setMinimumSize(showFileClose.tqsizeHint());
-   updateButton.setFixedSize(updateButton.tqsizeHint());
+   showConnOpen.setMinimumSize(showConnOpen.sizeHint());
+   showConnClose.setMinimumSize(showConnClose.sizeHint());
+   showFileOpen.setMinimumSize(showFileOpen.sizeHint());
+   showFileClose.setMinimumSize(showFileClose.sizeHint());
+   updateButton.setFixedSize(updateButton.sizeHint());
 }
 
 void LogView::loadSettings()
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 6fd788b2e..f75fd72e5 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
    hostLe->setText("*");
    
    viewStatistics->setMinimumSize(375,200);
-   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());
+   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());
    
    TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
       KDialog::spacingHint());
@@ -150,8 +150,8 @@ void StatisticsView::calculate()
       {
          if (connCount)
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(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)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(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)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          }
          else
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          };
          item=item->nextSibling();
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index 89263c2c6..c94bc5129 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -32,7 +32,7 @@
 
 
 #define Before(ttf,in) in.left(in.find(ttf))
-#define After(ttf,in)  (in.tqcontains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
+#define After(ttf,in)  (in.contains(ttf)?TQString(in.mid(in.find(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.tqcontains(":/"))
+   if (line.contains(":/"))
       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.tqcontains("Service"))
+   if ((readingpart==header) && line.contains("Service"))
    {
       iUser=line.find("uid");
       iGroup=line.find("gid");
       iPid=line.find("pid");
       iMachine=line.find("machine");
    }
-   else if ((readingpart==header) && (line.tqcontains("---")))
+   else if ((readingpart==header) && (line.contains("---")))
    {
       readingpart=connexions;
    }
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 52669c2f8..88d95680a 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -58,8 +58,8 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
 ,logView(&tabs,&config)
 ,statisticsView(&tabs,&config)
 {
-   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
-   tqlayout->addWidget(&tabs);
+   TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+   layout->addWidget(&tabs);
    tabs.addTab(&status,i18n("&Exports"));
    tabs.addTab(&imports,i18n("&Imports"));
    tabs.addTab(&logView,i18n("&Log"));
@@ -68,7 +68,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
    setButtons(Help);
    load();
 
-   setQuickHelp( i18n("The Samba and NFS tqStatus Monitor is a front end to the programs"
+   setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs"
      " <em>smbstatus</em> and <em>showmount</em>. Smbstatus reports on current"
      " Samba connections, and is part of the suite of Samba tools, which"
      " implements the SMB (Session Message Block) protocol, also called the"
diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop
index 02ab8aebf..14b8425ed 100644
--- a/kcontrol/samba/smbstatus.desktop
+++ b/kcontrol/samba/smbstatus.desktop
@@ -9,20 +9,20 @@ X-KDE-Library=samba
 X-KDE-FactoryName=samba
 X-KDE-ParentApp=kinfocenter
 
-Name=Samba tqStatus
+Name=Samba Status
 Name[ar]=حالة Samba
 Name[az]=Samba'nın Vəziyyəti
 Name[be]=Стан Samba
 Name[bg]=Сървър Samba
 Name[bn]=সাম্বা স্ট্যাটাস
 Name[br]=Saviad Samba
-Name[bs]=tqStatus Sambe
+Name[bs]=Status Sambe
 Name[ca]=Estat de Samba
 Name[cs]=Stav Samby
 Name[csb]=Sztaus Samba
 Name[cy]=Cyflwr Samba
 Name[da]=Samba-status
-Name[de]=Samba-tqStatus
+Name[de]=Samba-Status
 Name[el]=Κατάσταση samba
 Name[eo]=Sambo-stato
 Name[es]=Estado de Samba
@@ -38,7 +38,7 @@ Name[he]=מצב Samba
 Name[hi]=साम्बा स्थिति
 Name[hr]=Stanje Sambe
 Name[hu]=Samba
-Name[id]=tqStatus Samba
+Name[id]=Status Samba
 Name[is]=Staða Samba
 Name[it]=Stato di Samba
 Name[ja]=Samba の状態
@@ -48,13 +48,13 @@ Name[km]=ស្ថានភាព Samba
 Name[ko]=삼바 상태
 Name[lo]=ສະຖານະຂອງ Samba
 Name[lt]=Samba būsena
-Name[lv]=Samba tqStatuss
+Name[lv]=Samba Statuss
 Name[mk]=Статус на Samba
 Name[mn]=Samba-Төлөв
-Name[ms]=tqStatus Samba
+Name[ms]=Status Samba
 Name[mt]=Stat tas-Samba
 Name[nb]=Samba-status
-Name[nds]=Samba-tqStatus
+Name[nds]=Samba-Status
 Name[ne]=साम्बा वस्तुस्थिति
 Name[nl]=Samba-status
 Name[nn]=Samba-status
@@ -68,9 +68,9 @@ Name[ru]=Сервер Samba
 Name[rw]=Imimerere Samba
 Name[se]=Samba stáhtus
 Name[sk]=Stav systému Samba
-Name[sl]=tqStatus Sambe
+Name[sl]=Status Sambe
 Name[sr]=Статус Самбе
-Name[sr@Latn]=tqStatus Sambe
+Name[sr@Latn]=Status Sambe
 Name[ss]=Simo se Samba 
 Name[sv]=Samba-status
 Name[ta]=சம்பா நிலை
@@ -102,7 +102,7 @@ Comment[cs]=Monitor stavu Samby
 Comment[csb]=Mònitor stónu Sambë
 Comment[cy]=Monitr cyflwr samba
 Comment[da]=Overvågning af samba-status
-Comment[de]=Samba-tqStatusmonitor
+Comment[de]=Samba-Statusmonitor
 Comment[el]=Εποπτεία της Samba
 Comment[eo]=Rigardilo por la stato de Sambo
 Comment[es]=Monitor de estado de Samba
@@ -133,7 +133,7 @@ Comment[mn]=Samba-Төлөв харуулагч
 Comment[ms]=Monitor status Samba
 Comment[mt]=Monitur tal-istat tas-Samba
 Comment[nb]=Overvåking av Samba-status
-Comment[nds]=tqStatuskieker för Samba
+Comment[nds]=Statuskieker för Samba
 Comment[ne]=साम्बा वस्तुस्थिति मोनिटर
 Comment[nl]=Sambastatusmonitor
 Comment[nn]=Overvaking av Samba-status