diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
| commit | f537c21b68e08f649b1b297bce8f3904603137e0 (patch) | |
| tree | fb33065387509dea898c90022ddec9c3f8ede86d /tqt3integration/module | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'tqt3integration/module')
| -rw-r--r-- | tqt3integration/module/module.cpp | 6 | ||||
| -rw-r--r-- | tqt3integration/module/module.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index 3f3c4d418..67eb62870 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -152,7 +152,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCString& name, const TQCString& wmclass1, const TQCString& wmclass2 ) { - KFontDialog* dlg = new KFontDialog( NULL, name.isEmpty() ? name : "Font Selector", false, false ); + TDEFontDialog* dlg = new TDEFontDialog( NULL, name.isEmpty() ? name : "Font Selector", false, false ); dlg->setFont( def, false ); prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setPlainCaption( i18n( "Select Font" )); @@ -301,7 +301,7 @@ void Module::dialogDone( int result ) KFileDialog* dlg = static_cast< KFileDialog* >( handle ); TQString filename = result == TQDialog::Accepted ? dlg->selectedFile() : TQString(); if (!filename.isEmpty()) - KRecentDocument::add(filename); + TDERecentDocument::add(filename); post_getSaveFileName( dlg, filename, dlg->baseURL().path(), dlg->currentFilter()); dlg->deleteLater(); break; @@ -322,7 +322,7 @@ void Module::dialogDone( int result ) } case JobData::GetFont: { - KFontDialog* dlg = static_cast< KFontDialog* >( handle ); + TDEFontDialog* dlg = static_cast< TDEFontDialog* >( handle ); post_getFont( dlg, result == TQDialog::Accepted ? dlg->font() : TQFont(), result == TQDialog::Accepted ); dlg->deleteLater(); break; diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h index 4a4f215d4..1430e0530 100644 --- a/tqt3integration/module/module.h +++ b/tqt3integration/module/module.h @@ -115,21 +115,21 @@ class KColorDialog virtual void done( int r ) { ::KColorDialog::done( r ); emit dialogDone( r ); } // hmm? }; -class KFontDialog - : public ::KFontDialog +class TDEFontDialog + : public ::TDEFontDialog { Q_OBJECT public: - KFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal, + TDEFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, TQButton::ToggleState *sizeIsRelativeState = 0L ) - : ::KFontDialog( parent, name, onlyFixed, modal, fontlist, makeFrame, diff, sizeIsRelativeState ) + : ::TDEFontDialog( parent, name, onlyFixed, modal, fontlist, makeFrame, diff, sizeIsRelativeState ) {} signals: void dialogDone( int result ); protected: - virtual void done( int r ) { ::KFontDialog::done( r ); emit dialogDone( r ); } + virtual void done( int r ) { ::TDEFontDialog::done( r ); emit dialogDone( r ); } }; class KDialogBase |