From ee52bb567f32fefdcf06e083c76562ea40ccf174 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:18 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- keduca/keduca/kcheckeduca.cpp | 2 +- keduca/keduca/keduca.cpp | 2 +- keduca/keduca/keduca.h | 2 +- keduca/keduca/keduca_part.h | 2 +- keduca/keduca/kgroupeduca.cpp | 4 ++-- keduca/keduca/kradioeduca.cpp | 8 ++++---- keduca/keduca/kradioeduca.h | 6 +++--- keduca/keducabuilder/kcontroladdeditbase.ui | 2 +- keduca/keducabuilder/keducabuilder.cpp | 18 +++++++++--------- keduca/keducabuilder/keducabuilder.h | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-) (limited to 'keduca') diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index 5a9a60dc..eae53cd5 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -24,7 +24,7 @@ KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name) { _doc = 0; - KAcceleratorManager::setNoAccel( this ); + TDEAcceleratorManager::setNoAccel( this ); } KCheckEduca::~KCheckEduca() diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 9092eb00..c79beadc 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -64,7 +64,7 @@ Keduca::~Keduca() void Keduca::setupActions() { KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), + (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery" ); _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ), actionCollection()); diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h index f4899a4c..736dc712 100644 --- a/keduca/keduca/keduca.h +++ b/keduca/keduca/keduca.h @@ -57,7 +57,7 @@ private: // Private attributes /** Recent files */ - KRecentFilesAction *_recentFiles; + TDERecentFilesAction *_recentFiles; /** A KEDUCA file main view */ KParts::ReadOnlyPart *_part; diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index 69d88fdf..e165f52e 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -75,7 +75,7 @@ class KEducaPart : public KParts::ReadOnlyPart private: /* - * Sets the KActions for this part. + * Sets the TDEActions for this part. */ void setupActions(); diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp index 9f7a2413..ec77868f 100644 --- a/keduca/keduca/kgroupeduca.cpp +++ b/keduca/keduca/kgroupeduca.cpp @@ -48,7 +48,7 @@ void KGroupEduca::insertAnswer( const TQString& text) switch( _typeMode ) { case Radio: - answer = new KRadioEduca( _vbox2 ); + answer = new TDERadioEduca( _vbox2 ); break; case Check: answer = new KCheckEduca( _vbox2 ); @@ -87,7 +87,7 @@ bool KGroupEduca::isChecked(int id) { case Radio: { - KRadioEduca *tmpRadioButton = (KRadioEduca*) find(id); + TDERadioEduca *tmpRadioButton = (TDERadioEduca*) find(id); if(tmpRadioButton != 0) return tmpRadioButton->isChecked(); } break; diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 96792e24..b858cb6d 100644 --- a/keduca/keduca/kradioeduca.cpp +++ b/keduca/keduca/kradioeduca.cpp @@ -20,19 +20,19 @@ #include #include -KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name) +TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name) { _doc=0; - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); } -KRadioEduca::~KRadioEduca() +TDERadioEduca::~TDERadioEduca() { delete _doc; } /** reimpl */ -void KRadioEduca::drawButtonLabel( TQPainter *p) +void TDERadioEduca::drawButtonLabel( TQPainter *p) { int x, y, w, h; int extra_width, indicator_width; diff --git a/keduca/keduca/kradioeduca.h b/keduca/keduca/kradioeduca.h index c42f372f..1056ff53 100644 --- a/keduca/keduca/kradioeduca.h +++ b/keduca/keduca/kradioeduca.h @@ -25,13 +25,13 @@ /**TQRadioButton with wordwrap and richtext features *@author Javier Campos Morales */ -class KRadioEduca : public TQRadioButton { +class TDERadioEduca : public TQRadioButton { Q_OBJECT public: - KRadioEduca(TQWidget *parent=0, const char *name=0); - ~KRadioEduca(); + TDERadioEduca(TQWidget *parent=0, const char *name=0); + ~TDERadioEduca(); protected: diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index c5736e3d..e0902db1 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -636,7 +636,7 @@ unnamed - + Answer diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 3f498c51..77ece602 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -61,7 +61,7 @@ static const char* const keducabuilder_data[] = { "..............."}; KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f ) - : KMainWindow(parent,name,f), + : TDEMainWindow(parent,name,f), _nativeFormat("application/x-edu") { _keducaFile = new FileRead(); @@ -90,7 +90,7 @@ void KEducaBuilder::init() _split = new TQSplitter( mainView ); _split->setOrientation( Qt::Vertical ); - _listAnswer = new KListBox( _split, "_listAnswer" ); + _listAnswer = new TDEListBox( _split, "_listAnswer" ); _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); @@ -113,19 +113,19 @@ void KEducaBuilder::initMenuBar() { KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection()); KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection()); - (void)new KAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); + (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection()); KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection()); KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection()); - (void)new KAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); + (void)new TDEAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - (void)new KAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); - (void)new KAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); - (void)new KAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); - (void)new KAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); - (void)new KAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); + (void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); + (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); + (void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); + (void)new TDEAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); + (void)new TDEAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); } /** Delete current document and start new */ diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index d030013d..d91efb79 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -34,7 +34,7 @@ *@author Javier Campos */ -class KEducaBuilder : public KMainWindow { +class KEducaBuilder : public TDEMainWindow { Q_OBJECT @@ -76,9 +76,9 @@ private: /** KEDUCA file */ FileRead *_keducaFile; /** Recent files */ - KRecentFilesAction *_recentFiles; + TDERecentFilesAction *_recentFiles; /** List of answers */ - KListBox *_listAnswer; + TDEListBox *_listAnswer; /** Preview */ TQTextView *_preview; /** Main splitter */ -- cgit v1.2.1