summaryrefslogtreecommitdiffstats
path: root/kcachegrind
diff options
context:
space:
mode:
Diffstat (limited to 'kcachegrind')
-rw-r--r--kcachegrind/kcachegrind/callgraphview.cpp12
-rw-r--r--kcachegrind/kcachegrind/callgraphview.h6
-rw-r--r--kcachegrind/kcachegrind/configdlgbase.ui8
-rw-r--r--kcachegrind/kcachegrind/dumpselectionbase.ui12
-rw-r--r--kcachegrind/kcachegrind/functionselectionbase.ui2
-rw-r--r--kcachegrind/kcachegrind/toplevel.cpp4
-rw-r--r--kcachegrind/kcachegrind/treemap.cpp2
-rw-r--r--kcachegrind/kcachegrind/treemap.h2
8 files changed, 24 insertions, 24 deletions
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index b02d441a..bc01da8b 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -376,7 +376,7 @@ TQString GraphOptions::layoutString(Layout l)
return TQString("TopDown");
}
-GraphOptions::Layout GraphOptions::tqlayout(TQString s)
+GraphOptions::Layout GraphOptions::layout(TQString s)
{
if (s == TQString("Circular")) return Circular;
if (s == TQString("LeftRight")) return LeftRight;
@@ -562,10 +562,10 @@ void GraphExporter::writeDot()
*stream << "digraph \"callgraph\" {\n";
- if (_go->tqlayout() == LeftRight) {
+ if (_go->layout() == LeftRight) {
*stream << TQString(" rankdir=LR;\n");
}
- else if (_go->tqlayout() == Circular) {
+ else if (_go->layout() == Circular) {
TraceFunction *f = 0;
switch(_item->type()) {
case TraceItem::Function:
@@ -1095,7 +1095,7 @@ void CanvasNode::drawShape(TQPainter& p)
r.setRect(r.x()+2, r.y()+2, r.width()-4, r.height()-4);
if (StoredDrawParams::selected() && _view->hasFocus()) {
- _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
+ _view->style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
_view->colorGroup());
}
@@ -1589,7 +1589,7 @@ void CallGraphView::keyPressEvent(TQKeyEvent* e)
TraceFunction* f = 0;
TraceCall* c = 0;
- // rotate arrow key meaning for LeftRight tqlayout
+ // rotate arrow key meaning for LeftRight layout
int key = e->key();
if (_layout == LeftRight) {
switch(key) {
@@ -2701,7 +2701,7 @@ void CallGraphView::readViewConfig(KConfig* c,
_clusterGroups = g->readBoolEntry("ClusterGroups",
DEFAULT_CLUSTERGROUPS);
_detailLevel = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL);
- _layout = GraphOptions::tqlayout(g->readEntry("Layout",
+ _layout = GraphOptions::layout(g->readEntry("Layout",
layoutString(DEFAULT_LAYOUT)));
_zoomPosition = zoomPos(g->readEntry("ZoomPosition",
zoomPosString(DEFAULT_ZOOMPOS)));
diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h
index 631c6a30..4db619db 100644
--- a/kcachegrind/kcachegrind/callgraphview.h
+++ b/kcachegrind/kcachegrind/callgraphview.h
@@ -167,10 +167,10 @@ class GraphOptions
virtual bool expandCycles() = 0;
virtual bool clusterGroups() = 0;
virtual int detailLevel() = 0;
- virtual Layout tqlayout() = 0;
+ virtual Layout layout() = 0;
static TQString layoutString(Layout);
- static Layout tqlayout(TQString);
+ static Layout layout(TQString);
};
/* Graph Options Storage */
@@ -188,7 +188,7 @@ class StorableGraphOptions: public GraphOptions
virtual bool expandCycles() { return _expandCycles; }
virtual bool clusterGroups() { return _clusterGroups; }
virtual int detailLevel() { return _detailLevel; }
- virtual Layout tqlayout() { return _layout; }
+ virtual Layout layout() { return _layout; }
// setters
void setMaxCallerDepth(int d) { _maxCallerDepth = d; }
diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui
index 575ae5f6..dc0ee9ec 100644
--- a/kcachegrind/kcachegrind/configdlgbase.ui
+++ b/kcachegrind/kcachegrind/configdlgbase.ui
@@ -42,7 +42,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -381,7 +381,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -425,7 +425,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -469,7 +469,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui
index 2f7ac41d..b8ad1b0c 100644
--- a/kcachegrind/kcachegrind/dumpselectionbase.ui
+++ b/kcachegrind/kcachegrind/dumpselectionbase.ui
@@ -477,7 +477,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -586,7 +586,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -642,7 +642,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -868,7 +868,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -962,7 +962,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -1031,7 +1031,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui
index f61fcefd..eec019db 100644
--- a/kcachegrind/kcachegrind/functionselectionbase.ui
+++ b/kcachegrind/kcachegrind/functionselectionbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index 58cd6577..5a2e1deb 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -452,14 +452,14 @@ void TopLevel::createLayoutActions()
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>");
+ "<p>Make a copy of the current layout.</p>");
action->setWhatsThis( hint );
action = new KAction( i18n( "&Remove" ), KShortcut(),
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>");
+ "<p>Delete current layout and make the previous active.</p>");
action->setWhatsThis( hint );
action = new KAction( i18n( "&Go to Next" ),
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index 797e3a5f..0d4b8dc9 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -2178,7 +2178,7 @@ void TreeMapWidget::drawTreeMap()
if (hasFocus()) {
TQPainter p(this);
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
colorGroup() );
}
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index 356c493b..422cd35c 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -379,7 +379,7 @@ private:
int _sortTextNo;
bool _sortAscending;
- // temporary tqlayout
+ // temporary layout
TQRect _rect;
TQPtrList<TQRect>* _freeRects;
int _depth;