diff options
Diffstat (limited to 'kate/part')
44 files changed, 514 insertions, 514 deletions
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 11e347212..dcbc0eecd 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -21,11 +21,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/kjs - ${CMAKE_SOURCE_DIR}/kutils + ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor @@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy tde_add_kpart( ${target} SOURCES dummy.cpp EMBED kate-static - LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared + LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am index 746c35813..71b201485 100644 --- a/kate/part/Makefile.am +++ b/kate/part/Makefile.am @@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \ libkatepart_la_SOURCES = dummy.cpp -libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la +libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) +INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) METASOURCES = AUTO diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index ed9a6169b..9bbe317df 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -27,9 +27,9 @@ #include "katejscript.h" #include "kateview.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <cctype> @@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent () //BEGIN KateViewIndentAction KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name) - : KActionMenu (text, parent, name), doc(_doc) + : TDEActionMenu (text, parent, name), doc(_doc) { connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index 6c0d15d45..abdab7777 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject /** * This action provides a list of available indenters and gets plugged - * into the KateView's KActionCollection. + * into the KateView's TDEActionCollection. */ -class KateViewIndentationAction : public KActionMenu +class KateViewIndentationAction : public TDEActionMenu { Q_OBJECT diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index ac1ee73d9..f29ec9915 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -23,9 +23,9 @@ #include "katedocument.h" #include "kateview.h" -#include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdelocale.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> @@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks() { } -void KateBookmarks::createActions( KActionCollection* ac ) +void KateBookmarks::createActions( TDEActionCollection* ac ) { - m_bookmarkToggle = new KToggleAction( + m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, this, TQT_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); - m_bookmarkClear = new KAction( + m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, this, TQT_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); - m_goNext = new KAction( + m_goNext = new TDEAction( i18n("Next Bookmark"), "next", ALT + Key_PageDown, this, TQT_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); - m_goPrevious = new KAction( + m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "previous", ALT + Key_PageUp, this, TQT_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); - m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu(); + m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu(); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index 63928800e..ae4151812 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; } namespace Kate { class View; } -class KAction; -class KToggleAction; -class KActionCollection; +class TDEAction; +class TDEToggleAction; +class TDEActionCollection; class TQPopupMenu; class TQMenuData; @@ -44,7 +44,7 @@ class KateBookmarks : public TQObject KateBookmarks( KateView* parent, Sorting sort=Position ); virtual ~KateBookmarks(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); KateBookmarks::Sorting sorting() { return m_sorting; }; void setSorting( Sorting s ) { m_sorting = s; }; @@ -69,10 +69,10 @@ class KateBookmarks : public TQObject private: KateView* m_view; - KToggleAction* m_bookmarkToggle; - KAction* m_bookmarkClear; - KAction* m_goNext; - KAction* m_goPrevious; + TDEToggleAction* m_bookmarkToggle; + TDEAction* m_bookmarkClear; + TDEAction* m_goNext; + TDEAction* m_goPrevious; Sorting m_sorting; TQPopupMenu* m_bookmarksMenu; diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 1661c69df..61f81fadf 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -31,7 +31,7 @@ #include "kateautoindent.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <tqpopupmenu.h> @@ -118,7 +118,7 @@ class KateFileLoader if (c > 0) { - // fix utf16 LE, stolen from khtml ;) + // fix utf16 LE, stolen from tdehtml ;) if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00)) { // utf16LE, we need to put the decoder in LE mode diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index c5feb5071..09dd46f13 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -32,7 +32,7 @@ #include "../interfaces/katecmd.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kshellcompletion.h> @@ -279,7 +279,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, KCC_ERR( i18n("Unknown command '%1'").arg(cmd) ); } -KCompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view ) +TDECompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view ) { if ( cmd == "set-highlight" ) { diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h index 55c8d807b..d313be91d 100644 --- a/kate/part/katecmds.h +++ b/kate/part/katecmds.h @@ -25,7 +25,7 @@ #include "../interfaces/view.h" class KateDocument; -class KCompletion; +class TDECompletion; namespace KateCommands { @@ -59,7 +59,7 @@ class CoreCommands : public Kate::Command, public Kate::CommandExtension /** * override completionObject from interfaces/document.h . */ - KCompletion *completionObject( const TQString &cmd, Kate::View *view ); + TDECompletion *completionObject( const TQString &cmd, Kate::View *view ); }; /** diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index c2bebc841..ce4af0ecf 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -28,7 +28,7 @@ #ifndef __KateCodeCompletion_H__ #define __KateCodeCompletion_H__ -#include <ktexteditor/codecompletioninterface.h> +#include <tdetexteditor/codecompletioninterface.h> #include <tqvaluelist.h> #include <tqstringlist.h> diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 4b3c2f52b..ed4eaacd2 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -27,11 +27,11 @@ #include <math.h> -#include <kapplication.h> -#include <kconfig.h> -#include <kglobalsettings.h> +#include <tdeapplication.h> +#include <tdeconfig.h> +#include <tdeglobalsettings.h> #include <kcharsets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kfinddialog.h> #include <kreplacedialog.h> #include <kinstance.h> @@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig () m_pluginsSet.fill (true); // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate Document Defaults"); readConfig (config); } @@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig () { } -void KateDocumentConfig::readConfig (KConfig *config) +void KateDocumentConfig::readConfig (TDEConfig *config) { configStart (); @@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config) configEnd (); } -void KateDocumentConfig::writeConfig (KConfig *config) +void KateDocumentConfig::writeConfig (TDEConfig *config) { config->writeEntry("Tab Width", tabWidth()); @@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); + return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else - return KGlobal::charsets()->codecForName (m_encoding); + return TDEGlobal::charsets()->codecForName (m_encoding); } return s_global->codec (); @@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding) if (!enc.isEmpty()) { bool found = false; - TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found); if (!found || !codec) return; @@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig () s_global = this; // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate View Defaults"); readConfig (config); } @@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig () { } -void KateViewConfig::readConfig (KConfig *config) +void KateViewConfig::readConfig (TDEConfig *config) { configStart (); @@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config) configEnd (); } -void KateViewConfig::writeConfig (KConfig *config) +void KateViewConfig::writeConfig (TDEConfig *config) { config->writeEntry( "Dynamic Word Wrap", dynWordWrap() ); config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() ); @@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig () s_global = this; // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate Renderer Defaults"); readConfig (config); } @@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig () delete m_font; } -void KateRendererConfig::readConfig (KConfig *config) +void KateRendererConfig::readConfig (TDEConfig *config) { configStart (); @@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config) configEnd (); } -void KateRendererConfig::writeConfig (KConfig *config) +void KateRendererConfig::writeConfig (TDEConfig *config) { config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema())); @@ -1125,14 +1125,14 @@ void KateRendererConfig::setSchemaInternal( int schema ) m_schemaSet = true; m_schema = schema; - KConfig *config (KateFactory::self()->schemaManager()->schema(schema)); + TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema)); - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema ) m_lineMarkerColor[index] = col; } - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); if (!m_fontSet) { diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h index 56d094cd0..a698bc35d 100644 --- a/kate/part/kateconfig.h +++ b/kate/part/kateconfig.h @@ -19,7 +19,7 @@ #ifndef __KATE_CONFIG_H__ #define __KATE_CONFIG_H__ -#include <ktexteditor/markinterface.h> +#include <tdetexteditor/markinterface.h> #include <tqbitarray.h> #include <tqcolor.h> @@ -32,7 +32,7 @@ class KateRenderer; class KateFontStruct; class KateFontMetrics; -class KConfig; +class TDEConfig; class TQFont; class TQTextCodec; @@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); @@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); @@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 5a5a73b70..1b8ce89eb 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -35,44 +35,44 @@ #include "kateview.h" -#include <ktexteditor/configinterfaceextension.h> -#include <ktexteditor/plugin.h> +#include <tdetexteditor/configinterfaceextension.h> +#include <tdetexteditor/plugin.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> -#include <kaccel.h> -#include <kapplication.h> +#include <tdeaccel.h> +#include <tdeapplication.h> #include <kbuttonbox.h> #include <kcharsets.h> #include <kcolorbutton.h> #include <kcolorcombo.h> #include <kcolordialog.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> -#include <kfontdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdefontdialog.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kkeybutton.h> #include <kkeydialog.h> #include <klineedit.h> -#include <klistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelistview.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetypechooser.h> #include <knuminput.h> -#include <kparts/componentfactory.h> -#include <kpopupmenu.h> +#include <tdeparts/componentfactory.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kprocio.h> #include <kregexpeditorinterface.h> #include <krun.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> @@ -999,7 +999,7 @@ void KateSaveConfigTab::apply() KateDocumentConfig::global()->setConfigFlags(configFlags); - KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText())); + KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText())); KateDocumentConfig::global()->setEol(m_eol->currentItem()); KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked()); @@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload() m_encoding->clear (); m_encoding->insertItem (i18n("TDE Default")); m_encoding->setCurrentItem(0); - TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames()); int insert = 1; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found); if (found) { @@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b) //BEGIN PluginListView KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { } @@ -1226,7 +1226,7 @@ void KatePartPluginConfigPage::slotConfigure() path.clear(); path << cife->configPageName( i ); page = kd->addVBoxPage( path, cife->configPageFullName (i), - cife->configPagePixmap(i, KIcon::SizeMedium) ); + cife->configPagePixmap(i, TDEIcon::SizeMedium) ); } else { @@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply () for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it ) KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() ); - KateHlManager::self()->getKConfig()->sync (); + KateHlManager::self()->getTDEConfig()->sync (); } void KateHlConfigPage::reload () @@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox); actionButton (User1)->setIconSet(SmallIconSet("ok")); - transferJob = KIO::get( + transferJob = TDEIO::get( KURL(TQString(HLDOWNLOADPATH) + TQString("update-") + TQString(KATEPART_VERSION) + TQString(".xml")), true, true ); - connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &))); -// void data( KIO::Job *, const TQByteArray &data); + connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); +// void data( TDEIO::Job *, const TQByteArray &data); resize(450, 400); } KateHlDownloadDialog::~KateHlDownloadDialog(){} -void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data) +void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data) { if (!transferJob || transferJob->isErrorPage()) { @@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data) void KateHlDownloadDialog::slotUser1() { - TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/"); + TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/"); for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling()) { if (list->isSelected(it)) @@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1() TQString filename=src.fileName(false); TQString dest = destdir+filename; - KIO::NetAccess::download(src,dest, this); + TDEIO::NetAccess::download(src,dest, this); } } @@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt() void KateModOnHdPrompt::slotDiff() { - // Start a KProcess that creates a diff + // Start a TDEProcess that creates a diff KProcIO *p = new KProcIO(); - p->setComm( KProcess::All ); + p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) ); + connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); - p->start( KProcess::NotifyOnExit, true ); + p->start( TDEProcess::NotifyOnExit, true ); uint lastln = m_doc->numLines(); for ( uint l = 0; l < lastln; l++ ) @@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p) p->ackRead(); } -void KateModOnHdPrompt::slotPDone( KProcess *p ) +void KateModOnHdPrompt::slotPDone( TDEProcess *p ) { setCursor( ArrowCursor ); if( ! m_tmpfile ) diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index aa6f21f6d..0f865fcea 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -29,7 +29,7 @@ #include "../interfaces/document.h" -#include <klistview.h> +#include <tdelistview.h> #include <kdialogbase.h> #include <kmimetype.h> @@ -46,19 +46,19 @@ struct syntaxContextData; class KateDocument; class KateView; -namespace KIO +namespace TDEIO { class Job; class TransferJob; } -class KAccel; +class TDEAccel; class KColorButton; class KComboBox; class KIntNumInput; class KKeyButton; class KKeyChooser; -class KMainWindow; +class TDEMainWindow; class KPushButton; class KRegExpDialog; class KIntNumInput; @@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage bool m_ready; class KateDocument *m_doc; KKeyChooser* m_keyChooser; - class KActionCollection *m_ac; + class TDEActionCollection *m_ac; }; class KateSaveConfigTab : public KateConfigPage @@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage class KatePartPluginListItem; -class KatePartPluginListView : public KListView +class KatePartPluginListView : public TDEListView { Q_OBJECT @@ -350,17 +350,17 @@ class KateHlDownloadDialog: public KDialogBase private: class TQListView *list; class TQString listData; - KIO::TransferJob *transferJob; + TDEIO::TransferJob *transferJob; private slots: - void listDataReceived(KIO::Job *, const TQByteArray &data); + void listDataReceived(TDEIO::Job *, const TQByteArray &data); public slots: void slotUser1(); }; class KProcIO; -class KProcess; +class TDEProcess; /** * This dialog will prompt the user for what do with a file that is * modified on disk. @@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase private slots: void slotPRead(KProcIO*); ///< Read from the diff process - void slotPDone(KProcess*); ///< Runs the diff file when done + void slotPDone(TDEProcess*); ///< Runs the diff file when done private: KateDocument *m_doc; diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 603388479..e42bfb0bd 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -40,33 +40,33 @@ #include "katefiletype.h" #include "kateschema.h" #include "katetemplatehandler.h" -#include <ktexteditor/plugin.h> +#include <tdetexteditor/plugin.h> -#include <kio/job.h> -#include <kio/netaccess.h> -#include <kio/kfileitem.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/tdefileitem.h> -#include <kparts/event.h> +#include <tdeparts/event.h> -#include <klocale.h> -#include <kglobal.h> -#include <kapplication.h> -#include <kpopupmenu.h> -#include <kconfig.h> -#include <kfiledialog.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeapplication.h> +#include <tdepopupmenu.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kiconloader.h> #include <kxmlguifactory.h> #include <kdialogbase.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <klibloader.h> #include <kdirwatch.h> #include <twin.h> #include <kencodingfiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmdcodec.h> #include <kstandarddirs.h> @@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // my dcop object setObjId ("KateDocument#"+documentDCOPSuffix()); - // ktexteditor interfaces + // tdetexteditor interfaces setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix()); @@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave() //END //BEGIN KTextEditor::ConfigInterface stuff -void KateDocument::readConfig(KConfig *config) +void KateDocument::readConfig(TDEConfig *config) { config->setGroup("Kate Document Defaults"); @@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config) KateRendererConfig::global()->readConfig (config); } -void KateDocument::writeConfig(KConfig *config) +void KateDocument::writeConfig(TDEConfig *config) { config->setGroup("Kate Document Defaults"); @@ -1913,24 +1913,24 @@ void KateDocument::writeConfig(KConfig *config) void KateDocument::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); readConfig (config); } void KateDocument::writeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); writeConfig (config); config->sync(); } -void KateDocument::readSessionConfig(KConfig *kconfig) +void KateDocument::readSessionConfig(TDEConfig *tdeconfig) { // restore the url - KURL url (kconfig->readEntry("URL")); + KURL url (tdeconfig->readEntry("URL")); // get the encoding - TQString tmpenc=kconfig->readEntry("Encoding"); + TQString tmpenc=tdeconfig->readEntry("Encoding"); if (!tmpenc.isEmpty() && (tmpenc != encoding())) setEncoding(tmpenc); @@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(KConfig *kconfig) openURL (url); // restore the hl stuff - m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting"))); + m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting"))); if (hlMode() > 0) hlSetByUser = true; // indent mode - config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); + config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); // Restore Bookmarks - TQValueList<int> marks = kconfig->readIntListEntry("Bookmarks"); + TQValueList<int> marks = tdeconfig->readIntListEntry("Bookmarks"); for( uint i = 0; i < marks.count(); i++ ) addMark( marks[i], KateDocument::markType01 ); } -void KateDocument::writeSessionConfig(KConfig *kconfig) +void KateDocument::writeSessionConfig(TDEConfig *tdeconfig) { - if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) + if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; // save url - kconfig->writeEntry("URL", m_url.prettyURL() ); + tdeconfig->writeEntry("URL", m_url.prettyURL() ); // save encoding - kconfig->writeEntry("Encoding",encoding()); + tdeconfig->writeEntry("Encoding",encoding()); // save hl - kconfig->writeEntry("Highlighting", highlight()->name()); + tdeconfig->writeEntry("Highlighting", highlight()->name()); - kconfig->writeEntry("Indentation Mode", config()->indentationMode() ); + tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() ); // Save Bookmarks TQValueList<int> marks; @@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(KConfig *kconfig) ++it ) marks << it.current()->line; - kconfig->writeEntry( "Bookmarks", marks ); + tdeconfig->writeEntry( "Bookmarks", marks ); } void KateDocument::configDialog() @@ -1998,7 +1998,7 @@ void KateDocument::configDialog() path.clear(); path << KTextEditor::configInterfaceExtension (this)->configPageName (i); TQVBox *page = kd->addVBoxPage(path, KTextEditor::configInterfaceExtension (this)->configPageFullName (i), - KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, KIcon::SizeMedium) ); + KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, TDEIcon::SizeMedium) ); editorPages.append (KTextEditor::configInterfaceExtension (this)->configPage(i, page)); } @@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url ) m_tempFile = new KTempFile (); m_file = m_tempFile->name(); - m_job = KIO::get ( url, false, isProgressInfoEnabled() ); + m_job = TDEIO::get ( url, false, isProgressInfoEnabled() ); // connect to slots - connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); - connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinishedKate( KIO::Job* ) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); TQWidget *w = widget (); if (!w && !m_views.isEmpty ()) @@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url ) } } -void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data ) +void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data ) { // kdDebug(13020) << "KateDocument::slotData" << endl; @@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data ) m_tempFile->file()->writeBlock (data); } -void KateDocument::slotFinishedKate ( KIO::Job * job ) +void KateDocument::slotFinishedKate ( TDEIO::Job * job ) { // kdDebug(13020) << "KateDocument::slotJobFinished" << endl; @@ -2373,7 +2373,7 @@ bool KateDocument::openFile() return openFile (0); } -bool KateDocument::openFile(KIO::Job * job) +bool KateDocument::openFile(TDEIO::Job * job) { m_loading = true; // add new m_file to dirwatch @@ -2520,8 +2520,8 @@ bool KateDocument::save() // get the right permissions, start with safe default mode_t perms = 0600; - KIO::UDSEntry fentry; - if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget())) + TDEIO::UDSEntry fentry; + if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget())) { kdDebug () << "stating succesfull: " << url() << endl; KFileItem item (fentry, url()); @@ -2530,8 +2530,8 @@ bool KateDocument::save() // first del existing file if any, than copy over the file we have // failure if a: the existing file could not be deleted, b: the file could not be copied - if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() )) - && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) ) + if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() )) + && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) ) { kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl; } @@ -2761,7 +2761,7 @@ bool KateDocument::closeURL() } // - // first call the normal kparts implementation + // first call the normal tdeparts implementation // if (!KParts::ReadWritePart::closeURL ()) return false; diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index d967a25ab..adc0dc92a 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -29,16 +29,16 @@ #include "../interfaces/document.h" -#include <ktexteditor/configinterfaceextension.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/sessionconfiginterface.h> -#include <ktexteditor/editinterfaceext.h> -#include <ktexteditor/templateinterface.h> +#include <tdetexteditor/configinterfaceextension.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/sessionconfiginterface.h> +#include <tdetexteditor/editinterfaceext.h> +#include <tdetexteditor/templateinterface.h> #include <dcopobject.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqintdict.h> #include <tqmap.h> @@ -46,7 +46,7 @@ namespace KTextEditor { class Plugin; } -namespace KIO { class TransferJob; } +namespace TDEIO { class TransferJob; } class KateUndoGroup; class KateCmd; @@ -163,7 +163,7 @@ class KateDocument : public Kate::Document, KTextEditor::ConfigPage *configPage (uint number = 0, TQWidget *parent = 0, const char *name=0 ); TQString configPageName (uint number = 0) const; TQString configPageFullName (uint number = 0) const; - TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const; + TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const; // // KTextEditor::EditInterface stuff @@ -439,10 +439,10 @@ class KateDocument : public Kate::Document, public slots: void readConfig (); void writeConfig (); - void readConfig (KConfig *); - void writeConfig (KConfig *); - void readSessionConfig (KConfig *); - void writeSessionConfig (KConfig *); + void readConfig (TDEConfig *); + void writeConfig (TDEConfig *); + void readSessionConfig (TDEConfig *); + void writeSessionConfig (TDEConfig *); void configDialog (); // @@ -555,7 +555,7 @@ class KateDocument : public Kate::Document, /* Anders: Reimplemented to do kate specific stuff */ bool saveAs( const KURL &url ); - bool openFile (KIO::Job * job); + bool openFile (TDEIO::Job * job); bool openFile (); bool saveFile (); @@ -565,8 +565,8 @@ class KateDocument : public Kate::Document, void setModified( bool m ); private slots: - void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data ); - void slotFinishedKate ( KIO::Job * job ); + void slotDataKate ( TDEIO::Job* tdeio_job, const TQByteArray &data ); + void slotFinishedKate ( TDEIO::Job * job ); private: void abortLoadKate(); @@ -955,7 +955,7 @@ class KateDocument : public Kate::Document, /** * Variable Reader - * TODO add register functionality/ktexteditor interface + * TODO add register functionality/tdetexteditor interface */ private: /** @@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document, static TQRegExp kvLineMime; static TQRegExp kvVar; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; KTempFile *m_tempFile; // TemplateInterface diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index 370be7684..b2e43758f 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -24,8 +24,8 @@ #include "katedocument.h" #include "kateview.h" -#include <kpopupmenu.h> -#include <klocale.h> +#include <tdepopupmenu.h> +#include <tdelocale.h> KateBrowserExtension::KateBrowserExtension( KateDocument* doc ) : KParts::BrowserExtension( doc, "katepartbrowserextension" ), diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h index 75c6740d0..b604d47ce 100644 --- a/kate/part/katedocumenthelpers.h +++ b/kate/part/katedocumenthelpers.h @@ -23,7 +23,7 @@ #include "../interfaces/document.h" -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <tqstringlist.h> #include <tqguardedptr.h> diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 64bde8718..d6a9e0d59 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -34,7 +34,7 @@ #include "../interfaces/katecmd.h" #include <kvmallocator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdirwatch.h> #include <kstaticdeleter.h> @@ -68,10 +68,10 @@ KateFactory *KateFactory::s_self = 0; KateFactory::KateFactory () : m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION, - I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2, + I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org") , m_instance (&m_aboutData) - , m_plugins (KTrader::self()->query("KTextEditor/Plugin")) + , m_plugins (TDETrader::self()->query("KTextEditor/Plugin")) , m_jscript (0) { // set s_self diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 0fd939ce3..72fef8781 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -20,11 +20,11 @@ #define __KATE_FACTORY_H__ #include "katejscript.h" -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <ktrader.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> // katepart version must be a string in double quotes, format: "x.x" #define KATEPART_VERSION "2.5" @@ -87,7 +87,7 @@ class KateFactory * public accessor to the instance * @return instance */ - inline KInstance *instance () { return &m_instance; }; + inline TDEInstance *instance () { return &m_instance; }; /** * register document at the factory @@ -148,9 +148,9 @@ class KateFactory /** * on start detected plugins - * @return list of all at launch detected ktexteditor::plugins + * @return list of all at launch detected tdetexteditor::plugins */ - inline const KTrader::OfferList &plugins () { return m_plugins; }; + inline const TDETrader::OfferList &plugins () { return m_plugins; }; /** * global dirwatch @@ -221,12 +221,12 @@ class KateFactory /** * about data (authors and more) */ - KAboutData m_aboutData; + TDEAboutData m_aboutData; /** * our kinstance */ - KInstance m_instance; + TDEInstance m_instance; /** * registered docs @@ -261,7 +261,7 @@ class KateFactory /** * at start found plugins */ - KTrader::OfferList m_plugins; + TDETrader::OfferList m_plugins; /** * fallback document config diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 11d5e9a46..281bf7e2d 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -25,15 +25,15 @@ #include "kateview.h" #include "katefactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kmimemagic.h> #include <kmimetype.h> #include <kmimetypechooser.h> #include <kdebug.h> #include <kiconloader.h> #include <knuminput.h> -#include <klocale.h> -#include <kpopupmenu.h> +#include <tdelocale.h> +#include <tdepopupmenu.h> #include <tqregexp.h> #include <tqcheckbox.h> @@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager () // void KateFileTypeManager::update () { - KConfig config ("katefiletyperc", false, false); + TDEConfig config ("katefiletyperc", false, false); TQStringList g (config.groupList()); g.sort (); @@ -101,7 +101,7 @@ void KateFileTypeManager::update () // void KateFileTypeManager::save (TQPtrList<KateFileType> *v) { - KConfig config ("katefiletyperc", false, false); + TDEConfig config ("katefiletyperc", false, false); TQStringList newg; for (uint z=0; z < v->count(); z++) diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index 89bfd0025..c00953469 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -21,7 +21,7 @@ #include "katefont.h" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqfontinfo.h> @@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c) // KateFontStruct::KateFontStruct() -: myFont(KGlobalSettings::fixedFont()), - myFontBold(KGlobalSettings::fixedFont()), - myFontItalic(KGlobalSettings::fixedFont()), - myFontBI(KGlobalSettings::fixedFont()), +: myFont(TDEGlobalSettings::fixedFont()), + myFontBold(TDEGlobalSettings::fixedFont()), + myFontItalic(TDEGlobalSettings::fixedFont()), + myFontBI(TDEGlobalSettings::fixedFont()), myFontMetrics(myFont), myFontMetricsBold(myFontBold), myFontMetricsItalic(myFontItalic), diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index d5eec4c27..119b718fb 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -32,19 +32,19 @@ #include "kateschema.h" #include "kateconfig.h" -#include <kconfig.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdeglobal.h> #include <kinstance.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kregexp.h> -#include <kpopupmenu.h> -#include <kglobalsettings.h> +#include <tdepopupmenu.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqstringlist.h> #include <tqtextstream.h> @@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine, void KateHighlighting::loadWildcards() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); TQString extensionString = config->readEntry("Wildcards", iWildcards); @@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions() TQString KateHighlighting::getMimetypes() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); return config->readEntry("Mimetypes", iMimetypes); @@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes() int KateHighlighting::priority() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); return config->readNumEntry("Priority", m_priority); @@ -1652,7 +1652,7 @@ int KateHighlighting::priority() KateHlData *KateHighlighting::getData() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); KateHlData *hlData = new KateHlData( @@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData() void KateHighlighting::setData(KateHlData *hlData) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); config->writeEntry("Wildcards",hlData->wildcards); @@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData) void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema)); list.clear(); @@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l */ void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema)); @@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { - static const TQString& sq = KGlobal::staticQString("\"'"); + static const TQString& sq = TDEGlobal::staticQString("\"'"); return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); } @@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) error->setSelectedTextColor(Qt::red); list.append(error); - KConfig *config = KateHlManager::self()->self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema)); for (uint z = 0; z < defaultStyles(); z++) @@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) void KateHlManager::setDefaults(uint schema, KateAttributeList &list) { - KConfig *config = KateHlManager::self()->self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema)); for (uint z = 0; z < defaultStyles(); z++) diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index e312e4a01..8ff5e31b2 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -26,7 +26,7 @@ #include "../interfaces/document.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqptrlist.h> #include <tqvaluelist.h> @@ -350,7 +350,7 @@ class KateHlManager : public TQObject static KateHlManager *self(); - inline KConfig *getKConfig() { return &m_config; }; + inline TDEConfig *getTDEConfig() { return &m_config; }; KateHighlighting *getHl(int n); int nameFind(const TQString &name); @@ -396,7 +396,7 @@ class KateHlManager : public TQObject static KateHlManager *s_self; - KConfig m_config; + TDEConfig m_config; TQStringList commonSuffixes; KateSyntaxDocument *syntax; diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 58b4dd163..cab335312 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -35,9 +35,9 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeconfig.h> #include <kjs/function_object.h> #include <kjs/interpreter.h> @@ -52,7 +52,7 @@ namespace KJS { -// taken from khtml +// taken from tdehtml // therefor thx to: // Copyright (C) 1999-2003 Harri Porten (porten@kde.org) // Copyright (C) 2001-2003 David Faure (faure@kde.org) @@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force) return; // We'll store the scripts list in this config - KConfig config("katepartjscriptrc", false, false); + TDEConfig config("katepartjscriptrc", false, false); // figure out if the kate install is too new config.setGroup ("General"); @@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force) } // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -685,10 +685,10 @@ void KateJScriptManager::collectScripts (bool force) if (dfi.exists()) { - KConfig df (desktopFile, true, false); + TDEConfig df (desktopFile, true, false); df.setDesktopGroup (); - // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback + // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback TQString cmdname = df.readEntry ("X-Kate-Command"); if (cmdname.isEmpty()) { @@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists) return false; - KConfig df (m_scripts[cmd]->desktopFilename(), true, false); + TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false); df.setDesktopGroup (); msg = df.readEntry ("X-Kate-Help"); @@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force) // We'll store the scripts list in this config - KConfig config("katepartindentjscriptrc", false, false); + TDEConfig config("katepartindentjscriptrc", false, false); #if 0 // figure out if the kate install is too new config.setGroup ("General"); @@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/katekeyinterceptorfunctor.h b/kate/part/katekeyinterceptorfunctor.h index 0126ff814..2a973026a 100644 --- a/kate/part/katekeyinterceptorfunctor.h +++ b/kate/part/katekeyinterceptorfunctor.h @@ -17,7 +17,7 @@ */ #ifndef _KATE_KEY_INTERCEPTOR_FUNCTOR_H #define _KATE_KEY_INTERCEPTOR_FUNCTOR_H -#include <kshortcut.h> +#include <tdeshortcut.h> class KateKeyInterceptorFunctor { public: virtual bool operator()(KKey key)=0; diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index dbc7d1fa4..375b0b7d4 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -31,9 +31,9 @@ #include <tqfileinfo.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdeglobal.h> +#include <tdelocale.h> extern "C" { #include <lua.h> @@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) <<"================================================="<<endl; // We'll store the scripts list in this config - KConfig config("katepartluaindentscriptrc", false, false); + TDEConfig config("katepartluaindentscriptrc", false, false); #if 0 // figure out if the kate install is too new config.setGroup ("General"); @@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e9a74c50e..e66119747 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -30,12 +30,12 @@ #include <kateschema.h> #include <katetextline.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcolorbutton.h> #include <kdebug.h> #include <kdialog.h> // for spacingHint() -#include <kfontdialog.h> -#include <klocale.h> +#include <tdefontdialog.h> +#include <tdelocale.h> #include <kprinter.h> #include <kurl.h> #include <kuser.h> // for loginName @@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc) KUser u (KUser::UseRealUserID); tags["u"] = u.loginName(); - tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false); - tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); + tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); + tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); + tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); + tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) @@ -888,7 +888,7 @@ void KatePrintHeaderFooter::setHFFont() { TQFont fnt( lFontPreview->font() ); // display a font dialog - if ( KFontDialog::getFont( fnt, false, this ) == KFontDialog::Accepted ) + if ( TDEFontDialog::getFont( fnt, false, this ) == TDEFontDialog::Accepted ) { // change strFont strFont = fnt.toString(); diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index a5e295888..5b71c92e8 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -27,20 +27,20 @@ #include "kateview.h" #include "katerenderer.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <kcolorbutton.h> #include <kcombobox.h> #include <kinputdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdemessagebox.h> +#include <tdepopupmenu.h> #include <kcolordialog.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <ktexteditor/markinterface.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdetexteditor/markinterface.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> @@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem //BEGIN KateSchemaManager TQString KateSchemaManager::normalSchema () { - return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); + return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); } TQString KateSchemaManager::printingSchema () { - return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); + return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); } KateSchemaManager::KateSchemaManager () @@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile) // get the right group // special handling of the default schemas ;) // -KConfig *KateSchemaManager::schema (uint number) +TDEConfig *KateSchemaManager::schema (uint number) { if ((number>1) && (number < m_schemas.count())) m_config.setGroup (m_schemas[number]); @@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number) void KateSchemaManager::addSchema (const TQString &t) { m_config.setGroup (t); - m_config.writeEntry("Color Background", KGlobalSettings::baseColor()); + m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor()); update (false); } @@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) if ( ! m_schemas.contains( newSchema ) ) { // fallback defaults - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) mark[6] = Qt::red; SchemaColors c; - KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); + TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); c.back= config->readColorEntry("Color Background", &tmp0); c.selected = config->readColorEntry("Color Selection", &tmp1); @@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply () for ( it = m_schemas.begin(); it != m_schemas.end(); ++it ) { kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl; - KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() ); + TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() ); kdDebug(13030)<<"Using config group "<<config->group()<<endl; SchemaColors c = it.data(); @@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * // sizemanagment TQGridLayout *grid = new TQGridLayout( this, 1, 1 ); - m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false ); - m_fontchooser->enableColumn(KFontChooser::StyleList, false); + m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); + m_fontchooser->enableColumn(TDEFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); @@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_schema = newSchema; - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); @@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema) // set colors TQPalette p ( m_defaultStyles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -759,14 +759,14 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // Set listview colors // We do that now, because we can now get the "normal text" color. - // TODO this reads of the KConfig object, which should be changed when + // TODO this reads of the TDEConfig object, which should be changed when // the color tab is fixed. TQPalette p ( m_styles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc hbHl = new TQHBox( this ); layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); - lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl ); + lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl ); defaultSchemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( defaultSchemaCombo ); @@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply() KateRendererConfig::global()->reloadSchema(); // sync the hl config for real - KateHlManager::self()->getKConfig()->sync (); + KateHlManager::self()->getTDEConfig()->sync (); } void KateSchemaConfigPage::reload() @@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font - normalcol = KGlobalSettings::textColor(); + normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); selcol = KateRendererConfig::global()->selectionColor(); docfont = *KateRendererConfig::global()->font(); @@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { if ( !dynamic_cast<KateStyleListItem*>(i) ) return; - KPopupMenu m( this ); + TDEPopupMenu m( this ); KateAttribute *is = i->style(); int id; // the title is used, because the menu obscures the context name when diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 566b6ea27..77cc112a1 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -29,8 +29,8 @@ #include <tqlistview.h> #include <tqfont.h> -#include <kconfig.h> -#include <kaction.h> +#include <tdeconfig.h> +#include <tdeaction.h> class KateView; class KateStyleListItem; @@ -53,9 +53,9 @@ class KateSchemaManager void update (bool readfromfile = true); /** - * return kconfig with right group set or set to Normal if not there + * return tdeconfig with right group set or set to Normal if not there */ - KConfig *schema (uint number); + TDEConfig *schema (uint number); void addSchema (const TQString &t); @@ -85,18 +85,18 @@ class KateSchemaManager static TQString printingSchema (); private: - KConfig m_config; + TDEConfig m_config; TQStringList m_schemas; }; -class KateViewSchemaAction : public KActionMenu +class KateViewSchemaAction : public TDEActionMenu { Q_OBJECT public: KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0) - : KActionMenu(text, parent, name) { init(); }; + : TDEActionMenu(text, parent, name) { init(); }; ~KateViewSchemaAction(){;}; @@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget ~KateSchemaConfigFontTab(); public: - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); public slots: void apply(); @@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) private: - class KFontChooser *m_fontchooser; + class TDEFontChooser *m_fontchooser; FontMap m_fonts; int m_schema; diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index a7d37ead5..930e4d906 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -31,9 +31,9 @@ #include "kateconfig.h" #include "katehighlight.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <kdebug.h> #include <kfinddialog.h> @@ -66,7 +66,7 @@ KateSearch::~KateSearch() delete m_arbitraryHLList; } -void KateSearch::createActions( KActionCollection* ac ) +void KateSearch::createActions( TDEActionCollection* ac ) { KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index bec9eb51a..5ae92f568 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -37,7 +37,7 @@ class KateView; class KateDocument; class KateSuperRangeList; -class KActionCollection; +class TDEActionCollection; class KateSearch : public TQObject { @@ -87,7 +87,7 @@ class KateSearch : public TQObject KateSearch( KateView* ); ~KateSearch(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); public slots: void find(); diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 6ce2b2a72..494e52894 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -26,38 +26,38 @@ #include "kateview.h" -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> -#include <kspell.h> +#include <tdespell.h> #include <ksconfig.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> KateSpell::KateSpell( KateView* view ) : TQObject( view ) , m_view (view) - , m_kspell (0) + , m_tdespell (0) { } KateSpell::~KateSpell() { - // kspell stuff - if( m_kspell ) + // tdespell stuff + if( m_tdespell ) { - m_kspell->setAutoDelete(true); - m_kspell->cleanUp(); // need a way to wait for this to complete - delete m_kspell; + m_tdespell->setAutoDelete(true); + m_tdespell->cleanUp(); // need a way to wait for this to complete + delete m_tdespell; } } -void KateSpell::createActions( KActionCollection* ac ) +void KateSpell::createActions( TDEActionCollection* ac ) { KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } @@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to else kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl; - m_kspell = new KSpell( m_view, i18n("Spellcheck"), + m_tdespell = new KSpell( m_view, i18n("Spellcheck"), this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type ); - connect( m_kspell, TQT_SIGNAL(death()), + connect( m_tdespell, TQT_SIGNAL(death()), this, TQT_SLOT(spellCleanDone()) ); - connect( m_kspell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( m_kspell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); - connect( m_kspell, TQT_SIGNAL(done(const TQString&)), + connect( m_tdespell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(spellResult(const TQString&)) ); } void KateSpell::ready(KSpell *) { - m_kspell->setProgressResolution( 1 ); + m_tdespell->setProgressResolution( 1 ); - m_kspell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) ); + m_tdespell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) ); - kdDebug (13020) << "SPELLING READY STATUS: " << m_kspell->status () << endl; + kdDebug (13020) << "SPELLING READY STATUS: " << m_tdespell->status () << endl; } void KateSpell::locatePosition( uint pos, uint& line, uint& col ) @@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword void KateSpell::spellResult( const TQString& ) { m_view->clearSelection(); - m_kspell->cleanUp(); + m_tdespell->cleanUp(); } void KateSpell::spellCleanDone() { - KSpell::spellStatus status = m_kspell->status(); + KSpell::spellStatus status = m_tdespell->status(); if( status == KSpell::Error ) { KMessageBox::sorry( 0, @@ -210,8 +210,8 @@ void KateSpell::spellCleanDone() i18n("The spelling program seems to have crashed.")); } - delete m_kspell; - m_kspell = 0; + delete m_tdespell; + m_tdespell = 0; kdDebug (13020) << "SPELLING END" << endl; } diff --git a/kate/part/katespell.h b/kate/part/katespell.h index 870a88194..9ce41666c 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -27,7 +27,7 @@ class KateView; -class KAction; +class TDEAction; class KSpell; class KateSpell : public TQObject @@ -38,7 +38,7 @@ class KateSpell : public TQObject KateSpell( KateView* ); ~KateSpell(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); void updateActions (); @@ -69,9 +69,9 @@ class KateSpell : public TQObject private: KateView *m_view; - KAction *m_spellcheckSelection; + TDEAction *m_spellcheckSelection; - KSpell *m_kspell; + KSpell *m_tdespell; // define the part of the text to check KateTextCursor m_spellStart, m_spellEnd; diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 8e391b620..700daa9da 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -25,9 +25,9 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeconfig.h> #include <tqfile.h> @@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force) return; // We'll store the ModeList in katesyntaxhighlightingrc - KConfig config("katesyntaxhighlightingrc", false, false); + TDEConfig config("katesyntaxhighlightingrc", false, false); // figure our if the kate install is too new config.setGroup ("General"); @@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force) } // Let's get a list of all the xml files for hl - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp index 6c701e1ed..005892607 100644 --- a/kate/part/katetextline.cpp +++ b/kate/part/katetextline.cpp @@ -23,7 +23,7 @@ #include "katetextline.h" #include "katerenderer.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqregexp.h> diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 3922d04d0..7f14be16c 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -38,13 +38,13 @@ class TQTextStream; * The attribute stores the index to a table that contains fonts and colors * and also if a character is selected. */ -class KateTextLine : public KShared +class KateTextLine : public TDEShared { public: /** * Define a Shared-Pointer type */ - typedef KSharedPtr<KateTextLine> Ptr; + typedef TDESharedPtr<KateTextLine> Ptr; public: /** diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index ab4c2f54e..821cb0faf 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -46,29 +46,29 @@ #include "kateautoindent.h" #include "katespell.h" -#include <ktexteditor/plugin.h> +#include <tdetexteditor/plugin.h> -#include <kparts/event.h> +#include <tdeparts/event.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurldrag.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcursor.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> -#include <kmessagebox.h> -#include <kaction.h> +#include <tdemessagebox.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kxmlguifactory.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <klibloader.h> #include <kencodingfiledialog.h> -#include <kmultipledrag.h> -#include <ktempfile.h> +#include <tdemultipledrag.h> +#include <tdetempfile.h> #include <ksavefile.h> #include <tqfont.h> @@ -207,8 +207,8 @@ void KateView::setupConnections() void KateView::setupActions() { - KActionCollection *ac = this->actionCollection (); - KAction *a; + TDEActionCollection *ac = this->actionCollection (); + TDEAction *a; m_toggleWriteLock = 0; @@ -221,7 +221,7 @@ void KateView::setupActions() m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) @@ -235,56 +235,56 @@ void KateView::setupActions() a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a = m_toggleWriteLock = new KToggleAction( + a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); - a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); } else @@ -298,7 +298,7 @@ void KateView::setupActions() a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); @@ -307,7 +307,7 @@ void KateView::setupActions() a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); - a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); + a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); a->setWhatsThis(i18n("Configure various aspects of this editor.")); KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight"); @@ -324,7 +324,7 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); @@ -334,32 +334,32 @@ void KateView::setupActions() m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); - a= m_toggleBlockSelection = new KToggleAction( + a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); - a= m_toggleInsert = new KToggleAction( + a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); - KToggleAction *toggleAction; - a= m_toggleDynWrap = toggleAction = new KToggleAction( + TDEToggleAction *toggleAction; + a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); - a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); + a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); @@ -369,14 +369,14 @@ void KateView::setupActions() list2.append(i18n("&Always On")); m_setDynWrapIndicators->setItems(list2); - a= toggleAction=m_toggleFoldingMarkers = new KToggleAction( + a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); - a= m_toggleIconBar = toggleAction = new KToggleAction( + a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), ac, "view_border"); @@ -384,21 +384,21 @@ void KateView::setupActions() a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance.")); toggleAction->setCheckedState(i18n("Hide &Icon Border")); - a= toggleAction=m_toggleLineNumbers = new KToggleAction( + a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); - a= m_toggleScrollBarMarks = toggleAction = new KToggleAction( + a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); - a = toggleAction = m_toggleWWMarker = new KToggleAction( + a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); @@ -407,13 +407,13 @@ void KateView::setupActions() "wrap column as defined in the editing properties" )); toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker")); - a= m_switchCmdLine = new KAction( + a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); - a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol"); + a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol"); a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document")); TQStringList list; list.append("&UNIX"); @@ -437,137 +437,137 @@ void KateView::setupActions() void KateView::setupEditActions() { - m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); - KActionCollection* ac = m_editActions; + m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); + TDEActionCollection* ac = m_editActions; - new KAction( + new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), ac, "word_left" ); - new KAction( + new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), ac, "select_char_left" ); - new KAction( + new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), ac, "select_word_left" ); - new KAction( + new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(wordRight()), ac, "word_right" ); - new KAction( + new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), ac, "select_char_right" ); - new KAction( + new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), ac, "select_word_right" ); - new KAction( + new TDEAction( i18n("Move to Beginning of Line"), Key_Home, TQT_TQOBJECT(this), TQT_SLOT(home()), ac, "beginning_of_line" ); - new KAction( - i18n("Move to Beginning of Document"), KStdAccel::home(), + new TDEAction( + i18n("Move to Beginning of Document"), TDEStdAccel::home(), TQT_TQOBJECT(this), TQT_SLOT(top()), ac, "beginning_of_document" ); - new KAction( + new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), ac, "select_beginning_of_line" ); - new KAction( + new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), ac, "select_beginning_of_document" ); - new KAction( + new TDEAction( i18n("Move to End of Line"), Key_End, TQT_TQOBJECT(this), TQT_SLOT(end()), ac, "end_of_line" ); - new KAction( - i18n("Move to End of Document"), KStdAccel::end(), + new TDEAction( + i18n("Move to End of Document"), TDEStdAccel::end(), TQT_TQOBJECT(this), TQT_SLOT(bottom()), ac, "end_of_document" ); - new KAction( + new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), ac, "select_end_of_line" ); - new KAction( + new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), ac, "select_end_of_document" ); - new KAction( + new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), ac, "select_line_up" ); - new KAction( + new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), ac, "scroll_line_up" ); - new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), ac, "move_line_down"); - new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), ac, "move_line_up"); - new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(cursorRight()), ac, "move_cursor_right"); - new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), ac, "move_cusor_left"); - new KAction( + new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), ac, "select_line_down" ); - new KAction( + new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), ac, "scroll_line_down" ); - new KAction( - i18n("Scroll Page Up"), KStdAccel::prior(), + new TDEAction( + i18n("Scroll Page Up"), TDEStdAccel::prior(), TQT_TQOBJECT(this), TQT_SLOT(pageUp()), ac, "scroll_page_up" ); - new KAction( + new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), ac, "select_page_up" ); - new KAction( + new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(topOfView()), ac, "move_top_of_view" ); - new KAction( + new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); - new KAction( - i18n("Scroll Page Down"), KStdAccel::next(), + new TDEAction( + i18n("Scroll Page Down"), TDEStdAccel::next(), TQT_TQOBJECT(this), TQT_SLOT(pageDown()), ac, "scroll_page_down" ); - new KAction( + new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), ac, "select_page_down" ); - new KAction( + new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); - new KAction( + new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); - new KAction( + new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); - new KAction( + new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); @@ -575,34 +575,34 @@ void KateView::setupEditActions() // anders: shortcuts doing any changes should not be created in browserextension if ( !m_doc->readOnly() ) { - new KAction( + new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(transpose()), ac, "transpose_char" ); - new KAction( + new TDEAction( i18n("Delete Line"), CTRL + Key_K, TQT_TQOBJECT(this), TQT_SLOT(killLine()), ac, "delete_line" ); - new KAction( - i18n("Delete Word Left"), KStdAccel::deleteWordBack(), + new TDEAction( + i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), ac, "delete_word_left" ); - new KAction( - i18n("Delete Word Right"), KStdAccel::deleteWordForward(), + new TDEAction( + i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), ac, "delete_word_right" ); - new KAction(i18n("Delete Next Character"), Key_Delete, + new TDEAction(i18n("Delete Next Character"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), ac, "delete_next_character"); - KAction *a = new KAction(i18n("Backspace"), Key_Backspace, + TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(backspace()), ac, "backspace"); - KShortcut cut = a->shortcut(); + TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); a->setShortcut( cut ); } @@ -624,18 +624,18 @@ void KateView::setupEditActions() void KateView::setupCodeFolding() { - KActionCollection *ac=this->actionCollection(); - new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, + TDEActionCollection *ac=this->actionCollection(); + new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); - new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, + new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); - new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, + new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); - new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus, + new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS - KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this)); + TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); debugAccels->setEnabled(true); @@ -709,8 +709,8 @@ void KateView::slotStatusMsg () uint r = cursorLine() + 1; uint c = cursorColumn() + 1; - TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0)); - TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0)); + TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0)); + TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0)); TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" "); TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM "); @@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged () << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor" << "tools_spelling_selection"; - KAction *a = 0; + TDEAction *a = 0; for (uint z = 0; z < l.size(); z++) if ((a = actionCollection()->action( l[z].ascii() ))) a->setEnabled (m_doc->isReadWrite()); @@ -930,12 +930,12 @@ void KateView::joinLines() m_doc->joinLines( first, last ); } -void KateView::readSessionConfig(KConfig *config) +void KateView::readSessionConfig(TDEConfig *config) { setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1); } -void KateView::writeSessionConfig(KConfig *config) +void KateView::writeSessionConfig(TDEConfig *config) { config->writeEntry("CursorLine",m_viewInternal->cursor.line()); config->writeEntry("CursorColumn",m_viewInternal->cursor.col()); @@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig () l << "folding_toplevel" << "folding_expandtoplevel" << "folding_collapselocal" << "folding_expandlocal"; - KAction *a = 0; + TDEAction *a = 0; for (uint z = 0; z < l.size(); z++) if ((a = actionCollection()->action( l[z].ascii() ))) a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding()); @@ -1839,7 +1839,7 @@ void KateView::exportAsHTML () if ( url.isLocalFile() ) return; - KIO::NetAccess::upload( filename, url, 0 ); + TDEIO::NetAccess::upload( filename, url, 0 ); } //END diff --git a/kate/part/kateview.h b/kate/part/kateview.h index aa428096d..0a00ab1fc 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -28,9 +28,9 @@ #include "../interfaces/view.h" -#include <ktexteditor/sessionconfiginterface.h> -#include <ktexteditor/viewstatusmsginterface.h> -#include <ktexteditor/texthintinterface.h> +#include <tdetexteditor/sessionconfiginterface.h> +#include <tdetexteditor/viewstatusmsginterface.h> +#include <tdetexteditor/texthintinterface.h> #include <tqguardedptr.h> @@ -44,10 +44,10 @@ class KateViewSchemaAction; class KateRenderer; class KateSpell; -class KToggleAction; -class KAction; -class KRecentFilesAction; -class KSelectAction; +class TDEToggleAction; +class TDEAction; +class TDERecentFilesAction; +class TDESelectAction; class TQGridLayout; @@ -370,8 +370,8 @@ class KateView : public Kate::View, // config file / session management functions public: - void readSessionConfig(KConfig *); - void writeSessionConfig(KConfig *); + void readSessionConfig(TDEConfig *); + void writeSessionConfig(TDEConfig *); public slots: int getEol(); @@ -429,7 +429,7 @@ class KateView : public Kate::View, // Is it really necessary to have 3 methods for this?! :) KateDocument* doc() const { return m_doc; } - KActionCollection* editActionCollection() const { return m_editActions; } + TDEActionCollection* editActionCollection() const { return m_editActions; } public slots: void slotNewUndo(); @@ -472,31 +472,31 @@ class KateView : public Kate::View, void setupCodeFolding(); void setupCodeCompletion(); - KActionCollection* m_editActions; - KAction* m_editUndo; - KAction* m_editRedo; - KRecentFilesAction* m_fileRecent; - KToggleAction* m_toggleFoldingMarkers; - KToggleAction* m_toggleIconBar; - KToggleAction* m_toggleLineNumbers; - KToggleAction* m_toggleScrollBarMarks; - KToggleAction* m_toggleDynWrap; - KSelectAction* m_setDynWrapIndicators; - KToggleAction* m_toggleWWMarker; - KAction* m_switchCmdLine; - - KSelectAction* m_setEndOfLine; - - KAction *m_cut; - KAction *m_copy; - KAction *m_copyHTML; - KAction *m_paste; - KAction *m_selectAll; - KAction *m_deSelect; - - KToggleAction *m_toggleBlockSelection; - KToggleAction *m_toggleInsert; - KToggleAction *m_toggleWriteLock; + TDEActionCollection* m_editActions; + TDEAction* m_editUndo; + TDEAction* m_editRedo; + TDERecentFilesAction* m_fileRecent; + TDEToggleAction* m_toggleFoldingMarkers; + TDEToggleAction* m_toggleIconBar; + TDEToggleAction* m_toggleLineNumbers; + TDEToggleAction* m_toggleScrollBarMarks; + TDEToggleAction* m_toggleDynWrap; + TDESelectAction* m_setDynWrapIndicators; + TDEToggleAction* m_toggleWWMarker; + TDEAction* m_switchCmdLine; + + TDESelectAction* m_setEndOfLine; + + TDEAction *m_cut; + TDEAction *m_copy; + TDEAction *m_copyHTML; + TDEAction *m_paste; + TDEAction *m_selectAll; + TDEAction *m_deSelect; + + TDEToggleAction *m_toggleBlockSelection; + TDEToggleAction *m_toggleInsert; + TDEToggleAction *m_toggleWriteLock; KateDocument* m_doc; KateViewInternal* m_viewInternal; diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index f858ae908..dd52451b0 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -32,13 +32,13 @@ #include "kateview.h" #include "kateviewinternal.h" -#include <kapplication.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <knotifyclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> #include <tqpainter.h> @@ -272,7 +272,7 @@ class KateCmdLnWhatsThis : public TQWhatsThis * This class provide completion of flags. It shows a short description of * each flag, and flags are appended. */ -class KateCmdLineFlagCompletion : public KCompletion +class KateCmdLineFlagCompletion : public TDECompletion { public: KateCmdLineFlagCompletion() {;} @@ -365,7 +365,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) // clean up if ( m_oldCompletionObject ) { - KCompletion *c = completionObject(); + TDECompletion *c = completionObject(); setCompletionObject( m_oldCompletionObject ); m_oldCompletionObject = 0; delete c; @@ -465,7 +465,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev ) // clean up if needed if ( m_oldCompletionObject ) { - KCompletion *c = completionObject(); + TDECompletion *c = completionObject(); setCompletionObject( m_oldCompletionObject ); m_oldCompletionObject = 0; delete c; @@ -483,7 +483,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev ) Kate::CommandExtension *ce = dynamic_cast<Kate::CommandExtension*>(m_command); if ( ce ) { - KCompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view ); + TDECompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view ); if ( cmpl ) { // save the old completion object and use what the command provides @@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) { KateViewConfig::global()->setDefaultMarkType (vec[result-100]); // flush config, otherwise it isn't nessecarily done - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate View Defaults"); KateViewConfig::global()->writeConfig( config ); } @@ -1168,14 +1168,14 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) //END KateIconBorder KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name) - : KActionMenu (text, parent, name), doc(_doc), view (_view) + : TDEActionMenu (text, parent, name), doc(_doc), view (_view) { connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } void KateViewEncodingAction::slotAboutToShow() { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) @@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); if (found && codecForEnc) { @@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow() void KateViewEncodingAction::setMode (int mode) { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); - doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) ); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); + doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) ); // now we don't want the encoding changed again unless the user does so using the menu. doc->setEncodingSticky( true ); doc->reloadFile(); diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 1205ea99a..980d4d1cd 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -21,7 +21,7 @@ #ifndef __KATE_VIEW_HELPERS_H__ #define __KATE_VIEW_HELPERS_H__ -#include <kaction.h> +#include <tdeaction.h> #include <klineedit.h> #include <tqwidget.h> @@ -115,7 +115,7 @@ class KateCmdLine : public KLineEdit uint m_histpos; ///< position in the history uint m_cmdend; ///< the point where a command ends in the text, if we have a valid one. Kate::Command *m_command; ///< For completing flags/args and interactiveness - class KCompletion *m_oldCompletionObject; ///< save while completing command args. + class TDECompletion *m_oldCompletionObject; ///< save while completing command args. class KateCmdLnWhatsThis *m_help; }; @@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget mutable TQColor m_oldBackgroundColor; }; -class KateViewEncodingAction : public KActionMenu +class KateViewEncodingAction : public TDEActionMenu { Q_OBJECT diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index d93f81a86..c2b0ca4db 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -37,8 +37,8 @@ #include <kcursor.h> #include <kdebug.h> -#include <kapplication.h> -#include <kglobalsettings.h> +#include <tdeapplication.h> +#include <tdeglobalsettings.h> #include <kurldrag.h> #include <tqstyle.h> @@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force if (m_cursorTimer.isActive ()) { - if ( KApplication::cursorFlashTime() > 0 ) - m_cursorTimer.start( KApplication::cursorFlashTime() / 2 ); + if ( TDEApplication::cursorFlashTime() > 0 ) + m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 ); m_view->renderer()->setDrawCaret(true); } @@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) TQPoint p( e->pos() - dragInfo.start ); // we've left the drag square, we can start a real drag operation now - if( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) doDrag(); return; @@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout () void KateViewInternal::focusInEvent (TQFocusEvent *) { - if (KApplication::cursorFlashTime() > 0) - m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 ); + if (TDEApplication::cursorFlashTime() > 0) + m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 ); if (m_textHintEnabled) m_textHintTimer.start( m_textHintTimeout ); @@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e ) if ( e->text().length() > 0 ) { m_doc->insertText( cursor.line(), cursor.col(), e->text() ); - if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 ) - m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 ); + if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 ) + m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 ); updateView( true ); updateCursor( cursor, true ); diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index de89e0996..1b6decfe3 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -31,7 +31,7 @@ #include <pwd.h> #include <signal.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <tqimage.h> #include <tqfile.h> @@ -39,13 +39,13 @@ #include <unistd.h> #include <stdio.h> -#include <kaction.h> -#include <kcmdlineargs.h> +#include <tdeaction.h> +#include <tdecmdlineargs.h> #include "katefactory.h" -#include <kio/job.h> -#include <kmainwindow.h> +#include <tdeio/job.h> +#include <tdemainwindow.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqcolor.h> #include <tqcursor.h> @@ -66,7 +66,7 @@ #include "katedocument.h" #include "kateview.h" -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include "katejscript.h" #include "katedocumenthelpers.h" #include "kateconfig.h" @@ -371,7 +371,7 @@ static TQString findMostRecentFailureSnapshot() { return dir[0].mid(sizeof failureSnapshotPrefix - 1); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "b", 0, 0 }, { "base <base_dir>", "Directory containing tests, basedir and output directories.", 0}, @@ -390,7 +390,7 @@ static KCmdLineOptions options[] = { "output <directory>", "Put output in <directory> instead of <base_dir>/output", 0 } , { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } , { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } , - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) @@ -410,11 +410,11 @@ int main(int argc, char *argv[]) // signal( SIGALRM, signal_handler ); - KCmdLineArgs::init(argc, argv, "testregression", "TestRegression", + TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression", "Regression tester for kate", "1.0"); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs( ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( ); TQCString baseDir = args->getOption("base"); TQCString baseDirConfigFile(::getenv("HOME") + TQCString(BASE_DIR_CONFIG)); @@ -440,7 +440,7 @@ int main(int argc, char *argv[]) "\techo \"<root-path>\" > %s\n" "You may override the location by specifying the root explicitly on the\n" "command line with option -b\n" - "", KCmdLineArgs::appName(), + "", TDECmdLineArgs::appName(), (const char *)baseDirConfigFile, (const char *)baseDirConfigFile); ::exit( 1 ); @@ -461,7 +461,7 @@ int main(int argc, char *argv[]) } } - KApplication a; + TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle("windows"); KSimpleConfig cfg( "testkateregressionrc" ); @@ -511,7 +511,7 @@ int main(int argc, char *argv[]) // create widgets KateFactory *fac = KateFactory::self(); - KMainWindow *toplevel = new KMainWindow(); + TDEMainWindow *toplevel = new TDEMainWindow(); KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, @@ -650,7 +650,7 @@ int main(int argc, char *argv[]) RegressionTest *RegressionTest::curr = 0; -RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig, +RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig, const TQString &baseDir, const TQString &outputDir, bool _genOutput) : TQObject(part) @@ -723,14 +723,14 @@ RegressionTest::~RegressionTest() delete m_failureSave; } -void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname) +void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname) { Q_ASSERT(cfg); m_failureComp = cfg; m_failureComp->setGroup(sname); } -void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname) +void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname) { Q_ASSERT(cfg); m_failureSave = cfg; @@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir); - // are blocking reads possible with KProcess? + // are blocking reads possible with TDEProcess? char pwd[PATH_MAX]; (void) getcwd( pwd, PATH_MAX ); chdir( TQFile::encodeName( m_baseDir ) ); diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index 0bc717714..2128ce25d 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -165,7 +165,7 @@ class RegressionTest : public TQObject Q_OBJECT public: - RegressionTest(KateDocument *part, KConfig *baseConfig, + RegressionTest(KateDocument *part, TDEConfig *baseConfig, const TQString &baseDir, const TQString &outputDir, bool _genOutput); ~RegressionTest(); @@ -181,21 +181,21 @@ public: void rereadConfig(); static void createMissingDirs(const TQString &path); - void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname); - void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname); + void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname); + void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname); void createLink( const TQString& test, int failures ); void doFailureReport( const TQString& test, int failures ); KateDocument *m_part; KateView *m_view; - KConfig *m_baseConfig; + TDEConfig *m_baseConfig; TQString m_baseDir; TQString m_outputDir; bool m_genOutput; TQString m_currentBase; - KConfig *m_failureComp; - KConfig *m_failureSave; + TDEConfig *m_failureComp; + TDEConfig *m_failureSave; TQString m_currentOutput; TQString m_currentCategory; |