diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kexi/core | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kexi/core')
| -rw-r--r-- | kexi/core/kexi.cpp | 4 | ||||
| -rw-r--r-- | kexi/core/kexi.h | 2 | ||||
| -rw-r--r-- | kexi/core/kexiaboutdata.cpp | 6 | ||||
| -rw-r--r-- | kexi/core/kexiaboutdata.h | 2 | ||||
| -rw-r--r-- | kexi/core/kexidialogbase.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index aaaf589e..dbaddb11 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -313,9 +313,9 @@ ObjectStatus::operator KexiDB::MessageHandler*() return msgHandler; } -void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData) +void Kexi::initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData) { - KAboutData *about = aboutData; + TDEAboutData *about = aboutData; if (!about) about = Kexi::createAboutData(); #ifdef CUSTOM_VERSION diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h index 5a6804a5..921db42b 100644 --- a/kexi/core/kexi.h +++ b/kexi/core/kexi.h @@ -36,7 +36,7 @@ namespace Kexi { - KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData = 0); + KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData = 0); /*! Modes of view for the dialogs. Used mostly for parts and KexiDialogBase. */ enum ViewMode { diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index 51265bdb..e41cf0ff 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -38,15 +38,15 @@ static const char *description = using namespace Kexi; -KAboutData* Kexi::createAboutData() +TDEAboutData* Kexi::createAboutData() { - KAboutData *aboutData=new KAboutData( "kexi", KEXI_APP_NAME, + TDEAboutData *aboutData=new TDEAboutData( "kexi", KEXI_APP_NAME, KEXI_VERSION_STRING #ifndef CUSTOM_VERSION " (KOffice " KOFFICE_VERSION_STRING ")" #endif , description, - KAboutData::License_LGPL_V2, + TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2002-2007, Kexi Team\n" "(c) 2003-2007, OpenOffice Polska LLC\n"), I18N_NOOP( "This software is developed by Kexi Team - an international group\n" diff --git a/kexi/core/kexiaboutdata.h b/kexi/core/kexiaboutdata.h index 948906c5..06e3497d 100644 --- a/kexi/core/kexiaboutdata.h +++ b/kexi/core/kexiaboutdata.h @@ -26,7 +26,7 @@ namespace Kexi { -KEXICORE_EXPORT KAboutData* createAboutData(); +KEXICORE_EXPORT TDEAboutData* createAboutData(); } diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index 67e81a5d..d9b5d884 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -134,7 +134,7 @@ TQSize KexiDialogBase::sizeHint() const } /* -KInstance *KexiDialogBase::instance() { +TDEInstance *KexiDialogBase::instance() { return m_instance; }*/ |