summaryrefslogtreecommitdiffstats
path: root/kcontrol/kio
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kio')
-rw-r--r--kcontrol/kio/cache.cpp2
-rw-r--r--kcontrol/kio/cache_ui.ui4
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp8
-rw-r--r--kcontrol/kio/kcookiesmain.cpp2
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp2
-rw-r--r--kcontrol/kio/kcookiesmanagementdlg_ui.ui2
-rw-r--r--kcontrol/kio/kcookiespolicies.cpp4
-rw-r--r--kcontrol/kio/kcookiespoliciesdlg_ui.ui2
-rw-r--r--kcontrol/kio/kenvvarproxydlg.cpp10
-rw-r--r--kcontrol/kio/kmanualproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg.cpp2
-rw-r--r--kcontrol/kio/kproxydlg_ui.ui4
-rw-r--r--kcontrol/kio/main.cpp2
-rw-r--r--kcontrol/kio/manualproxy_ui.ui6
-rw-r--r--kcontrol/kio/netpref.cpp2
-rw-r--r--kcontrol/kio/policydlg.cpp4
-rw-r--r--kcontrol/kio/policydlg.h6
-rw-r--r--kcontrol/kio/smbrodlg.cpp6
-rw-r--r--kcontrol/kio/socks.cpp2
-rw-r--r--kcontrol/kio/socksbase.ui8
-rw-r--r--kcontrol/kio/uagentproviderdlg.cpp4
-rw-r--r--kcontrol/kio/uagentproviderdlg_ui.ui4
-rw-r--r--kcontrol/kio/useragentdlg.cpp2
-rw-r--r--kcontrol/kio/useragentdlg_ui.ui4
24 files changed, 48 insertions, 48 deletions
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index d98cba302..d42ec45d4 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui
index 532173407..ce9aed797 100644
--- a/kcontrol/kio/cache_ui.ui
+++ b/kcontrol/kio/cache_ui.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index e48d15432..00a87567e 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -27,7 +27,7 @@
#include "fakeuaprovider.h"
#define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL(x) TQString::tqfromLatin1(x)
+#define QFL(x) TQString::fromLatin1(x)
FakeUASProvider::FakeUASProvider()
{
@@ -97,13 +97,13 @@ void FakeUASProvider::parseDescription()
TQStringList languageList = KGlobal::locale()->languageList();
if ( languageList.count() )
{
- TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if( it != languageList.end() )
{
- if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 )
+ if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
languageList.remove( it );
else
- (*it) = TQString::tqfromLatin1("en");
+ (*it) = TQString::fromLatin1("en");
}
}
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp
index 8233f0d20..3bceb6acd 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/kio/kcookiesmain.cpp
@@ -3,7 +3,7 @@
// First version of cookies configuration by Waldo Bastian <bastian@kde.org>
// This dialog box created by David Faure <faure@kde.org>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtabwidget.h>
#include <klocale.h>
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 9a4f6eb2c..46b09b3f5 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -20,7 +20,7 @@
*/
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqgroupbox.h>
#include <tqhbox.h>
diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
index 00a032a79..e4fb65121 100644
--- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>62</height>
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index ac0b2572f..fb63d8cf7 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -24,7 +24,7 @@
*/
#include <tqheader.h>
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
@@ -392,7 +392,7 @@ void KCookiesPolicies::save()
while( at )
{
- domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
+ domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
at = at->nextSibling();
}
diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui
index 230ef9b5f..880b41cba 100644
--- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui
@@ -161,7 +161,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp
index 8d21c7a5b..1069aa797 100644
--- a/kcontrol/kio/kenvvarproxydlg.cpp
+++ b/kcontrol/kio/kenvvarproxydlg.cpp
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
@@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed()
setHighLight (mDlg->lbNoProxy, false);
// Detect HTTP proxy settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
// Detect HTTPS proxy settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
// Detect FTP proxy settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
// Detect the NO_PROXY settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
if ( !found )
{
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index b5961db7c..3757d5bfb 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/kio/kmanualproxydlg.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqspinbox.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
@@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
- mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy );
+ mDlg->pbCopyDown->setSizePolicy( sizePolicy );
init();
}
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp
index bbe7a76bd..f9f13ea1d 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/kio/kproxydlg.cpp
@@ -20,7 +20,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui
index d053707db..e2edb2d27 100644
--- a/kcontrol/kio/kproxydlg_ui.ui
+++ b/kcontrol/kio/kproxydlg_ui.ui
@@ -115,7 +115,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -300,7 +300,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index 96821defa..c4de74e6a 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtabwidget.h>
#include <kcmoduleloader.h>
diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui
index ecc061a64..43567977e 100644
--- a/kcontrol/kio/manualproxy_ui.ui
+++ b/kcontrol/kio/manualproxy_ui.ui
@@ -137,7 +137,7 @@
<property name="name">
<cstring>sbHttp</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>114</height>
diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp
index 1c1de3316..6ec5bcf05 100644
--- a/kcontrol/kio/netpref.cpp
+++ b/kcontrol/kio/netpref.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqvgroupbox.h>
diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp
index 316fd7e80..23b962ad8 100644
--- a/kcontrol/kio/policydlg.cpp
+++ b/kcontrol/kio/policydlg.cpp
@@ -18,7 +18,7 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvalidator.h>
@@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotTextChanged(const TQString&)));
- setFixedSize (tqsizeHint());
+ setFixedSize (sizeHint());
m_dlgUI->leDomain->setFocus ();
}
diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h
index a67bfccaa..2bf7a4c99 100644
--- a/kcontrol/kio/policydlg.h
+++ b/kcontrol/kio/policydlg.h
@@ -52,11 +52,11 @@ public:
if (advice.isEmpty())
return KCookieAdvice::Dunno;
- if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0)
+ if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
return KCookieAdvice::Accept;
- else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0)
return KCookieAdvice::Reject;
- else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0)
return KCookieAdvice::Ask;
return KCookieAdvice::Dunno;
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 148af43d1..562124637 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <klocale.h>
#include <kconfig.h>
@@ -140,7 +140,7 @@ void SMBRoOptions::save()
for (uint i=0; i<password.length(); i++)
{
TQChar c = password[i];
- unsigned int num = (c.tqunicode() ^ 173) + 17;
+ unsigned int num = (c.unicode() ^ 173) + 17;
unsigned int a1 = (num & 0xFC00) >> 10;
unsigned int a2 = (num & 0x3E0) >> 5;
unsigned int a3 = (num & 0x1F);
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index fd1ce7d8e..4e2502af9 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -20,7 +20,7 @@
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvbuttongroup.h>
#include <tqcheckbox.h>
diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui
index 3065ab229..90e801249 100644
--- a/kcontrol/kio/socksbase.ui
+++ b/kcontrol/kio/socksbase.ui
@@ -127,7 +127,7 @@
<property name="name">
<cstring>_c_customPath</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -211,7 +211,7 @@
<property name="name">
<cstring>_c_newPath</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp
index 5bf92cdb7..fe6a286c8 100644
--- a/kcontrol/kio/uagentproviderdlg.cpp
+++ b/kcontrol/kio/uagentproviderdlg.cpp
@@ -17,7 +17,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
@@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
TQString keycode = e->text();
if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
(cursorPosition() > 0 && key == Qt::Key_Minus) ||
- (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) )
+ (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
{
KLineEdit::keyPressEvent(e);
return;
diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui
index 7bf590208..2082e3db4 100644
--- a/kcontrol/kio/uagentproviderdlg_ui.ui
+++ b/kcontrol/kio/uagentproviderdlg_ui.ui
@@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>29</width>
<height>20</height>
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index c34d5cadc..dca35ab8c 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/kio/useragentdlg.cpp
@@ -23,7 +23,7 @@
*/
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqlineedit.h>
#include <tqtooltip.h>
diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui
index 73b9dfd2e..1e5d55c4e 100644
--- a/kcontrol/kio/useragentdlg_ui.ui
+++ b/kcontrol/kio/useragentdlg_ui.ui
@@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>