diff options
Diffstat (limited to 'kate/app/kateapp.cpp')
| -rw-r--r-- | kate/app/kateapp.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 0176545fa..613e9f604 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -39,7 +39,7 @@ #include <klibloader.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestartupinfo.h> #include <tqfile.h> @@ -69,10 +69,10 @@ KateApp::KateApp (TDECmdLineArgs *args) m_application = new Kate::Application (this); // doc + project man - m_docManager = new KateDocManager (TQT_TQOBJECT(this)); + m_docManager = new KateDocManager (this); // init all normal plugins - m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this)); + m_pluginManager = new KatePluginManager (this); // session manager up m_sessionManager = KateSessionManager::self(); @@ -113,7 +113,7 @@ KateApp::~KateApp () KateApp *KateApp::self () { - return (KateApp *) kapp; + return (KateApp *) tdeApp; } Kate::Application *KateApp::application () @@ -239,7 +239,7 @@ bool KateApp::startupKate() } else KMessageBox::sorry( activeMainWindow(), - i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).url()) ); + i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).pathOrURL()) ); } Kate::Document::setOpenErrorDialogsActivated (true); @@ -350,9 +350,9 @@ bool KateApp::query_session_close() saveSessions = true; } } - + if (saveSessions) - { + { m_sessionManager->saveActiveSession(); } m_sessionManager->saveConfig(saveSessions); @@ -403,7 +403,7 @@ bool KateApp::openURL (const KURL &url, const TQString &encoding, bool isTempFil } else KMessageBox::sorry( mainWindow, - i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.url()) ); + i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.pathOrURL()) ); return true; } |