summaryrefslogtreecommitdiffstats
path: root/kivio/kiviopart/kivio_view.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kivio/kiviopart/kivio_view.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/kivio_view.cpp')
-rw-r--r--kivio/kiviopart/kivio_view.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 3c45c639..35b32e56 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
TQString unit = KoUnit::unitName(m_pDoc->unit());
KoPoint xy(0, 0);
TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
- "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
- .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+ "X: %1 %3 Y: %2 %4").arg(TDEGlobal::_locale->formatNumber(xy.x(), 2))
+ .arg(TDEGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
addStatusBarItem(m_coordSLbl, 0, true);
}
@@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my )
KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my));
xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit()));
xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit()));
- TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
- .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+ TQString text = i18n("X: %1 %3 Y: %2 %4").arg(TDEGlobal::_locale->formatNumber(xy.x(), 2))
+ .arg(TDEGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
m_coordSLbl->setText(text);
}
}