summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/app/kateapp.cpp2
-rw-r--r--kate/app/kateconfigdialog.cpp4
-rw-r--r--kate/app/katefilelist.cpp2
-rw-r--r--kate/app/katefileselector.cpp8
-rw-r--r--kate/app/kategrepdialog.cpp2
-rw-r--r--kate/app/katemain.cpp2
-rw-r--r--kate/app/katemainwindow.cpp4
-rw-r--r--kate/app/katemdi.cpp4
-rw-r--r--kate/app/katemwmodonhddialog.cpp8
-rw-r--r--kate/app/katemwmodonhddialog.h4
-rw-r--r--kate/app/katesession.cpp2
-rw-r--r--kate/app/kateviewmanager.cpp2
-rw-r--r--kate/app/kateviewspacecontainer.cpp2
-rw-r--r--kate/app/kbookmarkhandler.cpp2
-rw-r--r--kate/app/kwritemain.cpp18
15 files changed, 33 insertions, 33 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/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 1d3cfd5aa..5ed8f8354 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -47,7 +47,7 @@
#include <kinstance.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kiconloader.h>
@@ -56,7 +56,7 @@
#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include <kseparator.h>
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/katemain.cpp b/kate/app/katemain.cpp
index d0212210b..1f7853fd2 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -19,7 +19,7 @@
#include "kateapp.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index b188e502e..89e67229e 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -55,7 +55,7 @@
#include <kdockwidget.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kiconloader.h>
@@ -68,7 +68,7 @@
#include <ksimpleconfig.h>
#include <kstatusbar.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <kurldrag.h>
#include <kdesktopfile.h>
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/katesession.cpp b/kate/app/katesession.cpp
index d57101310..9461a8a4a 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -22,7 +22,7 @@
#include "katemainwindow.h"
#include "katedocmanager.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kdirwatch.h>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 6ae57f2ec..3beb95826 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -41,7 +41,7 @@
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdestdaccel.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 72ffc8644..0908fb778 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -42,7 +42,7 @@
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <kstringhandler.h>
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 8dbf8461d..4e6fd3394 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -27,7 +27,7 @@
#include <kbookmarkimporter.h>
#include <tdepopupmenu.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdediroperator.h>
#include <tdeaction.h>
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();
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-03-02 14:26:32 +0000