From 74a2067d286867e313f736d6733407586b71195e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:10:05 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- atlantikdesigner/designer/designer.cpp | 20 ++++++++++---------- atlantikdesigner/designer/designer.h | 10 +++++----- atlantikdesigner/designer/editor.cpp | 2 +- atlantikdesigner/designer/editor.h | 4 ++-- atlantikdesigner/designer/group.cpp | 2 +- atlantikdesigner/designer/group.h | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'atlantikdesigner') diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 3ed7e24..35b64fb 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -36,7 +36,7 @@ #include "designer.h" AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { firstBoard = true; estates.setAutoDelete(true); @@ -53,23 +53,23 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) (void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); (void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); (void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); - (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); + (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); + (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); - (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); - (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); + (void) new TDEAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); + (void) new TDEAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); (void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); (void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); - (void) new KAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); - (void) new KAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); - (void) new KAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); - (void) new KAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); + (void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); + (void) new TDEAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); + (void) new TDEAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); + (void) new TDEAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); - estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); + estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); createGUI("atlantikdesignerui.rc"); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index e4bbff7..a10ee1e 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -15,14 +15,14 @@ class EstateEdit; class TQCloseEvent; -class KListAction; -class KRecentFilesAction; +class TDEListAction; +class TDERecentFilesAction; class Estate; class Player; class ConfigEstate; class AtlantikBoard; -class AtlanticDesigner : public KMainWindow +class AtlanticDesigner : public TDEMainWindow { Q_OBJECT @@ -80,8 +80,8 @@ class AtlanticDesigner : public KMainWindow TQGuardedPtr groupEditor; TQGuardedPtr boardInfoDlg; EstateList estates; - KListAction *estateAct; - KRecentFilesAction *recentAct; + TDEListAction *estateAct; + TDERecentFilesAction *recentAct; TQValueList cards; BoardInfo boardInfo; diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 5687a02..4825362 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -664,7 +664,7 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); hlayout->addWidget(delButton); - List = new KListBox(this); + List = new TDEListBox(this); layout->addWidget(List); connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 408c516..3439f81 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -17,7 +17,7 @@ class TQSpinBox; class KColorButton; class KComboBox; -class KListBox; +class TDEListBox; class KPushButton; enum EstateType { Street = 0, Cards, FreeParking, ToJail, Tax, Jail }; @@ -209,7 +209,7 @@ class CardView : public TQWidget void updateButtonsEnabled(); private: - KListBox *List; + TDEListBox *List; KPushButton *addButton; KPushButton *renameButton; KPushButton *delButton; diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 79b0205..03dabbf 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -28,7 +28,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) TQFrame *page = plainPage(); TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); - groups = new KListBox(page); + groups = new TDEListBox(page); hlayout->addWidget(groups); connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); TQStringList newgroups; diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index 657a590..791e617 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -10,7 +10,7 @@ class KColorButton; class KLineEdit; -class KListBox; +class TDEListBox; class KPushButton; class TQComboBox; @@ -78,7 +78,7 @@ class GroupEditor : public KDialogBase void selectionChanged(); private: - KListBox *groups; + TDEListBox *groups; KLineEdit *rentMathEdit; KColorButton *fgButton; KColorButton *bgButton; -- cgit v1.2.1