diff options
Diffstat (limited to 'kcontrol/konqhtml')
-rw-r--r-- | kcontrol/konqhtml/advancedTabDialog.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/advancedTabOptions.ui | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/appearance.cpp | 4 | ||||
-rw-r--r-- | kcontrol/konqhtml/domainlistview.cpp | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/filteropts.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/htmlopts.cpp | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/javaopts.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/jsopts.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/jspolicies.cpp | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/khttpoptdlg.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/main.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/nsconfigwidget.ui | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/pluginopts.cpp | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/policydlg.cpp | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index aed2d8c5b..681863cb6 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -19,7 +19,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqslider.h> diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 5249e8801..5df531f10 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 537a0a230..8c832e770 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -1,7 +1,7 @@ #include <tqfontdatabase.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvgroupbox.h> #include <tqwhatsthis.h> @@ -231,7 +231,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget TQFontDatabase db; - m_families = db.families(); + m_families = db.tqfamilies(); m_pFonts[0]->setFonts( m_families ); m_pFonts[1]->setFonts( m_families ); diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 58d5e43bc..699940b66 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -19,7 +19,7 @@ */ -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -38,8 +38,8 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - TQGridLayout* thisLayout = new TQGridLayout(layout()); - thisLayout->setAlignment(Qt::AlignTop); + TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); + thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 08a1f69df..731bae2ec 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -23,7 +23,7 @@ #include <kfiledialog.h> #include <dcopclient.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqgroupbox.h> diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 70ca4c2d6..88e9685bb 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -5,7 +5,7 @@ // (c) David Faure 1998 // (c) 2001 Waldo Bastian <[email protected]> -#include <layout.h>//CT - 12Nov1998 +#include <tqlayout.h>//CT - 12Nov1998 #include <tqwhatsthis.h> #include <tqvgroupbox.h> #include <tqlabel.h> @@ -82,7 +82,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->layout(), KDialog::spacingHint() ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), 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, " @@ -109,7 +109,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 shape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape 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/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 92430c46a..af168ed1f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -20,7 +20,7 @@ #include <khtml_settings.h> #include <knuminput.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> #include <tqlabel.h> diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index 9cc32cdaf..e50224f53 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -11,7 +11,7 @@ // Big changes to accommodate per-domain settings // (c) Leo Savernik 2002-2003 -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> #include <kconfig.h> diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index d4215905a..d295740dc 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -21,7 +21,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqwhatsthis.h> @@ -135,8 +135,8 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); - this_layout->setAlignment(Qt::AlignTop); + TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); + this_layout->tqsetAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index ad6bb8fb6..ca175e8e9 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -1,7 +1,7 @@ // File khttpoptdlg.cpp by Jacek Konieczny <[email protected]> // Port to KControl by David Faure <[email protected]> -#include <layout.h> //CT +#include <tqlayout.h> //CT #include <klocale.h> #include <kglobal.h> diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index fb5f15a5f..28654869e 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <dcopclient.h> #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include "jsopts.h" #include "javaopts.h" diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index 567d87e00..23e4ac881 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="name"> <cstring>GroupBox1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 2b858ae08..a977eb4ea 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -7,7 +7,7 @@ #include <stdlib.h> #include <unistd.h> -#include <layout.h> +#include <tqlayout.h> #include <tqprogressdialog.h> #include <tqregexp.h> #include <tqslider.h> @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp index 9b56170d6..4f1529ed8 100644 --- a/kcontrol/konqhtml/policydlg.cpp +++ b/kcontrol/konqhtml/policydlg.cpp @@ -2,7 +2,7 @@ // (C) 2002 Leo Savernik <[email protected]> // Generalizing the policy dialog -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqwhatsthis.h> #include <tqcombobox.h> |