diff options
Diffstat (limited to 'lib/kotext')
-rw-r--r-- | lib/kotext/KoAutoFormatDia.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoAutoFormatDia.h | 2 | ||||
-rw-r--r-- | lib/kotext/KoCustomVariablesDia.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoCustomVariablesDia.h | 2 | ||||
-rw-r--r-- | lib/kotext/KoFontDia.cpp | 4 | ||||
-rw-r--r-- | lib/kotext/KoFontTab.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoSearchDia.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoSearchDia.h | 4 | ||||
-rw-r--r-- | lib/kotext/KoStyleManager.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoTextView.cpp | 10 | ||||
-rw-r--r-- | lib/kotext/KoTextView.h | 4 | ||||
-rw-r--r-- | lib/kotext/KoVariable.cpp | 16 | ||||
-rw-r--r-- | lib/kotext/KoVariable.h | 8 | ||||
-rw-r--r-- | lib/kotext/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kotext/TDEFontDialog_local.cpp (renamed from lib/kotext/KFontDialog_local.cpp) | 86 | ||||
-rw-r--r-- | lib/kotext/TDEFontDialog_local.h (renamed from lib/kotext/KFontDialog_local.h) | 58 | ||||
-rw-r--r-- | lib/kotext/kofonttabbase.ui | 6 |
17 files changed, 106 insertions, 106 deletions
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index bc582bd5..4f503d17 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -584,7 +584,7 @@ void KoAutoFormatDia::setupTab3() connect(pbAdd,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotAddEntry())); - m_pListView = new KListView( tab3 ); + m_pListView = new TDEListView( tab3 ); m_pListView->addColumn( i18n( "Find" ) ); m_pListView->addColumn( i18n( "Replace" ) ); m_pListView->setAllColumnsShowFocus( true ); diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 354febf6..800028df 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -122,7 +122,7 @@ protected: TQPushButton *pbChangeFormat, *pbClearFormat; KCharSelect *charselect; KoAutoFormatLineEdit *m_find, *m_replace; - KListView *m_pListView; + TDEListView *m_pListView; TQChar oSimpleBegin, oSimpleEnd; TQChar oDoubleBegin, oDoubleEnd; diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index f3b84121..dd32a80e 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -159,7 +159,7 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView ******************************************************************/ KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) - : KListView( parent ) + : TDEListView( parent ) { header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index 915d6081..25b826ab 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -90,7 +90,7 @@ protected: * The listview. * Used by KoCustomVariablesDia */ -class KoCustomVariablesList : public KListView +class KoCustomVariablesList : public TDEListView { Q_OBJECT diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 258ea98d..1d82214c 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -59,7 +59,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, TQTabWidget *fontTabWidget = new TQTabWidget( mainHBox ); // Font tab - fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); fontTabWidget->addTab( fontTab, i18n( "Font" ) ); connect( fontTab, TQT_SIGNAL( familyChanged() ), this, TQT_SLOT( slotFontFamilyChanged() ) ); @@ -103,7 +103,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, connect( languageTab, TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( slotLanguageChanged() ) ); //Related properties List View - //relatedPropertiesListView = new KListView( mainHBox ); + //relatedPropertiesListView = new TDEListView( mainHBox ); //Preview fontDiaPreview = new KoFontDiaPreview( mainWidget ); diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index da0b524e..0615a337 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -23,7 +23,7 @@ KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, : KoFontTabBase( parent, name, fl ) { TQStringList list; - KFontChooser_local::getFontList(list, fontListCriteria); + TDEFontChooser_local::getFontList(list, fontListCriteria); characterFont->setFamilyList( list ); comparisonFont = characterFont->font(); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index b022eb72..7bbca041 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -589,7 +589,7 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_checkVertAlign = new TQCheckBox( i18n( "Vertical alignment:" ), page ); - m_familyItem = new KFontCombo(page); + m_familyItem = new TDEFontCombo(page); m_familyItem->setCurrentFont(m_ctx->m_family); m_sizeItem = new TQSpinBox( 4, 100, 1, page ); diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 40b4cb97..3c5ebf0b 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -47,7 +47,7 @@ class KoTextObject; class KCommand; class KoTextDocument; class KoFindReplace; -class KFontCombo; +class TDEFontCombo; class KoTextCursor; // // This class represents the KWord-specific search extension items, and also the @@ -321,7 +321,7 @@ private: TQCheckBox *m_checkFontAttribute; TQCheckBox *m_checkLanguage; - KFontCombo *m_familyItem; + TDEFontCombo *m_familyItem; TQSpinBox *m_sizeItem; KColorButton *m_colorItem; KColorButton *m_bgColorItem; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 5a99c38b..0738f0e3 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -683,7 +683,7 @@ KoStyleFontTab::KoStyleFontTab( TQWidget * parent ) ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQTabWidget *fontTabContainer = new TQTabWidget( this ); - m_fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + m_fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); m_decorationTab = new KoDecorationTab( this ); m_highlightingTab = new KoHighlightingTab( this ); m_layoutTab = new KoLayoutTab( true, this ); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 47d7004b..55c54e9d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -175,14 +175,14 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ }*/ bool clearUndoRedoInfo = TRUE; - if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordBack() ) + if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordBack() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordRight(); else deleteWordLeft(); clearUndoRedoInfo = TRUE; - } else if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordForward() ) + } else if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordForward() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordLeft(); @@ -355,7 +355,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ removeToolTipCompletion(); } - // We should use KAccel instead, to make this configurable ! + // We should use TDEAccel instead, to make this configurable ! // Well, those are all alternate keys, for keys already configurable (KDE-wide) // and a kaccel makes it hard to else @@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable() return dynamic_cast<KoLinkVariable *>(variable()); } -TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) +TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) { m_singleWord = false; m_wordUnderCursor = TQString(); @@ -1118,7 +1118,7 @@ TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const } if ( text.isEmpty() || textObject()->protectContent()) // Nothing to apply a tool to - return TQPtrList<KAction>(); + return TQPtrList<TDEAction>(); // Any tool that works on plain text is relevant TQValueList<KDataToolInfo> tools; diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index 0954192b..20013ad7 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -35,7 +35,7 @@ class KoTextFormat; class KoParagCounter; class KCommand; class TQTimer; -class KAction; +class TDEAction; class TDEInstance; class KDataToolInfo; class KoLinkVariable; @@ -134,7 +134,7 @@ public: TQString wordUnderCursor( const KoTextCursor& cursor ); /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */ - TQPtrList<KAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); + TQPtrList<TDEAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); void insertSoftHyphen(); void insertLineBreak(); diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 8ee25c19..856c05f1 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -569,10 +569,10 @@ void KoVariableCollection::setVariableSelected(KoVariable * var) m_varSelected=var; } -// TODO change to TQValueList<KAction *>, but only once plugActionList takes that -TQPtrList<KAction> KoVariableCollection::popupActionList() const +// TODO change to TQValueList<TDEAction *>, but only once plugActionList takes that +TQPtrList<TDEAction> KoVariableCollection::popupActionList() const { - TQPtrList<KAction> listAction; + TQPtrList<TDEAction> listAction; // Insert list of actions that change the subtype const TQStringList subTypeList = m_varSelected->subTypeList(); kdDebug() << k_funcinfo << "current subtype=" << m_varSelected->subType() << endl; @@ -583,7 +583,7 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const { // We store the subtype number as the action name TQCString name; name.setNum(i); - KToggleAction * act = new KToggleAction( *it, KShortcut(), 0, name ); + TDEToggleAction * act = new TDEToggleAction( *it, TDEShortcut(), 0, name ); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeSubType()) ); if ( i == m_varSelected->subType() ) act->setChecked( true ); @@ -600,14 +600,14 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const for ( int i = 0; it != list.end() ; ++it, ++i ) { if( i == 0 ) // first item, and list not empty - listAction.append( new KActionSeparator() ); + listAction.append( new TDEActionSeparator() ); if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { format->setFormatProperties( *it ); // temporary change TQString text = format->convert( m_varSelected->varValue() ); // We store the raw format as the action name - KToggleAction * act = new KToggleAction(text, KShortcut(), 0, (*it).utf8()); + TDEToggleAction * act = new TDEToggleAction(text, TDEShortcut(), 0, (*it).utf8()); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeFormat()) ); if ( (*it) == currentFormat ) act->setChecked( true ); @@ -622,7 +622,7 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const void KoVariableCollection::slotChangeSubType() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); int menuNumber = TQCString(act->name()).toInt(); int newSubType = m_varSelected->variableSubType(menuNumber); kdDebug(32500) << "slotChangeSubType: menuNumber=" << menuNumber << " newSubType=" << newSubType << endl; @@ -637,7 +637,7 @@ void KoVariableCollection::slotChangeSubType() void KoVariableCollection::slotChangeFormat() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); TQString newFormat = TQString::fromUtf8(act->name()); TQString oldFormat = m_varSelected->variableFormat()->formatProperties(); if (oldFormat != newFormat ) diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index 5cadc5e9..8a066456 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -326,8 +326,8 @@ public: void setVariableSelected(KoVariable * var); KoVariable *selectedVariable()const {return m_varSelected;} - /// List of KActions to put into the popupmenu on a variable - TQPtrList<KAction> popupActionList() const; + /// List of TDEActions to put into the popupmenu on a variable + TQPtrList<TDEAction> popupActionList() const; protected slots: // This is here because variables and formats are not TQObjects @@ -335,7 +335,7 @@ public: void slotChangeFormat(); private: - //typedef TQMap<KAction *, int> VariableSubTextMap; + //typedef TQMap<TDEAction *, int> VariableSubTextMap; //VariableSubTextMap m_variableSubTextMap; TQPtrList<KoVariable> variables; @@ -446,7 +446,7 @@ protected: TQVariant m_varValue; int m_ascent; - //typedef TQMap<KAction *, int> SubTextMap; + //typedef TQMap<TDEAction *, int> SubTextMap; //SubTextMap m_subTextMap; class Private; Private *d; diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am index 160c689c..fc2a2734 100644 --- a/lib/kotext/Makefile.am +++ b/lib/kotext/Makefile.am @@ -12,7 +12,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \ KoParagDia.cpp KoVariable.cpp KoCustomVariablesDia.cpp \ KoChangeCaseDia.cpp KoStyleManager.cpp KoSearchDia.cpp \ timedateformatwidget.ui TimeFormatWidget.cpp DateFormatWidget.cpp \ - KFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ + TDEFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ kodecorationtabbase.ui KoDecorationTab.cpp kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp \ KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui \ KoTextViewIface.skel KoTextViewIface.cc KoFontDia.cpp KoBgSpellCheck.cpp \ diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index 95bc2553..7103821b 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -56,8 +56,8 @@ #include <koffice_export.h> -#include "KFontDialog_local.h" -#include "KFontDialog_local.moc" +#include "TDEFontDialog_local.h" +#include "TDEFontDialog_local.moc" static int minimumListWidth( const TQListBox *list ) { @@ -83,16 +83,16 @@ static int minimumListHeight( const TQListBox *list, int numVisibleEntry ) return ( w * numVisibleEntry + 2 * list->frameWidth() ); } -class KFontChooser_local::KFontChooser_localPrivate +class TDEFontChooser_local::TDEFontChooser_localPrivate { public: - KFontChooser_localPrivate() + TDEFontChooser_localPrivate() { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } TQPalette m_palette; }; -KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, +TDEFontChooser_local::TDEFontChooser_local(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, bool makeFrame, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) @@ -104,7 +104,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, i18n( "Here you can choose the font to be used." ); TQWhatsThis::add( this, mainWhatsThisText ); - d = new KFontChooser_localPrivate; + d = new TDEFontChooser_localPrivate; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); int checkBoxGap = KDialog::spacingHint() / 2; @@ -195,7 +195,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, // // now create the actual boxes that hold the info // - familyListBox = new KListBox( page, "familyListBox"); + familyListBox = new TDEListBox( page, "familyListBox"); familyListBox->setEnabled( !diff ); gridLayout->addWidget( familyListBox, row, 0 ); TQString fontFamilyWhatsThisText = @@ -217,7 +217,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, familyListBox->setMinimumHeight( minimumListHeight( familyListBox, visibleListSize ) ); - styleListBox = new KListBox( page, "styleListBox"); + styleListBox = new TDEListBox( page, "styleListBox"); styleListBox->setEnabled( !diff ); gridLayout->addWidget(styleListBox, row, 1); TQString fontStyleWhatsThisText = @@ -236,7 +236,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, TQT_SLOT(style_chosen_slot(const TQString &))); - sizeListBox = new KListBox( page, "sizeListBox"); + sizeListBox = new TDEListBox( page, "sizeListBox"); sizeOfFont = new KIntNumInput( page, "sizeOfFont"); sizeOfFont->setMinValue(4); @@ -337,12 +337,12 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } -KFontChooser_local::~KFontChooser_local() +TDEFontChooser_local::~TDEFontChooser_local() { delete d; } -void KFontChooser_local::fillSizeList() { +void TDEFontChooser_local::fillSizeList() { if(! sizeListBox) return; //assertion. static const int c[] = @@ -361,7 +361,7 @@ void KFontChooser_local::fillSizeList() { } } -void KFontChooser_local::setColor( const TQColor & col ) +void TDEFontChooser_local::setColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Text, col ); TQPalette pal = sampleEdit->palette(); @@ -369,12 +369,12 @@ void KFontChooser_local::setColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::color() const +TQColor TDEFontChooser_local::color() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Text ); } -void KFontChooser_local::setBackgroundColor( const TQColor & col ) +void TDEFontChooser_local::setBackgroundColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Base, col ); TQPalette pal = sampleEdit->palette(); @@ -382,12 +382,12 @@ void KFontChooser_local::setBackgroundColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::backgroundColor() const +TQColor TDEFontChooser_local::backgroundColor() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Base ); } -void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) +void TDEFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) { // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeCheckBox ) { @@ -398,20 +398,20 @@ void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) } } -TQButton::ToggleState KFontChooser_local::sizeIsRelative() const +TQButton::ToggleState TDEFontChooser_local::sizeIsRelative() const { return sizeIsRelativeCheckBox ? sizeIsRelativeCheckBox->state() : TQButton::NoChange; } -TQSize KFontChooser_local::sizeHint( void ) const +TQSize TDEFontChooser_local::sizeHint( void ) const { return minimumSizeHint(); } -void KFontChooser_local::enableColumn( int column, bool state ) +void TDEFontChooser_local::enableColumn( int column, bool state ) { if( column & FamilyList ) { @@ -428,7 +428,7 @@ void KFontChooser_local::enableColumn( int column, bool state ) } -void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) +void TDEFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) { selFont = aFont; selectedSize=aFont.pointSize(); @@ -445,7 +445,7 @@ void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) } -int KFontChooser_local::fontDiffFlags() { +int TDEFontChooser_local::fontDiffFlags() { int diffFlags = 0; if (familyCheckbox && styleCheckbox && sizeCheckbox) { diffFlags = (int)(familyCheckbox->isChecked() ? FontDiffFamily : 0) @@ -455,7 +455,7 @@ int KFontChooser_local::fontDiffFlags() { return diffFlags; } -void KFontChooser_local::toggled_checkbox() +void TDEFontChooser_local::toggled_checkbox() { familyListBox->setEnabled( familyCheckbox->isChecked() ); styleListBox->setEnabled( styleCheckbox->isChecked() ); @@ -463,7 +463,7 @@ void KFontChooser_local::toggled_checkbox() sizeOfFont->setEnabled( sizeCheckbox->isChecked() ); } -void KFontChooser_local::family_chosen_slot(const TQString& family) +void TDEFontChooser_local::family_chosen_slot(const TQString& family) { TQString currentFamily; if (family.isEmpty()) @@ -509,7 +509,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) } -void KFontChooser_local::size_chosen_slot(const TQString& size){ +void TDEFontChooser_local::size_chosen_slot(const TQString& size){ selectedSize=size.toInt(); sizeOfFont->setValue(selectedSize); @@ -517,12 +517,12 @@ void KFontChooser_local::size_chosen_slot(const TQString& size){ emit fontSelected(selFont); } -void KFontChooser_local::size_value_slot(int val) { +void TDEFontChooser_local::size_value_slot(int val) { selFont.setPointSize(val); emit fontSelected(selFont); } -void KFontChooser_local::style_chosen_slot(const TQString& style) +void TDEFontChooser_local::style_chosen_slot(const TQString& style) { TQString currentStyle; if (style.isEmpty()) @@ -562,7 +562,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) selectedStyle = style; } -void KFontChooser_local::displaySample(const TQFont& font) +void TDEFontChooser_local::displaySample(const TQFont& font) { sampleEdit->setFont(font); sampleEdit->setCursorPosition(0); @@ -574,7 +574,7 @@ void KFontChooser_local::displaySample(const TQFont& font) //kdDebug() << " (" << font.toString() << ")\n"; } -void KFontChooser_local::setupDisplay() +void TDEFontChooser_local::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. @@ -651,7 +651,7 @@ void KFontChooser_local::setupDisplay() } -void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) +void TDEFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; TQStringList lstSys(dbase.families()); @@ -684,7 +684,7 @@ void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) list = lstSys; } -void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) +void TDEFontChooser_local::addFont( TQStringList &list, const char *xfont ) { const char *ptr = strchr( xfont, '-' ); if ( !ptr ) @@ -712,7 +712,7 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) } } -void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) +void TDEFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) { TQStringList fontList; getFontList(fontList, onlyFixedFonts?FixedWidthFonts:0); @@ -720,7 +720,7 @@ void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) familyListBox->insertStringList(fontList); } -void KFontChooser_local::setFamilyList( TQStringList list ) +void TDEFontChooser_local::setFamilyList( TQStringList list ) { familyListBox->blockSignals( true ); familyListBox->clear(); @@ -729,7 +729,7 @@ void KFontChooser_local::setFamilyList( TQStringList list ) familyListBox->blockSignals( false ); } -void KFontChooser_local::showXLFDArea(bool show) +void TDEFontChooser_local::showXLFDArea(bool show) { if( show ) { @@ -743,24 +743,24 @@ void KFontChooser_local::showXLFDArea(bool show) /////////////////////////////////////////////////////////////////////////////// -KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name, +TDEFontDialog_local::TDEFontDialog_local( TQWidget *parent, const char* name, bool onlyFixed, bool modal, const TQStringList &fontList, bool makeFrame, bool diff, TQButton::ToggleState *sizeIsRelativeState ) : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) { - chooser = new KFontChooser_local( this, "fontChooser", + chooser = new TDEFontChooser_local( this, "fontChooser", onlyFixed, fontList, makeFrame, 8, diff, sizeIsRelativeState ); setMainWidget(chooser); } -int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, +int TDEFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, true, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -775,11 +775,11 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi return result; } -int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, +int TDEFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -794,12 +794,12 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, } -int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, +int TDEFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, + TDEFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -814,8 +814,8 @@ int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, return result; } -void KFontChooser_local::virtual_hook( int, void* ) +void TDEFontChooser_local::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -void KFontDialog_local::virtual_hook( int id, void* data ) +void TDEFontDialog_local::virtual_hook( int id, void* data ) { KDialogBase::virtual_hook( id, data ); } diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/TDEFontDialog_local.h index 3ed6ff08..4c238874 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/TDEFontDialog_local.h @@ -41,20 +41,20 @@ class TQFont; class TQGroupBox; class TQLabel; class TQStringList; -class KListBox; +class TDEListBox; class KIntNumInput; /** * @short A font selection widget. * - * While KFontChooser_local as an ordinary widget can be embedded in + * While TDEFontChooser_local as an ordinary widget can be embedded in * custom dialogs and therefore is very flexible, in most cases * it is preferable to use the convenience functions in - * KFontDialog_local. + * TDEFontDialog_local. * * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org> * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontChooser_local : public TQWidget +class KOTEXT_EXPORT TDEFontChooser_local : public TQWidget { Q_OBJECT @@ -83,8 +83,8 @@ public: * <p>Consider the following code snippet; * \code * TQStringList list; - * KFontChooser_local::getFontList(list,SmoothScalableFonts); - * KFontChooser_local chooseFont = new KFontChooser_local(0, "FontList", false, list); + * TDEFontChooser_local::getFontList(list,SmoothScalableFonts); + * TDEFontChooser_local chooseFont = new TDEFontChooser_local(0, "FontList", false, list); * \endcode * <p> * The above creates a font chooser dialog with only SmoothScaleble fonts. @@ -98,7 +98,7 @@ public: * If that has not been created, X is queried, and all fonts * available on the system are displayed. * @param diff Display the difference version dialog. - * See KFontDialog_local::getFontDiff(). + * See TDEFontDialog_local::getFontDiff(). * @param makeFrame Draws a frame with titles around the contents. * @param visibleListSize The minimum number of visible entries in the * fontlists. @@ -109,7 +109,7 @@ public: * *sizeIsRelativeState, user choice may be retrieved by * calling sizeIsRelative(). */ - KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, + TDEFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), bool makeFrame = true, int visibleListSize=8, @@ -118,7 +118,7 @@ public: /** * Destructs the font chooser. */ - virtual ~KFontChooser_local(); + virtual ~TDEFontChooser_local(); /** * Enables or disable a font column in the chooser. @@ -248,13 +248,13 @@ public: * * @param list The list is returned here. * @param fontListCriteria should contain all the restrictions for font selection as OR-ed values - * @see KFontChooser_local::FontListCriteria for the individual values + * @see TDEFontChooser_local::FontListCriteria for the individual values */ static void getFontList( TQStringList &list, uint fontListCriteria); /** * - * Fill the font family list of the KFontChooser + * Fill the font family list of the TDEFontChooser * * @param list The font list. */ @@ -302,9 +302,9 @@ private: TQCheckBox *styleCheckbox; TQCheckBox *sizeCheckbox; TQLabel *sizeLabel; - KListBox *familyListBox; - KListBox *styleListBox; - KListBox *sizeListBox; + TDEListBox *familyListBox; + TDEListBox *styleListBox; + TDEListBox *sizeListBox; TQComboBox *charsetsCombo; // BIC: remove in KDE4 TQCheckBox *sizeIsRelativeCheckBox; @@ -320,17 +320,17 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - class KFontChooser_localPrivate; - KFontChooser_localPrivate *d; + class TDEFontChooser_localPrivate; + TDEFontChooser_localPrivate *d; }; /** * @short A font selection dialog. * - * The KFontDialog_local provides a dialog for interactive font selection. - * It is basically a thin wrapper around the KFontChooser_local widget, + * The TDEFontDialog_local provides a dialog for interactive font selection. + * It is basically a thin wrapper around the TDEFontChooser_local widget, * which can also be used standalone. In most cases, the simplest - * use of this class is the static method KFontDialog_local::getFont(), + * use of this class is the static method TDEFontDialog_local::getFont(), * which pops up the dialog, allows the user to select a font, and * returns when the dialog is closed. * @@ -338,8 +338,8 @@ private: * * \code * TQFont myFont; - * int result = KFontDialog_local::getFont( myFont ); - * if ( result == KFontDialog_local::Accepted ) + * int result = TDEFontDialog_local::getFont( myFont ); + * if ( result == TDEFontDialog_local::Accepted ) * ... * \endcode * @@ -348,7 +348,7 @@ private: * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org> * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontDialog_local : public KDialogBase { +class KOTEXT_EXPORT TDEFontDialog_local : public KDialogBase { Q_OBJECT @@ -375,7 +375,7 @@ public: * calling sizeIsRelative(). * */ - KFontDialog_local( TQWidget *parent = 0L, const char *name = 0, + TDEFontDialog_local( TQWidget *parent = 0L, const char *name = 0, bool onlyFixed = false, bool modal = false, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, @@ -447,11 +447,11 @@ public: * difference selection bitmask should be written. * Check the returned bitmask like: * \code - * if ( diffFlags & KFontChooser_local::FontDiffFamily ) + * if ( diffFlags & TDEFontChooser_local::FontDiffFamily ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffStyle ) + * if ( diffFlags & TDEFontChooser_local::FontDiffStyle ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffSize ) + * if ( diffFlags & TDEFontChooser_local::FontDiffSize ) * [...] * \endcode * @param onlyFixed if true, only select from fixed-width fonts. @@ -504,13 +504,13 @@ signals: void fontSelected( const TQFont &font ); protected: - KFontChooser_local *chooser; + TDEFontChooser_local *chooser; protected: virtual void virtual_hook( int id, void* data ); private: - class KFontDialog_localPrivate; - KFontDialog_localPrivate *d; + class TDEFontDialog_localPrivate; + TDEFontDialog_localPrivate *d; }; diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui index fa8b9ba4..d6d0a2f6 100644 --- a/lib/kotext/kofonttabbase.ui +++ b/lib/kotext/kofonttabbase.ui @@ -11,7 +11,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KFontChooser_local"> + <widget class="TDEFontChooser_local"> <property name="name"> <cstring>characterFont</cstring> </property> @@ -20,9 +20,9 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includes> - <include location="local" impldecl="in declaration">KFontDialog_local.h</include> + <include location="local" impldecl="in declaration">TDEFontDialog_local.h</include> </includes> <includehints> - <includehint>KFontDialog_local.h</includehint> + <includehint>TDEFontDialog_local.h</includehint> </includehints> </UI> |