diff options
70 files changed, 160 insertions, 805 deletions
diff --git a/admin b/admin -Subproject 85116532467b2bb4c73caf54c106c91a22dbe37 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/doc/kttsd/index.docbook b/doc/kttsd/index.docbook index 38d147a..e228488 100644 --- a/doc/kttsd/index.docbook +++ b/doc/kttsd/index.docbook @@ -227,7 +227,7 @@ also hang out in IRC (irc.kde.org, channel #kde-accessibility). <!-- ====================================================================== --> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Using &ktts;</title> <para> @@ -1713,7 +1713,7 @@ or menu bars. --> <!-- -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The main &ktts; window</title> <sect2> @@ -2071,7 +2071,7 @@ Some voices also have their own licensing.</para></note> <!-- ...................................................................... --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &ktts;</title> <!-- This first entity contains boiler plate for applications that are diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 5cd7e38..79bc216 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -35,7 +35,7 @@ #include <tdeshortcut.h> #include <kkeynative.h> #include <tdemacros.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "kdeexportfix.h" #include "kbstate.h" #include "kbstate.moc" @@ -113,9 +113,9 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, accessxFeatures = 0; //startTimer(100); // ten times a second - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); - kapp->installX11EventFilter (this); + tdeApp->installX11EventFilter (this); int opcode_rtn, error_rtn; XkbQueryExtension (this->x11Display(), &opcode_rtn, &xkb_base_event_type, &error_rtn, NULL, NULL); XkbSelectEvents (this->x11Display(), XkbUseCoreKbd, XkbAllEventsMask, @@ -125,7 +125,7 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, } KbStateApplet::~KbStateApplet() { - kapp->removeX11EventFilter (this); + tdeApp->removeX11EventFilter (this); setCustomMenu(0); delete instance; delete popup; @@ -694,7 +694,7 @@ void KbStateApplet::toggleAccessX() { } void KbStateApplet::configureAccessX() { - kapp->startServiceByDesktopName("kcmaccess"); + tdeApp->startServiceByDesktopName("kcmaccess"); } void KbStateApplet::configureKeyboard() { @@ -708,7 +708,7 @@ void KbStateApplet::configureKeyboard() { } void KbStateApplet::configureMouse() { - kapp->startServiceByDesktopName("mouse"); + tdeApp->startServiceByDesktopName("mouse"); } void KbStateApplet::about() { diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index bf09401..1abc1c1 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -73,7 +73,7 @@ KmagApp::KmagApp(TQWidget* , const char* name) : TDEMainWindow(0, name, WStyle_MinMax | WType_TopLevel | WStyle_StaysOnTop | WDestructiveClose | WStyle_ContextHelp), m_defaultMouseCursorType(2) { - config=kapp->config(); + config=tdeApp->config(); zoomArrayString << "5:1" << "2:1" << "1:1" << "1:1.5" << "1:2" << "1:3" << "1:4" << "1:5" << "1:6" << "1:7" << "1:8" << "1:12" << "1:16" << "1:20"; diff --git a/kmag/kmag.kdevprj b/kmag/kmag.kdevprj deleted file mode 100644 index a02efd9..0000000 --- a/kmag/kmag.kdevprj +++ /dev/null @@ -1,230 +0,0 @@ -[AUTHORS] -dist=true -install=true -install_location=/usr/share/doc/kmag -type=DATA - -[COPYING] -dist=true -install=true -install_location=/usr/share/doc/kmag -type=DATA - -[ChangeLog] -dist=true -install=true -install_location=/usr/share/doc/kmag -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=kmag -cflags= -cppflags= -cxxflags=\s-O3 -ldadd=-ltdeprint $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -ldflags=\s \s - -[General] -AMChanged=false -author=Sarang Lakare -configure_args=--prefix=/usr\s -kdevprj_version=1.3 -lfv_open_groups=GNU,Headers,Others,Sources,User Interface -make_options=\s-j1 -makefiles=Makefile.am,kmag/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,doc/en/images/Makefile.am -modifyMakefiles=true -project_name=Kmag -project_type=normal_kde2 -sgml_file= -short_info= -sub_dir=kmag/ -version=0.8 -version_control=CVS -workspace=1 - -[INSTALL] -dist=true -install=false -install_location=/usr/share/doc/kmag -type=DATA - -[KPP] -kpp_appgrp=Multimedia -kpp_bldroot=/usr/ -kpp_icon=0 -kpp_license=5 -kpp_summary=Magnifies a part of the screen! -kpp_url=http://kmag.sourceforge.net -kpp_version=0.6 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS -Headers=*.h,*.hh,*.hxx,*.hpp,*.H -Others=* -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l -Translations=*.po -User Interface=*.kdevdlg,*.ui,*.rc -groups=Headers,Sources,User Interface,Translations,GNU,Others - -[Makefile.am] -files=kmag.kdevprj,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,kmag.lsm,kmag.spec,install-user,install-root -sub_dirs=kmag,po,doc -type=normal - -[README] -dist=true -install=false -install_location=/usr/share/doc/kmag -type=DATA - -[TODO] -dist=true -install=false -install_location= -type=DATA - -[Workspace_1] -browser_file= -cpp_file= -header_file= -openfiles= -show_outputview=true -show_treeview=true - -[doc/Makefile.am] -sub_dirs=en -type=normal - -[doc/en/Makefile.am] -files=doc/en/index.docbook -sub_dirs=images -type=normal - -[doc/en/images/Makefile.am] -files=doc/en/images/screenshot.png -sub_dirs= -type=normal - -[doc/en/images/screenshot.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/kmag/images/screenshot.png -type=DATA - -[doc/en/index.docbook] -dist=true -install=true -install_location=$$(kde_htmldir)/en/kmag/index.docbook -type=DATA - -[install-root] -dist=true -install=false -install_location= -type=DATA - -[install-user] -dist=true -install=false -install_location= -type=DATA - -[kmag.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[kmag.lsm] -dist=true -install=false -install_location= -type=DATA - -[kmag.spec] -dist=true -install=false -install_location= -type=DATA - -[kmag/Makefile.am] -files=kmag/main.cpp,kmag/kmag.cpp,kmag/kmag.h,kmag/kmagui.rc,kmag/kmag.desktop,kmag/lo32-app-kmag.png,kmag/lo16-app-kmag.png,kmag/kmagselrect.cpp,kmag/kmagselrect.h,kmag/hi16-app-kmag.png,kmag/kmagzoomview.cpp,kmag/kmagzoomview.h -type=prog_main - -[kmag/hi16-app-kmag.png] -dist=true -install=true -install_location=$$(kde_icondir)/hicolor/16x16/apps/kmag.png -type=DATA - -[kmag/kmag.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kmag/kmag.desktop] -dist=true -install=true -install_location=$$(kde_appsdir)/Applications/Accessibility/kmag.desktop -type=DATA - -[kmag/kmag.h] -dist=true -install=false -install_location= -type=HEADER - -[kmag/kmagselrect.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kmag/kmagselrect.h] -dist=true -install=false -install_location= -type=HEADER - -[kmag/kmagui.rc] -dist=true -install=false -install_location= -type=DATA - -[kmag/kmagzoomview.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kmag/kmagzoomview.h] -dist=true -install=false -install_location= -type=HEADER - -[kmag/lo16-app-kmag.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/16x16/apps/kmag.png -type=DATA - -[kmag/lo32-app-kmag.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/32x32/apps/kmag.png -type=DATA - -[kmag/main.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[po/Makefile.am] -sub_dirs= -type=po diff --git a/kmag/kmag.mdk.spec b/kmag/kmag.mdk.spec deleted file mode 100644 index 1ce7761..0000000 --- a/kmag/kmag.mdk.spec +++ /dev/null @@ -1,108 +0,0 @@ -%define name kmag -%define version 0.8 -%define release 1 - -Name: %{name} -Version: %{version} -Release: %{release} -Summary: KDE Screen Magnifier -Group: Graphical desktop/KDE -License: GPL -Source: %{name}-%{version}.tar.gz -URL: http://kmag.sourceforge.net -Packager: Sarang Lakare <[email protected]> -Buildroot: %_tmppath/%{name}-%{version}-buildroot -BuildRequires: gcc-cpp db3 readline pam popt libtermcap2 zlib1 XFree86-devel XFree86-libs Mesa-common -BuildRequires: automake arts autoconf diffutils tdelibs file -BuildRequires: m4 texinfo gettext libjpeg62-devel tdelibs-devel gcc-c++ libbinutils2 libbzip2_1 -BuildRequires: db1 freetype2 libjpeg62 libmng1 libpng libtqt2 libtqt2-devel rpm-build - - -%description -KMagnifier is a screen magnifier for KDE. It is useful for -people with bad sight or others needing to magnify a part of the screen. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -n %{name}-%{version} - -%build -CFLAGS="%optflags" CXXFLAGS="%optflags" \ - ./configure --prefix=%_prefix \ - --disable-rpath \ - --disable-debug - -%make - -%install -make DESTDIR=%buildroot install - -install -d $RPM_BUILD_ROOT%_menudir - -kdedesktop2mdkmenu.pl kmag "Applications/Accessibility" %buildroot/%_datadir/applnk/Applications/Accessibility/kmag.desktop %buildroot/%_menudir/kmag - - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_menus - -%postun -%clean_menus - -%files -%defattr(-,root,root) -%_bindir/* -%_menudir/* -# -%_datadir/icons/locolor/16x16/apps/*.png -%_datadir/icons/locolor/32x32/apps/*.png -%_datadir/icons/hicolor/16x16/apps/*.png -# -%_datadir/applnk/Applications/Accessibility/*.desktop -# -%dir %_datadir/apps/kmag/ -%_datadir/apps/kmag/*.rc -# -#%doc README COPYING AUTHORS -#%doc %_docdir/HTML/en/*.docbook -%doc %_docdir/HTML/en/kmag/*.docbook -%doc %_docdir/HTML/en/kmag/images/*.png -#%doc %_docdir/HTML/en/kmag/common - -%changelog -* Sun Apr 21 2002 Sarang Lakare <[email protected]> 0.8-1mdk -- Rebuilding ver 0.8 for LM8.2/LM8.1 -- Added KDE documentation and removed GNU documentation - -* Tue Nov 20 2001 Sarang Lakare <[email protected]> 0.6-1mdk -- Rebuilding ver 0.6 for LM8.0 - -* Sat Oct 20 2001 Laurent MONTEL <[email protected]> 0.5-2mdk -- Rebuild against libpng3 - -* Wed Sep 19 2001 Laurent MONTEL <[email protected]> 0.5-1mdk -- update code (0.5) - -* Wed Aug 08 2001 Lenny Cartier <[email protected]> 0.3-6mdk -- rebuild - -* Tue Apr 10 2001 David BAUDENS <[email protected]> 0.3-5mdk -- Move KDE menu entriy in %%_datadir/applnk -- Fix and use optimizations -- Fix BuildRequires for non %%ix86 architectures -- Rebuild against latest GCC - -* Fri Mar 30 2001 Laurent MONTEL <[email protected]> 0.3-4mdk -- Fix typo in menu entry - -* Wed Mar 28 2001 Laurent MONTEL <[email protected]> 0.3-3mdk -- Add build requires - -* Tue Mar 13 2001 Laurent MONTEL <[email protected]> 0.3-2mdk -- REbuild with qt-2.3 - -* Sat Feb 24 2001 Daouda Lo <[email protected]> 0.3-1mdk -- first mdk package diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index 728ffaf..f378433 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -35,7 +35,7 @@ #include <tqnamespace.h> #include <tdemessagebox.h> #include <kaudioplayer.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqsound.h> #include <tdeglobalsettings.h> #include <kdebug.h> @@ -438,24 +438,24 @@ bool KMouseTool::applySettings() // Save options to kmousetoolrc file void KMouseTool::loadOptions() { - kapp->config()->setGroup("UserOptions"); + tdeApp->config()->setGroup("UserOptions"); - playSound = kapp->config()->readBoolEntry("AudibleClick",false); - smart_drag_on = kapp->config()->readBoolEntry("SmartDrag",false); + playSound = tdeApp->config()->readBoolEntry("AudibleClick",false); + smart_drag_on = tdeApp->config()->readBoolEntry("SmartDrag",false); - dwell_time = kapp->config()->readNumEntry("DwellTime",5); - drag_time = kapp->config()->readNumEntry("DragTime",3); - min_movement = kapp->config()->readNumEntry("Movement",5); - strokesEnabled = kapp->config()->readBoolEntry("strokesEnabled",false); + dwell_time = tdeApp->config()->readNumEntry("DwellTime",5); + drag_time = tdeApp->config()->readNumEntry("DragTime",3); + min_movement = tdeApp->config()->readNumEntry("Movement",5); + strokesEnabled = tdeApp->config()->readBoolEntry("strokesEnabled",false); TQPoint p; - int x = kapp->config()->readNumEntry("x",0); - int y = kapp->config()->readNumEntry("y",0); + int x = tdeApp->config()->readNumEntry("x",0); + int y = tdeApp->config()->readNumEntry("y",0); p.setX(x); p.setY(y); move(p); - mousetool_is_running = kapp->config()->readBoolEntry("MouseToolIsRunning",false); + mousetool_is_running = tdeApp->config()->readBoolEntry("MouseToolIsRunning",false); display = XOpenDisplay(NULL); } @@ -466,20 +466,20 @@ void KMouseTool::saveOptions() int x = p.x(); int y = p.y(); - kapp->config()->setGroup("ProgramOptions"); - kapp->config()->writeEntry("Version", KMOUSETOOL_VERSION); - kapp->config()->setGroup("UserOptions"); - kapp->config()->writeEntry("x", x); - kapp->config()->writeEntry("y", y); - kapp->config()->writeEntry("strokesEnabled", strokesEnabled); - kapp->config()->writeEntry("IsMinimized", isHidden()); - kapp->config()->writeEntry("DwellTime", dwell_time); - kapp->config()->writeEntry("DragTime", drag_time); - kapp->config()->writeEntry("Movement", min_movement); - kapp->config()->writeEntry("SmartDrag", smart_drag_on); - kapp->config()->writeEntry("AudibleClick", playSound); - kapp->config()->writeEntry("MouseToolIsRunning", mousetool_is_running); - kapp->config()->sync(); + tdeApp->config()->setGroup("ProgramOptions"); + tdeApp->config()->writeEntry("Version", KMOUSETOOL_VERSION); + tdeApp->config()->setGroup("UserOptions"); + tdeApp->config()->writeEntry("x", x); + tdeApp->config()->writeEntry("y", y); + tdeApp->config()->writeEntry("strokesEnabled", strokesEnabled); + tdeApp->config()->writeEntry("IsMinimized", isHidden()); + tdeApp->config()->writeEntry("DwellTime", dwell_time); + tdeApp->config()->writeEntry("DragTime", drag_time); + tdeApp->config()->writeEntry("Movement", min_movement); + tdeApp->config()->writeEntry("SmartDrag", smart_drag_on); + tdeApp->config()->writeEntry("AudibleClick", playSound); + tdeApp->config()->writeEntry("MouseToolIsRunning", mousetool_is_running); + tdeApp->config()->sync(); } void KMouseTool::updateStartStopText() @@ -548,7 +548,7 @@ void KMouseTool::applySelected() // Buttons at the bottom of the dialog void KMouseTool::helpSelected() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } void KMouseTool::closeSelected() @@ -583,13 +583,13 @@ void KMouseTool::quitSelected() if (answer != KMessageBox::Cancel) { saveOptions(); - kapp->quit(); + tdeApp->quit(); } } else { saveOptions(); - kapp->quit(); + tdeApp->quit(); } } diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp index a410f1f..ef930b1 100644 --- a/kmousetool/kmousetool/main.cpp +++ b/kmousetool/kmousetool/main.cpp @@ -20,7 +20,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeuniqueapplication.h> #include <dcopclient.h> #include <tqmessagebox.h> @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) KMouseTool *kmousetool = new KMouseTool(); - if (!kapp->config()->readBoolEntry("IsMinimized", false)) + if (!tdeApp->config()->readBoolEntry("IsMinimized", false)) kmousetool->show(); return a.exec(); diff --git a/kmousetool/kmousetool/mtstroke.cpp b/kmousetool/kmousetool/mtstroke.cpp index d4ec242..90a2fab 100644 --- a/kmousetool/kmousetool/mtstroke.cpp +++ b/kmousetool/kmousetool/mtstroke.cpp @@ -22,7 +22,7 @@ #include <iostream> // these are for locating the stroke information file -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> // #include <string> diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index 4960cff..fe51858 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -22,7 +22,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksconfig.h> #include <tdeconfig.h> @@ -63,7 +63,7 @@ void ConfigWizard::initCommandPage(TDEConfig *config) { } void ConfigWizard::initBookPage() { - TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook"); + TQString standardBook = tdeApp->dirs()->findResource("appdata", "standard.phrasebook"); bool displayBook = (standardBook.isNull() || standardBook.isEmpty()); if (displayBook) { @@ -80,7 +80,7 @@ void ConfigWizard::initBookPage() { void ConfigWizard::initCompletion (TDEConfig *config) { if (!WordCompletion::isConfigured()) { - TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", "dictionary.txt"); + TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", "dictionary.txt"); TQFile file(dictionaryFile); if (file.exists()) { // If there is a word completion dictionary but no entry in the @@ -138,7 +138,7 @@ bool ConfigWizard::configurationNeeded () { } void ConfigWizard::help () { - TDEApplication::kApplication()->invokeHelp ("Wizard"); + tdeApp->invokeHelp ("Wizard"); } #include "configwizard.moc" diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index a34e602..a57b908 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -28,7 +28,7 @@ #include <kstdaction.h> #include <kprinter.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // application specific includes #include "kmouth.h" @@ -43,7 +43,7 @@ KMouthApp::KMouthApp(TQWidget* , const char* name):TDEMainWindow(0, name) { isConfigured = false; - config=kapp->config(); + config=tdeApp->config(); /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts @@ -266,7 +266,7 @@ void KMouthApp::readOptions() toolBar("mainToolBar")->applySettings (config, "mainToolBar"); toolBar("phrasebookBar")->applySettings (config, "phrasebookBar"); - TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook"); + TQString standardBook = tdeApp->dirs()->findResource("appdata", "standard.phrasebook"); if (!standardBook.isEmpty()) { PhraseBook book; book.open(KURL::fromPathOrURL( standardBook )); @@ -460,7 +460,7 @@ void KMouthApp::slotPhrasebookConfirmed (PhraseBook &book) { phrases = new TDEActionCollection (this, actionCollection()); book.addToGUI (popup, toolbar, phrases, this, TQ_SLOT(slotPhraseSelected (const TQString &))); - TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/"); + TQString bookLocation = tdeApp->dirs()->saveLocation ("appdata", "/"); if (!bookLocation.isNull() && !bookLocation.isEmpty()) { book.save (KURL::fromPathOrURL( bookLocation + "standard.phrasebook" )); } diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index c26c7d5..0168538 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -39,7 +39,7 @@ #include <kguiitem.h> #include <tdemessagebox.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdesktopfile.h> #include "phrasebookdialog.h" @@ -225,7 +225,7 @@ void InitialPhraseBookWidget::createBook () { } } - TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/"); + TQString bookLocation = tdeApp->dirs()->saveLocation ("appdata", "/"); if (!bookLocation.isNull() && !bookLocation.isEmpty()) { book.save (KURL( bookLocation + "standard.phrasebook" )); } @@ -264,7 +264,7 @@ PhraseBookDialog::PhraseBookDialog () initGUI(); initActions(); initStandardPhraseBooks(); - TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook"); + TQString standardBook = tdeApp->dirs()->findResource("appdata", "standard.phrasebook"); if (!standardBook.isNull() && !standardBook.isEmpty()) { PhraseBook book; book.open(KURL( standardBook )); diff --git a/kmouth/speech.h b/kmouth/speech.h index 87fa3fd..5bacc1a 100644 --- a/kmouth/speech.h +++ b/kmouth/speech.h @@ -20,7 +20,7 @@ #include <tqobject.h> #include <tqstring.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> /**This class is used internally by TextToSpeechSystem in order to do the actual speaking. diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp index 8664a99..97e284c 100644 --- a/kmouth/texttospeechsystem.cpp +++ b/kmouth/texttospeechsystem.cpp @@ -41,7 +41,7 @@ TextToSpeechSystem::~TextToSpeechSystem() { } bool kttsdSay (const TQString &text, const TQString &language) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQCString replyType; TQByteArray replyData; diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 920fdd1..590cb0c 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -31,7 +31,7 @@ #include <kcombobox.h> #include <ksconfig.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <tdeconfig.h> @@ -222,11 +222,11 @@ TQString DictionaryCreationWizard::createDictionary() { do { dictnumber++; filename = TQString("wordcompletion%1.dict").arg(dictnumber); - dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename); + dictionaryFile = tdeApp->dirs()->findResource("appdata", filename); } while (TDEStandardDirs::exists(dictionaryFile)); - dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + filename; + dictionaryFile = tdeApp->dirs()->saveLocation ("appdata", "/") + filename; if (WordList::saveWordList (map, dictionaryFile)) return filename; else @@ -319,7 +319,7 @@ TQMap <TQString, int> MergeWidget::mergeParameters () { for (; it.current(); ++it) { if (it.current()->isChecked()) { TQString name = it.currentKey(); - TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", name); + TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", name); files[dictionaryFile] = weights[name]->value(); } } @@ -363,7 +363,7 @@ void CompletionWizardWidget::ok (TDEConfig *config) { TQString filename; TQString dictionaryFile; - dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict"; + dictionaryFile = tdeApp->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict"; if (WordList::saveWordList (map, dictionaryFile)) { config->setGroup("Dictionary 0"); config->writeEntry ("Filename", "wordcompletion1.dict"); diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index 9d72f3a..77a6854 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -24,7 +24,7 @@ #define INCLUDE_MENUITEM_DEF #include <tqpopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "klanguagebutton.h" diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index a2c5e70..6854b36 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp @@ -25,7 +25,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksimpleconfig.h> #include "klanguagebutton.h" diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp index 8d5f1e4..585e257 100644 --- a/kmouth/wordcompletion/wordcompletion.cpp +++ b/kmouth/wordcompletion/wordcompletion.cpp @@ -2,7 +2,7 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "wordcompletion.h" @@ -144,7 +144,7 @@ bool WordCompletion::setWordList(const TQString &wordlist) { d->current = d->dictionaries[0]; TQString filename = d->dictDetails[d->current].filename; - TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename); + TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", filename); TQFile file(dictionaryFile); if (file.exists() && file.open(IO_ReadOnly)) { TQTextStream stream(&file); @@ -195,7 +195,7 @@ void WordCompletion::addSentence (const TQString &sentence) { void WordCompletion::save () { if (d->wordsToSave) { TQString filename = d->dictDetails[d->current].filename; - TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename); + TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", filename); TQFile file(dictionaryFile); if (!file.exists()) return; diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index 2ba1fb2..e97b0e3 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -25,7 +25,7 @@ #include <kurlrequester.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <tdefiledialog.h> diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index 2031c8e..b9f4c7c 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -21,7 +21,7 @@ #include <tqdir.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <tdelocale.h> @@ -292,10 +292,10 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { pdlg->show(); tqApp->processEvents (20); - TQStringList files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true); + TQStringList files = tdeApp->dirs()->findAllResources ("html", language + "/*.docbook", true, true); if ((files.count() == 0) && (language.length() == 5)) { language = language.left(2); - files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true); + files = tdeApp->dirs()->findAllResources ("html", language + "/*.docbook", true, true); } return parseFiles (files, TQTextStream::UnicodeUTF8, 0, pdlg); diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 31be41d..9e1eee1 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -18,7 +18,7 @@ // KDE includes #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> // App specific includes diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h index 7b1df15..a0cd431 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h @@ -15,7 +15,7 @@ // TQt includes // KDE includes -#include <kprocess.h> +#include <tdeprocess.h> // App specific includes #include "KTTSDlibSetup.h" diff --git a/ksayit/ksayit.tdevelop b/ksayit/ksayit.tdevelop deleted file mode 100644 index 2d66eb5..0000000 --- a/ksayit/ksayit.tdevelop +++ /dev/null @@ -1,196 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Robert Vogl</author> - <email>[email protected]</email> - <version>0.8.3</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts> - <part>KDevCTags2</part> - <part>Unterstützung für Perforce (KDevelop)</part> - <part>Unterstützung für Subversion (KDevelop)</part> - <part>Unterstützung für CTags (KDevelop)</part> - <part>Unterstützung für CVSService (KDevelop)</part> - </ignoreparts> - <secondaryLanguages/> - </general> - <tdevautoproject> - <general> - <activetarget>KTTSD_Lib/libKTTSD_Lib.la</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>src/ksayit</mainprogram> - <directoryradio>executable</directoryradio> - <runarguments> - <ksayit/> - </runarguments> - <customdirectory>/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>debug</builddir> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevg77options</f77compiler> - <cxxflags>-O0</cxxflags> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - <envvars/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - </tdevautoproject> - <tdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </tdevfileview> - <tdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - <toc>opengl</toc> - <toc>wxwindows_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - <projectdoc> - <userdocDir>html/</userdocDir> - <apidocDir>html/</apidocDir> - </projectdoc> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </tdevdoctreeview> - <tdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </tdevdebugger> - <tdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </tdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <tdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </tdevdocumentation> -</tdevelop> diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index 69cb5a2..8b2000d 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // App specific includes #include "Types.h" diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp index 54e3cf1..7c44b12 100644 --- a/ksayit/src/fxpluginhandler.cpp +++ b/ksayit/src/fxpluginhandler.cpp @@ -125,7 +125,7 @@ void FXPluginHandler::readConfiguration() if ( factory ){ plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) ); if ( plugin.p ){ // Plugin found - plugin.p->setApplication( TDEApplication::kApplication() ); + plugin.p->setApplication( tdeApp ); plugin.description = plugin.p->getDescription_KS(); // append to list of active plugins m_lstActivePlugins.append( plugin.name ); @@ -158,7 +158,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname) if ( factory ){ plugin.p = static_cast<FXPlugin*>( factory->create( (TQObject*)this, (plugin.name).latin1() ) ); if ( plugin.p ){ // Plugin found - plugin.p->setApplication( TDEApplication::kApplication() ); + plugin.p->setApplication( tdeApp ); plugin.description = plugin.p->getDescription_KS(); // append to list of active plugins m_lstActivePlugins.append( plugin.name ); diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 67c466f..f55c056 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -38,7 +38,7 @@ #include <kedittoolbar.h> #include <kkeydialog.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // application specific includes #include "ksayit.h" @@ -69,8 +69,8 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, bkMenu = NULL; m_currentBookmarkFile = TQString(); - config=kapp->config(); - m_kttslib = new KTTSDLib(this, "KTTSD-Library", kapp); + config=tdeApp->config(); + m_kttslib = new KTTSDLib(this, "KTTSD-Library", tdeApp); initView(); initStatusBar(); @@ -126,7 +126,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, KSayItApp::~KSayItApp() { - // delete kapp->mainWidget(); + // delete tdeApp->mainWidget(); delete m_kttslib; delete tray; delete m_fxpluginhandler; @@ -552,7 +552,7 @@ void KSayItApp::slotFileQuit() int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel() ); if (really == KMessageBox::Yes){ slotSaveOptions(); - kapp->quit(); + tdeApp->quit(); } else { slotStatusMsg(i18n("Ready.")); } diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h index b50b9da..af4826d 100644 --- a/ksayit/src/ksayit_fxplugin.h +++ b/ksayit/src/ksayit_fxplugin.h @@ -29,7 +29,7 @@ using namespace Arts; * If you would like to implement a plugin, simply make a class * derived from FXPlugin, include 'ksayit_fxplugin.h' and reimplement all the * pure virtual functions provided herein. - * *Appl is a pointer to the main application as delivered by \p TDEApplication::kApplication(). + * *Appl is a pointer to the main application as delivered by \p tdeApp. * It can be used for any reason i.e. to install a TQt translator.\n \author Robert Vogl */ diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h index 2ce918a..717dcf9 100644 --- a/ksayit/src/ksayit_ttsplugin.h +++ b/ksayit/src/ksayit_ttsplugin.h @@ -36,7 +36,7 @@ * In addition you must implement two class factories:\n * \p createPlugin() returns a pointer to an instance of your class. * The Plugin Handler of KSayIt calls this function with a parameter pointing - * to the main application instance, as delivered by \p TDEApplication::kApplication(). + * to the main application instance, as delivered by \p tdeApp. * This pointer can be used for any reason i.e. to install a TQt translator.\n * An instance of your class should be deleted by use of \p destroyPlugin().\n * Example: diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index 42971a5..dbc23fc 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/ksayit/src/ksayitsystemtray.cpp @@ -44,7 +44,7 @@ void KSayItSystemTray::initActions() { // Context-menu menu = this->contextMenu(); - help = new KHelpMenu(this, kapp->aboutData(), false, actionCollection()); + help = new KHelpMenu(this, tdeApp->aboutData(), false, actionCollection()); // Standard actions settings = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection()); help_about = KStdAction::aboutApp(help, TQ_SLOT(aboutApplication()), actionCollection()); diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index d5ca9d9..0fdc160 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -28,7 +28,7 @@ #include <tdeaction.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kgenericfactory.h> @@ -91,12 +91,12 @@ void KateKttsdPluginView::slotReadOut() text = ei->text(); } - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); // If KTTSD not running, start it. if (!client->isApplicationRegistered("kttsd")) { TQString error; - if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); } TQByteArray data; diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 005f8c3..825cc27 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -40,7 +40,7 @@ #include <kdialogbase.h> #include <kpushbutton.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kregexpeditorinterface.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index e226f68..7ae4f49 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -41,7 +41,7 @@ #include <kdialogbase.h> #include <kpushbutton.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kregexpeditorinterface.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 5358161..617e458 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // KTTS includes. #include "filterproc.h" diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 350c77d..ea62734 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -34,7 +34,7 @@ #include <kcombobox.h> #include <kpushbutton.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kregexpeditorinterface.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop b/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop deleted file mode 100644 index 172caca..0000000 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Paul Giannaros</author> - <email>[email protected]</email> - <version>$VERSION$</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <tdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </tdevfileview> - <tdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> - <general> - <dbgshell/> - </general> - </tdevdebugger> - <tdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </tdevfilecreate> - <tdevtrollproject> - <general> - <activedir></activedir> - </general> - <run> - <directoryradio>executable</directoryradio> - </run> - </tdevtrollproject> - <tdevcppsupport> - <references> - <pcs>kdeincludedb</pcs> - <pcs>qtincludedb</pcs> - <pcs>qtincludesdb</pcs> - <pcs>kgmailtoincludedb</pcs> - </references> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </tdevcppsupport> - <tdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - </tdevcvsservice> -</tdevelop> diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop.pcs b/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop.pcs Binary files differdeleted file mode 100644 index 4cdb884..0000000 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.tdevelop.pcs +++ /dev/null diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 2f3538f..52aed90 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kurlrequester.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // KTTS includes. #include "filterconf.h" diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index b341337..f1b0b2d 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -29,8 +29,8 @@ #include <tdeversion.h> #include <tdeconfig.h> #include <tdetempfile.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <kdebug.h> // KTTS includes. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 8cbd792..2c96972 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <kgenericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> #include <tdeconfig.h> #include <knuminput.h> @@ -348,7 +348,7 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) false); // See if KTTSD is already running, and if so, create jobs tab. - if (kapp->dcopClient()->isApplicationRegistered("kttsd")) + if (tdeApp->dcopClient()->isApplicationRegistered("kttsd")) kttsdStarted(); else // Start KTTSD if check box is checked. @@ -887,7 +887,7 @@ void KCMKttsMgr::save() else { // If KTTSD is running, reinitialize it. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); bool kttsdRunning = (client->isApplicationRegistered("kttsd")); if (kttsdRunning) { @@ -1754,7 +1754,7 @@ void KCMKttsMgr::enableKttsdToggled(bool) if (reenter) return; reenter = true; // See if KTTSD is running. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); bool kttsdRunning = (client->isApplicationRegistered("kttsd")); // kdDebug() << "KCMKttsMgr::enableKttsdToggled: kttsdRunning = " << kttsdRunning << endl; // If Enable KTTSD check box is checked and it is not running, then start KTTSD. diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 5b33fc2..f1e6290 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -25,7 +25,7 @@ #include <tqcombobox.h> // KDE includes -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 5d0b7e7..9c4d99c 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/) void KTTSD::speakClipboard() { // Get the clipboard object. - TQClipboard *cb = kapp->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); // Copy text from the clipboard. TQString text = cb->text(); @@ -821,7 +821,7 @@ void KTTSD::kttsdExit() stopText(); kdDebug() << "KTTSD::kttsdExit: Emitting DCOP signal kttsdExiting()" << endl; kttsdExiting(); - kapp->quit(); + tdeApp->quit(); } /** @@ -847,7 +847,7 @@ void KTTSD::reinit() /** * Return KTTSD daemon version number. */ -TQString KTTSD::version() { return kapp->aboutData()->version(); } +TQString KTTSD::version() { return tdeApp->aboutData()->version(); } /* * Checks if KTTSD is ready to speak and at least one talker is configured. diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index a0636ac..5cefc98 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -30,7 +30,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> //#include <tdeio/job.h> diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index 2d39153..27336c0 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -35,7 +35,7 @@ // KDE includes. #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> // KTTS includes. diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 45923a1..3206e3a 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -28,8 +28,8 @@ // KDE includes. #include <tdeversion.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <kdebug.h> diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index 5d952bd..fec204a 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeparts/componentfactory.h> #include <ktrader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // KTTS includes. #include "pluginconf.h" diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index a6a7072..5434a48 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -506,7 +506,7 @@ void KttsJobMgrPart::slot_job_change_talker() void KttsJobMgrPart::slot_speak_clipboard() { // Get the clipboard object. - TQClipboard *cb = kapp->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); // Copy text from the clipboard. diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index d6e55ea..52bf832 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -236,7 +236,7 @@ void KttsMgrTray::exitWhenFinishedSpeaking() { if (getTextJobState(jobNumsList[ndx].toInt()) != KSpeech::jsFinished) return; } - kapp->quit(); + tdeApp->quit(); } /** @@ -292,19 +292,19 @@ void KttsMgrTray::speakClipboardSelected() void KttsMgrTray::aboutSelected() { - TDEAboutApplication aboutDlg(kapp->aboutData(), 0, "kttsmgraboutdlg", true); + TDEAboutApplication aboutDlg(tdeApp->aboutData(), 0, "kttsmgraboutdlg", true); aboutDlg.exec(); } void KttsMgrTray::helpSelected() { - kapp->invokeHelp(TQString(),"kttsd"); + tdeApp->invokeHelp(TQString(),"kttsd"); } void KttsMgrTray::quitSelected() { // kdDebug() << "Running KttsMgrTray::quitSelected" << endl; - kapp->quit(); + tdeApp->quit(); } void KttsMgrTray::holdSelected() @@ -327,7 +327,7 @@ void KttsMgrTray::resumeSelected() bool KttsMgrTray::isKttsdRunning() { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); return (client->isApplicationRegistered("kttsd")); } diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index c4099b6..f2404c3 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -27,7 +27,7 @@ // KDE includes. #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // PluginConf includes. #include "pluginconf.h" diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index 4bcf0b1..ac2931f 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -21,7 +21,7 @@ // KDE includes. #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> // PlugInProc includes. diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index 307ba79..473fdd0 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -112,7 +112,7 @@ * If @ref supportsAsync returns False, KTTSD will run the plugin in a separate * TQThread. As a consequence, the plugin must not make use of the KDE Library, * when @ref sayText or @ref synthText is called, -* with the exception of TDEProcess and family (KProcIO, KShellProcess). +* with the exception of TDEProcess and family (TDEProcIO, KShellProcess). * This restriction comes about because the KDE Libraries make use of the * main TQt event loop, which unfortunately, runs only in the main thread. * This restriction will likely be lifted in TQt 4 and later. diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index ccc3565..8930114 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -24,7 +24,7 @@ ******************************************************************************/ // KDE includes. -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> // Stretcher includes. diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp index 3688667..a95470f 100644 --- a/kttsd/libkttsd/testplayer.cpp +++ b/kttsd/libkttsd/testplayer.cpp @@ -28,7 +28,7 @@ // KDE includes. #include <tdeapplication.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index c67564d..bdd56b5 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -44,7 +44,7 @@ // KDE includes. #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index fac97e1..f539a63 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqapplication.h> diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index 99dc5ab..c8a1420 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -137,8 +137,8 @@ TQStringList GStreamerPlayer::getPluginList( const TQCString& classname ) TQStringList results; if(!m_initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); m_initialized = true; } @@ -182,8 +182,8 @@ bool GStreamerPlayer::requireVersion(uint major, uint minor, uint micro) guint gmajor, gminor, gmicro; if(!m_initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); m_initialized = true; } @@ -213,8 +213,8 @@ void GStreamerPlayer::readConfig() void GStreamerPlayer::setupPipeline() { if(!m_initialized) { - int argc = kapp->argc(); - char **argv = kapp->argv(); + int argc = tdeApp->argc(); + char **argv = tdeApp->argv(); gst_init(&argc, &argv); m_initialized = true; } diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 2144b52..8bd6c4d 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> #include <kcombobox.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> // KTTS includes. diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index e0f04ec..132cf6b 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -27,9 +27,9 @@ // KDE includes. #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // KTTS includes. #include <pluginproc.h> diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 9340fa5..8a24263 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kdialog.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcombobox.h> #include <tdelocale.h> #include <knuminput.h> diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index 27d96f0..ad9ac7d 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -35,8 +35,8 @@ #include <kdebug.h> #include <tdeconfig.h> #include <tdetempfile.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> // Epos Plugin includes. #include "eposproc.h" diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index 81e346c..64b74a6 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -42,9 +42,8 @@ #include <kcombobox.h> #include <tdeglobal.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> -#include <kprocio.h> #include <kprogress.h> #include <kiconloader.h> diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index da5e71b..cbad4ef 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -33,7 +33,8 @@ // KDE includes. #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> // KTTS includes. #include "utils.h" diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h index f4d0e25..60601a1 100644 --- a/kttsd/plugins/festivalint/festivalintproc.h +++ b/kttsd/plugins/festivalint/festivalintproc.h @@ -27,11 +27,10 @@ #include <tqstringlist.h> #include <tqmutex.h> -#include <kprocess.h> - #include <pluginproc.h> class TQTextCodec; +class TDEProcess; class FestivalIntProc : public PlugInProc{ TQ_OBJECT diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index aa33e04..d23cb3c 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <kdialog.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> // KTTS includes. diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index 269290f..14382ef 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -28,8 +28,8 @@ // KDE includes. #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> // Flite Plugin includes. #include "fliteproc.h" diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 6b47758..b17eaed 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -26,7 +26,7 @@ // KDE includes. #include <kdialog.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kprogress.h> diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index 3d5efdb..6295dc6 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include "freettsproc.h" diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 7f0b51f..3b30295 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <kdialog.h> #include <kcombobox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <kdialogbase.h> #include <klineedit.h> diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 51b1d24..fc92f99 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "hadifixproc.h" #include "hadifixproc.moc" diff --git a/translations/desktop_files/kmag-desktops/de.po b/translations/desktop_files/kmag-desktops/de.po index 14e640e..ab3f9cd 100644 --- a/translations/desktop_files/kmag-desktops/de.po +++ b/translations/desktop_files/kmag-desktops/de.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Lian Lianna Begett <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-14 11:43+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" +"PO-Revision-Date: 2025-01-18 19:06+0000\n" +"Last-Translator: Lian Lianna Begett <[email protected]>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeaccessibility/kmag-desktop-files/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kmag.desktop:2 msgid "KMag" -msgstr "" +msgstr "KMag" #. GenericName #: kmag.desktop:4 @@ -29,4 +30,4 @@ msgstr "Bildschirmlupe" #. Comment #: kmag.desktop:6 msgid "Tool to zoom screen areas" -msgstr "" +msgstr "Werkzeug zum Vergrößern von Bildschirminhalten" diff --git a/translations/desktop_files/kmag-desktops/zh_CN.po b/translations/desktop_files/kmag-desktops/zh_CN.po index 61d0a40..17456ef 100644 --- a/translations/desktop_files/kmag-desktops/zh_CN.po +++ b/translations/desktop_files/kmag-desktops/zh_CN.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Toad114514 <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-14 11:43+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" +"PO-Revision-Date: 2025-02-16 21:12+0000\n" +"Last-Translator: Toad114514 <[email protected]>\n" +"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeaccessibility/kmag-desktop-files/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kmag.desktop:2 msgid "KMag" -msgstr "" +msgstr "kMag" #. GenericName #: kmag.desktop:4 @@ -29,4 +30,4 @@ msgstr "屏幕放大镜" #. Comment #: kmag.desktop:6 msgid "Tool to zoom screen areas" -msgstr "" +msgstr "放大屏幕区域的工具" |