From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kcontrol/konqhtml/appearance.cpp | 12 ++++++------ kcontrol/konqhtml/appearance.h | 4 ++-- kcontrol/konqhtml/domainlistview.cpp | 2 +- kcontrol/konqhtml/domainlistview.h | 6 +++--- kcontrol/konqhtml/javaopts.h | 2 +- kcontrol/konqhtml/nsconfigwidget.ui | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kcontrol/konqhtml') diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 617197eba..cd54cd003 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -67,7 +67,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQLabel* label = new TQLabel( i18n("S&tandard font:"), this ); lay->addWidget( label , ++r, E); - m_pFonts[0] = new KFontCombo( emptyList, this ); + m_pFonts[0] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[0] ); lay->addMultiCellWidget(m_pFonts[0], r, r, M, W); @@ -88,7 +88,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "&Fixed font:"), this ); lay->addWidget( label, ++r, E ); - m_pFonts[1] = new KFontCombo( emptyList, this ); + m_pFonts[1] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[1] ); lay->addMultiCellWidget(m_pFonts[1], r, r, M, W); @@ -109,7 +109,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "S&erif font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[2] = new KFontCombo( emptyList, this ); + m_pFonts[2] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[2] ); lay->addMultiCellWidget( m_pFonts[2], r, r, M, W ); @@ -130,7 +130,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "Sa&ns serif font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[3] = new KFontCombo( emptyList, this ); + m_pFonts[3] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[3] ); lay->addMultiCellWidget( m_pFonts[3], r, r, M, W ); @@ -152,7 +152,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "C&ursive font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[4] = new KFontCombo( emptyList, this ); + m_pFonts[4] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[4] ); lay->addMultiCellWidget( m_pFonts[4], r, r, M, W ); @@ -174,7 +174,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "Fantas&y font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[5] = new KFontCombo( emptyList, this ); + m_pFonts[5] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[5] ); lay->addMultiCellWidget( m_pFonts[5], r, r, M, W ); diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index c833e8111..3c5131abf 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -17,7 +17,7 @@ #include class TQSpinBox; -class KFontCombo; +class TDEFontCombo; class KAppearanceOptions : public TDECModule { @@ -55,7 +55,7 @@ private: KIntNumInput* m_minSize; KIntNumInput* m_MedSize; KIntNumInput* m_pageDPI; - KFontCombo* m_pFonts[6]; + TDEFontCombo* m_pFonts[6]; TQComboBox* m_pEncoding; TQSpinBox *m_pFontSizeAdjust; diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 8bc8a3e50..3c8086abf 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -43,7 +43,7 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title, thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); - domainSpecificLV = new KListView(this); + domainSpecificLV = new TDEListView(this); domainSpecificLV->addColumn(i18n("Host/Domain")); domainSpecificLV->addColumn(i18n("Policy"), 100); connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed())); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index f62b2e46a..f5844071e 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -30,7 +30,7 @@ class TQPushButton; class TQStringList; class TDEConfig; -class KListView; +class TDEListView; class Policies; class PolicyDialog; @@ -80,7 +80,7 @@ public: /** * returns the list view displaying the domains */ - KListView *listView() const { return domainSpecificLV; } + TDEListView *listView() const { return domainSpecificLV; } /** * returns the add push-button. @@ -193,7 +193,7 @@ protected: TDEConfig *config; - KListView *domainSpecificLV; + TDEListView *domainSpecificLV; TQPushButton* addDomainPB; TQPushButton* changeDomainPB; diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index 0c179edd0..ea854aed3 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -22,7 +22,7 @@ class KColorButton; class TDEConfig; -class KListView; +class TDEListView; class KURLRequester; class KIntNumInput; diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index be05b0aa6..a20a0f02f 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -161,7 +161,7 @@ &Up - + dirList -- cgit v1.2.1