Cleanup KDE references, fixup header inclusion

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 3 months ago
parent 9a364c2dc9
commit 3246c49f3c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,7 +1,7 @@
README for Kalternatives
README for TDEAlternatives
------------------------
Kalternatives is a KDE program that a allows you to easily configure and
TDEAlternatives is a TDE program that a allows you to easily configure and
change your Mandrake/Debian alternatives system.
What is the Mandrake/Debian Alternatives System?
@ -24,7 +24,7 @@ would like to change /usr/bin/vi to point to the nvi executable you could:
1. Change the link on /etc/alternatives/vi by hand.
2. Use the Mandrake/Debian command update-alternatives --config vi
3. Use Kalternatives.
3. Use TDEAlternatives.
How is the program used?
@ -51,14 +51,10 @@ Who do I have to whine if the program fails for me?
To Juanjo Álvarez <juanjux@yahoo.es>
What is the KDE-Mandrake/Debian project?
What is the TDE-Mandrake/Debian project?
-------------------------------
The KDE-Debian project is composed of some individuals, actively supported by
The TDE-Debian project is composed of some individuals, actively supported by
some companies, trying to provide Debian and Debian based distributions with a
collection of first-class, updated KDE desktop including some KDE applications
specifically designed for Debian. If you want to support the info by money or
by work (coding, translations, testing) you can have more info on the
kde-Debian mailing list:
https://mail.kde.org/mailman/listinfo/kde-Mandrake/Debian
collection of first-class, updated TDE desktop including some TDE applications
specifically designed for Debian.

@ -1,7 +1,7 @@
#define VERSION "@VERSION@"
// Defined if you have fvisibility and fvisibility-inlines-hidden support.
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */

@ -1,14 +1,10 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kalternatives "<application>kalternatives 0&#46;10</application>">
<!ENTITY kappname "&kalternatives;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY tdealternatives "<application>tdealternatives 0&#46;10</application>">
<!ENTITY kappname "&tdealternatives;"><!-- Do *not* replace kappname-->
<!ENTITY package "tde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here -->
<!-- Do not define any other entities; instead, use the entities
from kde-genent.entities and $LANG/user.entities. -->
]>
<!-- kdoctemplate v0.8 October 1 1999
Minor update to "Credits and Licenses" section on August 24, 2000
@ -21,9 +17,9 @@
This template was designed by: David Rugge davidrugge@mindspring.com
with lots of help from: Eric Bischoff ebisch@cybercable.tm.fr
and Frederik Fouvry fouvry@sfs.nphil.uni-tuebingen.de
of the KDE DocBook team.
of the TDE DocBook team.
You may freely use this template for writing any sort of KDE documentation.
You may freely use this template for writing any sort of TDE documentation.
If you have any changes or improvements, please let us know.
Remember:
@ -44,7 +40,7 @@ thanks ;-).
as Authors, publish date, the abstract, and Keywords -->
<bookinfo>
<title>The &kalternatives; Handbook</title>
<title>The &tdealternatives; Handbook</title>
<authorgroup>
<author>
@ -83,18 +79,18 @@ Do NOT change these in the translation. -->
<abstract>
<para>
&kalternatives; is an application specially designed to do nothing you would
&tdealternatives; is an application specially designed to do nothing you would
ever want.
</para>
</abstract>
<!-- This is a set of Keywords for indexing by search engines.
Please at least include KDE, the KDE package it is in, the name
Please at least include TDE, the TDE package it is in, the name
of your application, and a few relevant keywords. -->
<keywordset>
<keyword>KDE</keyword>
<keyword>kalternatives</keyword>
<keyword>TDE</keyword>
<keyword>tdealternatives</keyword>
<keyword>nothing</keyword>
<keyword>nothing else</keyword>
</keywordset>
@ -108,7 +104,7 @@ document, and if there is no ID, the name of the generated HTML files will vary
from time to time making it hard to manage for maintainers and for the CVS
system. Any chapter labelled (OPTIONAL) may be left out at the author's
discretion. Other chapters should not be left out in order to maintain a
consistent documentation style across all KDE apps. -->
consistent documentation style across all TDE apps. -->
<chapter id="introduction">
<title>Introduction</title>
@ -119,13 +115,13 @@ problems. Basically a long version of the abstract. Don't include a
revision history. (see installation appendix comment) -->
<para>
&kalternatives; is a program that lets you do absolutely nothing. Please report
any problems or feature requests to the &kde; mailing lists.
&tdealternatives; is a program that lets you do absolutely nothing. Please report
any problems or feature requests to the &tde; mailing lists.
</para>
</chapter>
<chapter id="using-kalternatives">
<title>Using &kalternatives;</title>
<chapter id="using-tdealternatives">
<title>Using &tdealternatives;</title>
<!-- This chapter should tell the user how to use your app. You should use as
many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document
@ -137,7 +133,7 @@ your application. -->
patent issues. -->
<screenshot>
<screeninfo>Here's a screenshot of &kalternatives;</screeninfo>
<screeninfo>Here's a screenshot of &tdealternatives;</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="screenshot.png" format="PNG"/>
@ -153,8 +149,8 @@ patent issues. -->
</para>
<sect1 id="kalternatives-features">
<title>More &kalternatives; features</title>
<sect1 id="tdealternatives-features">
<title>More &tdealternatives; features</title>
<para>It slices! It dices! and it comes with a free toaster!</para>
<para>
@ -169,7 +165,7 @@ The Squiggle Tool <guiicon><inlinemediaobject>
<phrase>Squiggle</phrase>
</textobject>
</inlinemediaobject></guiicon> is used to draw squiggly lines all over
the &kalternatives; main window. It's not a bug, it's a feature!
the &tdealternatives; main window. It's not a bug, it's a feature!
</para>
</sect1>
@ -184,8 +180,8 @@ Also include any keys that have a special function but have no equivalent in the
menus or toolbars. This may not be necessary for small apps or apps with no tool
or menu bars. -->
<sect1 id="kalternatives-mainwindow">
<title>The main &kalternatives; window</title>
<sect1 id="tdealternatives-mainwindow">
<title>The main &tdealternatives; window</title>
<sect2>
<title>The File Menu</title>
@ -219,7 +215,7 @@ or menu bars. -->
<guimenu>File</guimenu>
<guimenuitem>Quit</guimenuitem>
</menuchoice></term>
<listitem><para><action>Quits</action> &kalternatives;</para></listitem>
<listitem><para><action>Quits</action> &tdealternatives;</para></listitem>
</varlistentry>
</variablelist>
</para>
@ -230,7 +226,7 @@ or menu bars. -->
<title>The <guimenu>Help</guimenu> Menu</title>
<!-- Assuming you have a standard help menu (help, what's this, about -->
<!-- &kalternatives;, about KDE) then the documentation is already written. -->
<!-- &tdealternatives;, about TDE) then the documentation is already written. -->
<!-- The following entity is valid anywhere that a variablelist is -->
<!-- valid. -->
@ -242,14 +238,14 @@ or menu bars. -->
</chapter>
<chapter id="developers">
<title>Developer's Guide to &kalternatives;</title>
<title>Developer's Guide to &tdealternatives;</title>
<!-- (OPTIONAL) A Programming/Scripting reference chapter should be
used for apps that use plugins or that provide their own scripting hooks
and/or development libraries. -->
<para>
Programming &kalternatives; plugins is a joy to behold. Just read through the next
Programming &tdealternatives; plugins is a joy to behold. Just read through the next
66 pages of API's to learn how!
</para>
@ -404,7 +400,7 @@ application work. -->
<qandaset id="faqlist">
<qandaentry>
<question>
<para>My Mouse doesn't work. How do I quit &kalternatives;?</para>
<para>My Mouse doesn't work. How do I quit &tdealternatives;?</para>
</question>
<answer>
<para>You silly goose! Check out the <link linkend="commands">Commands
@ -427,13 +423,13 @@ installed.</para>
<!-- Include credits for the programmers, documentation writers, and
contributors here. The license for your software should then be included below
the credits with a reference to the appropriate license file included in the KDE
the credits with a reference to the appropriate license file included in the TDE
distribution. -->
<title>Credits and License</title>
<para>
&kalternatives;
&tdealternatives;
</para>
<para>
Program copyright 2004 Juanjo <email>juanjux&#64;yahoo&#46;es</email>
@ -441,7 +437,7 @@ Program copyright 2004 Juanjo <email>juanjux&#64;yahoo&#46;es</email>
<para>
Contributors:
<itemizedlist>
<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para>
<listitem><para>Konqui the TDE Dragon <email>konqui@kde.org</email></para>
</listitem>
<listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
</listitem>
@ -472,11 +468,11 @@ Documentation copyright 2004 Juanjo <email>juanjux&#64;yahoo&#46;es</email>
<appendix id="installation">
<title>Installation</title>
<sect1 id="getting-kalternatives">
<title>How to obtain &kalternatives;</title>
<sect1 id="getting-tdealternatives">
<title>How to obtain &tdealternatives;</title>
<!-- This first entity contains boiler plate for applications that are
part of KDE CVS. You should remove it if you are releasing your
part of TDE CVS. You should remove it if you are releasing your
application -->
&install.intro.documentation;
@ -498,23 +494,7 @@ information here.
-->
<para>
In order to successfully use &kalternatives;, you need &kde; 1.1. Foobar.lib is
required in order to support the advanced &kalternatives; features. &kalternatives; uses
about 5 megs of memory to run, but this may vary depending on your
platform and configuration.
</para>
<para>
All required libraries as well as &kalternatives; itself can be found
on <ulink url="ftp://ftp.kalternatives.org">The &kalternatives; home page</ulink>.
</para>
<!-- For a list of updates, you may refer to the application web site
or the ChangeLog file, or ... -->
<para>
You can find a list of changes at <ulink
url="http://apps.kde.org/kalternatives">http://apps.kde.org/kalternatives</ulink>.
</para>
In order to successfully use &tdealternatives;, you need &tde;.</para>
</sect1>
<sect1 id="compilation">
@ -532,7 +512,7 @@ url="http://apps.kde.org/kalternatives">http://apps.kde.org/kalternatives</ulink
<title>Configuration</title>
<para>Don't forget to tell your system to start the <filename>dtd</filename>
dicer-toaster daemon first, or &kalternatives; won't work !</para>
dicer-toaster daemon first, or &tdealternatives; won't work !</para>
</sect1>

@ -13,5 +13,3 @@ tde_l10n_create_template(
CATALOG "desktop_files/tdealternatives-desktops"
SOURCES alternatives.desktop
)
# kate: replace-tabs true; tab-width 2;

@ -57,6 +57,3 @@ install(
FILES tdealternativesui.rc
DESTINATION ${DATA_INSTALL_DIR}/tdealternatives/
)
# kate: replace-tabs true; tab-width 2;

@ -13,4 +13,4 @@ X-TDE-ParentApp=kcontrol
Name=Alternatives
Comment=TDEAlternatives - DPKG/RPM alternatives manager for TDE
Categories=Qt;TDE;X-TDE-settings-system;
Keywords=applications,alternative,alternatives,dpkg,rpm,debian,devuan,ubuntu,redhat,fedora,mageia
Keywords=applications;alternative;alternatives;dpkg;rpm;debian;devuan;ubuntu;redhat;fedora;mageia

@ -24,7 +24,7 @@
#include <tqlistview.h>
#include <tdelistview.h>
#include <tqstring.h>
#include <kprocess.h>
#include <tdeprocess.h>
class Alternative;
class AltController;

@ -84,7 +84,6 @@ bool Alternative::isBroken() const
bool Alternative::select()
{
// This method was 19 lines in Python in the original kalternatives :-D
if(isSelected()) return true;
if(isBroken())
{

@ -21,20 +21,13 @@
#ifndef _ALTPARSER_H_
#define _ALTPARSER_H_
//FIXME: Cosas pa mirar:
//Comprobar entradas NULL y demás (sobre todo antes de los delete)
//
//Quitar el stdio.h
#include <config.h>
#include <tqstring.h>
#include <tqobject.h>
#include <tqptrlist.h>
#include <tqstringlist.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
class Item;
@ -134,7 +127,5 @@ public:
//FIXME: Put in a #ifdef
void debugPrintAlts() const;
TQString getAltDir() { return m_altdir ;}
//protected:
//virtual int compareItems(Item i1, Item i2);
};
#endif // _KALTERNATIVES_H_
#endif // _ALTPARSER_H_

@ -21,18 +21,17 @@
* 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "main.h"
#include "kalternatives.h"
#include <kuniqueapplication.h>
#include "tdealternatives.h"
#include <tdeuniqueapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
KUniqueApplication *app = 0; // Global
TDEUniqueApplication *app = 0; // Global
static const char description[] =
I18N_NOOP("A KDE Manager for the Debian/Mandrake alternatives system");
I18N_NOOP("A TDE Manager for the Debian/Mandrake alternatives system");
static const char version[] = "0.10";
@ -44,19 +43,19 @@ static TDECmdLineOptions options[] =
int main(int argc, char **argv)
{
TDEAboutData about("kalternatives", I18N_NOOP("kalternatives"), version, description,
TDEAboutData about("tdealternatives", I18N_NOOP("tdealternatives"), version, description,
TDEAboutData::License_GPL, "(C) 2004 Juanjo Alvarez Martinez and Mario Bensi", 0, 0, "juanjux@yahoo.es, nef@ipsquad.net");
about.addAuthor( "Juanjo Alvarez Martinez and Mario Bensi", 0, "juanjux@yahoo.es, nef@ipsquad.net" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication rapp;
TDEUniqueApplication rapp;
app = &rapp;
Kalternatives *mainWin = 0;
TDEAlternatives *mainWin = 0;
if (app->isRestored())
{
//RESTORE(kalternatives);
//RESTORE(tdealternatives);
}
else
{
@ -65,7 +64,7 @@ int main(int argc, char **argv)
/// @todo do something with the command line args here
mainWin = new Kalternatives();
mainWin = new TDEAlternatives();
app->setMainWidget( mainWin );
mainWin->show();

@ -1,8 +0,0 @@
#ifndef _MAIN_H_
#define _MAIN_H_
#include <kuniqueapplication.h>
extern KUniqueApplication *app;
#endif //_MAIN_H_

@ -2,7 +2,7 @@
<class>MainWindow</class>
<widget class="TQWidget">
<property name="name">
<cstring>Kalternatives</cstring>
<cstring>TDEAlternatives</cstring>
</property>
<property name="geometry">
<rect>
@ -27,7 +27,7 @@
</size>
</property>
<property name="caption">
<string>Alternatives Manager</string>
<string>TDE Alternatives Manager</string>
</property>
<grid>
<property name="name">

@ -21,12 +21,10 @@
* 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef _tdealternatives_H_
#define _tdealternatives_H_
#ifndef _TDEALTERNATIVES_H_
#define _TDEALTERNATIVES_H_
//#ifdef HAVE_CONFIG_H
//#include <config.h>
//#endif
#include <config.h>
#include <tdelistview.h>
#include <kpushbutton.h>
@ -78,4 +76,4 @@ private slots:
void slotPropertiesClicked();
};
#endif // _tdealternatives_H_
#endif // _TDEALTERNATIVES_H_

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kalternatives" version="1">
<kpartgui name="tdealternatives" version="1">
<MenuBar>
<Menu name="custom"><text>C&amp;ustom</text>
<Action name="custom_action" />

@ -28,7 +28,5 @@ msgstr ""
#. Keywords
#: alternatives.desktop:16
msgid ""
"applications,alternative,alternatives,dpkg,rpm,debian,devuan,ubuntu,redhat,"
"fedora,mageia"
msgid "applications;alternative;alternatives;dpkg;rpm;debian;devuan;ubuntu;redhat;fedora;mageia"
msgstr ""

@ -57,11 +57,11 @@ msgid "no description"
msgstr ""
#: main.cpp:35
msgid "A KDE Manager for the Debian/Mandrake alternatives system"
msgid "A TDE Manager for the Debian/Mandrake alternatives system"
msgstr ""
#: main.cpp:47
msgid "kalternatives"
msgid "tdealternatives"
msgstr ""
#: tdealternatives.cpp:85

Loading…
Cancel
Save