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

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent a935c1de6f
commit 4946d97747
24 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File

4
katapult/common/imagedisplay.cpp
Unescape View File

@ -384,7 +384,7 @@ void ImageDisplay::updateOffset()
offset[3] = margin[3] + padding; offset[3] = margin[3] + padding;
} }
void ImageDisplay::readSettings(KConfigBase *config) void ImageDisplay::readSettings(TDEConfigBase *config)
{ {
fadeTime = config->readUnsignedNumEntry("FadeTime", 250); fadeTime = config->readUnsignedNumEntry("FadeTime", 250);
updateFadeStep(); updateFadeStep();
@ -395,7 +395,7 @@ void ImageDisplay::readSettings(KConfigBase *config)
maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14); maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14);
} }
void ImageDisplay::writeSettings(KConfigBase *config) void ImageDisplay::writeSettings(TDEConfigBase *config)
{ {
config->writeEntry("FadeTime", fadeTime); config->writeEntry("FadeTime", fadeTime);
config->writeEntry("FontFace", fontFace); config->writeEntry("FontFace", fontFace);

4
katapult/common/imagedisplay.h
Unescape View File

@ -45,8 +45,8 @@ public slots:
void continueFade(); void continueFade();
virtual void hide(); virtual void hide();
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual TQWidget * configure(); virtual TQWidget * configure();
void setFont(const TQString &); void setFont(const TQString &);

4
katapult/common/katapultcatalog.cpp
Unescape View File

@ -75,11 +75,11 @@ Match KatapultCatalog::bestMatch() const
return _bestMatch; return _bestMatch;
} }
void KatapultCatalog::readSettings(KConfigBase *) void KatapultCatalog::readSettings(TDEConfigBase *)
{ {
} }
void KatapultCatalog::writeSettings(KConfigBase *) void KatapultCatalog::writeSettings(TDEConfigBase *)
{ {
} }

6
katapult/common/katapultcatalog.h
Unescape View File

@ -27,7 +27,7 @@
#include "match.h" #include "match.h"
class TQWidget; class TQWidget;
class KConfigBase; class TDEConfigBase;
/** /**
@author Joe Ferris @author Joe Ferris
@ -46,8 +46,8 @@ public:
Match bestMatch() const; Match bestMatch() const;
virtual void initialize(); virtual void initialize();
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual TQWidget * configure(); virtual TQWidget * configure();
protected: protected:

4
katapult/common/katapultdisplay.cpp
Unescape View File

@ -101,11 +101,11 @@ int KatapultDisplay::status() const
return _status; return _status;
} }
void KatapultDisplay::readSettings(KConfigBase *) void KatapultDisplay::readSettings(TDEConfigBase *)
{ {
} }
void KatapultDisplay::writeSettings(KConfigBase *) void KatapultDisplay::writeSettings(TDEConfigBase *)
{ {
} }

6
katapult/common/katapultdisplay.h
Unescape View File

@ -28,7 +28,7 @@
#include "katapultaction.h" #include "katapultaction.h"
class Katapult; class Katapult;
class KConfigBase; class TDEConfigBase;
/** /**
@author Joe Ferris @author Joe Ferris
@ -48,8 +48,8 @@ public:
void setAction(const KatapultAction *); void setAction(const KatapultAction *);
void setStatus(int); void setStatus(int);
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual TQWidget * configure(); virtual TQWidget * configure();
signals: signals:

12
katapult/katapult/katapultsettings.cpp
Unescape View File

@ -59,7 +59,7 @@ KatapultSettings::~KatapultSettings()
void KatapultSettings::readSettings() void KatapultSettings::readSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
_hideSessionNotification = config->readNumEntry("HideSessionNotification", 1); _hideSessionNotification = config->readNumEntry("HideSessionNotification", 1);
_hideUserNotification = config->readNumEntry("HideUserNotification", 0); _hideUserNotification = config->readNumEntry("HideUserNotification", 0);
_notificationTimeout = config->readNumEntry("NotificationTimeout", 5000); _notificationTimeout = config->readNumEntry("NotificationTimeout", 5000);
@ -83,7 +83,7 @@ void KatapultSettings::readSettings()
void KatapultSettings::writeSettings() void KatapultSettings::writeSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
int hideSession = _hideSessionNotification; int hideSession = _hideSessionNotification;
int hideUser = _hideUserNotification; int hideUser = _hideUserNotification;
@ -109,14 +109,14 @@ void KatapultSettings::writeSettings()
KatapultCatalog *catalog; KatapultCatalog *catalog;
while((catalog = it.current()) != 0) while((catalog = it.current()) != 0)
{ {
KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey())); TDEConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
catalog->writeSettings(&group); catalog->writeSettings(&group);
++it; ++it;
} }
if(_display != 0) if(_display != 0)
{ {
KConfigGroup group(config, TQString("Displays/%1").arg(_displayName)); TDEConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
_display->writeSettings(&group); _display->writeSettings(&group);
} }
@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins()
(service, 0, 0, TQStringList(), &errCode); (service, 0, 0, TQStringList(), &errCode);
if(catalog != 0) if(catalog != 0)
{ {
KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id)); TDEConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
catalog->readSettings(&group); catalog->readSettings(&group);
catalog->initialize(); catalog->initialize();
_activeCatalogs.insert(id, catalog); _activeCatalogs.insert(id, catalog);
@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins()
} }
if(_display != 0) if(_display != 0)
{ {
KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName)); TDEConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
_display->readSettings(&group); _display->readSettings(&group);
} }
} }

4
katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
Unescape View File

@ -331,12 +331,12 @@ void AmarokCatalog::minQueryLenChanged(int _minQueryLen)
this->_minQueryLen = _minQueryLen; this->_minQueryLen = _minQueryLen;
} }
void AmarokCatalog::readSettings(KConfigBase *config) void AmarokCatalog::readSettings(TDEConfigBase *config)
{ {
_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3); _minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3);
} }
void AmarokCatalog::writeSettings(KConfigBase *config) void AmarokCatalog::writeSettings(TDEConfigBase *config)
{ {
config->writeEntry("MinQueryLen", _minQueryLen); config->writeEntry("MinQueryLen", _minQueryLen);
} }

4
katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
Unescape View File

@ -40,8 +40,8 @@ public:
virtual ~AmarokCatalog(); virtual ~AmarokCatalog();
unsigned int minQueryLen() const; unsigned int minQueryLen() const;
void readSettings(KConfigBase *); void readSettings(TDEConfigBase *);
void writeSettings(KConfigBase *); void writeSettings(TDEConfigBase *);
TQWidget * configure(); TQWidget * configure();
//virtual void initialize(); //virtual void initialize();

4
katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp
Unescape View File

@ -144,7 +144,7 @@ unsigned int BookmarkCatalog::minQueryLen() const
return _minQueryLen; return _minQueryLen;
} }
void BookmarkCatalog::readSettings(KConfigBase *config) void BookmarkCatalog::readSettings(TDEConfigBase *config)
{ {
_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3); _minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3);
_mozEnabled = config->readBoolEntry("MozEnabled", TRUE); _mozEnabled = config->readBoolEntry("MozEnabled", TRUE);
@ -152,7 +152,7 @@ void BookmarkCatalog::readSettings(KConfigBase *config)
_mozFile = config->readEntry("MozFile", ""); _mozFile = config->readEntry("MozFile", "");
} }
void BookmarkCatalog::writeSettings(KConfigBase *config) void BookmarkCatalog::writeSettings(TDEConfigBase *config)
{ {
config->writeEntry("MinQueryLen", _minQueryLen); config->writeEntry("MinQueryLen", _minQueryLen);
config->writeEntry("MozEnabled", _mozEnabled); config->writeEntry("MozEnabled", _mozEnabled);

4
katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
Unescape View File

@ -44,8 +44,8 @@ public:
virtual ~BookmarkCatalog(); virtual ~BookmarkCatalog();
virtual void initialize(); virtual void initialize();
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual unsigned int minQueryLen() const; virtual unsigned int minQueryLen() const;
virtual TQWidget * configure(); virtual TQWidget * configure();

4
katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
Unescape View File

@ -256,7 +256,7 @@ void CalculatorCatalog::initialize()
} }
*/ */
void CalculatorCatalog::readSettings(KConfigBase* config) void CalculatorCatalog::readSettings(TDEConfigBase* config)
{ {
_fracDigits = config->readUnsignedNumEntry("FracDigits", 2); _fracDigits = config->readUnsignedNumEntry("FracDigits", 2);
_bScientific = config->readBoolEntry("Scientific", false); _bScientific = config->readBoolEntry("Scientific", false);
@ -265,7 +265,7 @@ void CalculatorCatalog::readSettings(KConfigBase* config)
_formatString = config->readEntry("FormatString", "%1 = %2"); _formatString = config->readEntry("FormatString", "%1 = %2");
} }
void CalculatorCatalog::writeSettings(KConfigBase* config) void CalculatorCatalog::writeSettings(TDEConfigBase* config)
{ {
config->writeEntry("FracDigits", fracDigits()); config->writeEntry("FracDigits", fracDigits());
config->writeEntry("Scientific", scientific()); config->writeEntry("Scientific", scientific());

4
katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
Unescape View File

@ -64,8 +64,8 @@ class CalculatorCatalog : public KatapultCatalog
virtual ~CalculatorCatalog(); virtual ~CalculatorCatalog();
//virtual void initialize(); //virtual void initialize();
virtual void readSettings(KConfigBase*); virtual void readSettings(TDEConfigBase*);
virtual void writeSettings(KConfigBase*); virtual void writeSettings(TDEConfigBase*);
virtual TQWidget* configure(); virtual TQWidget* configure();
int getVarID(const char*); int getVarID(const char*);

4
katapult/plugins/catalogs/documentcatalog/document.cpp
Unescape View File

@ -44,12 +44,12 @@ Document::~Document()
TQPixmap Document::icon(int size) const TQPixmap Document::icon(int size) const
{ {
KURL u; KURL u;
KIO::PreviewJob *doc; TDEIO::PreviewJob *doc;
u.setPath(_absPath); u.setPath(_absPath);
if (this->_showPreview) if (this->_showPreview)
{ {
doc=KIO::filePreview(u,size); doc=TDEIO::filePreview(u,size);
connect(doc, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), connect(doc, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&)));

4
katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
Unescape View File

@ -191,13 +191,13 @@ unsigned int DocumentCatalog::minQueryLen() const
return _minQueryLen; return _minQueryLen;
} }
void DocumentCatalog::readSettings(KConfigBase *config) void DocumentCatalog::readSettings(TDEConfigBase *config)
{ {
_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1); _minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1);
_showPreview = config->readBoolEntry("showPreview", FALSE); _showPreview = config->readBoolEntry("showPreview", FALSE);
} }
void DocumentCatalog::writeSettings(KConfigBase *config) void DocumentCatalog::writeSettings(TDEConfigBase *config)
{ {
config->writeEntry("MinQueryLen", _minQueryLen); config->writeEntry("MinQueryLen", _minQueryLen);
config->writeEntry("showPreview", _showPreview); config->writeEntry("showPreview", _showPreview);

4
katapult/plugins/catalogs/documentcatalog/documentcatalog.h
Unescape View File

@ -45,8 +45,8 @@ public:
virtual void initialize(); virtual void initialize();
virtual void queryChanged(); virtual void queryChanged();
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual unsigned int minQueryLen() const; virtual unsigned int minQueryLen() const;
virtual TQWidget * configure(); virtual TQWidget * configure();

4
katapult/plugins/catalogs/execcatalog/execcatalog.cpp
Unescape View File

@ -82,12 +82,12 @@ bool ExecCatalog::accepts(const TQString& str) const
return str.left(length + 1) == _triggerWord + " "; return str.left(length + 1) == _triggerWord + " ";
} }
void ExecCatalog::readSettings(KConfigBase* config) void ExecCatalog::readSettings(TDEConfigBase* config)
{ {
_triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "exec")); _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "exec"));
} }
void ExecCatalog::writeSettings(KConfigBase* config) void ExecCatalog::writeSettings(TDEConfigBase* config)
{ {
config->writeEntry("TriggerWord", _triggerWord); config->writeEntry("TriggerWord", _triggerWord);
} }

4
katapult/plugins/catalogs/execcatalog/execcatalog.h
Unescape View File

@ -51,8 +51,8 @@ class ExecCatalog : public KatapultCatalog
ExecCatalog(TQObject*, const char*, const TQStringList&); ExecCatalog(TQObject*, const char*, const TQStringList&);
virtual ~ExecCatalog(); virtual ~ExecCatalog();
virtual void readSettings(KConfigBase*); virtual void readSettings(TDEConfigBase*);
virtual void writeSettings(KConfigBase*); virtual void writeSettings(TDEConfigBase*);
virtual TQWidget* configure(); virtual TQWidget* configure();
int triggerWordLength(); int triggerWordLength();

4
katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
Unescape View File

@ -82,12 +82,12 @@ bool GoogleCatalog::accepts(const TQString& str) const
return str.left(length + 1) == _triggerWord + " "; return str.left(length + 1) == _triggerWord + " ";
} }
void GoogleCatalog::readSettings(KConfigBase* config) void GoogleCatalog::readSettings(TDEConfigBase* config)
{ {
_triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "google")); _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "google"));
} }
void GoogleCatalog::writeSettings(KConfigBase* config) void GoogleCatalog::writeSettings(TDEConfigBase* config)
{ {
config->writeEntry("TriggerWord", _triggerWord); config->writeEntry("TriggerWord", _triggerWord);
} }

4
katapult/plugins/catalogs/googlecatalog/googlecatalog.h
Unescape View File

@ -51,8 +51,8 @@ class GoogleCatalog : public KatapultCatalog
GoogleCatalog(TQObject*, const char*, const TQStringList&); GoogleCatalog(TQObject*, const char*, const TQStringList&);
virtual ~GoogleCatalog(); virtual ~GoogleCatalog();
virtual void readSettings(KConfigBase*); virtual void readSettings(TDEConfigBase*);
virtual void writeSettings(KConfigBase*); virtual void writeSettings(TDEConfigBase*);
virtual TQWidget* configure(); virtual TQWidget* configure();
int triggerWordLength(); int triggerWordLength();

4
katapult/plugins/catalogs/programcatalog/programcatalog.cpp
Unescape View File

@ -95,7 +95,7 @@ unsigned int ProgramCatalog::minQueryLen() const
return _minQueryLen; return _minQueryLen;
} }
void ProgramCatalog::readSettings(KConfigBase *config) void ProgramCatalog::readSettings(TDEConfigBase *config)
{ {
_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1); _minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1);
_ignoreIconless = config->readBoolEntry("IgnoreIconless", TRUE); _ignoreIconless = config->readBoolEntry("IgnoreIconless", TRUE);
@ -103,7 +103,7 @@ void ProgramCatalog::readSettings(KConfigBase *config)
_ignoreTerminal = config->readBoolEntry("IgnoreTerminal", TRUE); _ignoreTerminal = config->readBoolEntry("IgnoreTerminal", TRUE);
} }
void ProgramCatalog::writeSettings(KConfigBase *config) void ProgramCatalog::writeSettings(TDEConfigBase *config)
{ {
config->writeEntry("MinQueryLen", _minQueryLen); config->writeEntry("MinQueryLen", _minQueryLen);
config->writeEntry("IgnoreIconless", _ignoreIconless); config->writeEntry("IgnoreIconless", _ignoreIconless);

4
katapult/plugins/catalogs/programcatalog/programcatalog.h
Unescape View File

@ -41,8 +41,8 @@ public:
virtual ~ProgramCatalog(); virtual ~ProgramCatalog();
virtual void initialize(); virtual void initialize();
virtual void readSettings(KConfigBase *); virtual void readSettings(TDEConfigBase *);
virtual void writeSettings(KConfigBase *); virtual void writeSettings(TDEConfigBase *);
virtual unsigned int minQueryLen() const; virtual unsigned int minQueryLen() const;
virtual TQWidget * configure(); virtual TQWidget * configure();

4
katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
Unescape View File

@ -82,12 +82,12 @@ bool SpellCatalog::accepts(const TQString& str) const
return str.left(length + 1) == _triggerWord + " "; return str.left(length + 1) == _triggerWord + " ";
} }
void SpellCatalog::readSettings(KConfigBase* config) void SpellCatalog::readSettings(TDEConfigBase* config)
{ {
_triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "spell")); _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "spell"));
} }
void SpellCatalog::writeSettings(KConfigBase* config) void SpellCatalog::writeSettings(TDEConfigBase* config)
{ {
config->writeEntry("TriggerWord", _triggerWord); config->writeEntry("TriggerWord", _triggerWord);
} }

4
katapult/plugins/catalogs/spellcatalog/spellcatalog.h
Unescape View File

@ -48,8 +48,8 @@ class SpellCatalog : public KatapultCatalog
SpellCatalog(TQObject*, const char*, const TQStringList&); SpellCatalog(TQObject*, const char*, const TQStringList&);
virtual ~SpellCatalog(); virtual ~SpellCatalog();
virtual void readSettings(KConfigBase*); virtual void readSettings(TDEConfigBase*);
virtual void writeSettings(KConfigBase*); virtual void writeSettings(TDEConfigBase*);
virtual TQWidget* configure(); virtual TQWidget* configure();
int triggerWordLength(); int triggerWordLength();

Write Preview
Loading…
Cancel
Save