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

18 files changed, 115 insertions, 115 deletions

diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 9c533c9e2..681863cb6 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -52,11 +52,11 @@ advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const ch
             this, TQT_SLOT(save()));
     actionButton(Apply)->setEnabled(false);
     TQFrame* page = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
+    TQVBoxLayout* layout = new TQVBoxLayout(page);
     m_advancedWidget = new advancedTabOptions(page);
-    tqlayout->addWidget(m_advancedWidget);
-    tqlayout->addSpacing( 20 );
-    tqlayout->addStretch();
+    layout->addWidget(m_advancedWidget);
+    layout->addSpacing( 20 );
+    layout->addStretch();
 
     connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui
index 886d602c5..7116bc1ee 100644
--- a/kcontrol/konqhtml/advancedTabOptions.ui
+++ b/kcontrol/konqhtml/advancedTabOptions.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>advancedTabOptions</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -43,7 +43,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout</cstring>
+                <cstring>layout</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -150,6 +150,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 3eff2fd25..29dccb14b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -36,10 +36,10 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
   setColumnLayout(0, Qt::Vertical);
-  tqlayout()->setSpacing(0);
-  tqlayout()->setMargin(0);
-  TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
-  thisLayout->tqsetAlignment(Qt::AlignTop);
+  layout()->setSpacing(0);
+  layout()->setMargin(0);
+  TQGridLayout* thisLayout = new TQGridLayout(layout());
+  thisLayout->setAlignment(Qt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index 7d0d30b82..a8238bbb4 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -85,21 +85,21 @@ public:
   /**
    * returns the add push-button.
    *
-   * Note: The add button already tqcontains a default "what's this" text.
+   * Note: The add button already contains a default "what's this" text.
    */
   TQPushButton *addButton() const { return addDomainPB; }
 
   /**
    * returns the change push-button.
    *
-   * Note: The change button already tqcontains a default "what's this" text.
+   * Note: The change button already contains a default "what's this" text.
    */
   TQPushButton *changeButton() const { return changeDomainPB; }
 
   /**
    * returns the delete push-button.
    *
-   * Note: The delete button already tqcontains a default "what's this" text.
+   * Note: The delete button already contains a default "what's this" text.
    */
   TQPushButton *deleteButton() const { return deleteDomainPB; }
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index e1fcb28c7..79ab4d45a 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -323,5 +323,5 @@ TQString KCMFilter::quickHelp() const
 {
     return i18n("<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of filters"
                 " that are checked against linked images and frames. URL's that match are either discarded or"
-                " tqreplaced with a placeholder image. ");
+                " replaced with a placeholder image. ");
 }
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index e6a6c59bb..3cca58732 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     // Tabbed Browsing
 
     TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
-    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
 
     m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
     TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
@@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
 
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
-    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change "
+    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
     connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
 
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 3f19d3b98..503eadfdd 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -15,7 +15,7 @@
 
 
 //-----------------------------------------------------------------------------
-// The "Misc Options" Tab for the HTML view tqcontains :
+// The "Misc Options" Tab for the HTML view contains :
 
 // Change cursor over links
 // Underline links
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 54186a6bb..af168ed1f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -123,14 +123,14 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group,
     TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java "
           "that can be contained in HTML pages. "
           "Note that, as with any browser, enabling active contents can be a security problem.") );
-    TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+    TQString wtstr = i18n("This box contains the domains and hosts you have set "
                          "a specific Java policy for. This policy will be used "
                          "instead of the default policy for enabling or disabling Java applets on pages sent by these "
                          "domains or hosts. <p>Select a policy and use the controls on "
                          "the right to modify it.");
     TQWhatsThis::add( domainSpecific->listView(), wtstr );
 #if 0
-    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                           "the Java policies. These policies will be merged "
                                           "with the existing ones. Duplicate entries are ignored.") );
     TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped "
@@ -163,7 +163,7 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group,
     TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
                                   "your path, simply leave it as 'java'. If you need to use a different jre, "
                                   "enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), "
-                                  "or the path to the directory that tqcontains 'bin/java' (e.g. /opt/IBMJava2-13).") );
+                                  "or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") );
 
     TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") );
 
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index fbced3897..de8f7c7eb 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -41,10 +41,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index cf0124395..ae73fc686 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -79,14 +79,14 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge
                                           "button allows you to easily share your policies with other people by allowing "
                                           "you to save and retrieve them from a zipped file.") );
 
-  TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+  TQString wtstr = i18n("This box contains the domains and hosts you have set "
                        "a specific JavaScript policy for. This policy will be used "
                        "instead of the default policy for enabling or disabling JavaScript on pages sent by these "
                        "domains or hosts. <p>Select a policy and use the controls on "
                        "the right to modify it.");
   TQWhatsThis::add( domainSpecific->listView(), wtstr );
 
-  TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+  TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                         "the JavaScript policies. These policies will be merged "
                                         "with the existing ones. Duplicate entries are ignored.") );
   TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped "
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 0360f2bf8..5196af8dd 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -68,9 +68,9 @@ void JSPolicies::load() {
   window_focus = config->readUnsignedNumEntry(key,
   	is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);
 
-  key = prefix + "WindowtqStatusPolicy";
+  key = prefix + "WindowStatusPolicy";
   window_status = config->readUnsignedNumEntry(key,
-  	is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY);
+  	is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
 }
 
 void JSPolicies::defaults() {
@@ -83,7 +83,7 @@ void JSPolicies::defaults() {
   window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
   window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
   window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
-  window_status = is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY;
+  window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
 }
 
 void JSPolicies::save() {
@@ -114,7 +114,7 @@ void JSPolicies::save() {
   else
     config->deleteEntry(key);
 
-  key = prefix + "WindowtqStatusPolicy";
+  key = prefix + "WindowStatusPolicy";
   if (window_status != INHERIT_POLICY)
     config->writeEntry(key, window_status);
   else
@@ -133,12 +133,12 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   bool is_per_domain = !policies->isGlobal();
 
   setColumnLayout(0, Qt::Vertical);
-  tqlayout()->setSpacing(0);
-  tqlayout()->setMargin(0);
-  TQGridLayout *this_tqlayout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
-  this_tqlayout->tqsetAlignment(Qt::AlignTop);
-  this_tqlayout->setSpacing(3);
-  this_tqlayout->setMargin(11);
+  layout()->setSpacing(0);
+  layout()->setMargin(0);
+  TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
+  this_layout->setAlignment(Qt::AlignTop);
+  this_layout->setSpacing(3);
+  this_layout->setMargin(11);
 
   TQString wtstr;	// what's this description
   int colIdx;		// column index
@@ -146,7 +146,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.open ================================
   colIdx = 0;
   TQLabel *label = new TQLabel(i18n("Open new windows:"),this);
-  this_tqlayout->addWidget(label,0,colIdx++);
+  this_layout->addWidget(label,0,colIdx++);
 
   js_popup = new TQButtonGroup(this);
   js_popup->setExclusive(true);
@@ -157,35 +157,35 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_popup->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,0,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,0,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ask"), this);
   TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Deny"), this);
   TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Smart"), this);
   TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
                                    "links are activated through an explicit "
                                    "mouse click or keyboard operation."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("If you disable this, Konqueror will stop "
                "interpreting the <i>window.open()</i> "
@@ -202,7 +202,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.resizeBy/resizeTo ================================
   colIdx = 0;
   label = new TQLabel(i18n("Resize window:"),this);
-  this_tqlayout->addWidget(label,1,colIdx++);
+  this_layout->addWidget(label,1,colIdx++);
 
   js_resize = new TQButtonGroup(this);
   js_resize->setExclusive(true);
@@ -212,23 +212,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_resize->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,1,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,1,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
   js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow);
-  this_tqlayout->addWidget(policy_btn,1,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,1,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
   				"The web page will <i>think</i> it changed the "
 				"size but the actual window is not affected."));
   js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore);
-  this_tqlayout->addWidget(policy_btn,1,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,1,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the window size on their own by using "
   		"<i>window.resizeBy()</i> or <i>window.resizeTo()</i>. "
@@ -240,7 +240,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.moveBy/moveTo ================================
   colIdx = 0;
   label = new TQLabel(i18n("Move window:"),this);
-  this_tqlayout->addWidget(label,2,colIdx++);
+  this_layout->addWidget(label,2,colIdx++);
 
   js_move = new TQButtonGroup(this);
   js_move->setExclusive(true);
@@ -250,23 +250,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_move->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,2,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,2,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
   js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow);
-  this_tqlayout->addWidget(policy_btn,2,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,2,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
   				"The web page will <i>think</i> it moved the "
 				"window but the actual position is not affected."));
   js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore);
-  this_tqlayout->addWidget(policy_btn,2,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,2,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the window position on their own by using "
   		"<i>window.moveBy()</i> or <i>window.moveTo()</i>. "
@@ -278,7 +278,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.focus ================================
   colIdx = 0;
   label = new TQLabel(i18n("Focus window:"),this);
-  this_tqlayout->addWidget(label,3,colIdx++);
+  this_layout->addWidget(label,3,colIdx++);
 
   js_focus = new TQButtonGroup(this);
   js_focus->setExclusive(true);
@@ -288,15 +288,15 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_focus->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,3,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,3,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
   js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow);
-  this_tqlayout->addWidget(policy_btn,3,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,3,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. "
@@ -304,8 +304,8 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 				"the focus to the window but the actual "
 				"focus will remain unchanged.") );
   js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore);
-  this_tqlayout->addWidget(policy_btn,3,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,3,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites set the focus to their browser window on their "
   		"own by using <i>window.focus()</i>. This usually leads to "
@@ -319,7 +319,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.status ================================
   colIdx = 0;
   label = new TQLabel(i18n("Modify status bar text:"),this);
-  this_tqlayout->addWidget(label,4,colIdx++);
+  this_layout->addWidget(label,4,colIdx++);
 
   js_statusbar = new TQButtonGroup(this);
   js_statusbar->setExclusive(true);
@@ -329,32 +329,32 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_statusbar->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,4,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,4,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusAllow);
-  this_tqlayout->addWidget(policy_btn,4,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow);
+  this_layout->addWidget(policy_btn,4,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. "
   				"The web page will <i>think</i> it changed "
 				"the text but the actual text will remain "
 				"unchanged.") );
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusIgnore);
-  this_tqlayout->addWidget(policy_btn,4,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore);
+  this_layout->addWidget(policy_btn,4,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the status bar text by setting "
-  		"<i>window.status</i> or <i>window.defaulttqStatus</i>, "
+  		"<i>window.status</i> or <i>window.defaultStatus</i>, "
 		"thus sometimes preventing displaying the real URLs of hyperlinks. "
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowtqStatusPolicy(int)));
+  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
 }
 
 JSPoliciesFrame::~JSPoliciesFrame() {
@@ -399,7 +399,7 @@ void JSPoliciesFrame::setWindowFocusPolicy(int id) {
   emit changed();
 }
 
-void JSPoliciesFrame::setWindowtqStatusPolicy(int id) {
+void JSPoliciesFrame::setWindowStatusPolicy(int id) {
   policies->window_status = id;
   emit changed();
 }
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index b2d08c11d..45352fbb9 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -50,16 +50,16 @@ public:
    * Enumeration for all policies
    */
   enum Policies { JavaScriptEnabled = 0, WindowOpen, WindowResize,
-  		WindowMove, WindowFocus, WindowtqStatus, NumPolicies };
+  		WindowMove, WindowFocus, WindowStatus, NumPolicies };
 #endif
 
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
@@ -141,19 +141,19 @@ public:
   }
 
   /**
-   * Returns whether the WindowtqStatus policy is inherited.
+   * Returns whether the WindowStatus policy is inherited.
    */
-  bool isWindowtqStatusPolicyInherited() const {
+  bool isWindowStatusPolicyInherited() const {
     return window_status == INHERIT_POLICY;
   }
   /**
-   * Returns the current value of the WindowtqStatus policy.
+   * Returns the current value of the WindowStatus policy.
    *
-   * This will return an illegal value if isWindowtqStatusPolicyInherited is
+   * This will return an illegal value if isWindowStatusPolicyInherited is
    * true.
    */
-  KHTMLSettings::KJSWindowtqStatusPolicy windowtqStatusPolicy() const {
-    return (KHTMLSettings::KJSWindowtqStatusPolicy)window_status;
+  KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
+    return (KHTMLSettings::KJSWindowStatusPolicy)window_status;
   }
 
   /**
@@ -178,7 +178,7 @@ private:
   unsigned int window_move;
   // one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
   unsigned int window_focus;
-  // one of KHTMLSettings::KJSWindowtqStatusPolicy or INHERIT_POLICY
+  // one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
   unsigned int window_status;
 
   friend class JSPoliciesFrame;	// for changing policies
@@ -187,7 +187,7 @@ private:
 /**
  * @short Provides a framed widget with controls for the JavaScript policy settings.
  *
- * This widget tqcontains controls for changing all JavaScript policies
+ * This widget contains controls for changing all JavaScript policies
  * except the JavaScript enabled policy itself. The rationale behind this is
  * that the enabled policy be separate from the rest in a prominent
  * place.
@@ -253,7 +253,7 @@ private slots:
   void setWindowResizePolicy(int id);
   void setWindowMovePolicy(int id);
   void setWindowFocusPolicy(int id);
-  void setWindowtqStatusPolicy(int id);
+  void setWindowStatusPolicy(int id);
 
 private:
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index de08bf995..28654869e 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -97,9 +97,9 @@ KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
 
   setAboutData( about );
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   // ### the groupname is duplicated in KJSParts::save
   java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index 3bbbe9f8e..d772595c2 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>NSConfigWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
     <property name="caption">
         <string>Netscape Plugin Config</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -72,7 +72,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -96,7 +96,7 @@
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>300</width>
                                 <height>0</height>
@@ -184,7 +184,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -261,8 +261,8 @@
     <include location="global" impldecl="in declaration">klistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>qwidget.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index ee434b710..d5cd4cc2b 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
+    hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
 
     /**************************************************************************
      ********************* Domain-specific Settings ***************************
      *************************************************************************/
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
-    domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+    domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
     connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
@@ -99,13 +99,13 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
           "that can be contained in HTML pages, e.g. Macromedia Flash. "
           "Note that, as with any browser, enabling active contents can be a security problem.") );
 
-    TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+    TQString wtstr = i18n("This box contains the domains and hosts you have set "
                          "a specific plugin policy for. This policy will be used "
                          "instead of the default policy for enabling or disabling plugins on pages sent by these "
                          "domains or hosts. <p>Select a policy and use the controls on "
                          "the right to modify it.");
     TQWhatsThis::add( domainSpecific->listView(), wtstr );
-    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                           "the plugin policies. These policies will be merged "
                                           "with the existing ones. Duplicate entries are ignored.") );
     TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped "
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index c51ad5ffe..8b61f8f16 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -37,10 +37,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index 4943ac373..a9814396a 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -42,10 +42,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if it tqcontains policies specific to a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if it contains policies specific to a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    * @param prefix prefix to use for configuration keys. The domain-specific
diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h
index bc10b3b5c..e4a176fb3 100644
--- a/kcontrol/konqhtml/policydlg.h
+++ b/kcontrol/konqhtml/policydlg.h
@@ -99,7 +99,7 @@ public:
     void refresh();
 
     /**
-     * Adds another panel which tqcontains controls for more policies.
+     * Adds another panel which contains controls for more policies.
      *
      * The widget is inserted between the "feature enabled" combo box and
      * the dialog buttons at the bottom.