From 257013fc4a8df61a2a4811127f9f183bb0c7019a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:59:28 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- k9author/k9menuedit.cpp | 8 ++++---- src/k9copy.cpp | 18 +++++++++--------- src/k9copy.h | 16 ++++++++-------- src/k9prefauthor.cpp | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp index ee94b3d..c37ad41 100644 --- a/k9author/k9menuedit.cpp +++ b/k9author/k9menuedit.cpp @@ -91,8 +91,8 @@ void k9MenuEdit::bFontClick() { if (m_menuEditor->getSelected()) { k9MenuButton *b=m_menuEditor->getSelected(); TQFont myFont(b->getFont()); - int result = KFontDialog::getFont( myFont ); - if ( result == KFontDialog::Accepted && m_menuEditor->getSelected() ) { + int result = TDEFontDialog::getFont( myFont ); + if ( result == TDEFontDialog::Accepted && m_menuEditor->getSelected() ) { TQPtrList *l=m_menuEditor->getSelection(); for (b=l->first();b;b=l->next()) { b->setFont(myFont); @@ -101,8 +101,8 @@ void k9MenuEdit::bFontClick() { } else { if (m_text) { TQFont myFont(m_text->font()); - int result = KFontDialog::getFont( myFont ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( myFont ); + if ( result == TDEFontDialog::Accepted ) setFont(myFont); } diff --git a/src/k9copy.cpp b/src/k9copy.cpp index cca96d5..345480e 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -44,7 +44,7 @@ k9Copy::k9Copy() : KMdiMainFrm( 0, "k9Copy" ,KMdi::IDEAlMode ) { - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget m_k9MainView=NULL; m_k9ImportView =NULL; @@ -260,7 +260,7 @@ void k9Copy::setupActions() { setStandardToolBarMenuEnabled(TRUE); createStandardStatusBarAction(); - PlayTitleAction = new KAction(i18n("Play title"), 0, + PlayTitleAction = new TDEAction(i18n("Play title"), 0, TQT_TQOBJECT(this), TQT_SLOT(ActionPlayTitle()), actionCollection(), "PlayTitle"); m_actions["playtitle"]=PlayTitleAction; @@ -269,28 +269,28 @@ void k9Copy::setupActions() { img.loadFromData( img_preview, sizeof( img_preview ), "PNG" ); PlayTitleAction->setIconSet(TQIconSet(img)); - CopyAction = new KAction(i18n("Copy"), 0, + CopyAction = new TDEAction(i18n("Copy"), 0, TQT_TQOBJECT(this), TQT_SLOT(ActionCopy()), actionCollection(), "Copy"); m_actions["copy"]=CopyAction; CopyAction->setIcon("dvdcopy"); - mkMpeg2Action = new KAction(i18n("Extract MPEG2"),0, + mkMpeg2Action = new TDEAction(i18n("Extract MPEG2"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionMpeg2()), actionCollection(),"MakeMPEG2"); m_actions["mp2"]=mkMpeg2Action; mkMpeg2Action->setIcon("mpeg"); - mkMP4Action = new KAction(i18n("Create MPEG-4"),0, + mkMP4Action = new TDEAction(i18n("Create MPEG-4"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionMP4()), actionCollection(),"MakeMPEG4"); m_actions["mp4"]=mkMP4Action; mkMP4Action->setIcon("mp4"); - ejectAction = new KAction(i18n("Eject"),0, + ejectAction = new TDEAction(i18n("Eject"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionEject()), actionCollection() , "Eject"); ejectAction->setIcon("player_eject"); @@ -298,19 +298,19 @@ void k9Copy::setupActions() { m_actions["eject"]=ejectAction; - backupAction= new KRadioAction(i18n("DVD Backup"),0, + backupAction= new TDERadioAction(i18n("DVD Backup"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionBackup()), actionCollection(), "backup"); backupAction->setExclusiveGroup("mode"); m_actions["backup"]=backupAction; - authorAction= new KRadioAction(i18n("DVD Author"),0, + authorAction= new TDERadioAction(i18n("DVD Author"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionAuthor()), actionCollection(), "author"); authorAction->setExclusiveGroup("mode"); m_actions["author"]=authorAction; - m_actions["create"]= new KAction(i18n("Create DVD"),0, + m_actions["create"]= new TDEAction(i18n("Create DVD"),0, TQT_TQOBJECT(this), TQT_SLOT(ActionCreate()), actionCollection(), "Create"); m_actions["create"]->setIcon("author"); diff --git a/src/k9copy.h b/src/k9copy.h index 4e33d8d..4edc456 100644 --- a/src/k9copy.h +++ b/src/k9copy.h @@ -90,13 +90,13 @@ private: void createCopyWindows(); void removeToolWindows(); void saveDock(); - KAction *CopyAction; - KAction *PlayTitleAction; - KAction *mkMP4Action; - KAction *mkMpeg2Action; - KAction *ejectAction; - KRadioAction *backupAction; - KRadioAction *authorAction; + TDEAction *CopyAction; + TDEAction *PlayTitleAction; + TDEAction *mkMP4Action; + TDEAction *mkMpeg2Action; + TDEAction *ejectAction; + TDERadioAction *backupAction; + TDERadioAction *authorAction; private: k9Main *m_k9Main; KMdiChildView *m_k9MainView,*m_k9ImportView; @@ -112,7 +112,7 @@ private: k9Import *m_k9Import; bool m_useXine; bool m_useDvdAuthor; - TQMap m_actions; + TQMap m_actions; TQPtrList m_ToolViews; k9CdDrives m_drives; }; diff --git a/src/k9prefauthor.cpp b/src/k9prefauthor.cpp index a3f9f4c..83ab84a 100644 --- a/src/k9prefauthor.cpp +++ b/src/k9prefauthor.cpp @@ -41,7 +41,7 @@ k9prefAuthor::~k9prefAuthor() /*$SPECIALIZATION$*/ void k9prefAuthor::bButtonFontClicked() { - KFontDialog::getFont( m_font ); + TDEFontDialog::getFont( m_font ); } void k9prefAuthor::save() {