Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent c3e3301aba
commit 79fd2b2bbd

@ -123,7 +123,7 @@ option( BUILD_KMILO "Build kmilo" ${BUILD_ALL} )
option( BUILD_KREGEXPEDITOR "Build kregexpeditor" ${BUILD_ALL} )
option( BUILD_KSIM "Build ksim" ${BUILD_ALL} )
option( BUILD_KTIMER "Build ktimer" ${BUILD_ALL} )
option( BUILD_KWALLET "Build kwallet" ${BUILD_ALL} )
option( BUILD_KWALLET "Build tdewallet" ${BUILD_ALL} )
option( BUILD_SUPERKARAMBA "Build superkaramba" ${BUILD_ALL} )
@ -173,7 +173,7 @@ tde_conditional_add_subdirectory( BUILD_KMILO kmilo )
tde_conditional_add_subdirectory( BUILD_KREGEXPEDITOR kregexpeditor )
tde_conditional_add_subdirectory( BUILD_KSIM ksim )
tde_conditional_add_subdirectory( BUILD_KTIMER ktimer )
tde_conditional_add_subdirectory( BUILD_KWALLET kwallet )
tde_conditional_add_subdirectory( BUILD_KWALLET tdewallet )
tde_conditional_add_subdirectory( BUILD_SUPERKARAMBA superkaramba )

@ -39,7 +39,7 @@ tde_add_library( ark_common STATIC_PIC
tde_add_tdeinit_executable( ark AUTOMOC
SOURCES main.cpp arkapp.cpp mainwindow.cpp
LINK ark_common-static khtml-shared
LINK ark_common-static tdehtml-shared
)
@ -49,12 +49,12 @@ tde_add_kpart( libarkpart AUTOMOC
SOURCES ark_part.cpp arkfactory.cpp zip.cpp
tar.cpp filelistview.cpp arch.cpp lha.cpp
compressedfile.cpp zoo.cpp rar.cpp ar.cpp
arkutils.cpp archiveformatdlg.cpp
artdeutils.cpp archiveformatdlg.cpp
arkwidget.cpp searchbar.cpp addition.ui
extraction.ui general.ui arkviewer.cpp
sevenzip.cpp extractiondialog.cpp ace.cpp
tarlistingthread.cpp arj.cpp
LINK ark_common-static khtml-shared
LINK ark_common-static tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -27,7 +27,7 @@ libarkpart_la_COMPILE_FIRST = settings.h
libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
filelistview.cpp arch.cpp lha.cpp \
compressedfile.cpp zoo.cpp rar.cpp \
ar.cpp arkutils.cpp archiveformatdlg.cpp \
ar.cpp artdeutils.cpp archiveformatdlg.cpp \
arkwidget.cpp searchbar.cpp \
addition.ui extraction.ui general.ui \
arkviewer.cpp sevenzip.cpp extractiondialog.cpp \

@ -47,7 +47,7 @@
// ark includes
#include "arch.h"
#include "arkwidget.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
// the archive types

@ -42,7 +42,7 @@
#include "arj.h"
#include "arkwidget.h"
#include "settings.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName )

@ -23,10 +23,10 @@
#ifndef ARK_PART_H
#define ARK_PART_H
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kparts/statusbarextension.h>
#include <kparts/factory.h>
#include <tdeparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/statusbarextension.h>
#include <tdeparts/factory.h>
#include <kaction.h>
#include <kprogress.h>

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui name="ark_kparts" version="8">
<kpartgui name="ark_tdeparts" version="8">
<ActionProperties>
<Action name="select_all" icon="ark_selectall"/>
<Action name="deselect_all" icon="ark_deselectall"/>

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui name="ark_kparts" version="7">
<kpartgui name="ark_tdeparts" version="7">
<ActionProperties>
<Action name="select_all" icon="ark_selectall"/>
</ActionProperties>

@ -21,7 +21,7 @@
#ifndef ARKFACTORY_H
#define ARKFACTORY_H
#include <kparts/factory.h>
#include <tdeparts/factory.h>
class ArkFactory : public KParts::Factory
{

@ -22,7 +22,7 @@
#include "arkviewer.h"
#include <klocale.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kmimetype.h>
#include <kdebug.h>
#include <kurl.h>

@ -23,7 +23,7 @@
*/
#include <kdialogbase.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
class ArkViewer : public KDialogBase
{

@ -75,7 +75,7 @@
#include "extractiondialog.h"
#include "arkwidget.h"
#include "filelistview.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "archiveformatinfo.h"
#include "compressedfile.h"
#include "searchbar.h"

@ -72,7 +72,7 @@
// TQt includes
#include <tqfile.h>
#include "arkutils.h"
#include "artdeutils.h"
TQString ArkUtils::getTimeStamp(const TQString &_month,
const TQString &_day,

@ -48,7 +48,7 @@
#include <kurlpixmapprovider.h>
#include <kdebug.h>
#include "arkutils.h"
#include "artdeutils.h"
#include "settings.h"
ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,

@ -49,7 +49,7 @@
#include "settings.h"
#include "arch.h"
#include "lha.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName )

@ -32,8 +32,8 @@
#include <kfiledialog.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <kparts/componentfactory.h>
#include <kparts/browserextension.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/browserextension.h>
#include <kkeydialog.h>
#include <kcombobox.h>
#include <kio/netaccess.h>

@ -31,8 +31,8 @@
// KDE includes
#include <kmainwindow.h>
#include <kparts/mainwindow.h>
#include <kparts/part.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
#include <kprogress.h>
class ArkWidget;

@ -49,7 +49,7 @@
#include "arch.h"
#include "settings.h"
#include "rar.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )

@ -39,7 +39,7 @@
#include "sevenzip.h"
#include "arkwidget.h"
#include "settings.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename )

@ -46,7 +46,7 @@
#include "arkwidget.h"
#include "arch.h"
#include "zoo.h"
#include "arkutils.h"
#include "artdeutils.h"
#include "filelistview.h"
static TQString fixTime( const TQString &_strTime );

@ -9,5 +9,5 @@
#
#################################################
tde_create_handbook( DESTINATION kwallet )
tde_create_handbook( DESTINATION tdewallet )

Before

Width:  |  Height:  |  Size: 997 B

After

Width:  |  Height:  |  Size: 997 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

@ -1,16 +1,16 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kwallet "<application>KWallet</application>">
<!ENTITY kwalletmanager "<application>KWallet Manager</application>">
<!ENTITY tdewallet "<application>KWallet</application>">
<!ENTITY tdewalletmanager "<application>KWallet Manager</application>">
<!ENTITY package "tdeutils">
<!ENTITY kappname "&kwallet;">
<!ENTITY kappname "&tdewallet;">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>
<book lang="&language;">
<bookinfo>
<title>The &kwallet; Handbook</title>
<title>The &tdewallet; Handbook</title>
<authorgroup>
<author>
@ -58,15 +58,15 @@ to manage. Remembering them is difficult, writing them down on paper or in
a text file is insecure, and using tools such at PGP is tedious and
inconvenient.</para>
<para>&kwallet; saves this sensitive data for you in a strongly encrypted
<para>&tdewallet; saves this sensitive data for you in a strongly encrypted
file, accessible by all applications, and protected with a master
password that you define.</para>
<tip>
<para>&kwallet; supports multiple wallets, so
<para>&tdewallet; supports multiple wallets, so
for the most secure operation, you should use one wallet for local
passwords, and another for network passwords and form data. You can
configure this behavior in the &kwallet; &kcontrolcenter; module, however
configure this behavior in the &tdewallet; &kcontrolcenter; module, however
the default setting is to store everything in one wallet.</para>
</tip>
@ -76,20 +76,20 @@ be accessed.</para>
</chapter>
<chapter id="kwalletmanager">
<title>&kwalletmanager;</title>
<chapter id="tdewalletmanager">
<title>&tdewalletmanager;</title>
<para>&kwalletmanager; serves a number of functions. Firstly it allows you to see if
<para>&tdewalletmanager; serves a number of functions. Firstly it allows you to see if
any wallets are open, which wallets those are, and which applications are
using each wallet. You can disconnect an application's access to a wallet
from within the &kwalletmanager;.</para>
from within the &tdewalletmanager;.</para>
<para>You may also manage the wallets installed on the system, creating and
deleting wallets and manipulating their contents (changing keys, ...).</para>
<para>Normally the &kwalletmanager; application is launched when
<para>Normally the &tdewalletmanager; application is launched when
&kde; starts and remains in iconic form in the system tray. Alternatively,
when a wallet is opened, the &kwalletmanager; application will be
when a wallet is opened, the &tdewalletmanager; application will be
launched. A system tray icon indicates that a wallet is open:
<mediaobject>
<imageobject>
@ -108,22 +108,22 @@ wallet:
</para>
<para>Click once on the system tray wallet icon to display the &kwalletmanager;
<para>Click once on the system tray wallet icon to display the &tdewalletmanager;
window showing all available wallets as icons which reflect their
current status, either open or closed.</para>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="kwalletmanager.png"/>
<imagedata fileref="tdewalletmanager.png"/>
</imageobject>
</mediaobject></para>
<sect1 id="kwalletmanager-context-menu">
<title>The &kwalletmanager; Context Menu</title>
<sect1 id="tdewalletmanager-context-menu">
<title>The &tdewalletmanager; Context Menu</title>
<para><mousebutton>Right</mousebutton> clicking on a wallet in the
&kwalletmanager; window offers
&tdewalletmanager; window offers
the following functions:</para>
<variablelist>
@ -184,10 +184,10 @@ connected applications will appear in a submenu.</para></listitem>
</variablelist>
</sect1>
<sect1 id="kwalletmanager-wallet-window">
<sect1 id="tdewalletmanager-wallet-window">
<title>The Wallet Window</title>
<para>Double clicking on a wallet in the &kwalletmanager; window will open a new
<para>Double clicking on a wallet in the &tdewalletmanager; window will open a new
window displaying that wallet's contents. A wallet may contain any number
of folders, which allow storing of password information. By default a wallet
will contain folders named Form Data and Passwords.
@ -237,19 +237,19 @@ locations.</para>
</chapter>
<chapter id="kwallet-kcontrol-module">
<title>Configuring &kwallet;</title>
<chapter id="tdewallet-kcontrol-module">
<title>Configuring &tdewallet;</title>
<sect1 id="wallet-preferences">
<title><guilabel>Wallet Preferences</guilabel></title>
<para>&kwallet; contains a small configuration panel with several options
that allow you to tune &kwallet; to your personal preferences. The
default settings for &kwallet; are sufficient for most users.</para>
<para>&tdewallet; contains a small configuration panel with several options
that allow you to tune &tdewallet; to your personal preferences. The
default settings for &tdewallet; are sufficient for most users.</para>
<para>Check the box to enable or disable the &kde; wallet subsystem
entirely. If this box is unchecked, then &kwallet; is entirely disabled and
none of the other options here have any effect, nor will &kwallet; record
entirely. If this box is unchecked, then &tdewallet; is entirely disabled and
none of the other options here have any effect, nor will &tdewallet; record
any information, or offer to fill in forms for you.</para>
<variablelist>
@ -353,7 +353,7 @@ context menu that appears, or by simply selecting it and pressing the
<chapter id="advanced-features">
<title>Advanced Features</title>
<para>Wallets can be dragged from the &kwalletmanager; window. This allows
<para>Wallets can be dragged from the &tdewalletmanager; window. This allows
you to drag the wallet to a file browser window, where you can choose to
copy, move, or link the wallet, as desired.</para>
@ -369,7 +369,7 @@ copying of data to portable devices.</para>
<chapter id="credits-and-licenses">
<title>Credits and Licenses</title>
<para>&kwallet; &copy; 2003 &George.Staikos;</para>
<para>&tdewallet; &copy; 2003 &George.Staikos;</para>
<para>Documentation &copy; &Lauri.Watts; and &George.Staikos;</para>
<!-- TRANS:CREDIT_FOR_TRANSLATORS -->

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

@ -29,4 +29,4 @@ METASOURCES = AUTO
knumbertest_SOURCES = knumbertest.cpp
knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)
knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

@ -3,7 +3,7 @@ LDADD = $(LIB_KFILE)
bin_PROGRAMS = kcharselect
kcharselect_SOURCES = kcharselectdia.cc main.cc
kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcharselect_METASOURCES = kcharselectdia.moc
updatedir = $(kde_datadir)/kconf_update

@ -352,7 +352,7 @@ void AddAction::updateObjects()
QCStringList theObjects = theClient->remoteObjects(*i);
for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j)
if(*j != "ksycoca" && *j != "qt")// && getFunctions(*i, *j).count())
if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count())
new KListViewItem(a, *j);
}
updateFunctions();

@ -342,7 +342,7 @@ void EditAction::updateDCOPObjects()
QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8());
if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object());
for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j)
if(*j != "ksycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count())
if(*j != "tdesycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count())
theDCOPObjects->insertItem(TQString::fromUtf8(*j));
updateDCOPFunctions();
}

@ -34,7 +34,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
# the library search path.
libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE´s XML GUI builing

@ -6,7 +6,7 @@ INCLUDES= $(all_includes)
## kdessh
bin_PROGRAMS = kdessh
kdessh_SOURCES = kdessh.cpp sshdlg.cpp
kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdessh_LDADD = $(LIB_TDEUI) -ltdesu
kdessh_METASOURCES = AUTO
noinst_HEADERS = sshdlg.h

@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp
disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
kdf_SOURCES = kdf.cpp
kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdf_LDADD = libkdf_common.la $(LIB_KFILE)
kwikdisk_SOURCES = kwikdisk.cpp
kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE)
kde_module_LTLIBRARIES = kcm_kdf.la

@ -44,7 +44,7 @@
#include <kprinter.h>
#include <ksavefile.h>
#include <kstatusbar.h>
#include <kspell.h>
#include <tdespell.h>
#include <kurldrag.h>
#include "ktextfiledlg.h"
@ -61,8 +61,8 @@ TQPtrList<TopLevel> *TopLevel::windowList = 0;
int default_open = TopLevel::OPEN_READWRITE;
TopLevel::TopLevel (TQWidget *, const char *name)
: KMainWindow ( 0,name ), kspellconfigOptions(0),
eframe(0), newWindow(false), kspell(0)
: KMainWindow ( 0,name ), tdespellconfigOptions(0),
eframe(0), newWindow(false), tdespell(0)
{
if (!windowList)
{
@ -385,24 +385,24 @@ void TopLevel::spellcheck()
{
if (!eframe) return;
if (kspell) return; // In progress
if (tdespell) return; // In progress
statusBar()->changeItem(i18n("Spellcheck: Started."), ID_GENERAL);
initSpellConfig();
kspell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
TQT_SLOT( spell_started(KSpell *)), kspellconfigOptions);
tdespell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions);
connect (kspell, TQT_SIGNAL ( death()),
connect (tdespell, TQT_SIGNAL ( death()),
this, TQT_SLOT ( spell_finished( )));
connect (kspell, TQT_SIGNAL (progress (unsigned int)),
connect (tdespell, TQT_SIGNAL (progress (unsigned int)),
this, TQT_SLOT (spell_progress (unsigned int)));
connect (kspell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
connect (tdespell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
eframe, TQT_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int)));
connect (kspell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
connect (tdespell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
eframe, TQT_SLOT (corrected (const TQString &, const TQString &, unsigned int)));
connect (kspell, TQT_SIGNAL (done(const TQString&)),
connect (tdespell, TQT_SIGNAL (done(const TQString&)),
this, TQT_SLOT (spell_done(const TQString&)));
}
@ -410,8 +410,8 @@ void TopLevel::spellcheck()
void TopLevel::spell_started( KSpell *)
{
eframe->spellcheck_start();
kspell->setProgressResolution(2);
kspell->check(eframe->text());
tdespell->setProgressResolution(2);
tdespell->check(eframe->text());
}
@ -427,7 +427,7 @@ void TopLevel::spell_progress (unsigned int percent)
void TopLevel::spell_done(const TQString& newtext)
{
eframe->spellcheck_stop();
if (kspell->dlgResult() == 0)
if (tdespell->dlgResult() == 0)
{
eframe->setText( newtext);
statusBar()->changeItem (i18n("Spellcheck: Aborted."), ID_GENERAL);
@ -436,7 +436,7 @@ void TopLevel::spell_done(const TQString& newtext)
{
statusBar()->changeItem (i18n("Spellcheck: Complete."), ID_GENERAL);
}
kspell->cleanUp();
tdespell->cleanUp();
}
// Replace ISpell with the name of the actual spell checker.
@ -455,10 +455,10 @@ TQString TopLevel::replaceISpell(TQString msg, int client)
void TopLevel::spell_finished( )
{
KSpell::spellStatus status = kspell->status();
int client = kspellconfigOptions->client();
delete kspell;
kspell = 0;
KSpell::spellStatus status = tdespell->status();
int client = tdespellconfigOptions->client();
delete tdespell;
tdespell = 0;
if (status == KSpell::Error)
{
KMessageBox::sorry(this, replaceISpell(i18n("ISpell could not be started.\n"
@ -831,7 +831,7 @@ void TopLevel::showSettings()
return;
initSpellConfig();
TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), kspellconfigOptions);
TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), tdespellconfigOptions);
connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings()));
dialog->show();
@ -839,8 +839,8 @@ void TopLevel::showSettings()
void TopLevel::initSpellConfig()
{
if (!kspellconfigOptions)
kspellconfigOptions = new KSpellConfig(0 , "SpellingSettings", 0, false );
if (!tdespellconfigOptions)
tdespellconfigOptions = new KSpellConfig(0 , "SpellingSettings", 0, false );
}
void TopLevel::search_again()

@ -117,7 +117,7 @@ protected:
void initSpellConfig();
private:
KSpellConfig *kspellconfigOptions;
KSpellConfig *tdespellconfigOptions;
public: // Should not be!
KEdit *eframe;
@ -138,7 +138,7 @@ private:
TDEConfig *config;
KSpell *kspell; // Current spell checking object
KSpell *tdespell; // Current spell checking object
/*
* The source, the destination of the copy, and the open mode

@ -1,4 +1,4 @@
kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kfloppy_LDADD = $(LIB_TDEUI) -lm
INCLUDES = $(all_includes)

@ -40,7 +40,7 @@ tde_add_executable( kgpg AUTOMOC
keyexport.ui sourceselect.ui
kgpgsettings.kcfgc conf_servers.ui
conf_ui2.ui conf_misc.ui
LINK kabc-shared kutils-shared tdeprint-shared
LINK kabc-shared tdeutils-shared tdeprint-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -11,7 +11,7 @@ kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp \
keyproperties.ui conf_encryption.ui conf_decryption.ui conf_gpg.ui dcopiface.skel \
keyinfowidget.cpp groupedit.ui kgpgrevokewidget.ui newkey.ui adduid.ui keyexport.ui \
sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui
kgpg_LDADD = $(LIB_KIO) $(LIB_KABC) -lkutils -ltdeprint
kgpg_LDADD = $(LIB_KIO) $(LIB_KABC) -ltdeutils -ltdeprint
pics_DATA= kgpg_anim.gif kgpg_docked.png kgpg_docked.gif kgpg_blank.png kgpg_fill.png
picsdir=$(kde_datadir)/kgpg/pics
@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg
METASOURCES = AUTO
# the library search path.
kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
appsdir = $(kde_datadir)/kgpg
apps_DATA = kgpg.rc listkeys.rc tips

@ -20,7 +20,7 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
khexedit_METASOURCES = AUTO
khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
khexedit_LDADD = $(LIB_KIO) $(LIB_TDEPRINT)
xdg_apps_DATA = khexedit.desktop

@ -426,7 +426,7 @@ void COptionDialog::setupFilePage( void )
{
TQString text;
TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
BarIcon("kmultiple", KIcon::SizeMedium ) );
BarIcon("tdemultiple", KIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );

@ -29,7 +29,7 @@ link_directories(
tde_add_kpart( libkbyteseditwidget AUTOMOC
SOURCES kbyteseditwidget.cpp
DESTINATION ${PLUGIN_INSTALL_DIR}
LINK khexeditcommon-shared kparts-shared
LINK khexeditcommon-shared tdeparts-shared
)

@ -29,7 +29,7 @@ link_directories(
tde_add_kpart( libkhexedit2part AUTOMOC
SOURCES khepart.cpp khebrowserextension.cpp
khepartfactory.cpp
LINK khexeditcommon-shared kparts-shared
LINK khexeditcommon-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -19,7 +19,7 @@
#define KHEBROWSEREXTENSION_H
// kde specific
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
namespace KHE
{

@ -19,7 +19,7 @@
#define KHEPART_H
// kde specific
#include <kparts/part.h>
#include <tdeparts/part.h>
// app specific
#include "kbigbuffer.h"

@ -18,7 +18,7 @@
#ifndef KHEPARTFACTORY_H
#define KHEPARTFACTORY_H
#include <kparts/factory.h>
#include <tdeparts/factory.h>
class TDEInstance;
class TDEAboutData;

@ -1,5 +1,5 @@
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_KFILE) $(LIB_TDEPRINT)
bin_PROGRAMS = kjots

@ -4,30 +4,30 @@ lib_LTLIBRARIES = libkcmlaptop.la
SUBDIRS = pics applnk
libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp
libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkcmlaptop_la_LIBADD = $(LIB_TDEUI)
MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel
kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kded_klaptopdaemon_la_LIBADD = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la
klaptop_acpi_helper_SOURCES = acpi_helper.cpp
klaptop_acpi_helper_LDADD = $(LIB_QT)
klaptop_check_SOURCES = laptop_check.cpp
klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
klaptop_check_LDADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp
kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module
kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module
kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
kcm_laptop_la_COMPILE_FIRST = crcresult.h
AM_CPPFLAGS = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
KDE_OPTIONS = nofinal

@ -15,7 +15,7 @@ The code in this module is heavily based on:
- the Thinkpad plug-in by Jonathan Riddell (jr@jriddell.org)
Also, for the Dell specific implementations, code was taken from the
i8kutils package of Massimo Dal Zotto <dz@debian.org> which can be
i8tdeutils package of Massimo Dal Zotto <dz@debian.org> which can be
downloaded from http://www.debian.org/~dz/i8k/
LICENSE:
@ -42,7 +42,7 @@ COMPATIBILITY:
This plug-in should work on any Linux distribution that has the i8k module
loaded or compiled into the kernel. Compatibility is really dependant on
the i8kutils package of Massimo Dal Zotto <dz@debian.org> which can be
the i8tdeutils package of Massimo Dal Zotto <dz@debian.org> which can be
downloaded from http://www.debian.org/~dz/i8k/. Currently (20041122), this
should support:

@ -35,7 +35,7 @@
#include <kservicetype.h>
#include <kservice.h>
#include <kconfig.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "kmilointerface.h"
#include "defaultskin.h"

@ -77,7 +77,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC
emacsregexpconverter.cpp
regexphighlighter.cpp util.cpp
VERSION 1.0.0
LINK kio-shared kmultiformlistbox-static
LINK kio-shared tdemultiformlistbox-static
kwidgetstreamer-static
DESTINATION ${LIB_INSTALL_DIR}
)

@ -27,14 +27,14 @@ add_definitions(
)
##### kmultiformlistbox (static) ################
tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
SOURCES ccp.cpp kmultiformlistboxentry.cpp
kmultiformlistbox.cpp
kmultiformlistbox-multivisible.cpp
kmultiformlistboxfactory.cpp indexWindow.cpp
kmultiformlistbox-windowed.cpp
##### tdemultiformlistbox (static) ################
tde_add_library( tdemultiformlistbox STATIC_PIC AUTOMOC
SOURCES ccp.cpp tdemultiformlistboxentry.cpp
tdemultiformlistbox.cpp
tdemultiformlistbox-multivisible.cpp
tdemultiformlistboxfactory.cpp indexWindow.cpp
tdemultiformlistbox-windowed.cpp
widgetwindow.cpp windowlistboxitem.cpp
)
@ -43,8 +43,8 @@ tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
install(
FILES
kmultiformlistbox.h
kmultiformlistboxentry.h
kmultiformlistboxfactory.h
tdemultiformlistbox.h
tdemultiformlistboxentry.h
tdemultiformlistboxfactory.h
DESTINATION ${INCLUDE_INSTALL_DIR}
)

@ -1,15 +1,15 @@
AM_CPPFLAGS = -DQT_NO_CAST_ASCII
noinst_LTLIBRARIES = libkmultiformlistbox.la
noinst_LTLIBRARIES = libtdemultiformlistbox.la
INCLUDES= -I$(srcdir)/../KWidgetStreamer $(all_includes)
include_HEADERS = kmultiformlistboxentry.h kmultiformlistbox.h \
kmultiformlistboxfactory.h
noinst_HEADERS = ccp.h indexWindow.h kmultiformlistbox-multivisible.h \
kmultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
libkmultiformlistbox_la_SOURCES = ccp.cpp kmultiformlistboxentry.cpp \
kmultiformlistbox.cpp kmultiformlistbox-multivisible.cpp \
kmultiformlistboxfactory.cpp indexWindow.cpp \
kmultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
include_HEADERS = tdemultiformlistboxentry.h tdemultiformlistbox.h \
tdemultiformlistboxfactory.h
noinst_HEADERS = ccp.h indexWindow.h tdemultiformlistbox-multivisible.h \
tdemultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
libtdemultiformlistbox_la_SOURCES = ccp.cpp tdemultiformlistboxentry.cpp \
tdemultiformlistbox.cpp tdemultiformlistbox-multivisible.cpp \
tdemultiformlistboxfactory.cpp indexWindow.cpp \
tdemultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
METASOURCES = AUTO

@ -19,7 +19,7 @@
// ccp = Cut-Copy-Paste
//---------------------
#include "kmultiformlistbox-multivisible.h"
#include "tdemultiformlistbox-multivisible.h"
#include "ccp.h"
#include <tqobjectlist.h>
#include <tqpopupmenu.h>

@ -21,10 +21,10 @@
#include <tqmessagebox.h>
#else
#include <kmessagebox.h>
#include "kmultiformlistbox-multivisible.moc"
#include "tdemultiformlistbox-multivisible.moc"
#endif
#include "kmultiformlistbox-multivisible.h"
#include "tdemultiformlistbox-multivisible.h"
#include "indexWindow.h"
#include "ccp.h"

@ -22,11 +22,11 @@
// To make an instance of the widget, you need to inherit the classes
// `KMultiFormListBoxFactory' and `KMultiFormListBoxEntry'.
// ------------------------------------------------------------------------
#ifndef __kmultiformlistboxmultivisble
#define __kmultiformlistboxmultivisble
#ifndef __tdemultiformlistboxmultivisble
#define __tdemultiformlistboxmultivisble
// -------------------------------- includes ------------------------------
#include "kmultiformlistbox.h"
#include "tdemultiformlistbox.h"
//-------------------------------------------------------------------------
/**
@ -132,5 +132,5 @@ private:
};
#endif /* kmultiformlistboxmultivisble */
#endif /* tdemultiformlistboxmultivisble */

@ -15,8 +15,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
#ifndef __kmultiformlistboxshower
#define __kmultiformlistboxshower
#ifndef __tdemultiformlistboxshower
#define __tdemultiformlistboxshower
// -------------------------------- includes ------------------------------
//-------------------------------------------------------------------------
@ -49,5 +49,5 @@ public:
};
#endif /* kmultiformlistboxshower */
#endif /* tdemultiformlistboxshower */

@ -21,7 +21,7 @@
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include "kmultiformlistbox-windowed.moc"
#include "tdemultiformlistbox-windowed.moc"
#endif
#include "widgetwindow.h"

@ -15,8 +15,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
#ifndef __kmultiformlistboxwindowed
#define __kmultiformlistboxwindowed
#ifndef __tdemultiformlistboxwindowed
#define __tdemultiformlistboxwindowed
#ifdef TQT_ONLY
#include "compat.h"
@ -25,8 +25,8 @@
#include <klistbox.h>
#endif
#include "kmultiformlistboxfactory.h"
#include "kmultiformlistbox.h"
#include "tdemultiformlistboxfactory.h"
#include "tdemultiformlistbox.h"
class WindowListboxItem;
@ -80,5 +80,5 @@ private slots:
};
#endif /* kmultiformlistboxwindowed */
#endif /* tdemultiformlistboxwindowed */

@ -16,11 +16,11 @@
* Boston, MA 02110-1301, USA.
**/
#ifndef TQT_ONLY
#include "kmultiformlistbox.moc"
#include "tdemultiformlistbox.moc"
#endif
#include "kmultiformlistbox-multivisible.h"
#include "kmultiformlistbox-windowed.h"
#include "tdemultiformlistbox-multivisible.h"
#include "tdemultiformlistbox-windowed.h"
KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *parent,
bool showUpDownButtons, bool showHelpButton, TQString addButtonText,

@ -15,12 +15,12 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
#ifndef __kmultiformlistbox
#define __kmultiformlistbox
#ifndef __tdemultiformlistbox
#define __tdemultiformlistbox
#include "kmultiformlistboxfactory.h"
#include "kmultiformlistbox-shower.h"
#include "kmultiformlistboxentry.h"
#include "tdemultiformlistboxfactory.h"
#include "tdemultiformlistbox-shower.h"
#include "tdemultiformlistboxentry.h"
#include <tqptrlist.h>
#include <tqlayout.h>
#include <tqscrollview.h>
@ -122,5 +122,5 @@ private:
};
#endif /* kmultiformlistbox */
#endif /* tdemultiformlistbox */

@ -17,10 +17,10 @@
**/
#ifndef TQT_ONLY
#include "kmultiformlistboxentry.moc"
#include "tdemultiformlistboxentry.moc"
#endif
#include "kmultiformlistboxentry.h"
#include "tdemultiformlistboxentry.h"
//----------------------------------------------------------------------
// This function is needed to signal which of the KMultiFormListBox entries
// the Idx button was invoked from.

@ -15,8 +15,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
#ifndef __kmultiformlistboxentry
#define __kmultiformlistboxentry
#ifndef __tdemultiformlistboxentry
#define __tdemultiformlistboxentry
#include <tqpoint.h>
#include <tqwidget.h>
@ -70,5 +70,5 @@ signals:
};
#endif /* kmultiformlistboxentry */
#endif /* tdemultiformlistboxentry */

@ -15,7 +15,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
#include "kmultiformlistboxfactory.h"
#include "tdemultiformlistboxfactory.h"
#include <tqframe.h>
TQWidget *KMultiFormListBoxFactory::separator(TQWidget *parent) {

@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA.
**/
// -------------------------------- includes ------------------------------
#ifndef __kmultiformlistboxfactory
#define __kmultiformlistboxfactory
#ifndef __tdemultiformlistboxfactory
#define __tdemultiformlistboxfactory
#include <tqobject.h>
#include "kwidgetstreamer.h"
class KMultiFormListBoxEntry;
@ -66,5 +66,5 @@ public:
virtual TQWidget *separator(TQWidget *parent);
};
#endif /* kmultiformlistbox */
#endif /* tdemultiformlistbox */

@ -26,7 +26,7 @@
#include <klistbox.h>
#endif
#include "kmultiformlistbox-windowed.h"
#include "tdemultiformlistbox-windowed.h"
/**
@internal

@ -16,7 +16,7 @@
* Boston, MA 02110-1301, USA.
**/
#include "kwidgetstreamer.h"
#include "kmultiformlistbox.h"
#include "tdemultiformlistbox.h"
#include <tqobjectlist.h>
#include <tqvariant.h>

@ -28,7 +28,7 @@ libkregexpeditorcommon_la_SOURCES = \
emacsregexpconverter.cpp regexphighlighter.cpp util.cpp
libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \
KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
METASOURCES = AUTO
@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
bin_PROGRAMS = kregexpeditor
kregexpeditor_SOURCES = main.cpp
kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_KIO)
kregexpeditor_INCLUDES = $(all_includes)

@ -24,7 +24,7 @@
#include <kdialogbase.h>
#endif
#include <kmultiformlistbox.h>
#include <tdemultiformlistbox.h>
#include "regexpwidget.h"
#include <tqvgroupbox.h>

@ -31,12 +31,12 @@ HEADERS += altnregexp.h \
gen_qregexpparser.hh \
indexWindow.h \
infopage.h \
kmultiformlistbox-multivisible.h \
kmultiformlistbox-shower.h \
kmultiformlistbox-windowed.h \
kmultiformlistbox.h \
kmultiformlistboxentry.h \
kmultiformlistboxfactory.h \
tdemultiformlistbox-multivisible.h \
tdemultiformlistbox-shower.h \
tdemultiformlistbox-windowed.h \
tdemultiformlistbox.h \
tdemultiformlistboxentry.h \
tdemultiformlistboxfactory.h \
kregexpeditorgui.h \
kregexpeditorprivate.h \
kwidgetstreamer.h \
@ -96,11 +96,11 @@ SOURCES += altnregexp.cpp \
gen_qregexplexer.cpp \
indexWindow.cpp \
infopage.cpp \
kmultiformlistbox-multivisible.cpp \
kmultiformlistbox-windowed.cpp \
kmultiformlistbox.cpp \
kmultiformlistboxentry.cpp \
kmultiformlistboxfactory.cpp \
tdemultiformlistbox-multivisible.cpp \
tdemultiformlistbox-windowed.cpp \
tdemultiformlistbox.cpp \
tdemultiformlistboxentry.cpp \
tdemultiformlistboxfactory.cpp \
kregexpeditorgui.cpp \
kregexpeditorprivate.cpp \
kwidgetstreamer.cpp \

@ -1,5 +1,5 @@
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_TDEUI) $(LIB_KFILE)
bin_PROGRAMS = ktimer

@ -1,26 +0,0 @@
INCLUDES= $(all_includes)
SUBDIRS=. icons konfigurator
bin_PROGRAMS = kwalletmanager
kwalletmanager_SOURCES = walletwidget.ui kwalletmanager.cpp \
kwalletmanager.skel main.cpp kwalletpopup.cpp \
kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
kbetterthankdialogbase.ui
kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwalletmanager_LDADD = $(LIB_KIO) -lkwalletclient
METASOURCES = AUTO
noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\
allyourbase.h kwmapeditor.h
xdg_apps_DATA = kwalletmanager.desktop kwalletmanager-kwalletd.desktop
KDE_ICON = kwalletmanager
rc_DATA = kwalletmanager.rc kwalleteditor.rc
rcdir = $(kde_datadir)/kwalletmanager
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kwalletmanager.pot
kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h

@ -1,5 +0,0 @@
KDE_ICON = kwalletmanager
pics_ICON = AUTO
picsdir = $(kde_datadir)/kwalletmanager/icons

@ -1,15 +0,0 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kwallet.la
kcm_kwallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
kcm_kwallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kwallet_la_LIBADD = $(LIB_TDEUI) -lkwalletclient
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmkwallet.pot
xdg_apps_DATA = kwalletconfig.desktop
kde_services_DATA = kwallet_config.desktop kwalletmanager_show.desktop

@ -40,7 +40,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
# kde_cfg_DATA = superkaramba.kcfg
superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)

@ -39,8 +39,8 @@
#include <tdeversion.h>
#include <kdirwatch.h>
#include <kparts/componentfactory.h>
#include <kparts/part.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/part.h>
#include <tqdir.h>
#include <tqwidgetlist.h>

@ -25,12 +25,12 @@ link_directories(
)
##### kwalletmanager (executable) ###############
##### tdewalletmanager (executable) ###############
tde_add_executable( kwalletmanager AUTOMOC
SOURCES walletwidget.ui kwalletmanager.cpp
kwalletmanager.skel main.cpp kwalletpopup.cpp
kwalleteditor.cpp kwmapeditor.cpp
tde_add_executable( tdewalletmanager AUTOMOC
SOURCES walletwidget.ui tdewalletmanager.cpp
tdewalletmanager.skel main.cpp tdewalletpopup.cpp
tdewalleteditor.cpp kwmapeditor.cpp
allyourbase.cpp kbetterthankdialogbase.ui
LINK kio-shared
DESTINATION ${BIN_INSTALL_DIR}
@ -39,17 +39,17 @@ tde_add_executable( kwalletmanager AUTOMOC
##### icons #####################################
tde_install_icons( kwalletmanager)
tde_install_icons( tdewalletmanager)
##### other data ################################
install( FILES kwalletmanager.rc kwalleteditor.rc
DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager
install( FILES tdewalletmanager.rc tdewalleteditor.rc
DESTINATION ${DATA_INSTALL_DIR}/tdewalletmanager
)
install( FILES kwalletmanager.desktop
kwalletmanager-kwalletd.desktop
install( FILES tdewalletmanager.desktop
tdewalletmanager-tdewalletd.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)

@ -0,0 +1,26 @@
INCLUDES= $(all_includes)
SUBDIRS=. icons konfigurator
bin_PROGRAMS = tdewalletmanager
tdewalletmanager_SOURCES = walletwidget.ui tdewalletmanager.cpp \
tdewalletmanager.skel main.cpp tdewalletpopup.cpp \
tdewalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
kbetterthankdialogbase.ui
tdewalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdewalletmanager_LDADD = $(LIB_KIO) -ltdewalletclient
METASOURCES = AUTO
noinst_HEADERS = tdewalletmanager.h tdewalletpopup.h walletwidget.h tdewalleteditor.h\
allyourbase.h kwmapeditor.h
xdg_apps_DATA = tdewalletmanager.desktop tdewalletmanager-tdewalletd.desktop
KDE_ICON = tdewalletmanager
rc_DATA = tdewalletmanager.rc tdewalleteditor.rc
rcdir = $(kde_datadir)/tdewalletmanager
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdewalletmanager.pot
kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h

@ -29,14 +29,14 @@
#include <kstandarddirs.h>
#include <kurl.h>
#include <kurldrag.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqdragobject.h>
#include <tqfile.h>
#include <tqptrlist.h>
/****************
* KWalletFolderItem - ListView items to represent kwallet folders
* KWalletFolderItem - ListView items to represent tdewallet folders
*/
KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries)
: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) {
@ -102,7 +102,7 @@ TQListViewItem* KWalletFolderItem::getItem(const TQString& key) {
}
bool KWalletFolderItem::acceptDrop(const TQMimeSource *mime) const {
return mime->provides("application/x-kwallet-entry") ||
return mime->provides("application/x-tdewallet-entry") ||
mime->provides("text/uri-list");
}
@ -118,7 +118,7 @@ KWalletFolderItem::~KWalletFolderItem() {
}
/****************
* KWalletContainerItem - ListView items to represent kwallet containers, i.e.
* KWalletContainerItem - ListView items to represent tdewallet containers, i.e.
* passwords, maps, ...
*/
KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type)
@ -152,7 +152,7 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) {
}
/****************
* KWalletEntryItem - ListView items to represent kwallet entries
* KWalletEntryItem - ListView items to represent tdewallet entries
*/
KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename)
: KListViewItem(parent, ename), _wallet(w), _oldName(ename) {
@ -171,14 +171,14 @@ KWalletEntryItem::~KWalletEntryItem() {
* KWalletItem - IconView items to represent wallets
*/
KWalletItem::KWalletItem(TQIconView *parent, const TQString& walletName)
: TQIconViewItem(parent, walletName, DesktopIcon("kwalletmanager")) {
: TQIconViewItem(parent, walletName, DesktopIcon("tdewalletmanager")) {
}
KWalletItem::~KWalletItem() {
}
bool KWalletItem::acceptDrop(const TQMimeSource *mime) const {
return mime->provides("application/x-kwallet-folder") ||
return mime->provides("application/x-tdewallet-folder") ||
mime->provides("text/uri-list");
}
@ -246,7 +246,7 @@ static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) {
void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst) {
Q_UNUSED(lst);
if (e->provides("application/x-kwallet-folder") ||
if (e->provides("application/x-tdewallet-folder") ||
e->provides("text/uri-list")) {
// FIXME: don't allow the drop if the wallet name is the same
@ -262,8 +262,8 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
TQFile file;
TQDataStream *ds = 0L;
if (e->provides("application/x-kwallet-folder")) {
TQByteArray edata = e->encodedData("application/x-kwallet-folder");
if (e->provides("application/x-tdewallet-folder")) {
TQByteArray edata = e->encodedData("application/x-tdewallet-folder");
if (!edata.isEmpty()) {
ds = new TQDataStream(edata, IO_ReadOnly);
}
@ -327,7 +327,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
class KWalletEntryDrag : public TQStoredDrag {
public:
KWalletEntryDrag(TQWidget *dragSource, const char *name = 0L)
: TQStoredDrag("application/x-kwallet-entry", dragSource, name) {
: TQStoredDrag("application/x-tdewallet-entry", dragSource, name) {
}
virtual ~KWalletEntryDrag() {}
@ -339,7 +339,7 @@ class KWalletEntryDrag : public TQStoredDrag {
class KWalletFolderDrag : public TQStoredDrag {
public:
KWalletFolderDrag(TQWidget *dragSource, const char *name = 0L)
: TQStoredDrag("application/x-kwallet-folder", dragSource, name) {
: TQStoredDrag("application/x-tdewallet-folder", dragSource, name) {
}
virtual ~KWalletFolderDrag() {}
@ -365,12 +365,12 @@ KWalletEntryList::~KWalletEntryList() {
bool KWalletEntryList::acceptDrag(TQDropEvent* e) const {
TQListViewItem *i = itemAt(contentsToViewport(e->pos()));
if (i) {
if (e->provides("application/x-kwallet-entry") ||
if (e->provides("application/x-tdewallet-entry") ||
e->provides("text/uri-list")) {
return true;
}
}
if ((e->provides("application/x-kwallet-folder") &&
if ((e->provides("application/x-tdewallet-folder") &&
e->source() != viewport()) ||
e->provides("text/uri-list")) {
return true;
@ -388,7 +388,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
KWalletEntryList *el = 0L;
TQListViewItem *sel = 0L;
//detect if we are dragging from kwallet itself
//detect if we are dragging from tdewallet itself
if (e->source() && e->source()->parent() &&
!strcmp(e->source()->parent()->className(), "KWalletEntryList")) {
@ -399,7 +399,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
sel = el->selectedItem();
}
if (e->provides("application/x-kwallet-entry")) {
if (e->provides("application/x-tdewallet-entry")) {
//do nothing if we are in the same folder
if (sel && sel->parent()->parent() ==
KWalletEntryList::getItemFolder(item)) {
@ -407,20 +407,20 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
return;
}
isEntry = true;
TQByteArray data = e->encodedData("application/x-kwallet-entry");
TQByteArray data = e->encodedData("application/x-tdewallet-entry");
if (data.isEmpty()) {
e->ignore();
return;
}
ds = new TQDataStream(data, IO_ReadOnly);
} else if (e->provides("application/x-kwallet-folder")) {
} else if (e->provides("application/x-tdewallet-folder")) {
//do nothing if we are in the same wallet
if (this == el) {
e->ignore();
return;
}
isEntry = false;
TQByteArray data = e->encodedData("application/x-kwallet-folder");
TQByteArray data = e->encodedData("application/x-tdewallet-folder");
if (data.isEmpty()) {
e->ignore();
return;
@ -488,7 +488,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
fi->refresh();
delete(ds);
//delete source if we were moving, i.e., we are dragging
//from kwalletmanager and Control is not pressed
//from tdewalletmanager and Control is not pressed
if (ok && el && !(state & TQt::ControlButton) && sel) {
el->_wallet->removeEntry(sel->text(0));
delete sel;
@ -498,7 +498,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
ok = decodeFolder(_wallet, *ds);
delete ds;
//delete source if we were moving, i.e., we are dragging
//from kwalletmanager and Control is not pressed
//from tdewalletmanager and Control is not pressed
if (ok && el && !(state & TQt::ControlButton) && sel) {
KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(sel);
if (fi) {
@ -535,8 +535,8 @@ void KWalletEntryList::contentsDropEvent(TQDropEvent *e) {
}
void KWalletEntryList::contentsDragEnterEvent(TQDragEnterEvent *e) {
if (e->provides("application/x-kwallet-entry") ||
e->provides("application/x-kwallet-folder") ||
if (e->provides("application/x-tdewallet-entry") ||
e->provides("application/x-tdewallet-folder") ||
e->provides("application/uri-list")) {
e->accept();
} else {
@ -620,7 +620,7 @@ class KWalletIconDrag : public TQIconDrag {
* */
KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
: KIconView(parent, name) {
TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
}
@ -654,7 +654,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
return;
}
TQString dest = TDEGlobal::dirs()->saveLocation("kwallet") + u.fileName();
TQString dest = TDEGlobal::dirs()->saveLocation("tdewallet") + u.fileName();
if (TQFile::exists(dest)) {
KMessageBox::sorry(viewport(), i18n("That wallet file already exists. You cannot overwrite wallets."));
e->ignore();
@ -676,7 +676,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
TQDragObject *KWalletIconView::dragObject() {
KWalletIconDrag* id = new KWalletIconDrag(viewport(), "KWallet Drag");
TQString path = "file:" + TDEGlobal::dirs()->saveLocation("kwallet");
TQString path = "file:" + TDEGlobal::dirs()->saveLocation("tdewallet");
TQPoint pos = _mousePos;
for (TQIconViewItem *item = firstItem(); item; item = item->nextItem()) {
if (item->isSelected()) {

@ -23,7 +23,7 @@
#include <kiconview.h>
#include <klistview.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <kiconloader.h>
#include <kicontheme.h>

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

@ -9,8 +9,8 @@
#
#################################################
tde_install_icons( kwalletmanager)
tde_install_icons( tdewalletmanager)
tde_install_icons(
DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager/icons
DESTINATION ${DATA_INSTALL_DIR}/tdewalletmanager/icons
)

@ -0,0 +1,5 @@
KDE_ICON = tdewalletmanager
pics_ICON = AUTO
picsdir = $(kde_datadir)/tdewalletmanager/icons

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 997 B

After

Width:  |  Height:  |  Size: 997 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -22,24 +22,24 @@ link_directories(
)
##### kcm_kwallet (kpart) #######################
##### kcm_tdewallet (kpart) #######################
tde_add_kpart( kcm_kwallet AUTOMOC
tde_add_kpart( kcm_tdewallet AUTOMOC
SOURCES walletconfigwidget.ui konfigurator.cpp
LINK tdeui-shared kwalletclient-shared
LINK tdeui-shared tdewalletclient-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
##### other data ################################
install( FILES kwalletconfig.desktop
install( FILES tdewalletconfig.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
install(
FILES
kwallet_config.desktop
kwalletmanager_show.desktop
tdewallet_config.desktop
tdewalletmanager_show.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)

@ -0,0 +1,15 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_tdewallet.la
kcm_tdewallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
kcm_tdewallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_tdewallet_la_LIBADD = $(LIB_TDEUI) -ltdewalletclient
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmtdewallet.pot
xdg_apps_DATA = tdewalletconfig.desktop
kde_services_DATA = tdewallet_config.desktop tdewalletmanager_show.desktop

@ -28,7 +28,7 @@
#include <kgenericfactory.h>
#include <kinputdialog.h>
#include <kpopupmenu.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
@ -38,20 +38,20 @@
#include <tqspinbox.h>
typedef KGenericFactory<KWalletConfig, TQWidget> KWalletFactory;
K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
K_EXPORT_COMPONENT_FACTORY(kcm_tdewallet, KWalletFactory("kcmtdewallet"))
KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
: TDECModule(KWalletFactory::instance(), parent, name) {
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmkwallet"),
new TDEAboutData(I18N_NOOP("kcmtdewallet"),
I18N_NOOP("TDE Wallet Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003 George Staikos"));
about->addAuthor("George Staikos", 0, "staikos@kde.org");
setAboutData( about );
_cfg = new TDEConfig("kwalletrc", false, false);
_cfg = new TDEConfig("tdewalletrc", false, false);
TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
vbox->add(_wcw = new WalletConfigWidget(this));
@ -76,7 +76,7 @@ KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringL
updateWalletLists();
load();
if (DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
if (DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
_wcw->_launch->hide();
}
@ -163,10 +163,10 @@ void KWalletConfig::newNetworkWallet() {
void KWalletConfig::launchManager() {
if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
TDEApplication::startServiceByDesktopName("kwalletmanager_show");
if (!DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
TDEApplication::startServiceByDesktopName("tdewalletmanager_show");
} else {
DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
DCOPRef r("tdewalletmanager", "tdewalletmanager-mainwindow#1");
r.send("show");
r.send("raise");
}
@ -284,7 +284,7 @@ void KWalletConfig::save() {
}
_cfg->sync();
DCOPRef("kded", "kwalletd").call("reconfigure()");
DCOPRef("kded", "tdewalletd").call("reconfigure()");
emit changed(false);
}

@ -1,8 +1,8 @@
[Desktop Entry]
Type=Service
Exec=kcmshell --caption %c kwalletconfig
Icon=kwalletmanager
DocPath=kwallet/index.html
Exec=kcmshell --caption %c tdewalletconfig
Icon=tdewalletmanager
DocPath=tdewallet/index.html
Name=TDE Wallet
Name[ar]=محفظة كدى
Name[bg]=Портфейл

@ -1,10 +1,10 @@
[Desktop Entry]
Icon=kwalletmanager
Icon=tdewalletmanager
Type=Application
Exec=kcmshell kwalletconfig
DocPath=kwallet/index.html
Exec=kcmshell tdewalletconfig
DocPath=tdewallet/index.html
X-TDE-ModuleType=Library
X-TDE-Library=kwallet
X-TDE-Library=tdewallet
X-TDE-ParentApp=kcontrol
Name=TDE Wallet

@ -52,9 +52,9 @@ Name[uz]=Qopchiq boshqarish vositasi
Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
Name[zh_CN]=钱包管理工具
Name[zh_TW]=錢包管理工具
Exec=kwalletmanager --show %u
Exec=tdewalletmanager --show %u
MimeType=application/x-kde-wallet
InitialPreference=6
Icon=kwalletmanager
Icon=tdewalletmanager
Type=Service
X-TDE-StartupNotify=true

@ -52,8 +52,8 @@ Name[uz]=Qopchiq boshqarish vositasi
Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
Name[zh_CN]=钱包管理工具
Name[zh_TW]=錢包管理工具
Exec=kwalletmanager --kwalletd
Icon=kwalletmanager
Exec=tdewalletmanager --tdewalletd
Icon=tdewalletmanager
Type=Application
Terminal=false
X-TDE-StartupNotify=false

@ -29,7 +29,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include "kwalletmanager.h"
#include "tdewalletmanager.h"
class MyApp : public KUniqueApplication {
@ -43,12 +43,12 @@ class MyApp : public KUniqueApplication {
int main(int argc, char **argv) {
static KCmdLineOptions options[] = {
{"show", I18N_NOOP("Show window on startup"), 0},
{"kwalletd", I18N_NOOP("For use by kwalletd only"), 0},
{"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0},
{"+name", I18N_NOOP("A wallet name"), 0},
KCmdLineLastOption
};
TDEAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
I18N_NOOP("TDE Wallet Management Tool"),
TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003,2004 George Staikos"), 0,
@ -71,7 +71,7 @@ int main(int argc, char **argv) {
a.setMainWidget(&wm);
TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@ -79,8 +79,8 @@ int main(int argc, char **argv) {
wm.show();
}
if (args->isSet("kwalletd")) {
wm.kwalletdLaunch();
if (args->isSet("tdewalletd")) {
wm.tdewalletdLaunch();
}
for (int i = 0; i < args->count(); ++i) {

@ -20,7 +20,7 @@
#include "kbetterthankdialogbase.h"
#include "kwalleteditor.h"
#include "tdewalleteditor.h"
#include "kwmapeditor.h"
#include "allyourbase.h"
@ -128,7 +128,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
}
createActions();
createGUI("kwalleteditor.rc");
createGUI("tdewalleteditor.rc");
delete toolBar();
setCaption(wallet);
@ -1127,11 +1127,11 @@ void KWalletEditor::setNewWallet(bool x) {
void KWalletEditor::saveAs() {
KURL url = KFileDialog::getSaveURL(TQString(), "*.kwl", this);
if (!url.isEmpty()) {
// Sync() kwalletd
// Sync() tdewalletd
if (_nonLocal) {
TDEIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
} else {
TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + _walletName + ".kwl";
KURL destURL; destURL.setPath(path);
TDEIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
}
@ -1139,5 +1139,5 @@ void KWalletEditor::saveAs() {
}
#include "kwalleteditor.moc"
#include "tdewalleteditor.moc"

@ -22,7 +22,7 @@
#define KWALLETEDITOR_H
#include "walletwidget.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <kmainwindow.h>
#include <tqstringlist.h>

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui name="kwalleteditor" version="2">
<kpartgui name="tdewalleteditor" version="2">
<MenuBar>
<Menu name="file"><text>&amp;File</text>
<Action name="create_folder"/>

@ -18,9 +18,9 @@
*/
#include "kwalletmanager.h"
#include "kwalletpopup.h"
#include "kwalleteditor.h"
#include "tdewalletmanager.h"
#include "tdewalletpopup.h"
#include "tdewalleteditor.h"
#include "allyourbase.h"
#include <dcopclient.h>
@ -37,7 +37,7 @@
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <ksystemtray.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqaccel.h>
#include <tqguardedptr.h>
@ -48,17 +48,17 @@
KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
: KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
_kwalletdLaunch = false;
TQAccel *accel = new TQAccel(this, "kwalletmanager");
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
_tdewalletdLaunch = false;
TQAccel *accel = new TQAccel(this, "tdewalletmanager");
TDEApplication::dcopClient()->setQtBridgeEnabled(false);
_shuttingDown = false;
TDEConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
TDEConfig cfg("tdewalletrc"); // not sure why this setting isn't in tdewalletmanagerrc...
TDEConfigGroup walletConfigGroup(&cfg, "Wallet");
_dcopRef = 0L;
if (walletConfigGroup.readBoolEntry("Launch Manager", true)) {
_tray = new KSystemTray(this, "kwalletmanager tray");
_tray = new KSystemTray(this, "tdewalletmanager tray");
_tray->setPixmap(loadSystemTrayIcon("wallet_closed"));
TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open."));
connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown()));
@ -83,7 +83,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
_tray = 0L;
}
_iconView = new KWalletIconView(this, "kwalletmanager icon view");
_iconView = new KWalletIconView(this, "tdewalletmanager icon view");
connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*)));
connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
@ -91,7 +91,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
setCentralWidget(_iconView);
_iconView->setMinimumSize(320, 200);
_dcopRef = new DCOPRef("kded", "kwalletd");
_dcopRef = new DCOPRef("kded", "tdewalletd");
_dcopRef->dcopClient()->setNotifications(true);
connect(_dcopRef->dcopClient(),
TQT_SIGNAL(applicationRemoved(const TQCString&)),
@ -112,7 +112,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
// wallet closes before we are done opening. We will then stay
// open. Must check that a wallet is still open here.
new KAction(i18n("&New Wallet..."), "kwalletmanager", 0, TQT_TQOBJECT(this),
new KAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this),
TQT_SLOT(createWallet()), actionCollection(),
"wallet_create");
KAction *act = new KAction(i18n("Configure &Wallet..."), "configure",
@ -131,7 +131,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
createGUI("kwalletmanager.rc");
createGUI("tdewalletmanager.rc");
accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet()));
accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet()));
@ -141,7 +141,7 @@ actionCollection());
show();
}
kapp->setName("kwallet"); // hack to fix docs
kapp->setName("tdewallet"); // hack to fix docs
}
@ -152,8 +152,8 @@ KWalletManager::~KWalletManager() {
}
void KWalletManager::kwalletdLaunch() {
_kwalletdLaunch = true;
void KWalletManager::tdewalletdLaunch() {
_tdewalletdLaunch = true;
}
@ -326,12 +326,12 @@ void KWalletManager::allWalletsClosed() {
void KWalletManager::possiblyQuit() {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet");
if (_windows.isEmpty() &&
!isVisible() &&
!cfg.readBoolEntry("Leave Manager Open", false) &&
_kwalletdLaunch) {
_tdewalletdLaunch) {
kapp->quit();
}
}
@ -399,7 +399,7 @@ void KWalletManager::shuttingDown() {
void KWalletManager::setupWallet() {
TDEApplication::startServiceByDesktopName("kwallet_config");
TDEApplication::startServiceByDesktopName("tdewallet_config");
}
@ -420,4 +420,4 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) {
}
#include "kwalletmanager.moc"
#include "tdewalletmanager.moc"

@ -52,12 +52,12 @@ Name[uz]=Qopchiq boshqarish vositasi
Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
Name[zh_CN]=钱包管理工具
Name[zh_TW]=錢包管理工具
Exec=kwalletmanager %u
Exec=tdewalletmanager %u
MimeType=application/x-kde-wallet;
InitialPreference=6
Icon=kwalletmanager
Icon=tdewalletmanager
Type=Application
Terminal=false
X-TDE-StartupNotify=false
Categories=Qt;TDE;Settings;
DocPath=kwallet/index.html
DocPath=tdewallet/index.html

@ -41,7 +41,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
TQPixmap loadSystemTrayIcon(const TQString &icon);
void kwalletdLaunch();
void tdewalletdLaunch();
public slots:
void createWallet();
@ -79,7 +79,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
KWalletIconView *_iconView;
DCOPRef *_dcopRef;
TQPtrList<KMainWindow> _windows;
bool _kwalletdLaunch;
bool _tdewalletdLaunch;
};
#endif

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui name="kwalletmanager" version="3">
<kpartgui name="tdewalletmanager" version="3">
<MenuBar>
<Menu name="file"><text>&amp;File</text>
<Action name="wallet_create"/>

@ -18,20 +18,20 @@
*/
#include "kwalletpopup.h"
#include "tdewalletpopup.h"
#include <kaction.h>
#include <kdebug.h>
#include <kiconview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <kstdguiitem.h>
KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), _walletName(wallet) {
insertTitle(wallet);
KActionCollection *ac = new KActionCollection(this, "kwallet context actions");
KActionCollection *ac = new KActionCollection(this, "tdewallet context actions");
KAction *act;
act = new KAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this),
@ -106,5 +106,5 @@ void KWalletPopup::disconnectApp(int id) {
KWallet::Wallet::disconnectApplication(_walletName, _appMap[id].latin1());
}
#include "kwalletpopup.moc"
#include "tdewalletpopup.moc"
Loading…
Cancel
Save