diff options
Diffstat (limited to 'kcachegrind')
32 files changed, 113 insertions, 113 deletions
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index c66c5809..99613171 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -369,7 +369,7 @@ TraceCall* GraphEdge::priorVisible() // GraphOptions // -TQString GraphOptions::tqlayoutString(Layout l) +TQString GraphOptions::layoutString(Layout l) { if (l == Circular) return TQString("Circular"); if (l == LeftRight) return TQString("LeftRight"); @@ -1313,8 +1313,8 @@ protected: void CallGraphTip::maybeTip( const TQPoint& pos ) { - if (!tqparentWidget()->inherits( "CallGraphView" )) return; - CallGraphView* cgv = (CallGraphView*)tqparentWidget(); + if (!parentWidget()->inherits( "CallGraphView" )) return; + CallGraphView* cgv = (CallGraphView*)parentWidget(); TQPoint cPos = cgv->viewportToContents(pos); @@ -1367,9 +1367,9 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) // // CallGraphView // -CallGraphView::CallGraphView(TraceItemView* tqparentView, +CallGraphView::CallGraphView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQCanvasView(tqparent, name), TraceItemView(tqparentView) + : TQCanvasView(tqparent, name), TraceItemView(parentView) { _zoomPosition = DEFAULT_ZOOMPOS; _lastAutoPosition = TopLeft; @@ -1786,7 +1786,7 @@ void CallGraphView::showRenderWarning() TQString s; if (_renderProcess) - s =i18n("Warning: a long lasting graph tqlayouting is in progress.\n" + s =i18n("Warning: a long lasting graph layouting is in progress.\n" "Reduce node/edge limits for speedup.\n"); else s = i18n("Layouting stopped.\n"); @@ -1878,7 +1878,7 @@ void CallGraphView::refresh() _unparsedOutput = TQString(); - // tqlayouting of more than seconds is dubious + // layouting of more than seconds is dubious _renderTimer.start(1000, true); } @@ -2195,7 +2195,7 @@ void CallGraphView::dotExited() if (!_canvas) { _canvas = new TQCanvas(size().width(),size().height()); - TQString s = i18n("Error running the graph tqlayouting tool.\n"); + TQString s = i18n("Error running the graph layouting tool.\n"); s += i18n("Please check that 'dot' is installed (package GraphViz)."); TQCanvasText* t = new TQCanvasText(s, _canvas); t->move(5, 5); @@ -2702,7 +2702,7 @@ void CallGraphView::readViewConfig(KConfig* c, DEFAULT_CLUSTERGROUPS); _detailLevel = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL); _layout = GraphOptions::tqlayout(g->readEntry("Layout", - tqlayoutString(DEFAULT_LAYOUT))); + layoutString(DEFAULT_LAYOUT))); _zoomPosition = zoomPos(g->readEntry("ZoomPosition", zoomPosString(DEFAULT_ZOOMPOS))); @@ -2724,7 +2724,7 @@ void CallGraphView::saveViewConfig(KConfig* c, DEFAULT_CLUSTERGROUPS); writeConfigEntry(&g, "DetailLevel", _detailLevel, DEFAULT_DETAILLEVEL); writeConfigEntry(&g, "Layout", - tqlayoutString(_layout), tqlayoutString(DEFAULT_LAYOUT).utf8().data()); + layoutString(_layout), layoutString(DEFAULT_LAYOUT).utf8().data()); writeConfigEntry(&g, "ZoomPosition", zoomPosString(_zoomPosition), zoomPosString(DEFAULT_ZOOMPOS).utf8().data()); diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h index 2e15022d..f2e567c1 100644 --- a/kcachegrind/kcachegrind/callgraphview.h +++ b/kcachegrind/kcachegrind/callgraphview.h @@ -169,7 +169,7 @@ class GraphOptions virtual int detailLevel() = 0; virtual Layout tqlayout() = 0; - static TQString tqlayoutString(Layout); + static TQString layoutString(Layout); static Layout tqlayout(TQString); }; @@ -240,7 +240,7 @@ public: // calls createGraph before dumping of not already created void writeDot(); - // to map back to structures when parsing a tqlayouted graph + // to map back to structures when parsing a layouted graph /* <toFunc> is a helper for node() and edge(). * Don't use the returned pointer directly, but only with @@ -422,7 +422,7 @@ class CallGraphView: public TQCanvasView, public TraceItemView, public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; - CallGraphView(TraceItemView* tqparentView, + CallGraphView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); ~CallGraphView(); diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp index 53727a2d..605e572e 100644 --- a/kcachegrind/kcachegrind/callmapview.cpp +++ b/kcachegrind/kcachegrind/callmapview.cpp @@ -50,9 +50,9 @@ #define DEFAULT_MAXAREA 100 -CallMapView::CallMapView(bool showCallers, TraceItemView* tqparentView, +CallMapView::CallMapView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(tqparentView) + : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h index 4bff8857..67cecb6d 100644 --- a/kcachegrind/kcachegrind/callmapview.h +++ b/kcachegrind/kcachegrind/callmapview.h @@ -34,7 +34,7 @@ class CallMapView: public TreeMapWidget, public TraceItemView public: - CallMapView(bool showCallers, TraceItemView* tqparentView, + CallMapView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp index 0329fefe..11da69e4 100644 --- a/kcachegrind/kcachegrind/callview.cpp +++ b/kcachegrind/kcachegrind/callview.cpp @@ -35,9 +35,9 @@ // -CallView::CallView(bool showCallers, TraceItemView* tqparentView, +CallView::CallView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; diff --git a/kcachegrind/kcachegrind/callview.h b/kcachegrind/kcachegrind/callview.h index 9d20d95f..b18e6c3c 100644 --- a/kcachegrind/kcachegrind/callview.h +++ b/kcachegrind/kcachegrind/callview.h @@ -33,7 +33,7 @@ class CallView: public TQListView, public TraceItemView TQ_OBJECT public: - CallView(bool showCallers, TraceItemView* tqparentView, + CallView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui index b2a818ac..9e5c0b59 100644 --- a/kcachegrind/kcachegrind/configdlgbase.ui +++ b/kcachegrind/kcachegrind/configdlgbase.ui @@ -649,5 +649,5 @@ <include location="global" impldecl="in implementation">kcolorbutton.h</include> </includes> <pixmapinproject/> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/costlistitem.h b/kcachegrind/kcachegrind/costlistitem.h index b5607ce6..369a0c74 100644 --- a/kcachegrind/kcachegrind/costlistitem.h +++ b/kcachegrind/kcachegrind/costlistitem.h @@ -45,7 +45,7 @@ private: TraceCostItem* _costItem; // >0 only for last item in list, if items are skipped int _skipped; - // number of items in group, is put in tqparenthesis after name + // number of items in group, is put in parenthesis after name int _groupSize; }; diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp index 28558f6c..ff69bf47 100644 --- a/kcachegrind/kcachegrind/costtypeview.cpp +++ b/kcachegrind/kcachegrind/costtypeview.cpp @@ -35,9 +35,9 @@ // -CostTypeView::CostTypeView(TraceItemView* tqparentView, +CostTypeView::CostTypeView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { addColumn( i18n( "Event Type" ) ); addColumn( i18n( "Incl." ) ); diff --git a/kcachegrind/kcachegrind/costtypeview.h b/kcachegrind/kcachegrind/costtypeview.h index 3a68a6c7..8940b3c7 100644 --- a/kcachegrind/kcachegrind/costtypeview.h +++ b/kcachegrind/kcachegrind/costtypeview.h @@ -33,7 +33,7 @@ class CostTypeView: public TQListView, public TraceItemView TQ_OBJECT public: - CostTypeView(TraceItemView* tqparentView, + CostTypeView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp index 460a4969..ba6ce77f 100644 --- a/kcachegrind/kcachegrind/coverageview.cpp +++ b/kcachegrind/kcachegrind/coverageview.cpp @@ -36,9 +36,9 @@ // -CoverageView::CoverageView(bool showCallers, TraceItemView* tqparentView, +CoverageView::CoverageView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; @@ -108,7 +108,7 @@ TQString CoverageView::whatsThis() const "<p>As there can be many calls from the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in tqparentheses, there is the " + "calls happening; then, in parentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.</p>" @@ -138,7 +138,7 @@ TQString CoverageView::whatsThis() const "<p>As there can be many calls to the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in tqparentheses, there is the " + "calls happening; then, in parentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.</p>" diff --git a/kcachegrind/kcachegrind/coverageview.h b/kcachegrind/kcachegrind/coverageview.h index 64b56c4a..0be96e85 100644 --- a/kcachegrind/kcachegrind/coverageview.h +++ b/kcachegrind/kcachegrind/coverageview.h @@ -34,7 +34,7 @@ class CoverageView: public TQListView, public TraceItemView TQ_OBJECT public: - CoverageView(bool showCallers, TraceItemView* tqparentView, + CoverageView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui index a56e582c..0643eed7 100644 --- a/kcachegrind/kcachegrind/dumpselectionbase.ui +++ b/kcachegrind/kcachegrind/dumpselectionbase.ui @@ -1078,5 +1078,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui index 606fb1cd..3ab3378d 100644 --- a/kcachegrind/kcachegrind/functionselectionbase.ui +++ b/kcachegrind/kcachegrind/functionselectionbase.ui @@ -159,5 +159,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index 24e83cf6..aea8c0f5 100644 --- a/kcachegrind/kcachegrind/instrview.cpp +++ b/kcachegrind/kcachegrind/instrview.cpp @@ -110,9 +110,9 @@ static bool parseLine(char* buf, Addr& addr, // -InstrView::InstrView(TraceItemView* tqparentView, +InstrView::InstrView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showHexCode = DEFAULT_SHOWHEXCODE; _lastHexCodeWidth = 50; diff --git a/kcachegrind/kcachegrind/instrview.h b/kcachegrind/kcachegrind/instrview.h index fa175ae4..86d011cc 100644 --- a/kcachegrind/kcachegrind/instrview.h +++ b/kcachegrind/kcachegrind/instrview.h @@ -36,7 +36,7 @@ class InstrView : public TQListView, public TraceItemView TQ_OBJECT public: - InstrView(TraceItemView* tqparentView, + InstrView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui index 88f74ead..5ee69746 100644 --- a/kcachegrind/kcachegrind/partselectionbase.ui +++ b/kcachegrind/kcachegrind/partselectionbase.ui @@ -85,5 +85,5 @@ <data format="XPM.GZ" length="5230">789c9597db4e1d4b0e86eff31428be8b46b5fb54dd551acd051020211c4320c0682eecaa5e9ccf90005bf3ee53cbbfe9d9c9c548a38ea27c2977b5cbfe6dd7fae3c3c2e1cee6c2873fde3d3cf2e3595a48a77cbff0213f5d5dbdfcf35ffff8f3ddfba65998fff161a179ffb777ef771f17d2c2d6cdf53807c705a889cdac6ee72c47736eebd637b5f2b672d70ecd30e744ca7d9b9a4ad7579587363433e527e5d072abefbb03636978ceb4a31c5bc13a91716ad41f89e0aec2fe74abcc6d6ad5f9e4945357375ef75f997357751dd61d19c71afb61bdef421b951f274ebaffb6716cb3f2b2f230f18d3183dd95b1b441d7d59f2e94757ccf1b27eceff69563618d0f5dcfd9d7beeb7a5dd7f3fac6fb4ee32b87c619f1168d976f7d6ff6df26d6ef4b301e1bac7f54f63e747a5e87f5c173276aff605c22a8fefc540e5e3af5972f956359577bf2c6d978cb78d6697edc9eb2f8b143fed7945359d778b0e6c3e7be81bf7465dce23cf4ac3c16567f19fecefaae53bd081b7baccbb131b7d05f679ca03f27c6b9d1f388c6bbaffab7f80dca4d1fed7bfafdbeedb9533d490f1e2ae8d5693ccacb83d77cd027e3d4416faa97beefa3d7f8f086f168f9d9020f43a3f5c5aa877e28eb88f74fe319becfaa873e0c15de775f95639f3dec37c143d361bf2be3cef4b76bdcb7d84ff5d2cbd0227facf1ecd360fa67d54b9f078ffcd10f636e11ff53e3847853ad3c1b668837e9fe43358c2df45a81430b3db2e6676842d368fd48abdc068b87e0fd2e788bf792b21f861e7afd0e0e5ce37dcdd7d0872218e5d789f57b3218a71ae7bb501eca3af67b510e21c05fd27a1b6218ac3ef17d0ed68fe8cb1be3fc6e5159863ca0bfed824340fe687d62c4838c23f677f0370de380fcdd2be7e03dfab1d6cf300bcd80fa80bfb358dbf9547fa18abe413d68fe421d63ade7737aded094cf63fdcc38f4d0bfee17dac2d08380a3a0dff24cb90bdc23ffaa87e0636c912fed87612e38d4df1e982bc4dbdd29872001f14aca319413eb793e83cbfbe8af27606e4c0f5f8d3bcb7763ec6b8da73b57e69083d61f9d82b9b5fada31f635fcaf8d7b7b5ffb41f16e34ff34fe214dfc0c8e1ef1a22330bfcdc345e31e4c33e3c1e6e181b1609e3ac43f8759803e8cd9f2e7e0ff18ab80ef5d8239e2fc0ef129f90ff0bf0773347fee8d13ce279bc6b34af5c61abf58157bf4b765b05435f4abfec726968c2b67e536fa80fe388279067f680d2c750dff75fe9766da07e44bc02521ba4e1d584c1fb261dcc23fd97f63f8c3af136bfc687362c4e76962ed8fac7a2ecdb7853f7c63ec6bf467bd3fc421c680780c60b6f9275fc045aea84fadaf18a2e0fc04ff0237bd9e8fefc0d236e8ef3f8d83c57fdd38daf94edeb886be74fec618b3ed7f3731e66b0fe67a403e76c0454ef8de9231dbfe9f8dc5fc47be38a6887ad2f950964d2fdc1a27d3c7b6710693f6ef9864b4fdb4ffc6cc5540fea0972c339c87afc1c9f4443a5fe2c84d40bd2f82cb3ae6c7b1716dbc37b1e68bf5be118b7e3dead78125d87d0bfa99bd7d8fb78c1bdb4fcfcfd51bcb9d716bebda3fb8966cf7cf57709103f2e327c6fe5a2fdc4ab4fb01deef5283fa65d50ffb54c13fd67ec37d61e845fb070f8571df7c341eec7e7a691c6ae453fb771937d1fa999ebfa43358bf573d3327c6fdd0a9de59b87414e59f60911ef3ff07380d16bf0b63b6fbb8ce0f4e523a80ee8ff8a5f21fe83f384f2e8cf9d419db7d4bb4bff32cb1dd871ae38c79417962dd9f8f2786bfaa3fa992ddbf68d5d8d6797d62dc27b4bf4a9bdeee5be7c619efbb169c2b9bb7aa67e972857a67d59bf8943cf4a6f5237dae3b9c3f4f8cef5713637e6a3c6548e546a7eb87e0b28e7cf7c68ddd2fb15f28acf166bd2f484c19f921f8cbc57de84ff52c397b8f7e178d7bbb7f7e9f18f743d593ccd210d12f9e8c05fd8417c1e5e704e2afefa7aa5cf850ff4fc6a1473debfc4d7561c4ebd3c48897f69fd4e4d8eb7e4efb736a0b23fe9adfd465bb3f388d6ff22933fa1df6f7597ad483c62371f6e6ff8671b6f89e198fb8cfb0ea3f49619c6f6562cc27d5474a7906e6b589d1df549f29e78479450fe0b1c2fc67d5731a0ba33ffc97a167fd7d92ebb1b1f9a87acdcdd8a23ff2e3c4a81fed0fb91bbb88f8e9f772f9b9c6b8bfac187bd41febbcc8c35831f4bb6edc227eeec8b847bc58ef0f398d91a1179d6f391746bdebfd60ac4716b0180bd8a97e473f8ea2dfdb7d9c3f8e1cff8f8760057b27e57f92cb6e743377e24efff29cb97377e12edd55b190c99eddb5bb71b7eeceddbb07f7e89edc0ff7d33dbb17f7ea16dd925b761fdd8a63d8174f52b15e756bee93fbecd6dd17b7e136dd96db763b6ed77d2dd67bee9bdb77078ed49e8b27b7c5fabb3b7447eed855ae768d6bcbd339ef7a37b8e022392a2734fbd1dd119350a24c23cde8844ee98ccee9c2f9c2977445d77443b793fd8ceee89e1ee8919ee807fdb4e7995ee8b5d82fd252b15ffe8bfd097da4155aa535fa34597fa6f5f2f717da28f69bb445dbb433d99fd22e7da53dfa3659efd3017da7c3f2af233aa68aeadfec1b6aa9236fd63d0d14ca15c0719913737b965fedcbf0c83cc29a677cc2a77cc6e77cc1977cc5d7c5fee637fbdbb2db9d5adff343b17ee427fec1737ee69762fffa9bfd222ff17259fdc82bbcca6bfc893ff33a7fe10ddee42ddee69ddfec77f92beff137dee703fece877cc4c7aee58a6b6ee8b8fc10ed7eb13f635f9a4bc5e54719477152ba671977a505c84845c57222a7bfd89fcb999ccb855cca955cbfc5546ee456ee68b14cf67b799047799aec2fdc92fc28999cef567224cff222afb2c85b32e36d599265f9282bb23ad95fba6559934f2593f3e798b74acc8fd5f6b3accb17d9904dd9926db3a7520d1fdd37d9915df95a72599e1291566df7e49beccb817c974339829eb55e56dc7e51ec0d2dcbb1545297a791563af1c5eff2d3beb4faf8562f568f0744745b9e9d5f1f7992d5e412a186ffef7afff7dfdffd077c99ae99</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 24262885..60a96bac 100644 --- a/kcachegrind/kcachegrind/partview.cpp +++ b/kcachegrind/kcachegrind/partview.cpp @@ -37,9 +37,9 @@ // -PartView::PartView(TraceItemView* tqparentView, +PartView::PartView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _inSelectionUpdate = false; diff --git a/kcachegrind/kcachegrind/partview.h b/kcachegrind/kcachegrind/partview.h index 0d4e882c..06de9bf7 100644 --- a/kcachegrind/kcachegrind/partview.h +++ b/kcachegrind/kcachegrind/partview.h @@ -33,7 +33,7 @@ class PartView: public TQListView, public TraceItemView TQ_OBJECT public: - PartView(TraceItemView* tqparentView, + PartView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp index cdd3589c..be171d90 100644 --- a/kcachegrind/kcachegrind/sourceview.cpp +++ b/kcachegrind/kcachegrind/sourceview.cpp @@ -37,9 +37,9 @@ // -SourceView::SourceView(TraceItemView* tqparentView, +SourceView::SourceView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _inSelectionUpdate = false; diff --git a/kcachegrind/kcachegrind/sourceview.h b/kcachegrind/kcachegrind/sourceview.h index 4c40b13d..2e2c0386 100644 --- a/kcachegrind/kcachegrind/sourceview.h +++ b/kcachegrind/kcachegrind/sourceview.h @@ -36,7 +36,7 @@ class SourceView : public TQListView, public TraceItemView TQ_OBJECT public: - SourceView(TraceItemView* tqparentView, + SourceView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/stackselectionbase.ui b/kcachegrind/kcachegrind/stackselectionbase.ui index 728308a8..c61010f9 100644 --- a/kcachegrind/kcachegrind/stackselectionbase.ui +++ b/kcachegrind/kcachegrind/stackselectionbase.ui @@ -76,5 +76,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index d40b284e..41accc9c 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -228,9 +228,9 @@ void TabWidget::moveEvent(TQMoveEvent* e) * bottomSplitter mainSplitter */ -TabView::TabView(TraceItemView* tqparentView, +TabView::TabView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), TraceItemView(tqparentView) + : TQWidget(tqparent, name), TraceItemView(parentView) { setFocusPolicy(TQ_StrongFocus); diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h index 323464e9..caea8126 100644 --- a/kcachegrind/kcachegrind/tabview.h +++ b/kcachegrind/kcachegrind/tabview.h @@ -114,7 +114,7 @@ class TabView : public TQWidget, public TraceItemView public: - TabView(TraceItemView* tqparentView, + TabView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp index cf06a75d..ad5344b5 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -449,42 +449,42 @@ void TopLevel::createLayoutActions() action = new KAction( i18n( "&Duplicate" ), KShortcut(KKey("Ctrl+Plus")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutDuplicate()), - actionCollection(), "tqlayout_duplicate" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()), + actionCollection(), "layout_duplicate" ); hint = i18n("<b>Duplicate Current Layout</b>" "<p>Make a copy of the current tqlayout.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Remove" ), KShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRemove()), - actionCollection(), "tqlayout_remove" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()), + actionCollection(), "layout_remove" ); hint = i18n("<b>Remove Current Layout</b>" "<p>Delete current tqlayout and make the previous active.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Next" ), KShortcut(KKey("Ctrl+Right")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutNext()), - actionCollection(), "tqlayout_next" ); + 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")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutPrevious()), - actionCollection(), "tqlayout_previous" ); + 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(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRestore()), - actionCollection(), "tqlayout_restore" ); + 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(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutSave()), - actionCollection(), "tqlayout_save" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutSave()), + actionCollection(), "layout_save" ); hint = i18n("Save Layouts as Default"); action->setWhatsThis( hint ); } @@ -920,7 +920,7 @@ void TopLevel::toggleCycles() if (!_data) return; - _data->tqinvalidateDynamicCost(); + _data->invalidateDynamicCost(); _data->updateFunctionCycles(); _partSelection->refresh(); @@ -1744,7 +1744,7 @@ void TopLevel::restoreTraceTypes() KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0); _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0); - if (_layoutCount == 0) tqlayoutRestore(); + if (_layoutCount == 0) layoutRestore(); updateLayoutActions(); } @@ -1778,7 +1778,7 @@ void TopLevel::restoreTraceSettings() /* Layout */ -void TopLevel::tqlayoutDuplicate() +void TopLevel::layoutDuplicate() { // save current and allocate a new slot _multiView->saveViewConfig(KGlobal::config(), @@ -1789,10 +1789,10 @@ void TopLevel::tqlayoutDuplicate() updateLayoutActions(); - kdDebug() << "TopLevel::tqlayoutDuplicate: count " << _layoutCount << endl; + kdDebug() << "TopLevel::layoutDuplicate: count " << _layoutCount << endl; } -void TopLevel::tqlayoutRemove() +void TopLevel::layoutRemove() { if (_layoutCount <2) return; @@ -1807,7 +1807,7 @@ void TopLevel::tqlayoutRemove() updateLayoutActions(); } -void TopLevel::tqlayoutNext() +void TopLevel::layoutNext() { if (_layoutCount <2) return; @@ -1824,11 +1824,11 @@ void TopLevel::tqlayoutNext() TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::tqlayoutNext: current " + if (0) kdDebug() << "TopLevel::layoutNext: current " << _layoutCurrent << endl; } -void TopLevel::tqlayoutPrevious() +void TopLevel::layoutPrevious() { if (_layoutCount <2) return; @@ -1845,11 +1845,11 @@ void TopLevel::tqlayoutPrevious() TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::tqlayoutPrevious: current " + if (0) kdDebug() << "TopLevel::layoutPrevious: current " << _layoutCurrent << endl; } -void TopLevel::tqlayoutSave() +void TopLevel::layoutSave() { KConfig* config = KGlobal::config(); TQString key = traceKey(); @@ -1876,7 +1876,7 @@ void TopLevel::tqlayoutSave() aConfig.writeEntry("DefaultCurrent", _layoutCurrent); } -void TopLevel::tqlayoutRestore() +void TopLevel::layoutRestore() { KConfig* config = KGlobal::config(); KConfigGroup aConfig(config, TQCString("Layouts")); @@ -1909,13 +1909,13 @@ void TopLevel::updateLayoutActions() { KAction* ka; - ka = actionCollection()->action("tqlayout_next"); + ka = actionCollection()->action("layout_next"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("tqlayout_previous"); + ka = actionCollection()->action("layout_previous"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("tqlayout_remove"); + ka = actionCollection()->action("layout_remove"); if (ka) ka->setEnabled(_layoutCount>1); _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000); diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h index c24b27d3..c437ceae 100644 --- a/kcachegrind/kcachegrind/toplevel.h +++ b/kcachegrind/kcachegrind/toplevel.h @@ -104,13 +104,13 @@ public slots: void querySlot(); void dummySlot(); - // tqlayouts - void tqlayoutDuplicate(); - void tqlayoutRemove(); - void tqlayoutNext(); - void tqlayoutPrevious(); - void tqlayoutSave(); - void tqlayoutRestore(); + // layouts + void layoutDuplicate(); + void layoutRemove(); + void layoutNext(); + void layoutPrevious(); + void layoutSave(); + void layoutRestore(); void updateLayoutActions(); void updateStatusBar(); @@ -251,7 +251,7 @@ private: TracePartList _activeParts; // hidden parts TracePartList _hiddenParts; - // tqlayouts + // layouts int _layoutCurrent, _layoutCount; // for delayed slots diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index 83cc1488..50de3e3a 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -2511,7 +2511,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l) } -void TraceCall::tqinvalidateDynamicCost() +void TraceCall::invalidateDynamicCost() { TraceLineCall* lc; for (lc=_lineCalls.first();lc;lc=_lineCalls.next()) @@ -2945,7 +2945,7 @@ void TraceFunctionSource::update() _dirty = false; } -void TraceFunctionSource::tqinvalidateDynamicCost() +void TraceFunctionSource::invalidateDynamicCost() { // no need to create lineMap if not already created if (_lineMap) { @@ -3130,7 +3130,7 @@ void TraceAssoziation::tqinvalidate(TraceData* d, int rtti) TraceFunctionMap::Iterator it; for ( it = d->functionMap().begin(); it != d->functionMap().end(); ++it ) - (*it).tqinvalidateAssoziation(rtti); + (*it).invalidateAssoziation(rtti); } @@ -3198,7 +3198,7 @@ void TraceFunction::removeAssoziation(int rtti, bool reallyDelete) } } -void TraceFunction::tqinvalidateAssoziation(int rtti) +void TraceFunction::invalidateAssoziation(int rtti) { TraceAssoziation* a; for (a=_assoziations.first();a;a=_assoziations.next()) @@ -3587,15 +3587,15 @@ const TraceCallList& TraceFunction::callings(bool /* skipCycle */) const return _callings; } -void TraceFunction::tqinvalidateDynamicCost() +void TraceFunction::invalidateDynamicCost() { TraceCall* c; for (c=_callings.first();c;c=_callings.next()) - c->tqinvalidateDynamicCost(); + c->invalidateDynamicCost(); TraceFunctionSource* sf; for (sf=_sourceFiles.first();sf;sf=_sourceFiles.next()) - sf->tqinvalidateDynamicCost(); + sf->invalidateDynamicCost(); if (_instrMap) { TraceInstrMap::Iterator iit; @@ -4310,7 +4310,7 @@ bool TracePart::activate(bool active) _active = active; // to be done by the client of this function - // data()->tqinvalidateDynamicCost(); + // data()->invalidateDynamicCost(); // So better use the TraceData functions... return true; @@ -4527,7 +4527,7 @@ void TraceData::load(const TQString& base) } _parts.sort(); - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); // clear loading messages from status bar @@ -4574,7 +4574,7 @@ bool TraceData::activateParts(const TracePartList& l) if (changed) { // because active parts have changed, throw away calculated // costs... - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); } @@ -4593,7 +4593,7 @@ bool TraceData::activateParts(TracePartList l, bool active) changed = true; if (changed) { - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); } @@ -4645,7 +4645,7 @@ TQString TraceData::activePartRange() return res; } -void TraceData::tqinvalidateDynamicCost() +void TraceData::invalidateDynamicCost() { // tqinvalidate all dynamic costs @@ -4667,7 +4667,7 @@ void TraceData::tqinvalidateDynamicCost() TraceFunctionMap::Iterator it; for ( it = _functionMap.begin(); it != _functionMap.end(); ++it ) { - (*it).tqinvalidateDynamicCost(); + (*it).invalidateDynamicCost(); } tqinvalidate(); @@ -5044,7 +5044,7 @@ void TraceData::updateFunctionCycles() _inFunctionCycleUpdate = false; // we have to tqinvalidate costs because cycles are now taken into account - tqinvalidateDynamicCost(); + invalidateDynamicCost(); #if 0 if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0); diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h index 1b57d297..edc4c8f8 100644 --- a/kcachegrind/kcachegrind/tracedata.h +++ b/kcachegrind/kcachegrind/tracedata.h @@ -64,7 +64,7 @@ class TQFile; * * For cost items, which are sums over all trace files read in, the * summed cost metrics change when e.g. a new trace file is read. - * Thus, their cached costs are tqinvalidated, and again recalculated + * Thus, their cached costs are invalidated, and again recalculated * only on demand. In the following list, theses cost items are called * "dynamic", the other "fixed" (but neverless calculated lazy). * @@ -301,7 +301,7 @@ public: virtual void clear(); /** Invalidate the cost attributes. - * An tqinvalidated object needs to be recalculated when a cost + * An invalidated object needs to be recalculated when a cost * attribute is requested (e.g. by subCost()). * Has to be overwritten by subclasses when the cost influences costs of * other cost items. If only one item depends on the cost of this item, @@ -310,7 +310,7 @@ public: virtual void tqinvalidate(); /** - * Sets a dependant to be tqinvalidated when this cost is tqinvalidated. + * Sets a dependant to be invalidated when this cost is invalidated. * Call this function directly after the constructor. */ void setDependant(TraceItem* d) { _dep = d; } @@ -1303,7 +1303,7 @@ class TraceCall: public TraceCallListCost // we need some special handling for cycle calls void update(); - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); // factories TracePartCall* partCall(TracePart*, @@ -1502,7 +1502,7 @@ public: uint lastLineno(); TraceLineMap* lineMap(); - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); /* factories */ TraceLine* line(uint lineno, bool createNew = true); @@ -1592,7 +1592,7 @@ class TraceFunction: public TraceCostItem // this tqinvalidate all subcosts of function depending on // active status of parts - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); void addCaller(TraceCall*); @@ -1651,7 +1651,7 @@ class TraceFunction: public TraceCostItem void addAssoziation(TraceAssoziation* a); void removeAssoziation(TraceAssoziation* a); void removeAssoziation(int rtti, bool reallyDelete = true); - void tqinvalidateAssoziation(int rtti); + void invalidateAssoziation(int rtti); TraceAssoziation* assoziation(int rtti); // cycles @@ -1844,7 +1844,7 @@ class TraceData: public TraceCost * tqinvalidate the dynamic costs on a activation change, * i.e. all cost items dependend on active parts. * This has to be done by the caller when true is returned by - * calling tqinvalidateDynamicCost(). + * calling invalidateDynamicCost(). */ bool activateParts(const TracePartList&); bool activateParts(TracePartList, bool active); @@ -1914,8 +1914,8 @@ class TraceData: public TraceCost virtual void update(); - // tqinvalidates all cost items dependant on active state of parts - void tqinvalidateDynamicCost(); + // invalidates all cost items dependant on active state of parts + void invalidateDynamicCost(); // cycle detection void updateFunctionCycles(); diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp index 1d612ac3..8323ea61 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -30,10 +30,10 @@ #define TRACE_UPDATES 0 -TraceItemView::TraceItemView(TraceItemView* tqparentView, TopLevel* top) +TraceItemView::TraceItemView(TraceItemView* parentView, TopLevel* top) { - _parentView = tqparentView; - _topLevel = top ? top : tqparentView->topLevel(); + _parentView = parentView; + _topLevel = top ? top : parentView->topLevel(); _data = _newData = 0; // _partList and _newPartList is empty diff --git a/kcachegrind/kcachegrind/traceitemview.h b/kcachegrind/kcachegrind/traceitemview.h index a842a1d2..1d0c0394 100644 --- a/kcachegrind/kcachegrind/traceitemview.h +++ b/kcachegrind/kcachegrind/traceitemview.h @@ -69,7 +69,7 @@ public: // a TraceItemView can have a position in a tqparent container enum Position { Hidden, Top, Right, Left, Bottom }; - TraceItemView(TraceItemView* tqparentView, TopLevel* top = 0); + TraceItemView(TraceItemView* parentView, TopLevel* top = 0); virtual ~TraceItemView() {} virtual TQString whatsThis() const; @@ -165,7 +165,7 @@ public: void addGoMenu(TQPopupMenu*); protected: - // helpers to call selected()/activated() of tqparentView + // helpers to call selected()/activated() of parentView void selected(TraceItem*); void selected(const TracePartList&); void activated(TraceItem*); diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp index cdc48cc8..39207fd2 100644 --- a/kcachegrind/kcachegrind/treemap.cpp +++ b/kcachegrind/kcachegrind/treemap.cpp @@ -855,7 +855,7 @@ void TreeMapItem::clear() } -// tqinvalidates current tqchildren and forces redraw +// invalidates current tqchildren and forces redraw // this is only usefull when tqchildren are created on demand in items() void TreeMapItem::refresh() { @@ -1086,10 +1086,10 @@ protected: void TreeMapTip::maybeTip( const TQPoint& pos ) { - if ( !tqparentWidget()->inherits( "TreeMapWidget" ) ) + if ( !parentWidget()->inherits( "TreeMapWidget" ) ) return; - TreeMapWidget* p = (TreeMapWidget*)tqparentWidget(); + TreeMapWidget* p = (TreeMapWidget*)parentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); TQPtrList<TQRect>* rList = i ? i->freeRects() : 0; diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index 9c936cbd..17cba09d 100644 --- a/kcachegrind/kcachegrind/treemap.h +++ b/kcachegrind/kcachegrind/treemap.h @@ -444,7 +444,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected tqchildren or tqparents stays true. + * has no selected tqchildren or parents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -532,7 +532,7 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a tqchildren value() is almost the tqparents sum(), + * If a tqchildren value() is almost the parents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the * tqparent/child size relation can not be mapped to a correct |