diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
| commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
| tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /kexi/formeditor | |
| parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
| download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kexi/formeditor')
| -rw-r--r-- | kexi/formeditor/formmanager.cpp | 4 | ||||
| -rw-r--r-- | kexi/formeditor/test/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 87adfb20..412d3665 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -122,7 +122,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name) #endif connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); - slotSettingsChanged(KApplication::SETTINGS_SHORTCUTS); + slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS); //moved to createWidgetLibrary() m_lib = new WidgetLibrary(this, supportedFactoryGroups); m_propSet = new WidgetPropertySet(this); @@ -1459,7 +1459,7 @@ FormManager::showFormUICode() void FormManager::slotSettingsChanged(int category) { - if (category==KApplication::SETTINGS_SHORTCUTS) { + if (category==TDEApplication::SETTINGS_SHORTCUTS) { m_contextMenuKey = KGlobalSettings::contextMenuKey(); } } diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp index 5c79f55f..629a1026 100644 --- a/kexi/formeditor/test/main.cpp +++ b/kexi/formeditor/test/main.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) about.addCredit( "Kristof Borrey ", "Icons", 0, "kristof.borrey@skynet.be" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; KGlobal::iconLoader()->addAppDir("kexi"); |