diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-26 00:41:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-26 00:41:16 +0000 |
| commit | 698569f8428ca088f764d704034a1330517b98c0 (patch) | |
| tree | bf45be6946ebbbee9cce5a5bcf838f4c952d87e6 /kexi | |
| parent | 2785103a6bd4de55bd26d79e34d0fdd4b329a73a (diff) | |
| download | koffice-698569f8428ca088f764d704034a1330517b98c0.tar.gz koffice-698569f8428ca088f764d704034a1330517b98c0.zip | |
Finish rebranding of Krita as Chalk
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238363 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi')
| -rw-r--r-- | kexi/3rdparty/kolibs/koGlobal.cc | 2 | ||||
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 2 | ||||
| -rw-r--r-- | kexi/migration/mysql/mysqlmigrate.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/kexibrowser.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 58c90445d..b8f6e23dd 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -61,7 +61,7 @@ KoGlobal::KoGlobal() // Another way to get the DPI of the display would be TQPaintDeviceMetrics, // but we have no widget here (and moving this to KoView wouldn't allow // using this from the document easily). -#ifdef TQ_WS_X11 +#ifdef Q_WS_X11 m_dpiX = TQPaintDevice::x11AppDpiX(); m_dpiY = TQPaintDevice::x11AppDpiY(); #else diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 15491d5c8..a2cf0e0cb 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -1422,7 +1422,7 @@ void KexiMainWindowImpl::updateReadOnlyState() // update "insert ....." actions for every part KActionCollection *ac = actionCollection(); for (KexiPart::PartInfoListIterator it(*Kexi::partManager().partInfoList()); it.current(); ++it) { - KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )) ); + KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() ); if (a) a->setEnabled(!readOnly); } diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 013613eac..9b69350be 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -509,7 +509,7 @@ void MySQLMigrate::getConstraints(int flags, KexiDB::Field* fld) { fld->setPrimaryKey(flags & PRI_KEY_FLAG); fld->setAutoIncrement(flags & AUTO_INCREMENT_FLAG); fld->setNotNull(flags & NOT_NULL_FLAG); - fld->setUniqueKey(flags & UNITQUE_KEY_FLAG); + fld->setUniqueKey(flags & UNIQUE_KEY_FLAG); //! @todo: Keys and uniqueness } diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index a4ec402f9..cbaf0e0cc 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -763,7 +763,7 @@ void KexiBrowser::slotNewObjectPopupAboutToShow() for (KexiPart::PartInfoListIterator it(*list); it.current(); ++it) { //add an item to "New object" toolbar popup KAction *action = m_mainWin->actionCollection()->action( - TQString(KexiPart::nameForCreateAction(*it.current())) ); + TQString(KexiPart::nameForCreateAction(*it.current())).ascii() ); if (action) { action->plug(m_newObjectPopup); } |