TDE
/
kipi-plugins
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kipi-plugins
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KWallet to TDEWallet

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 0dda7febf8
commit 4d509ffb80
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
kipi-plugins/flickrexport/flickrwindow.h
Unescape View File

@ -57,7 +57,7 @@ namespace KIPI
class Interface;
}
namespace KWallet
namespace TDEWallet
{
class Wallet;
}
@ -148,7 +148,7 @@ private:
TQValueList< TQPair<KURL, FPhotoInfo> > m_uploadQueue;
// KWallet::Wallet *m_wallet;
// TDEWallet::Wallet *m_wallet;
TDEHTMLPart *m_photoView;
KLineEdit *m_tagsLineEdit;

4
kipi-plugins/galleryexport/galleries.cpp
Unescape View File

@ -118,9 +118,9 @@ void Galleries::Load()
bool bln_use_wallet = false;
#if KDE_IS_VERSION(3,2,0)
mpWallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(),
mpWallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(),
kapp->activeWindow()->winId(),
KWallet::Wallet::Synchronous);
TDEWallet::Wallet::Synchronous);
if (!mpWallet)
{
kdWarning() << "Failed to open tdewallet" << endl;

4
kipi-plugins/galleryexport/galleries.h
Unescape View File

@ -22,7 +22,7 @@
#include <tqptrlist.h>
#include <tqlistview.h>
namespace KWallet
namespace TDEWallet
{
class Wallet;
}
@ -100,7 +100,7 @@ public:
private:
void Load();
KWallet::Wallet* mpWallet;
TDEWallet::Wallet* mpWallet;
GalleryPtrList mGalleries;
unsigned int mMaxGalleryId;

4
kipi-plugins/picasawebexport/picasawebwindow.h
Unescape View File

@ -59,7 +59,7 @@ namespace KIPI
class Interface;
}
namespace KWallet
namespace TDEWallet
{
class Wallet;
}
@ -121,7 +121,7 @@ private:
TQLabel *m_userNameDisplayLabel;
// KWallet::Wallet *m_wallet;
// TDEWallet::Wallet *m_wallet;
TDEHTMLPart *m_photoView;
KURL::List *m_urls;

6
kipi-plugins/sync/sink.cpp
Unescape View File

@ -23,7 +23,7 @@
namespace KIPISyncPlugin
{
Sink::Sink(unsigned int sinkId, TQString name, TDEConfig*, KWallet::Wallet*)
Sink::Sink(unsigned int sinkId, TQString name, TDEConfig*, TDEWallet::Wallet*)
: mSinkId(sinkId),
mName(name)
{
@ -80,7 +80,7 @@ void Sink::asTQListViewItem(TQListView* pParent)
*/
// Pretend sink (just for testin the structure - will be removed!)
Sink2::Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
Sink2::Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet)
: Sink(sinkId, name, pConfig, pWallet)
{
mName = "Sink2";
@ -95,7 +95,7 @@ KIPI2::CollectionList* Sink2::getCollections()
return (KIPI2::CollectionList*) NULL;
}
void Sink2::Save(TDEConfig*, KWallet::Wallet*)
void Sink2::Save(TDEConfig*, TDEWallet::Wallet*)
{
}

8
kipi-plugins/sync/sink.h
Unescape View File

@ -41,7 +41,7 @@ namespace KIPISyncPlugin
class Sink : public KIPI2::Interface
{
public:
Sink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
Sink(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
unsigned int SinkId();
@ -56,7 +56,7 @@ public:
virtual const KIPI2::CollectionList* getCollections() = 0;
virtual void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet) = 0;
virtual void Save(TDEConfig* pConfig, TDEWallet::Wallet* pWallet) = 0;
// As some Sinks are remote, we have the concept of connect/disconnect
virtual bool Connect() { return true; };
@ -77,11 +77,11 @@ protected:
class Sink2 : Sink
{
public:
Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
Sink2(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
TQString Type();
TQString TypeDescription();
KIPI2::CollectionList* getCollections();
void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet);
void Save(TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
};

2
kipi-plugins/sync/sinkfactory.cpp
Unescape View File

@ -35,7 +35,7 @@ bool SinkFactory::Register(TQString type, SinkProxy* pSinkProxy)
}
// The main creation method
Sink* SinkFactory::Create(TQString type, unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
Sink* SinkFactory::Create(TQString type, unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet)
{
if (!mSinkProxies.contains(type))
return NULL;

8
kipi-plugins/sync/sinkfactory.h
Unescape View File

@ -22,7 +22,7 @@
#include <tqmap.h>
class TQListView;
class TDEConfig;
namespace KWallet
namespace TDEWallet
{
class Wallet;
}
@ -35,13 +35,13 @@ class Sink;
// Create a templated creator function to allow our "sinks" to
// register themselves with the factory.
template <class T>
Sink* SinkCreator(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet)
Sink* SinkCreator(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet)
{
return (Sink*) new T(sinkId, name, pConfig, pWallet);
}
// Define a type that is a pointer to the templated function above.
typedef Sink* SinkProxy(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
typedef Sink* SinkProxy(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
// And define a type that is a Map of names to creator functions.
typedef TQMap<TQString, SinkProxy*> SinkMap;
@ -51,7 +51,7 @@ class SinkFactory
{
public:
static bool Register(TQString name, SinkProxy* pSinkProxy);
static Sink* Create(TQString name, unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet);
static Sink* Create(TQString name, unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
private:
static SinkMap mSinkProxies;

8
kipi-plugins/sync/sinks.cpp
Unescape View File

@ -58,11 +58,11 @@ Sinks::Sinks()
: mpWallet(NULL),
mMaxSinkId(0)
{
KWallet::Wallet* p_wallet = NULL;
TDEWallet::Wallet* p_wallet = NULL;
#if KDE_IS_VERSION(3,2,0)
mpWallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(),
mpWallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(),
kapp->activeWindow()->winId(),
KWallet::Wallet::Synchronous);
TDEWallet::Wallet::Synchronous);
if (!mpWallet)
{
kdWarning() << "Failed to open tdewallet" << endl;
@ -149,7 +149,7 @@ void Sinks::Save()
config.deleteGroup("Sync Sinks");
config.setGroup("Sync Sinks");
KWallet::Wallet* p_wallet = NULL;
TDEWallet::Wallet* p_wallet = NULL;
if (mpWallet)
{
if (mpWallet->hasFolder("KIPISyncPlugin"))

4
kipi-plugins/sync/sinks.h
Unescape View File

@ -24,7 +24,7 @@
// Some sinks may wish to make use of the Wallet to store sensitive
// information so we manage it here.
namespace KWallet
namespace TDEWallet
{
class Wallet;
}
@ -69,7 +69,7 @@ public:
private:
void Load();
KWallet::Wallet* mpWallet;
TDEWallet::Wallet* mpWallet;
SinkPtrList mSinks;
unsigned int mMaxSinkId;

4
kipi-plugins/sync/sinks/gallery/gallerysink.cpp
Unescape View File

@ -44,7 +44,7 @@
namespace KIPISyncPlugin
{
GallerySink::GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version)
GallerySink::GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet, GalleryVersion version)
: Sink(sinkId, name, pConfig, pWallet),
mVersion(version),
mAuthToken(""),
@ -70,7 +70,7 @@ const KIPI2::CollectionList* GallerySink::getCollections()
return NULL;
}
void GallerySink::Save(TDEConfig* pConfig, KWallet::Wallet* pWallet)
void GallerySink::Save(TDEConfig* pConfig, TDEWallet::Wallet* pWallet)
{
pConfig->writeEntry(TQString("Name%1").arg(mSinkId), mName);
pConfig->writeEntry(TQString("Type%1").arg(mSinkId), Type());

4
kipi-plugins/sync/sinks/gallery/gallerysink.h
Unescape View File

@ -51,12 +51,12 @@ public:
GE_ADDPHOTO
};
GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version);
GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, TDEWallet::Wallet* pWallet, GalleryVersion version);
~GallerySink();
const KIPI2::CollectionList* getCollections();
void Save(TDEConfig* pConfig, KWallet::Wallet* pWallet);
void Save(TDEConfig* pConfig, TDEWallet::Wallet* pWallet);
bool Connect();

Write Preview
Loading…
Cancel
Save