summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:57:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:57:47 -0600
commit6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch)
tree7e66b929b5455837f22ea54ed91fc9af6f64f7bf
parent68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff)
downloadkoffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz
koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--acinclude.m426
-rw-r--r--chalk/core/kis_imagepipe_brush.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_zoom.cc4
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc4
-rw-r--r--chalk/plugins/viewplugins/screenshot/main.cpp2
-rw-r--r--chalk/ui/kis_doc.cc2
-rw-r--r--chalk/ui/kis_label_progress.cc4
-rw-r--r--filters/chalk/gmagick/kis_image_magick_converter.cc6
-rw-r--r--filters/chalk/magick/kis_image_magick_converter.cc6
-rw-r--r--kexi/doc/dev/TODO-Kexi-js2
-rw-r--r--kexi/formeditor/formmanager.cpp4
-rw-r--r--kexi/formeditor/test/main.cpp2
-rw-r--r--kexi/kexiutils/utils.h8
-rw-r--r--kexi/main/keximainwindowimpl.cpp6
-rw-r--r--kexi/main/keximainwindowimpl.h2
-rw-r--r--kexi/migration/importwizard.cpp2
-rw-r--r--kexi/migration/keximigratetest.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotest.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotestgui.cpp2
-rw-r--r--kexi/tests/gui/finddialog/main.cpp2
-rw-r--r--kexi/tests/newapi/main.cpp4
-rw-r--r--kexi/tests/startup/main.cpp2
-rw-r--r--kexi/tests/tableview/main.cpp2
-rw-r--r--kexi/tests/widgets/kexidbdrivercombotest.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp4
-rw-r--r--kivio/kiviopart/kivio_canvas.cpp2
-rw-r--r--kivio/kiviopart/kivio_view.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_birdeye_panel.cpp2
-rwxr-xr-xkspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py8
-rw-r--r--kspread/tests/test_formula.cc2
-rw-r--r--kword/KWPartFrameSet.cpp2
-rw-r--r--lib/kformula/main.cc2
-rw-r--r--lib/kofficecore/KoApplication.cpp4
-rw-r--r--lib/kofficecore/KoApplication.h2
-rw-r--r--lib/kofficecore/KoDocument.h6
-rw-r--r--lib/kofficecore/tests/korecttest.cpp2
-rw-r--r--lib/kofficeui/KoKoolBar.cpp2
-rw-r--r--lib/kofficeui/tests/coloraction_test.cpp2
-rw-r--r--lib/koproperty/test/main.cpp2
-rw-r--r--lib/kotext/kohyphen/kohyphentest.cpp2
-rw-r--r--lib/kotext/tests/kobordertest.cpp4
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp2
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp2
-rw-r--r--lib/kross/runner/main.cpp8
-rw-r--r--lib/kross/test/main.cpp6
-rw-r--r--lib/store/tests/storage_test.cpp2
-rw-r--r--lib/store/tests/storedroptest.cpp4
-rw-r--r--tools/converter/koconverter.cpp2
-rw-r--r--tools/kthesaurus/main.cc2
49 files changed, 89 insertions, 89 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 65e0a0fc..f7629e5f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1970,20 +1970,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+ printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+ printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+ printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+ printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+ printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+ printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+ printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+ printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+ printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+ printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
- KApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+ TDEApplication::kde_wallpaperdir().data());
+ printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+ printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index e7c61e65..f9389997 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -391,7 +391,7 @@ void KisImagePipeBrush::selectNextBrush(const KisPaintInformation& info) const {
case KisPipeBrushParasite::Incremental:
index = (index + 1) % m_parasite.rank[i]; break;
case KisPipeBrushParasite::Random:
- index = int(float(m_parasite.rank[i])*KApplication::random() / RAND_MAX); break;
+ index = int(float(m_parasite.rank[i])*TDEApplication::random() / RAND_MAX); break;
case KisPipeBrushParasite::Pressure:
index = static_cast<int>(info.pressure * (m_parasite.rank[i] - 1) + 0.5); break;
case KisPipeBrushParasite::Angular:
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index f866e5e2..eda09f6e 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -131,8 +131,8 @@ void KisToolZoom::slotTimer()
#if KDE_IS_VERSION(3,4,0)
int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
#else
- int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier
- |KApplication::ControlModifier|KApplication::Modifier1);
+ int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+ |TDEApplication::ControlModifier|TDEApplication::Modifier1);
#endif
if (state & TQt::ControlButton) {
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 58db0dad..9eb795ba 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -168,8 +168,8 @@ void KisToolSelectSimilar::slotTimer()
#if KDE_IS_VERSION(3,4,0)
int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
#else
- int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier
- |KApplication::ControlModifier|KApplication::Modifier1);
+ int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+ |TDEApplication::ControlModifier|TDEApplication::Modifier1);
#endif
enumSelectionMode action;
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 6d74a63e..21c4112b 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
"nhasan@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication app;
+ TDEApplication app;
KImageIO::registerFormats();
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 02699d67..ee8c65a7 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -1120,7 +1120,7 @@ void KisDoc::IODone()
void KisDoc::slotIOProgress(TQ_INT8 percentage)
{
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index c081111f..d58e4b4b 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -169,7 +169,7 @@ void KisLabelProgress::update(int percent)
{
m_bar->setValue(percent);
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
app->processEvents();
// The following is safer, but makes cancel impossible:
@@ -181,7 +181,7 @@ void KisLabelProgress::updateStage(const TQString&, int percent)
{
m_bar->setValue(percent);
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
app->processEvents();
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 22982cc5..59f35ce3 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -309,7 +309,7 @@ namespace {
static bool init = false;
if (!init) {
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
InitializeMagick(*app -> argv());
atexit(DestroyMagick);
@@ -330,7 +330,7 @@ namespace {
#if 0
MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
{
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
@@ -343,7 +343,7 @@ namespace {
#else
unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
{
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index ec70f179..e83bbe56 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -257,7 +257,7 @@ namespace {
static bool init = false;
if (!init) {
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
InitializeMagick(*app -> argv());
atexit(DestroyMagick);
@@ -278,7 +278,7 @@ namespace {
#ifdef HAVE_MAGICK6
MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
{
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
@@ -291,7 +291,7 @@ namespace {
#else
unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
{
- KApplication *app = KApplication::kApplication();
+ TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index f41d8111..814e14bd 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -912,7 +912,7 @@ XML Export TODO:
(templates/XSLT could be also supported)
General TODO:
-- handle KApplication::shutDown()
+- handle TDEApplication::shutDown()
TODO:
- on opening detect whether a table exists (empty table view should not be displayed)
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");
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 81e4f41e..8b832061 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -87,12 +87,12 @@ namespace KexiUtils
}
/*! Sets "wait" cursor with 1 second delay (or 0 seconds if noDelay is true).
- Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+ Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
KEXIUTILS_EXPORT void setWaitCursor(bool noDelay = false);
/*! Remove "wait" cursor previously set with \a setWaitCursor(),
even if it's not yet visible.
- Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+ Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
KEXIUTILS_EXPORT void removeWaitCursor();
/*! Helper class. Allocate it in your code block as follows:
@@ -101,7 +101,7 @@ namespace KexiUtils
</code>
.. and wait cursor will be visible (with one second delay) until you're in this block, without
a need to call removeWaitCursor() before exiting the block.
- Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+ Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
class KEXIUTILS_EXPORT WaitCursor
{
public:
@@ -116,7 +116,7 @@ namespace KexiUtils
.. and the wait cursor will be hidden unless you leave this block, without
a need to call setWaitCursor() before exiting the block. After leaving the codee block,
the cursor will be visible again, if it was visible before creating the WaitCursorRemover object.
- Does nothing if the application has no GUI enabled. (see KApplication::guiEnabled()) */
+ Does nothing if the application has no GUI enabled. (see TDEApplication::guiEnabled()) */
class KEXIUTILS_EXPORT WaitCursorRemover
{
public:
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index f6be589a..96bd81be 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -151,7 +151,7 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata)
bool GUIenabled = true;
TQWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created
//! @todo switch GUIenabled off when needed
- KApplication* app = new KApplication(true, GUIenabled);
+ TDEApplication* app = new TDEApplication(true, GUIenabled);
#ifdef KEXI_STANDALONE
KGlobal::locale()->removeCatalogue("kexi");
@@ -3957,13 +3957,13 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
{
#ifndef KEXI_NO_FEEDBACK_AGENT
#ifdef FEEDBACK_CLASS
- const KAboutData* about = KApplication::kApplication()->aboutData();
+ const KAboutData* about = TDEApplication::kApplication()->aboutData();
FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
if ( wizard->exec() )
{
- KApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
+ TDEApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
TQString(), TQString(),
about->appName() + TQCString( " [feedback]" ),
wizard->feedbackDocument().toString( 2 ).local8Bit() );
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 270e9272..f477d2fb 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -52,7 +52,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
KexiMainWindowImpl();
virtual ~KexiMainWindowImpl();
- /*! Used by the main kexi routine. Creates a new Kexi main window and a new KApplication object.
+ /*! Used by the main kexi routine. Creates a new Kexi main window and a new TDEApplication object.
kdemain() has to destroy the latter on exit.
\return result 1 on error and 0 on success (the result can be used as a result of kdemain()) */
static int create(int argc, char *argv[], KAboutData* aboutdata = 0);
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 3592557c..6fdc5966 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
void ImportWizard::progressUpdated(int percent) {
m_progressBar->setProgress(percent);
- KApplication::kApplication()->processEvents();
+ TDEApplication::kApplication()->processEvents();
}
//===========================================================
diff --git a/kexi/migration/keximigratetest.cpp b/kexi/migration/keximigratetest.cpp
index bb67d985..e81e8d80 100644
--- a/kexi/migration/keximigratetest.cpp
+++ b/kexi/migration/keximigratetest.cpp
@@ -38,7 +38,7 @@ using namespace KexiMigration;
int main(int argc, char *argv[])
{
- KApplication app(argc, argv, "Kexi Migrate Test");
+ TDEApplication app(argc, argv, "Kexi Migrate Test");
ImportWizard* iw = new ImportWizard();
iw->setGeometry(300,300,300,250);
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 34435fba..2a1cc900 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
//create an new "Console"-runner
KUnitTest::Runner * runner = KUnitTest::Runner::self();
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 8fad0230..3c9eb147 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -43,7 +43,7 @@ int main( int argc, char** argv )
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
//create new kapplication
- KApplication app;
+ TDEApplication app;
//create new kunitrunnergui
KUnitTest::RunnerGUI runner(0);
//show the ui
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 3a9148fb..4dbcb5a6 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -28,7 +28,7 @@ int main( int argc, char ** argv )
{
KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication app;
+ TDEApplication app;
KexiFindDialog dlg(true, 0, "dialog");
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index 7bb6a059..a87c49db 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -51,7 +51,7 @@ bool db_name_required = true;
KexiDB::ConnectionData conn_data;
TQGuardedPtr<KexiDB::Connection> conn;
TQGuardedPtr<KexiDB::Driver> driver;
-KApplication *app = 0;
+TDEApplication *app = 0;
KInstance *instance = 0;
static KCmdLineOptions options[] =
@@ -157,7 +157,7 @@ int main(int argc, char** argv)
}
if (gui) {
- app = new KApplication(true, true);
+ app = new TDEApplication(true, true);
instance = app;
KGlobal::iconLoader()->addAppDir("kexi");
}
diff --git a/kexi/tests/startup/main.cpp b/kexi/tests/startup/main.cpp
index 3d97ac32..d7429cf4 100644
--- a/kexi/tests/startup/main.cpp
+++ b/kexi/tests/startup/main.cpp
@@ -33,7 +33,7 @@
int main(int argc, char* argv[])
{
- KApplication app(argc, argv, "startup");
+ TDEApplication app(argc, argv, "startup");
// Widget w;
// app.setMainWidget(&w);
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 90a51b5f..88121b57 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -31,7 +31,7 @@
int main(int argc, char* argv[])
{
- KApplication app(argc, argv, "tv_test");
+ TDEApplication app(argc, argv, "tv_test");
KGlobal::iconLoader()->addAppDir("kexi");
KexiTableView tv;
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 32d1cdb7..eeb87d31 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -46,7 +46,7 @@ int main(int argc, char** argv)
{
// Initialise the program
TDECmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true);
- KApplication* app = new KApplication(true, true);
+ TDEApplication* app = new TDEApplication(true, true);
// Look for installed database drivers
KexiDB::DriverManager manager;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index a766c597..fa474bfc 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -185,7 +185,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
d = new KexiTableViewPrivate(this);
connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
- slotSettingsChanged(KApplication::SETTINGS_SHORTCUTS);
+ slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
m_data = new KexiTableViewData(); //to prevent crash because m_data==0
m_owner = true; //-this will be deleted if needed
@@ -2593,7 +2593,7 @@ KexiTableItem *KexiTableView::highlightedItem() const
void KexiTableView::slotSettingsChanged(int category)
{
- if (category==KApplication::SETTINGS_SHORTCUTS) {
+ if (category==TDEApplication::SETTINGS_SHORTCUTS) {
d->contextMenuKey = KGlobalSettings::contextMenuKey();
}
}
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index e2125cbb..f8b2f78c 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev )
painter.save();
painter.setClipRegion(grayRegion, TQPainter::CoordPainter);
painter.setPen(TQt::NoPen);
- painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid));
+ painter.fillRect(grayRegion.boundingRect(), TDEApplication::palette().active().brush(TQColorGroup::Mid));
painter.restore();
// end of copy...
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index cdc550af..3c45c639 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -1709,7 +1709,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
#if KDE_IS_VERSION(3, 4, 0)
if(kapp->keyboardMouseState() & TQt::ControlButton) {
#else
- if(KApplication::keyboardModifiers() & KApplication::ControlModifier) {
+ if(TDEApplication::keyboardModifiers() & TDEApplication::ControlModifier) {
#endif
pStencil->setFGColor(m_setFGColor->color());
pStencil->setBGColor(m_setBGColor->color());
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 30cf7f1f..572936e7 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView()
KivioScreenPainter kpainter;
kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
- kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid));
+ kpainter.painter()->fillRect(rect, TDEApplication::palette().active().brush(TQColorGroup::Mid));
kpainter.painter()->fillRect(px0, py0, pw, ph, white);
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index c6da1fe2..4356c90d 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -652,7 +652,7 @@ class Samples:
def getCode(self):
return (
'import qt, tdecore, dcop, dcopext',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("klipper") ]',
'd = dcopext.DCOPApp(apps[0], dcopclient)',
'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")',
@@ -670,7 +670,7 @@ class Samples:
return (
'import qt, tdecore, dcop, dcopext',
'',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("amarok") ]',
'app = apps[0]',
'd = dcopext.DCOPApp(app, dcopclient)',
@@ -695,7 +695,7 @@ class Samples:
return (
'import qt, tdecore, dcop, dcopext',
'',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kopete") ]',
'app = apps[0]',
'd = dcopext.DCOPApp(app, dcopclient)',
@@ -731,7 +731,7 @@ class Samples:
' return ba',
'',
'# Get the KWord DCOP client.',
- 'dcopclient = tdecore.KApplication.dcopClient()',
+ 'dcopclient = tdecore.TDEApplication.dcopClient()',
'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kword") ]',
'if len(apps) < 1: raise "No KWord instance is running. Please start KWord before!"',
'appname = apps[0]',
diff --git a/kspread/tests/test_formula.cc b/kspread/tests/test_formula.cc
index 2d992085..45538e79 100644
--- a/kspread/tests/test_formula.cc
+++ b/kspread/tests/test_formula.cc
@@ -52,7 +52,7 @@ int main( int argc, char** argv )
{
// Initialize command line args
TDECmdLineArgs::init(argc, argv, "formulatest", "formulatest", "unit test", "0.1", true);
- KApplication app(false, false);
+ TDEApplication app(false, false);
run( new FormulaParserTester() );
run( new FormulaEvalTester() );
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 33203d0b..d9ce5706 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -354,7 +354,7 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
int keyState = kapp->keyboardMouseState();
#else
int keyState = 0;
- if ( kapp->keyboardModifiers() & KApplication::ControlModifier )
+ if ( kapp->keyboardModifiers() & TDEApplication::ControlModifier )
keyState = TQt::ControlButton;
#endif
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index a08cecd9..966404ed 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -244,7 +244,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 5346ff0a..47861558 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -56,7 +56,7 @@ public:
};
KoApplication::KoApplication()
- : KApplication( initHack() )
+ : TDEApplication( initHack() )
{
d = new KoApplicationPrivate;
@@ -70,7 +70,7 @@ KoApplication::KoApplication()
m_starting = true;
}
-// This gets called before entering KApplication::KApplication
+// This gets called before entering TDEApplication::TDEApplication
bool KoApplication::initHack()
{
TDECmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" );
diff --git a/lib/kofficecore/KoApplication.h b/lib/kofficecore/KoApplication.h
index 1682b245..87a711f2 100644
--- a/lib/kofficecore/KoApplication.h
+++ b/lib/kofficecore/KoApplication.h
@@ -39,7 +39,7 @@ class KoApplicationPrivate;
* If the last mainwindow becomes closed, KoApplication automatically
* calls TQApplication::quit.
*/
-class KOFFICECORE_EXPORT KoApplication : public KApplication
+class KOFFICECORE_EXPORT KoApplication : public TDEApplication
{
Q_OBJECT
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index f521607b..63fd47c9 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -181,7 +181,7 @@ public:
/**
* @brief Used by KoApplication, and by KoMainWindow, when no document exists yet.
*
- * With the help of @p instance or KApplication::instance() this
+ * With the help of @p instance or TDEApplication::instance() this
* method figures out which .desktop file matches this application. In this
* file it searches for the "X-TDE-NativeMimeType" entry and returns it.
*
@@ -193,7 +193,7 @@ public:
/**
* Used by KoMainWindow, when no document exists yet.
*
- * With the help of @p instance or KApplication::instance() this
+ * With the help of @p instance or TDEApplication::instance() this
* method figures out which .desktop file matches this application. In this
* file it searches for the "X-TDE-ExtraNativeMimeTypes" entry and returns it.
*
@@ -203,7 +203,7 @@ public:
static TQStringList readExtraNativeMimeTypes( KInstance *instance = 0 );
/**
- * With the help of @p instance or KApplication::instance() this
+ * With the help of @p instance or TDEApplication::instance() this
* method figures out which .desktop file matches this application,
* and returns the KService instance for it.
*/
diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp
index f1a1fd89..6866e176 100644
--- a/lib/kofficecore/tests/korecttest.cpp
+++ b/lib/kofficecore/tests/korecttest.cpp
@@ -35,7 +35,7 @@ bool check(TQString txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
- KApplication app(argc,argv,"korecttest",false,false);
+ TDEApplication app(argc,argv,"korecttest",false,false);
KoRect emptyRect;
check( "KoRect() is null", emptyRect.isNull(), true );
diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp
index 1db0ee9b..ce848874 100644
--- a/lib/kofficeui/KoKoolBar.cpp
+++ b/lib/kofficeui/KoKoolBar.cpp
@@ -462,7 +462,7 @@ void KoKoolBarItem::press()
int main( int argc, char **argv )
{
- KApplication app( argc, argv );
+ TDEApplication app( argc, argv );
KoKoolBar bar;
int file = bar.insertGroup("File");
TQPixmap pix;
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index 9dfd066c..3e9c146a 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -102,7 +102,7 @@ int main( int argc, char ** argv )
{
srand( time( 0 ) );
- KApplication a( argc, argv, "KColorAction Test" );
+ TDEApplication a( argc, argv, "KColorAction Test" );
TopLevel *toplevel = new TopLevel( 0, "coloractiontest" );
a.setMainWidget( toplevel );
toplevel->show();
diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp
index b28a8034..2ac77391 100644
--- a/lib/koproperty/test/main.cpp
+++ b/lib/koproperty/test/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
Test *mainWin = 0;
if (app.isRestored())
diff --git a/lib/kotext/kohyphen/kohyphentest.cpp b/lib/kotext/kohyphen/kohyphentest.cpp
index 96e0bd2d..f756b421 100644
--- a/lib/kotext/kohyphen/kohyphentest.cpp
+++ b/lib/kotext/kohyphen/kohyphentest.cpp
@@ -40,7 +40,7 @@ void check_hyphenation( const TQStringList& tests, const TQStringList& results,
int main (int argc, char ** argv)
{
- KApplication app(argc, argv, "KoHyphenator test");
+ TDEApplication app(argc, argv, "KoHyphenator test");
try {
hypher = KoHyphenator::self();
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 6dd37aa4..c4e59ffc 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -47,9 +47,9 @@ private:
int main (int argc, char ** argv)
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0);
- KApplication app;
+ TDEApplication app;
KoZoomHandler* zh = new KoZoomHandler();
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 6721f771..38aab237 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -202,7 +202,7 @@ void KoTextFormatterTest::counterAndBigChar()
int main (int argc, char ** argv)
{
- KApplication app(argc, argv, "KoTextFormatter test");
+ TDEApplication app(argc, argv, "KoTextFormatter test");
// Don't let locale settings lead to different hyphenation output
KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index e521023e..d7234332 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -320,7 +320,7 @@ void WdgScriptsManager::slotUnloadScript()
void WdgScriptsManager::slotGetNewScript()
{
#ifdef KROSS_SUPPORT_NEWSTUFF
- const TQString appname = KApplication::kApplication()->name();
+ const TQString appname = TDEApplication::kApplication()->name();
const TQString type = TQString("%1/script").arg(appname);
if(! d->newstuff) {
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index fcff2bb0..74c84cf3 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -45,7 +45,7 @@
#define ERROR_UNHALDEDEXCEPTION -5
#define ERROR_EXCEPTION -6
-KApplication* app = 0;
+TDEApplication* app = 0;
int runScriptFile(const TQString& scriptfile)
{
@@ -125,8 +125,8 @@ int main(int argc, char **argv)
return ERROR_HELP;
}
- // Create KApplication instance.
- app = new KApplication( /* allowStyles */ true, /* GUIenabled */ true );
+ // Create TDEApplication instance.
+ app = new TDEApplication( /* allowStyles */ true, /* GUIenabled */ true );
//TQString interpretername = args->getOption("interpreter");
//TQString scriptfilename = args->getOption("scriptfile");
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
break;
}
- // Free the KApplication instance and exit the program.
+ // Free the TDEApplication instance and exit the program.
delete app;
return result;
}
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index f8caf2d8..a42f9f46 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -49,7 +49,7 @@
#include <string>
#include <iostream>
-KApplication *app = 0;
+TDEApplication *app = 0;
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
f.close();
if( args->isSet("gui") ) {
- app = new KApplication();
+ app = new TDEApplication();
TestWindow *mainWin = new TestWindow(interpretername, scriptcode);
app->setMainWidget(mainWin);
mainWin->show();
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
result = app->exec();
}
else {
- app = new KApplication(true, true);
+ app = new TDEApplication(true, true);
runInterpreter(interpretername, scriptcode);
}
}
diff --git a/lib/store/tests/storage_test.cpp b/lib/store/tests/storage_test.cpp
index fdb56b1d..baef1b83 100644
--- a/lib/store/tests/storage_test.cpp
+++ b/lib/store/tests/storage_test.cpp
@@ -206,7 +206,7 @@ int test( const char* testName, KoStore::Backend backend, const TQString& testFi
int main( int argc, char **argv )
{
TDECmdLineArgs::init( argc, argv, "storage_test", "A test for the KoStore classes", "1" );
- KApplication app( argc, argv );
+ TDEApplication app( argc, argv );
// KZip (due to KSaveFile) doesn't support relative filenames
// So use $PWD as base for the paths explicitely.
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index 2845e590..30f756a8 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -24,9 +24,9 @@ private:
int main( int argc, char** argv )
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc, argv, "storedroptest", 0, 0, 0, 0);
- KApplication app;
+ TDEApplication app;
StoreDropTest* window = new StoreDropTest( 0 );
window->resize( 500, 500 );
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index dc8ab1b4..d40d9545 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -81,7 +81,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
// Install the libkoffice* translations
KGlobal::locale()->insertCatalogue("koffice");
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index 968afd57..5786227d 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -41,7 +41,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication a; // KDataTool needs an instance
+ TDEApplication a; // KDataTool needs an instance
// TODO: take term from command line!