diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kivio/kiviopart/ui | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/ui')
| -rw-r--r-- | kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp | 2 | ||||
| -rw-r--r-- | kivio/kiviopart/ui/kiviooptionsdialog.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 11c2cc28..9cbe4385 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -72,7 +72,7 @@ namespace Kivio { void AddStencilSetPanel::updateList() { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQStringList dirList = dirs->findDirs("data", "kivio/stencils"); dirList.sort(); m_stencilSetLView->clear(); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 5621074d..613f0fd4 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -53,7 +53,7 @@ // { // setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? // "guides_vertical":"guides_horizontal")); -// TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); +// TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } @@ -65,7 +65,7 @@ // // void GuidesListViewItem::setUnit(KoUnit::Unit u) // { -// TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); +// TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } @@ -73,7 +73,7 @@ // void GuidesListViewItem::setPosition(double p, KoUnit::Unit u) // { // m_data->setPosition(KoUnit::fromUserValue(p, u)); -// TQString s = KGlobal::_locale->formatNumber(p, 2); +// TQString s = TDEGlobal::_locale->formatNumber(p, 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } |