From 7716a5e605907a009e19f429cec4e6b5f346bd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:36 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tdecachegrind/TODO | 2 +- tdecachegrind/tdecachegrind/main.cpp | 2 +- tdecachegrind/tdecachegrind/toplevel.cpp | 94 ++++++++++++++++---------------- tdecachegrind/tdecachegrind/toplevel.h | 24 ++++---- 4 files changed, 61 insertions(+), 61 deletions(-) (limited to 'tdecachegrind') diff --git a/tdecachegrind/TODO b/tdecachegrind/TODO index 1eca67ed..b9ee78c2 100644 --- a/tdecachegrind/TODO +++ b/tdecachegrind/TODO @@ -83,7 +83,7 @@ WISHS: - every xxx BBs (DONE) - dump around - function invocation - - KAction event + - TDEAction event - DCOP event - data accesses from (instr address/count) diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index 81d05ee6..edf04f16 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -62,7 +62,7 @@ int main( int argc, char ** argv ) if (a.isRestored()){ int n = 1; - while (KMainWindow::canBeRestored(n)){ + while (TDEMainWindow::canBeRestored(n)){ (new TopLevel())->restore(n); n++; } diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index 9efd6400..c8ac689b 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -67,7 +67,7 @@ TopLevel::TopLevel(const char *name) - : KMainWindow(0, name), DCOPObject("KCachegrindIface") + : TDEMainWindow(0, name), DCOPObject("KCachegrindIface") { init(); @@ -197,7 +197,7 @@ void TopLevel::setupPartSelection(PartSelection* ps) * sub widgets. * * No positions are saved. These is done automatically for - * KToolbar, and manually in queryExit() for QT docks. + * TDEToolbar, and manually in queryExit() for QT docks. */ void TopLevel::saveCurrentState(TQString postfix) { @@ -249,7 +249,7 @@ void TopLevel::saveTraceSettings() * sub widgets. * * This does NOT restore any positions. This is done automatically for - * KToolbar, and manually in the createDocks() for QT docks.. + * TDEToolbar, and manually in the createDocks() for QT docks.. */ void TopLevel::restoreCurrentState(TQString postfix) { @@ -445,44 +445,44 @@ void TopLevel::readProperties(TDEConfig* c) void TopLevel::createLayoutActions() { TQString hint; - KAction* action; + TDEAction* action; - action = new KAction( i18n( "&Duplicate" ), - KShortcut(KKey("Ctrl+Plus")), + action = new TDEAction( i18n( "&Duplicate" ), + TDEShortcut(KKey("Ctrl+Plus")), TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()), actionCollection(), "layout_duplicate" ); hint = i18n("Duplicate Current Layout" "

Make a copy of the current layout.

"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Remove" ), KShortcut(), + action = new TDEAction( i18n( "&Remove" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()), actionCollection(), "layout_remove" ); hint = i18n("Remove Current Layout" "

Delete current layout and make the previous active.

"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Go to Next" ), - KShortcut(KKey("Ctrl+Right")), + action = new TDEAction( i18n( "&Go to Next" ), + TDEShortcut(KKey("Ctrl+Right")), TQT_TQOBJECT(this), TQT_SLOT(layoutNext()), actionCollection(), "layout_next" ); hint = i18n("Go to Next Layout"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Go to Previous" ), - KShortcut(KKey("Ctrl+Left")), + action = new TDEAction( i18n( "&Go to Previous" ), + TDEShortcut(KKey("Ctrl+Left")), TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()), actionCollection(), "layout_previous" ); hint = i18n("Go to Previous Layout"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Restore to Default" ), KShortcut(), + action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()), actionCollection(), "layout_restore" ); hint = i18n("Restore Layouts to Default"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Save as Default" ), KShortcut(), + action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(layoutSave()), actionCollection(), "layout_save" ); hint = i18n("Save Layouts as Default"); @@ -493,32 +493,32 @@ void TopLevel::createLayoutActions() void TopLevel::createMiscActions() { TQString hint; - KAction* action; + TDEAction* action; action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection()); hint = i18n("New

Open new empty KCachegrind window.

"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Add..." ), KShortcut(), + action = new TDEAction( i18n( "&Add..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(addTrace()), actionCollection(), "file_add" ); hint = i18n("Add Profile Data" "

This opens an additional profile data file in the current window.

"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Reload" ), "reload", + action = new TDEAction( i18n( "&Reload" ), "reload", #if TDE_VERSION > 0x030190 - // for KDE 3.2: KStdAccel::key is deprecated - KStdAccel::shortcut(KStdAccel::Reload), + // for KDE 3.2: TDEStdAccel::key is deprecated + TDEStdAccel::shortcut(TDEStdAccel::Reload), #else - KStdAccel::key(KStdAccel::Reload), + TDEStdAccel::key(TDEStdAccel::Reload), #endif TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" ); hint = i18n("Reload Profile Data" "

This loads any new created parts, too.

"); action->setWhatsThis( hint ); - action = new KAction( i18n( "&Export Graph" ), KShortcut(), + action = new TDEAction( i18n( "&Export Graph" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(exportGraph()), actionCollection(), "export" ); @@ -528,12 +528,12 @@ void TopLevel::createMiscActions() action->setWhatsThis( hint ); - _taDump = new KToggleAction( i18n( "&Force Dump" ), "redo", + _taDump = new TDEToggleAction( i18n( "&Force Dump" ), "redo", #if TDE_VERSION > 0x030190 - // for KDE 3.2: KStdAccel::key is deprecated - KStdAccel::shortcut(KStdAccel::Redo), + // for KDE 3.2: TDEStdAccel::key is deprecated + TDEStdAccel::shortcut(TDEStdAccel::Redo), #else - KStdAccel::key(KStdAccel::Redo), + TDEStdAccel::key(TDEStdAccel::Redo), #endif TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ), actionCollection(), "dump" ); @@ -573,7 +573,7 @@ void TopLevel::createMiscActions() KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection()); - _partDockShown = new KToggleAction(i18n("Parts Overview"), KShortcut(), + _partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()), actionCollection(), "settings_show_partdock"); @@ -582,7 +582,7 @@ void TopLevel::createMiscActions() _partDockShown->setToolTip( hint ); _partDockShown->setWhatsThis( hint ); - _stackDockShown = new KToggleAction(i18n("Call Stack"), KShortcut(), + _stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()), actionCollection(), "settings_show_stackdock"); @@ -591,7 +591,7 @@ void TopLevel::createMiscActions() _stackDockShown->setToolTip( hint ); _stackDockShown->setWhatsThis( hint ); - _functionDockShown = new KToggleAction(i18n("Function Profile"), KShortcut(), + _functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()), actionCollection(), "settings_show_profiledock"); @@ -601,7 +601,7 @@ void TopLevel::createMiscActions() _functionDockShown->setWhatsThis( hint ); #if ENABLE_DUMPDOCK - _dumpDockShown = new KToggleAction(i18n("Profile Dumps"), KShortcut(), + _dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()), actionCollection(), "settings_show_dumpdock"); @@ -611,8 +611,8 @@ void TopLevel::createMiscActions() _dumpDockShown->setWhatsThis( hint ); #endif - _taPercentage = new KToggleAction(i18n("Show Relative Costs"), "percent", - KShortcut(), + _taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()), actionCollection(), "view_percentage"); @@ -625,8 +625,8 @@ void TopLevel::createMiscActions() _taPercentage->setToolTip( hint ); _taPercentage->setWhatsThis( hint ); - _taExpanded = new KToggleAction(i18n("Percentage Relative to Parent"), "move", - KShortcut(), + _taExpanded = new TDEToggleAction(i18n("Percentage Relative to Parent"), "move", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()), actionCollection(), "view_expanded"); @@ -650,8 +650,8 @@ void TopLevel::createMiscActions() "

(*) Only if function grouping is switched on (e.g. ELF object grouping)."); _taExpanded->setWhatsThis( hint ); - _taCycles = new KToggleAction( i18n( "Do Cycle Detection" ), "undo", - KShortcut(), + _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "undo", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(), "view_cycles" ); #if TDE_VERSION >= 0x030290 @@ -699,7 +699,7 @@ void TopLevel::createMiscActions() action->setToolTip( hint ); action->setWhatsThis( hint ); #else - _paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", + _paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "up", ALT+Key_Up, TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ), actionCollection(), "go_up" ); @@ -714,7 +714,7 @@ void TopLevel::createMiscActions() _paUp->setWhatsThis( hint ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); - _paBack = new KToolBarPopupAction( backForward.first, ALT+Key_Left, + _paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()), actionCollection(), "go_back" ); connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), @@ -725,7 +725,7 @@ void TopLevel::createMiscActions() _paBack->setToolTip( hint ); _paBack->setWhatsThis( hint ); - _paForward = new KToolBarPopupAction( backForward.second, ALT+Key_Right, + _paForward = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserForward()), actionCollection(), "go_forward" ); @@ -738,19 +738,19 @@ void TopLevel::createMiscActions() _paForward->setWhatsThis( hint ); #endif - _saCost = new KSelectAction( i18n("Primary Event Type"), KShortcut(), + _saCost = new TDESelectAction( i18n("Primary Event Type"), TDEShortcut(), actionCollection(), "view_cost_type"); hint = i18n("Select primary event type of costs"); _saCost->setComboWidth(300); _saCost->setToolTip( hint ); _saCost->setWhatsThis( hint ); - // cost types are dependent on loaded data, thus KSelectAction + // cost types are dependent on loaded data, thus TDESelectAction // is filled in setData() connect( _saCost, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(costTypeSelected(const TQString&))); - _saCost2 = new KSelectAction( i18n("Secondary Event Type"), KShortcut(), + _saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(), actionCollection(), "view_cost_type2"); hint = i18n("Select secondary event type for cost e.g. shown in annotations"); _saCost2->setComboWidth(300); @@ -760,7 +760,7 @@ void TopLevel::createMiscActions() connect( _saCost2, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&))); - saGroup = new KSelectAction( i18n("Grouping"), KShortcut(), + saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(), actionCollection(), "view_group_type"); hint = i18n("Select how functions are grouped into higher level cost items"); @@ -779,7 +779,7 @@ void TopLevel::createMiscActions() connect( saGroup, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int))); - _taSplit = new KToggleAction(i18n("Split"), "view_left_right", KShortcut(), + _taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(splitSlot()), actionCollection(), "view_split"); @@ -787,8 +787,8 @@ void TopLevel::createMiscActions() _taSplit->setToolTip( hint ); _taSplit->setWhatsThis( hint ); - _taSplitDir = new KToggleAction(i18n("SplitQt::Horizontal"), - "view_left_right", KShortcut(), + _taSplitDir = new TDEToggleAction(i18n("SplitQt::Horizontal"), + "view_left_right", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()), actionCollection(), "view_split_dir"); @@ -800,7 +800,7 @@ void TopLevel::createMiscActions() #if TDE_VERSION >= 308 // KDE 3.1 KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); #else - (void) new KAction( KGuiItem( i18n("Tip of the &Day..."), "idea", + (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea", i18n("Show \"Tip of the Day\"") ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()), actionCollection(), "help_show_tip" ); @@ -1907,7 +1907,7 @@ void TopLevel::layoutRestore() void TopLevel::updateLayoutActions() { - KAction* ka; + TDEAction* ka; ka = actionCollection()->action("layout_next"); if (ka) ka->setEnabled(_layoutCount>1); @@ -1990,7 +1990,7 @@ bool TopLevel::queryExit() // save QT dock positions... - // We don't want to save the KToolbar position here. + // We don't want to save the TDEToolbar position here. // Its already stored. delete toolBar(); diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h index 7ac4f2de..69b3079b 100644 --- a/tdecachegrind/tdecachegrind/toplevel.h +++ b/tdecachegrind/tdecachegrind/toplevel.h @@ -39,12 +39,12 @@ class TQProgressBar; class TQPopupMenu; class KURL; -class KSelectAction; -class KToggleAction; -class KToolBarPopupAction; +class TDESelectAction; +class TDEToggleAction; +class TDEToolBarPopupAction; class TraceData; -class KRecentFilesAction; +class TDERecentFilesAction; class MainWidget; class PartSelection; class FunctionSelection; @@ -52,7 +52,7 @@ class DumpSelection; class StackSelection; class TraceFunction; -class TopLevel : public KMainWindow, public DCOPObject +class TopLevel : public TDEMainWindow, public DCOPObject { Q_OBJECT @@ -214,7 +214,7 @@ private: KStatusBar* _statusbar; TQLabel* _statusLabel; - KRecentFilesAction* _openRecent; + TDERecentFilesAction* _openRecent; bool _twoMainWidgets; Qt::Orientation _spOrientation; @@ -228,12 +228,12 @@ private: TQDockWindow *_partDock, *_stackDock, *_functionDock, *_dumpDock; bool _forcePartDock; - KSelectAction *_saCost, *_saCost2, *saGroup; - KToggleAction *_partDockShown, *_stackDockShown; - KToggleAction *_functionDockShown, *_dumpDockShown; - KToggleAction *_taPercentage, *_taExpanded, *_taCycles; - KToggleAction *_taDump, *_taSplit, *_taSplitDir; - KToolBarPopupAction *_paForward, *_paBack, *_paUp; + TDESelectAction *_saCost, *_saCost2, *saGroup; + TDEToggleAction *_partDockShown, *_stackDockShown; + TDEToggleAction *_functionDockShown, *_dumpDockShown; + TDEToggleAction *_taPercentage, *_taExpanded, *_taCycles; + TDEToggleAction *_taDump, *_taSplit, *_taSplitDir; + TDEToolBarPopupAction *_paForward, *_paBack, *_paUp; TraceFunction* _function; const TQObject* _lastSender; -- cgit v1.2.1