diff options
Diffstat (limited to 'kate/app')
-rw-r--r-- | kate/app/kateapp.cpp | 2 | ||||
-rw-r--r-- | kate/app/katefilelist.cpp | 2 | ||||
-rw-r--r-- | kate/app/katefileselector.cpp | 8 | ||||
-rw-r--r-- | kate/app/kategrepdialog.cpp | 2 | ||||
-rw-r--r-- | kate/app/katemdi.cpp | 4 | ||||
-rw-r--r-- | kate/app/katemwmodonhddialog.cpp | 8 | ||||
-rw-r--r-- | kate/app/katemwmodonhddialog.h | 4 | ||||
-rw-r--r-- | kate/app/kwritemain.cpp | 18 |
8 files changed, 24 insertions, 24 deletions
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 479d0c77c..d7b3dd4c8 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -113,7 +113,7 @@ KateApp::~KateApp () KateApp *KateApp::self () { - return (KateApp *) kapp; + return (KateApp *) tdeApp; } Kate::Application *KateApp::application () diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 1a1ce3103..de749a60a 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -741,7 +741,7 @@ void KFLConfigPage::apply() void KFLConfigPage::reload() { // read in from config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "Filelist" ); cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) ); kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) ); diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index a9c9d2c16..c68b8e031 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -230,7 +230,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name) cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) ); cmbPath->setURLs( config->readPathListEntry( "dir history" ) ); // if we restore history - if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) { + if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) { TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) { // waitingDir = loc; @@ -245,7 +245,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name) filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); TQString flt(""); - if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); slotFilterChange( flt ); @@ -629,7 +629,7 @@ void KFSConfigPage::apply() m_changed = false; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l; @@ -671,7 +671,7 @@ void KFSConfigPage::reload() } void KFSConfigPage::init() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l = config->readListEntry( "toolbar actions", ',' ); diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index b6779043d..1d5db5c0f 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -321,7 +321,7 @@ void GrepTool::processOutput() lbResult->insertItem(item); buf = buf.mid(pos+1); } - kapp->processEvents(); + tdeApp->processEvents(); } void GrepTool::slotSearch() diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 15b4e62d1..679be8a30 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -149,7 +149,7 @@ GUIClient::GUIClient ( MainWindow *mw ) m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) ); // read shortcuts - actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); + actionCollection()->readShortcutSettings( "Shortcuts", tdeApp->config() ); } GUIClient::~GUIClient() @@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv) // try to read the action shortcut TDEShortcut sc; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = TDEShortcut( cfg->readEntry( aname, "" ) ); diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index ffdd92fa7..978095010 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -28,7 +28,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <krun.h> #include <tdetempfile.h> #include <kpushbutton.h> @@ -213,11 +213,11 @@ void KateMwModOnHdDialog::slotDiff() return; // Start a TDEProcess that creates a diff - KProcIO *p = new KProcIO(); + TDEProcIO *p = new TDEProcIO(); p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << doc->url().path(); connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) ); - connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) ); + connect( p, TQ_SIGNAL(readReady(TDEProcIO*)), this, TQ_SLOT(slotPRead(TDEProcIO*)) ); setCursor( WaitCursor ); @@ -230,7 +230,7 @@ void KateMwModOnHdDialog::slotDiff() p->closeWhenDone(); } -void KateMwModOnHdDialog::slotPRead( KProcIO *p) +void KateMwModOnHdDialog::slotPRead( TDEProcIO *p) { // create a file for the diff if we haven't one allready if ( ! m_tmpfile ) diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h index 2ca012f84..e9b867a71 100644 --- a/kate/app/katemwmodonhddialog.h +++ b/kate/app/katemwmodonhddialog.h @@ -25,7 +25,7 @@ #include <kate/document.h> typedef TQPtrVector<Kate::Document> DocVector; -class KProcIO; +class TDEProcIO; class TDEProcess; /** * A dialog for handling multiple documents modified on disk @@ -46,7 +46,7 @@ class KateMwModOnHdDialog : public KDialogBase private slots: void slotDiff(); void slotSelectionChanged(); - void slotPRead(KProcIO*); + void slotPRead(TDEProcIO*); void slotPDone(TDEProcess*); private: diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 44899a82c..2b0c2ddfb 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -81,7 +81,7 @@ KWrite::KWrite (KTextEditor::Document *doc) { KMessageBox::error(this, i18n("A TDE text-editor component could not be found;\n" "please check your TDE installation.")); - kapp->exit(1); + tdeApp->exit(1); } docList.append(doc); @@ -134,7 +134,7 @@ KWrite::~KWrite() delete m_view->document(); } - kapp->config()->sync (); + tdeApp->config()->sync (); } void KWrite::setupActions() @@ -297,7 +297,7 @@ void KWrite::editKeys() void KWrite::editToolbars() { - saveMainWindowSettings( kapp->config(), "MainWindow" ); + saveMainWindowSettings( tdeApp->config(), "MainWindow" ); KEditToolbar *dlg = new KEditToolbar(guiFactory()); connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) ); dlg->exec(); @@ -306,7 +306,7 @@ void KWrite::editToolbars() void KWrite::slotNewToolbarConfig() { - applyMainWindowSettings( kapp->config(), "MainWindow" ); + applyMainWindowSettings( tdeApp->config(), "MainWindow" ); } @@ -431,13 +431,13 @@ void KWrite::writeConfig(TDEConfig *config) //config file void KWrite::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); readConfig(config); } void KWrite::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); writeConfig(config); } @@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(TDEConfig *config) //save documents //restore session void KWrite::restore() { - TDEConfig *config = kapp->sessionConfig(); + TDEConfig *config = tdeApp->sessionConfig(); if (!config) return; @@ -595,7 +595,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv) TDEGlobal::locale()->insertCatalogue("katepart"); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isRegistered()) { client->attach(); @@ -604,7 +604,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - if (kapp->isRestored()) + if (tdeApp->isRestored()) { KWrite::restore(); } |