TDE
/
ksquirrel
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 299a14479b
commit 0fafc9ff70
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -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");

2
ksquirrel/ksquirrel-libs-configurator/main.cpp
Unescape View File

@ -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");

2
ksquirrel/ksquirrel.cpp
Unescape View File

@ -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)

6
ksquirrel/ksquirrelpart/sq_glwidget.cpp
Unescape View File

@ -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();

6
ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
Unescape View File

@ -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();

4
ksquirrel/main.cpp
Unescape View File

@ -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;

6
ksquirrel/sq_glwidget.cpp
Unescape View File

@ -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();

6
ksquirrel/sq_glwidget_stuff.cpp
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save