summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m426
-rw-r--r--ksquirrel/ksquirrel-libs-configurator/main.cpp2
-rw-r--r--ksquirrel/ksquirrel.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget.cpp6
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp6
-rw-r--r--ksquirrel/main.cpp4
-rw-r--r--ksquirrel/sq_glwidget.cpp6
-rw-r--r--ksquirrel/sq_glwidget_stuff.cpp6
8 files changed, 29 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e6fd5bf..4b73fe2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1979,20 +1979,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/ksquirrel/ksquirrel-libs-configurator/main.cpp b/ksquirrel/ksquirrel-libs-configurator/main.cpp
index 82e8ebf..30d4df3 100644
--- a/ksquirrel/ksquirrel-libs-configurator/main.cpp
+++ b/ksquirrel/ksquirrel-libs-configurator/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
KGlobal::locale()->insertCatalogue("ksquirrel");
KGlobal::locale()->setActiveCatalogue("ksquirrel");
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index f19a8d4..5992dee 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -1202,7 +1202,7 @@ void KSquirrel::finalActions()
if(create_splash)
{
createPostSplash();
- KApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ TDEApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
}
// write config file to disk (it is currently in memory cache)
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index d97f05d..08817d0 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -572,7 +572,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e)
SQ_Config::instance()->setGroup("GL view");
int dc = SQ_Config::instance()->readNumEntry("double_click", 0);
- if(dc && clickTime.isValid() && clickTime.msecsTo(t) <= KApplication::doubleClickInterval())
+ if(dc && clickTime.isValid() && clickTime.msecsTo(t) <= TDEApplication::doubleClickInterval())
{
if(dc == 1)
KSquirrel::app()->closeGLWidget();
@@ -1253,7 +1253,7 @@ void SQ_GLWidget::startDecoding(const TQString &file)
#endif
if(m_expected.isEmpty())
- KApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ TDEApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
decode();
}
@@ -1475,7 +1475,7 @@ void SQ_GLWidget::decode()
// absolute evil, but should do...
if(notexpected)
- KApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ TDEApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
i = tab->codeK->read_next();
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 041fa03..0c67176 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -644,9 +644,9 @@ void SQ_GLWidget::toClipboard()
// image doesn't have extra regions
if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h)
- KApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
+ TDEApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
else
- KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
+ TDEApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
}
void SQ_GLWidget::bcg()
@@ -1394,7 +1394,7 @@ void SQ_GLWidget::slotCloseRequest(int index)
Qt::NoButton,
Qt::NoButton);
- KApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev);
+ TDEApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev);
std::vector<Tab>::iterator itEnd = tabs.end();
std::vector<Tab>::iterator it = tabs.begin();
diff --git a/ksquirrel/main.cpp b/ksquirrel/main.cpp
index e2b3073..319cc36 100644
--- a/ksquirrel/main.cpp
+++ b/ksquirrel/main.cpp
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
high->have_categories = sq_args->isSet("categories");
high->have_mountview = sq_args->isSet("mountview");
- KApplication a;
+ TDEApplication a;
if(!TQGLFormat::hasOpenGL())
{
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
{
splash = new SQ_SplashScreen(0, "ksquirrel-splash-screen");
if(!high->showLibsAndExit) splash->show(); // don't show splash when -l
- KApplication::flush();
+ TDEApplication::flush();
}
delete config;
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index d97f05d..08817d0 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -572,7 +572,7 @@ void SQ_GLWidget::mousePressEvent(TQMouseEvent *e)
SQ_Config::instance()->setGroup("GL view");
int dc = SQ_Config::instance()->readNumEntry("double_click", 0);
- if(dc && clickTime.isValid() && clickTime.msecsTo(t) <= KApplication::doubleClickInterval())
+ if(dc && clickTime.isValid() && clickTime.msecsTo(t) <= TDEApplication::doubleClickInterval())
{
if(dc == 1)
KSquirrel::app()->closeGLWidget();
@@ -1253,7 +1253,7 @@ void SQ_GLWidget::startDecoding(const TQString &file)
#endif
if(m_expected.isEmpty())
- KApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ TDEApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
decode();
}
@@ -1475,7 +1475,7 @@ void SQ_GLWidget::decode()
// absolute evil, but should do...
if(notexpected)
- KApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ TDEApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
i = tab->codeK->read_next();
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 041fa03..0c67176 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -644,9 +644,9 @@ void SQ_GLWidget::toClipboard()
// image doesn't have extra regions
if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h)
- KApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
+ TDEApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
else
- KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
+ TDEApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
}
void SQ_GLWidget::bcg()
@@ -1394,7 +1394,7 @@ void SQ_GLWidget::slotCloseRequest(int index)
Qt::NoButton,
Qt::NoButton);
- KApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev);
+ TDEApplication::sendEvent(SQ_GLView::window()->tabbar(), &ev);
std::vector<Tab>::iterator itEnd = tabs.end();
std::vector<Tab>::iterator it = tabs.begin();