TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
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 68a4fdfd2c
commit 6ec5cc8d82
49 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

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

2
chalk/core/kis_imagepipe_brush.cc
Unescape View File

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

4
chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
Unescape View File

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

4
chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
Unescape View File

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

2
chalk/plugins/viewplugins/screenshot/main.cpp
Unescape View File

@ -21,7 +21,7 @@ int main(int argc, char **argv)
"nhasan@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
TDEApplication app;
KImageIO::registerFormats();

2
chalk/ui/kis_doc.cc
Unescape View File

@ -1120,7 +1120,7 @@ void KisDoc::IODone()
void KisDoc::slotIOProgress(TQ_INT8 percentage)
{
KApplication *app = KApplication::kApplication();
TDEApplication *app = TDEApplication::kApplication();
Q_ASSERT(app);

4
chalk/ui/kis_label_progress.cc
Unescape View File

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

6
filters/chalk/gmagick/kis_image_magick_converter.cc
Unescape View File

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

6
filters/chalk/magick/kis_image_magick_converter.cc
Unescape View File

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

2
kexi/doc/dev/TODO-Kexi-js
Unescape View File

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

4
kexi/formeditor/formmanager.cpp
Unescape View File

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

2
kexi/formeditor/test/main.cpp
Unescape View File

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

8
kexi/kexiutils/utils.h
Unescape View File

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

6
kexi/main/keximainwindowimpl.cpp
Unescape View File

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

2
kexi/main/keximainwindowimpl.h
Unescape View File

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

2
kexi/migration/importwizard.cpp
Unescape View File

@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
void ImportWizard::progressUpdated(int percent) {
m_progressBar->setProgress(percent);
KApplication::kApplication()->processEvents();
TDEApplication::kApplication()->processEvents();
}
//===========================================================

2
kexi/migration/keximigratetest.cpp
Unescape View File

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

2
kexi/plugins/macros/tests/komacrotest.cpp
Unescape View File

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

2
kexi/plugins/macros/tests/komacrotestgui.cpp
Unescape View File

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

2
kexi/tests/gui/finddialog/main.cpp
Unescape View File

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

4
kexi/tests/newapi/main.cpp
Unescape View File

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

2
kexi/tests/startup/main.cpp
Unescape View File

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

2
kexi/tests/tableview/main.cpp
Unescape View File

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

2
kexi/tests/widgets/kexidbdrivercombotest.cpp
Unescape View File

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

4
kexi/widget/tableview/kexitableview.cpp
Unescape View File

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

2
kivio/kiviopart/kivio_canvas.cpp
Unescape View File

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

2
kivio/kiviopart/kivio_view.cpp
Unescape View File

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

2
kivio/kiviopart/ui/kivio_birdeye_panel.cpp
Unescape View File

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

8
kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
Unescape View File

@ -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]',

2
kspread/tests/test_formula.cc
Unescape View File

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

2
kword/KWPartFrameSet.cpp
Unescape View File

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

2
lib/kformula/main.cc
Unescape View File

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

4
lib/kofficecore/KoApplication.cpp
Unescape View File

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

2
lib/kofficecore/KoApplication.h
Unescape View File

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

6
lib/kofficecore/KoDocument.h
Unescape View File

@ -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.
*/

2
lib/kofficecore/tests/korecttest.cpp
Unescape View File

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

2
lib/kofficeui/KoKoolBar.cpp
Unescape View File

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

2
lib/kofficeui/tests/coloraction_test.cpp
Unescape View File

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

2
lib/koproperty/test/main.cpp
Unescape View File

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

2
lib/kotext/kohyphen/kohyphentest.cpp
Unescape View File

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

4
lib/kotext/tests/kobordertest.cpp
Unescape View File

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

2
lib/kotext/tests/kotextformattertest.cpp
Unescape View File

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

2
lib/kross/main/wdgscriptsmanager.cpp
Unescape View File

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

8
lib/kross/runner/main.cpp
Unescape View File

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

6
lib/kross/test/main.cpp
Unescape View File

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

2
lib/store/tests/storage_test.cpp
Unescape View File

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

4
lib/store/tests/storedroptest.cpp
Unescape View File

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

2
tools/converter/koconverter.cpp
Unescape View File

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

2
tools/kthesaurus/main.cc
Unescape View File

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

Write Preview
Loading…
Cancel
Save