summaryrefslogtreecommitdiffstats
path: root/languages/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/app_templates/dcopservice/dcopservice.cpp2
-rw-r--r--languages/cpp/app_templates/kapp/Makefile.am2
-rw-r--r--languages/cpp/app_templates/kapp/app.cpp2
-rw-r--r--languages/cpp/app_templates/kdevlang/kdevlang_part.cpp4
-rw-r--r--languages/cpp/app_templates/kpartapp/app.cpp6
-rw-r--r--languages/cpp/app_templates/kscons_kxt/app.cpp2
-rw-r--r--languages/cpp/app_templates/kxt/app.cpp2
-rw-r--r--languages/cpp/app_templates/tdeconfig35/app.cpp2
-rw-r--r--languages/cpp/backgroundparser.cpp18
-rw-r--r--languages/cpp/configproblemreporter.ui.h4
-rw-r--r--languages/cpp/cppsupport_utils.cpp4
-rw-r--r--languages/cpp/cppsupportpart.cpp10
-rw-r--r--languages/cpp/debugger/debuggerpart.cpp18
-rw-r--r--languages/cpp/debugger/gdbcontroller.cpp10
-rw-r--r--languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp4
15 files changed, 45 insertions, 45 deletions
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
index a631186c..cca191c1 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
@@ -45,5 +45,5 @@ bool %{APPNAME}::remove(TQString arg)
bool %{APPNAME}::exit()
{
- kapp->quit();
+ tdeApp->quit();
}
diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am
index efe532d3..a6a4e597 100644
--- a/languages/cpp/app_templates/kapp/Makefile.am
+++ b/languages/cpp/app_templates/kapp/Makefile.am
@@ -16,4 +16,4 @@ $(templateName).tar.gz: ${dataFiles}
archivedir = ${appwizarddatadir}
archive_DATA = $(templateName).tar.gz ${templateName}.png
-CLEANFILES = *.tar.gz \ No newline at end of file
+CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index d801904f..3fad8256 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -93,7 +93,7 @@ void %{APPNAME}::setupActions()
KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index c96ffbf1..25955e3f 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -134,14 +134,14 @@ void %{APPNAME}Part::parse()
if (project())
{
- kapp->setOverrideCursor(waitCursor);
+ tdeApp->setOverrideCursor(waitCursor);
TQStringList files = project()->allFiles();
for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it)
{
kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl;
}
emit updatedSourceInfo();
- kapp->restoreOverrideCursor();
+ tdeApp->restoreOverrideCursor();
} else {
kdDebug(9014) << "No project" << endl;
}
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index f963714e..6b5e22a5 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -53,8 +53,8 @@
// if we couldn't find our Part, we exit since the Shell by
// itself can't do anything useful
KMessageBox::error(this, i18n("Could not find our part."));
- kapp->quit();
- // we return here, cause kapp->quit() only means "exit the
+ tdeApp->quit();
+ // we return here, cause tdeApp->quit() only means "exit the
// next time we enter the event loop...
return;
}
@@ -79,7 +79,7 @@ void %{APPNAME}::setupActions()
KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 44a90d53..f918fe91 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -63,7 +63,7 @@
void %{APPNAME}::setupActions()
{
KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index e9edb6d5..9001f45e 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -61,7 +61,7 @@
void %{APPNAMELC}::setupActions()
{
KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index ce638d20..66a901d2 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -48,7 +48,7 @@
void %{APPNAMELC}::setupActions()
{
KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
- KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index a111acde..be28b31b 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -77,9 +77,9 @@ public:
{
m_deadlock.unlock();
// GET LOCK
- kapp->lock ();
+ tdeApp->lock ();
- //kdDebug(9007) << "-------> kapp locked" << endl;
+ //kdDebug(9007) << "-------> tdeApp locked" << endl;
TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() );
TQPtrListIterator<KParts::Part> it( parts );
@@ -94,15 +94,15 @@ public:
contents = TQString( editIface->text().ascii() ); // deep copy
- //kdDebug(9007) << "-------> kapp unlocked" << endl;
+ //kdDebug(9007) << "-------> tdeApp unlocked" << endl;
break;
}
// RELEASE LOCK
- kapp->unlock();
+ tdeApp->unlock();
m_deadlock.lock();
- //kdDebug(9007) << "-------> kapp unlocked" << endl;
+ //kdDebug(9007) << "-------> tdeApp unlocked" << endl;
}
if( m_readFromDisk || contents == TQString() )
@@ -123,7 +123,7 @@ public:
{
bool ret = false;
m_deadlock.unlock();
- kapp->lock ();
+ tdeApp->lock ();
KParts::ReadOnlyPart *part = m_cppSupport->partController()->partForURL( KURL(fileName) );
KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part );
@@ -131,7 +131,7 @@ public:
if ( doc )
ret = doc->isModified();
- kapp->unlock();
+ tdeApp->unlock();
m_deadlock.lock();
return ret;
}
@@ -475,11 +475,11 @@ void BackgroundParser::close()
m_close = true;
m_canParse.wakeAll();
}
- kapp->unlock();
+ tdeApp->unlock();
while ( running() )
sleep( 1 );
- kapp->lock();
+ tdeApp->lock();
}
bool BackgroundParser::filesInQueue()
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index f65db442..43fa1b67 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -21,7 +21,7 @@
void ConfigureProblemReporter::init()
{
m_part = 0;
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "General Options" );
problemReporterCheckbox->setChecked( config->readBoolEntry( "EnableProblemReporter", true ) );
bgParserCheckbox->setChecked( config->readBoolEntry( "EnableCppBgParser", true ) );
@@ -54,7 +54,7 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part )
void ConfigureProblemReporter::accept()
{
- TDEConfig * config = kapp->config();
+ TDEConfig * config = tdeApp->config();
config->setGroup( "General Options" );
config->writeEntry( "EnableProblemReporter", problemReporterCheckbox->isChecked() );
config->writeEntry( "EnableCppBgParser", bgParserCheckbox->isChecked() );
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index e58639e0..68c89488 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -120,7 +120,7 @@ static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass )
TQString formattedOpeningParenthesis(bool suppressSpace)
{
- TDEConfig * config = kapp->config();
+ TDEConfig * config = tdeApp->config();
config->setGroup("AStyle");
bool use_spaces = config->readBoolEntry("PadParentheses", false);
if (not use_spaces or suppressSpace) return "(";
@@ -129,7 +129,7 @@ TQString formattedOpeningParenthesis(bool suppressSpace)
TQString formattedClosingParenthesis(bool suppressSpace)
{
- TDEConfig * config = kapp->config();
+ TDEConfig * config = tdeApp->config();
config->setGroup("AStyle");
bool use_spaces = config->readBoolEntry("PadParentheses", false);
if (not use_spaces or suppressSpace) return ")";
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index c94539de..7d02b77c 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -178,7 +178,7 @@ class BackgroundParserConfig
public:
void readConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "General Options" );
m_useProblemReporter = config->readBoolEntry( "EnableProblemReporter", true );
m_useBackgroundParser = config->readBoolEntry( "EnableCppBgParser", true );
@@ -1464,7 +1464,7 @@ bool CppSupportPart::parseProject( bool force )
mainWindow() ->statusBar() ->message( i18n( "Updating..." ) );
- kapp->setOverrideCursor( waitCursor );
+ tdeApp->setOverrideCursor( waitCursor );
_jd = new JobData;
if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower()
@@ -1604,7 +1604,7 @@ void CppSupportPart::slotParseFiles()
_jd->backgroundState = 0;
_jd->cycle = 1;
_jd->lastParse = TQTime::currentTime();
- kapp->restoreOverrideCursor( );
+ tdeApp->restoreOverrideCursor( );
}
}
else // finished or interrupted
@@ -1615,7 +1615,7 @@ void CppSupportPart::slotParseFiles()
if ( !m_projectClosed )
{
kdDebug( 9007 ) << "updating sourceinfo" << endl;
- kapp->restoreOverrideCursor( );
+ tdeApp->restoreOverrideCursor( );
emit updatedSourceInfo();
mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 );
TQFile::remove( project() ->projectDirectory()
@@ -1835,7 +1835,7 @@ void CppSupportPart::slotMakeMember()
if ( !implFile.isEmpty() )
{
partController() ->editDocument( KURL( implFile ) );
- kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 );
+ tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 );
}
if ( atLine == -2 )
atLine = m_activeEditor->numLines() - 1;
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index e2efd7b0..ea0c410d 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -374,13 +374,13 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
void DebuggerPart::setupDcop()
{
- QCStringList objects = kapp->dcopClient()->registeredApplications();
+ QCStringList objects = tdeApp->dcopClient()->registeredApplications();
for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it)
if ((*it).find("drkonqi-") == 0)
slotDCOPApplicationRegistered(*it);
- connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&)));
- kapp->dcopClient()->setNotifications(true);
+ connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&)));
+ tdeApp->dcopClient()->setNotifications(true);
}
void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId)
@@ -389,14 +389,14 @@ void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId)
TQByteArray answer;
TQCString replyType;
- kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000);
+ tdeApp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000);
TQDataStream d(answer, IO_ReadOnly);
TQCString appName;
d >> appName;
if (appName.length() && project() && project()->mainProgram().endsWith(appName)) {
- kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop"));
+ tdeApp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop"));
connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true);
}
}
@@ -407,14 +407,14 @@ ASYNC DebuggerPart::slotDebugExternalProcess()
TQByteArray answer;
TQCString replyType;
- kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000);
+ tdeApp->dcopClient()->call(tdeApp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000);
TQDataStream d(answer, IO_ReadOnly);
int pid;
d >> pid;
if (attachProcess(pid) && m_drkonqi.isEmpty()) {
- m_drkonqi = kapp->dcopClient()->senderId();
+ m_drkonqi = tdeApp->dcopClient()->senderId();
TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi()));
mainWindow()->raiseView(framestackWidget);
}
@@ -429,13 +429,13 @@ ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/)
void DebuggerPart::slotCloseDrKonqi()
{
- kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray());
+ tdeApp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray());
m_drkonqi = "";
}
DebuggerPart::~DebuggerPart()
{
- kapp->dcopClient()->setNotifications(false);
+ tdeApp->dcopClient()->setNotifications(false);
if (variableWidget)
mainWindow()->removeView(variableWidget);
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 60c4366b..da53c0ec 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -984,7 +984,7 @@ void GDBController::slotStopDebugger()
start = TQTime::currentTime();
while (-1)
{
- kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
+ tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
now = TQTime::currentTime();
if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000)
break;
@@ -1002,7 +1002,7 @@ void GDBController::slotStopDebugger()
start = TQTime::currentTime();
while (-1)
{
- kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
+ tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
now = TQTime::currentTime();
if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000)
break;
@@ -1018,7 +1018,7 @@ void GDBController::slotStopDebugger()
start = TQTime::currentTime();
while (-1)
{
- kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
+ tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 );
now = TQTime::currentTime();
if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000)
break;
@@ -1098,7 +1098,7 @@ void GDBController::slotRun()
if (stateIsOn(s_appNotStarted)) {
delete tty_;
- tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() ));
+ tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() ));
if (!config_dbgTerminal_)
{
connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) );
@@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const
void GDBController::demandAttention() const
{
- if ( TQWidget * w = kapp->mainWidget() )
+ if ( TQWidget * w = tdeApp->mainWidget() )
{
KWin::demandAttention( w->winId(), true );
}
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index 0c2ea291..3f8a2760 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
: SettingsDialogBase( parent, name, fl )
{
- TDEApplication::kApplication()->dirs()->addResourceType("include","include");
- TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include","");
+ tdeApp->dirs()->addResourceType("include","include");
+ TQStringList tdedirs=tdeApp->dirs()->findDirs("include","");
for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it )
{
TQString tdedir = *it;