From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: 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
---
 kcontrol/konq/README                   |  4 ++--
 kcontrol/konq/behaviour.cpp            |  6 +++---
 kcontrol/konq/browser.cpp              | 12 ++++++------
 kcontrol/konq/desktop.cpp              | 10 +++++-----
 kcontrol/konq/desktopbehavior.ui       | 12 ++++++------
 kcontrol/konq/desktopbehavior_impl.cpp | 16 ++++++++--------
 kcontrol/konq/previews.cpp             |  2 +-
 kcontrol/konq/previews.h               |  2 +-
 kcontrol/konq/rootopts.cpp             | 14 +++++++-------
 kcontrol/konq/rootopts.h               |  2 +-
 10 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'kcontrol/konq')

diff --git a/kcontrol/konq/README b/kcontrol/konq/README
index 22d05d7ff..11ad5c7b5 100644
--- a/kcontrol/konq/README
+++ b/kcontrol/konq/README
@@ -1,7 +1,7 @@
-This module tqcontains a combination of configuration items which at first
+This module contains a combination of configuration items which at first
 sight seem to be a rather weird combination.
 
-It tqcontains configuration for:
+It contains configuration for:
 * KDesktop
 * Konqueror 
 * Number of virtual desktops. (Handled by KWin via NETWM)
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 75a46c717..af6c12cc4 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     winPixmap->setPixmap(TQPixmap(locate("data",
                                         "kcontrol/pics/onlyone.png")));
-    winPixmap->setFixedSize( winPixmap->tqsizeHint() );
+    winPixmap->setFixedSize( winPixmap->sizeHint() );
 
 
    // ----
@@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     TQHBox *hboxpreview = new TQHBox(vbox);
     TQWidget* spacer = new TQWidget( hboxpreview );
     spacer->setMinimumSize( 20, 0 );
-    spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+    spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
     connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
@@ -146,7 +146,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
 						"while calling 'Move to Trash'."));
 
     TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this );
-    bg->tqlayout()->setSpacing( KDialog::spacingHint() );
+    bg->layout()->setSpacing( KDialog::spacingHint() );
     TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask"
        " for a confirmation when you \"delete\" a file."
        " <ul><li><em>Move To Trash:</em> moves the file to your trash folder,"
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index a17631927..cb1b5c47e 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -33,18 +33,18 @@
 KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
     : KCModule( parent, "kcmkonq" ) 
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   TQTabWidget *tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   appearance = new KonqFontOptions(config, group, false, tab, name);
-  appearance->tqlayout()->setMargin( KDialog::marginHint() );
+  appearance->layout()->setMargin( KDialog::marginHint() );
 
   behavior = new KBehaviourOptions(config, group, tab, name);
-  behavior->tqlayout()->setMargin( KDialog::marginHint() );
+  behavior->layout()->setMargin( KDialog::marginHint() );
 
   previews = new KPreviewOptions(tab, name);
-  previews->tqlayout()->setMargin( KDialog::marginHint() );
+  previews->layout()->setMargin( KDialog::marginHint() );
 
   kuick = KCModuleLoader::loadModule("kcmkuick", tab);
 
@@ -53,7 +53,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare
   tab->addTab(previews, i18n("&Previews && Meta-Data"));
   if (kuick)
   {
-    kuick->tqlayout()->setMargin( KDialog::marginHint() );
+    kuick->layout()->setMargin( KDialog::marginHint() );
     tab->addTab(kuick, i18n("&Quick Copy && Move"));
   }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index f0f922845..98275995c 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -59,7 +59,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
 
   Q_ASSERT(maxDesktops % 2 == 0);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   // number group
   TQGroupBox *number_group = new TQGroupBox(this);
@@ -82,7 +82,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   lay->addWidget(_numInput);
   lay->setStretchFactor( _numInput, 2 );
 
-  tqlayout->addWidget(number_group);
+  layout->addWidget(number_group);
 
   // name group
   TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
@@ -109,13 +109,13 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   for(int i = 1; i < maxDesktops; i++)
       setTabOrder( _nameInput[i-1], _nameInput[i] );
 
-  tqlayout->addWidget(name_group);
+  layout->addWidget(name_group);
 
   _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
   connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
 
-  tqlayout->addWidget(_wheelOption);
-  tqlayout->addStretch(1);
+  layout->addWidget(_wheelOption);
+  layout->addStretch(1);
 
   load();
 }
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index 30da90234..6e614b022 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>DesktopBehaviorBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -58,7 +58,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -74,7 +74,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -268,7 +268,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>191</width>
                                         <height>80</height>
@@ -287,7 +287,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -410,7 +410,7 @@
     <tabstop>enableMediaBox</tabstop>
     <tabstop>mediaListView</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index a48550628..6b4aaadb0 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -49,9 +49,9 @@ const int customMenu2ID = 6;
 DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * )
     : KCModule( parent, "kcmkonq" )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
-    tqlayout->addWidget(m_behavior);
+    layout->addWidget(m_behavior);
     connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
 }
 
@@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
    */
   bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
 
-  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"));
+  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
   connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
   connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
@@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
 
   if ( leftHandedMouse )
   {
-     tqSwap(strMouseButton1, strMouseButton3);
-     tqSwap(strButtonTxt1, strButtonTxt3);
+     qSwap(strMouseButton1, strMouseButton3);
+     qSwap(strButtonTxt1, strButtonTxt3);
   }
 
   leftLabel->setText( strMouseButton1 );
@@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView()
     for (; it2 != mimetypes.end(); ++it2) {
         if ( ((*it2)->name().startsWith("media/")) )
         {
-            bool ok=excludedMedia.tqcontains((*it2)->name())==0;
+            bool ok=excludedMedia.contains((*it2)->name())==0;
             new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok);
         }
     }
@@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults )
     previewListView->clear();
     TQStringList previews = g_pConfig->readListEntry("Preview");
     for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName()));
-    new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/"));
+        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
+    new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
     //
     g_pConfig->setGroup( "FMSettings" );
     toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) );
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 66a49309f..0e3ea0861 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -198,7 +198,7 @@ void KPreviewOptions::save()
         group.writeEntry( protocol, it.current()->isOn(), true, true );
     }
     // config key is in bytes, numinput is in MB
-    group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true );
+    group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true );
     group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true );
     group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true );
     group.sync();
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index 03c3a175e..8cf3ceade 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -24,7 +24,7 @@
 
 /*
 
-The "Previews" Tab tqcontains :
+The "Previews" Tab contains :
 
 List of protocols that support listing, with a checkbox for each
 Configuration of the maximum image size
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index c4e2c26d2..f4111cfda 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   tmpLabel->setBuddy( urDesktop );
   lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
   connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
-  TQString wtstr = i18n("This folder tqcontains all the files"
+  TQString wtstr = i18n("This folder contains all the files"
                        " which you see on your desktop. You can change the location of this"
                        " folder if you want to, and the contents will move automatically"
                        " to the new location as well.");
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   tmpLabel->setBuddy( urAutostart );
   lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
   connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
-  wtstr = i18n("This folder tqcontains applications or"
+  wtstr = i18n("This folder contains applications or"
                " links to applications (shortcuts) that you want to have started"
                " automatically whenever KDE starts. You can change the location of this"
                " folder if you want to, and the contents will move automatically"
@@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::ListJob* job = KIO::listDir( src );
             connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
                      this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
-            tqApp->enter_loop();
+            qApp->enter_loop();
 
             if (m_ok)
             {
@@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::Job * job = KIO::move( src, dest );
             connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
             // wait for job
-            tqApp->enter_loop();
+            qApp->enter_loop();
         }
     }
     kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl;
@@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
 
         KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
         connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-        tqApp->enter_loop();
+        qApp->enter_loop();
     }
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 void DesktopPathConfig::slotResult( KIO::Job * job )
@@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job )
 
         job->showErrorDialog(this);
     }
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 #include "rootopts.moc"
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 51737f8d0..7af18f1ae 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -30,7 +30,7 @@ class KURLRequester;
 namespace KIO { class Job; }
 
 //-----------------------------------------------------------------------------
-// The "Path" Tab tqcontains :
+// The "Path" Tab contains :
 // The paths for Desktop, Autostart and Documents
 
 class DesktopPathConfig : public KCModule
-- 
cgit v1.2.1