Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
86d8364ac7
100 changed files with 347 additions and 347 deletions
  1. 12
    12
      akregator/src/akregator_part.cpp
  2. 4
    4
      akregator/src/akregator_part.h
  3. 3
    3
      akregator/src/akregator_view.cpp
  4. 5
    5
      akregator/src/akregator_view.h
  5. 16
    16
      akregator/src/articlefilter.cpp
  6. 21
    21
      akregator/src/articlefilter.h
  7. 2
    2
      akregator/src/articleviewer.cpp
  8. 3
    3
      akregator/src/configdialog.cpp
  9. 3
    3
      akregator/src/configdialog.h
  10. 1
    1
      akregator/src/frame.cpp
  11. 7
    7
      akregator/src/librss/image.cpp
  12. 3
    3
      akregator/src/librss/image.h
  13. 11
    11
      akregator/src/librss/loader.cpp
  14. 4
    4
      akregator/src/librss/loader.h
  15. 2
    2
      akregator/src/mainwindow.cpp
  16. 3
    3
      akregator/src/mainwindow.h
  17. 2
    2
      akregator/src/pageviewer.cpp
  18. 1
    1
      akregator/src/pageviewer.h
  19. 3
    3
      akregator/src/viewer.cpp
  20. 2
    2
      akregator/src/viewer.h
  21. 7
    7
      certmanager/certificatewizardimpl.cpp
  22. 2
    2
      certmanager/certificatewizardimpl.h
  23. 17
    17
      certmanager/certmanager.cpp
  24. 4
    4
      certmanager/certmanager.h
  25. 3
    3
      certmanager/conf/appearanceconfigpage.cpp
  26. 1
    1
      certmanager/conf/appearanceconfigpage.h
  27. 6
    6
      certmanager/conf/appearanceconfigwidget.cpp
  28. 1
    1
      certmanager/conf/appearanceconfigwidget.h
  29. 2
    2
      certmanager/conf/configuredialog.cpp
  30. 4
    4
      certmanager/conf/dirservconfigpage.cpp
  31. 1
    1
      certmanager/conf/dirservconfigpage.h
  32. 3
    3
      certmanager/conf/dnorderconfigpage.cpp
  33. 1
    1
      certmanager/conf/dnorderconfigpage.h
  34. 1
    1
      certmanager/conf/kleopatra_config_appear.desktop
  35. 1
    1
      certmanager/conf/kleopatra_config_dirserv.desktop
  36. 1
    1
      certmanager/conf/kleopatra_config_dnorder.desktop
  37. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  38. 3
    3
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  39. 7
    7
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  40. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  41. 1
    1
      certmanager/lib/cryptplugwrapper.h
  42. 4
    4
      certmanager/lib/kleo/cryptobackendfactory.cpp
  43. 3
    3
      certmanager/lib/kleo/cryptobackendfactory.h
  44. 2
    2
      certmanager/lib/kleo/dn.cpp
  45. 4
    4
      certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
  46. 4
    4
      certmanager/lib/kleo/kconfigbasedkeyfilter.h
  47. 3
    3
      certmanager/lib/kleo/keyfiltermanager.cpp
  48. 1
    1
      certmanager/lib/ui/cryptoconfigmodule.h
  49. 2
    2
      certmanager/lib/ui/keyselectiondialog.cpp
  50. 10
    10
      certmanager/storedtransferjob.cpp
  51. 6
    6
      certmanager/storedtransferjob.h
  52. 1
    1
      kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
  53. 7
    7
      kaddressbook/addresseeconfig.cpp
  54. 2
    2
      kaddressbook/addresseeeditordialog.cpp
  55. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  56. 9
    9
      kaddressbook/common/filter.cpp
  57. 4
    4
      kaddressbook/common/filter.h
  58. 1
    1
      kaddressbook/common/kabprefs.cpp
  59. 1
    1
      kaddressbook/common/kabprefs.h
  60. 2
    2
      kaddressbook/imagewidget.cpp
  61. 2
    2
      kaddressbook/interfaces/configurewidget.cpp
  62. 2
    2
      kaddressbook/interfaces/configurewidget.h
  63. 3
    3
      kaddressbook/interfaces/core.h
  64. 1
    1
      kaddressbook/kabcore.cpp
  65. 3
    3
      kaddressbook/kabcore.h
  66. 2
    2
      kaddressbook/kaddressbookmain.cpp
  67. 3
    3
      kaddressbook/kaddressbookmain.h
  68. 2
    2
      kaddressbook/kaddressbookview.cpp
  69. 5
    5
      kaddressbook/kaddressbookview.h
  70. 4
    4
      kaddressbook/kcmconfigs/addresseewidget.cpp
  71. 1
    1
      kaddressbook/kcmconfigs/extensionconfigdialog.cpp
  72. 2
    2
      kaddressbook/kcmconfigs/extensionconfigdialog.h
  73. 1
    1
      kaddressbook/kcmconfigs/kabconfig.desktop
  74. 2
    2
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  75. 1
    1
      kaddressbook/kcmconfigs/kabcustomfields.desktop
  76. 1
    1
      kaddressbook/kcmconfigs/kabldapconfig.desktop
  77. 2
    2
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  78. 1
    1
      kaddressbook/kcmconfigs/kcmkabconfig.h
  79. 1
    1
      kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
  80. 2
    2
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  81. 1
    1
      kaddressbook/kcmconfigs/kcmkabldapconfig.h
  82. 4
    4
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  83. 3
    3
      kaddressbook/keywidget.cpp
  84. 4
    4
      kaddressbook/ldapsearchdialog.cpp
  85. 1
    1
      kaddressbook/nameeditdialog.cpp
  86. 2
    2
      kaddressbook/printing/detailledstyle.cpp
  87. 2
    2
      kaddressbook/soundwidget.cpp
  88. 2
    2
      kaddressbook/viewconfigurefieldspage.cpp
  89. 2
    2
      kaddressbook/viewconfigurefieldspage.h
  90. 2
    2
      kaddressbook/viewconfigurefilterpage.cpp
  91. 3
    3
      kaddressbook/viewconfigurefilterpage.h
  92. 4
    4
      kaddressbook/viewconfigurewidget.cpp
  93. 4
    4
      kaddressbook/viewconfigurewidget.h
  94. 8
    8
      kaddressbook/viewmanager.cpp
  95. 4
    4
      kaddressbook/views/configurecardviewdialog.cpp
  96. 5
    5
      kaddressbook/views/configurecardviewdialog.h
  97. 4
    4
      kaddressbook/views/configuretableviewdialog.cpp
  98. 5
    5
      kaddressbook/views/configuretableviewdialog.h
  99. 2
    2
      kaddressbook/views/kaddressbookcardview.cpp
  100. 0
    0
      kaddressbook/views/kaddressbookcardview.h

+ 12
- 12
akregator/src/akregator_part.cpp View File

@@ -197,7 +197,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*)));
connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));

// notify the part that this is our internal widget
@@ -308,7 +308,7 @@ Part::~Part()
delete m_applyFiltersInterceptor;
}

void Part::readProperties(KConfig* config)
void Part::readProperties(TDEConfig* config)
{
m_backedUpList = false;
openStandardFeedList();
@@ -317,7 +317,7 @@ void Part::readProperties(KConfig* config)
m_view->readProperties(config);
}

void Part::saveProperties(KConfig* config)
void Part::saveProperties(TDEConfig* config)
{
if (m_view)
{
@@ -619,9 +619,9 @@ void Part::importFile(const KURL& url)
{
isRemote = true;

if (!KIO::NetAccess::download(url, filename, m_view) )
if (!TDEIO::NetAccess::download(url, filename, m_view) )
{
KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
return;
}
}
@@ -640,7 +640,7 @@ void Part::importFile(const KURL& url)
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));

if (isRemote)
KIO::NetAccess::removeTempFile(filename);
TDEIO::NetAccess::removeTempFile(filename);
}

void Part::exportFile(const KURL& url)
@@ -680,8 +680,8 @@ void Part::exportFile(const KURL& url)
stream << m_view->feedListToOPML().toString() << "\n";
tmpfile.close();

if (!KIO::NetAccess::upload(tmpfile.name(), url, m_view))
KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
if (!TDEIO::NetAccess::upload(tmpfile.name(), url, m_view))
KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
}
}

@@ -780,10 +780,10 @@ void Part::showKNotifyOptions()

void Part::showOptions()
{
if ( KConfigDialog::showDialog( "settings" ) )
if ( TDEConfigDialog::showDialog( "settings" ) )
return;

KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );

connect( dialog, TQT_SIGNAL(settingsChanged()),
this, TQT_SLOT(slotSettingsChanged()) );
@@ -848,10 +848,10 @@ void Part::initFonts()
if (Settings::serifFont().isEmpty())
Settings::setSerifFont(fonts[3]);

KConfig* conf = Settings::self()->config();
TDEConfig* conf = Settings::self()->config();
conf->setGroup("HTML Settings");

KConfig konq("konquerorrc", true, false);
TDEConfig konq("konquerorrc", true, false);
konq.setGroup("HTML Settings");

if (!conf->hasKey("MinimumFontSize"))

+ 4
- 4
akregator/src/akregator_part.h View File

@@ -38,7 +38,7 @@ class TQDomDocument;
class TQTimer;

class TDEAboutData;
class KConfig;
class TDEConfig;
class KURL;

namespace Akregator
@@ -117,17 +117,17 @@ namespace Akregator
virtual void addFeed();

/**
This method is called when this app is restored. The KConfig
This method is called when this app is restored. The TDEConfig
object points to the session management config file that was saved
with @ref saveProperties
Calls AkregatorView's saveProperties.
*/
virtual void readProperties(KConfig* config);
virtual void readProperties(TDEConfig* config);

/** This method is called when it is time for the app to save its
properties for session management purposes.
Calls AkregatorView's readProperties. */
virtual void saveProperties(KConfig* config);
virtual void saveProperties(TDEConfig* config);

/** merges a nested part's GUI into the gui of this part
@return true iff merging was successful, i.e. the GUI factory was not NULL */

+ 3
- 3
akregator/src/akregator_view.cpp View File

@@ -328,7 +328,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if ( sp2sizes.count() >= m_articleSplitter->sizes().count() )
m_articleSplitter->setSizes( sp2sizes );

KConfig *conf = Settings::self()->config();
TDEConfig *conf = Settings::self()->config();
conf->setGroup("General");
if(!conf->readBoolEntry("Disable Introduction", false))
{
@@ -1445,7 +1445,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
}
}

void View::readProperties(KConfig* config)
void View::readProperties(TDEConfig* config)
{

if (!Settings::resetQuickFilterOnNodeChange())
@@ -1474,7 +1474,7 @@ void View::readProperties(KConfig* config)
}
}

void View::saveProperties(KConfig* config)
void View::saveProperties(TDEConfig* config)
{
// save filter settings
config->writeEntry("searchLine", m_searchBar->text());

+ 5
- 5
akregator/src/akregator_view.h View File

@@ -42,7 +42,7 @@ class TQHBox;
class TQToolButton;
class TQListViewItem;
class KComboBox;
class KConfig;
class TDEConfig;
class KFileItem;
class KLineEdit;
class KListView;
@@ -50,7 +50,7 @@ class KListViewItem;
class KTabWidget;
class Viewer;

namespace KIO {
namespace TDEIO {

class Job;
}
@@ -124,8 +124,8 @@ namespace Akregator {
void addFeedToGroup(const TQString& url, const TQString& group);

/** session management **/
virtual void readProperties(KConfig* config);
virtual void saveProperties(KConfig* config);
virtual void readProperties(TDEConfig* config);
virtual void saveProperties(TDEConfig* config);

Frame* currentFrame() const { return m_currentFrame; }

@@ -136,7 +136,7 @@ namespace Akregator {
void setWindowCaption(const TQString&);
void setStatusBarText(const TQString&);
void setProgress(int);
void signalStarted(KIO::Job*);
void signalStarted(TDEIO::Job*);
void signalCompleted();
void signalCanceled(const TQString&);


+ 16
- 16
akregator/src/articlefilter.cpp View File

@@ -122,7 +122,7 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj

}

void Criterion::writeConfig(KConfig* config) const
void Criterion::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));

@@ -133,7 +133,7 @@ void Criterion::writeConfig(KConfig* config) const
config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
}

void Criterion::readConfig(KConfig* config)
void Criterion::readConfig(TDEConfig* config)
{
m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
@@ -267,7 +267,7 @@ bool ArticleMatcher::matches( const Article &a ) const
return true;
}

void ArticleMatcher::writeConfig(KConfig* config) const
void ArticleMatcher::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
@@ -283,7 +283,7 @@ void ArticleMatcher::writeConfig(KConfig* config) const
}
}

void ArticleMatcher::readConfig(KConfig* config)
void ArticleMatcher::readConfig(TDEConfig* config)
{
m_criteria.clear();
m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
@@ -406,13 +406,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
*this = other;
}

void TagMatcher::writeConfig(KConfig* config) const
void TagMatcher::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
}

void TagMatcher::readConfig(KConfig* config)
void TagMatcher::readConfig(TDEConfig* config)
{
d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
}
@@ -462,13 +462,13 @@ void SetStatusAction::setStatus(int status)
m_status = status;
}

void SetStatusAction::writeConfig(KConfig* config) const
void SetStatusAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
}

void SetStatusAction::readConfig(KConfig* config)
void SetStatusAction::readConfig(TDEConfig* config)
{
m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
}
@@ -579,7 +579,7 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
return *(d->matcher) == *(other.d->matcher) && *(d->action) == *(other.d->action) && d->name == other.d->name;
}

void ArticleFilterList::writeConfig(KConfig* config) const
void ArticleFilterList::writeConfig(TDEConfig* config) const
{
config->setGroup(TQString::fromLatin1("Filters"));
config->writeEntry(TQString::fromLatin1("count"), count());
@@ -592,7 +592,7 @@ void ArticleFilterList::writeConfig(KConfig* config) const
}
}

void ArticleFilterList::readConfig(KConfig* config)
void ArticleFilterList::readConfig(TDEConfig* config)
{
clear();
config->setGroup(TQString::fromLatin1("Filters"));
@@ -607,12 +607,12 @@ void ArticleFilterList::readConfig(KConfig* config)
}


void AssignTagAction::readConfig(KConfig* config)
void AssignTagAction::readConfig(TDEConfig* config)
{
m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
}

void AssignTagAction::writeConfig(KConfig* config) const
void AssignTagAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
@@ -638,11 +638,11 @@ void AssignTagAction::setTagID(const TQString& tagID)
m_tagID = tagID;
}

void DeleteAction::readConfig(KConfig* /*config*/)
void DeleteAction::readConfig(TDEConfig* /*config*/)
{
}

void DeleteAction::writeConfig(KConfig* config) const
void DeleteAction::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
}
@@ -654,7 +654,7 @@ bool DeleteAction::operator==(const AbstractAction& other)
return o != 0;
}

void ArticleFilter::readConfig(KConfig* config)
void ArticleFilter::readConfig(TDEConfig* config)
{
delete d->matcher;
d->matcher = 0;
@@ -688,7 +688,7 @@ void ArticleFilter::readConfig(KConfig* config)
d->action->readConfig(config);
}

void ArticleFilter::writeConfig(KConfig* config) const
void ArticleFilter::writeConfig(TDEConfig* config) const
{
config->writeEntry(TQString::fromLatin1("name"), d->name);
config->writeEntry(TQString::fromLatin1("id"), d->id);

+ 21
- 21
akregator/src/articlefilter.h View File

@@ -32,7 +32,7 @@
#include <tqvaluelist.h>
#include <tqvariant.h>

class KConfig;
class TDEConfig;

namespace Akregator {

@@ -77,8 +77,8 @@ class ArticleFilter
ArticleFilter& operator=(const ArticleFilter& other);
bool operator==(const ArticleFilter& other) const;

void writeConfig(KConfig* config) const;
void readConfig(KConfig* config);
void writeConfig(TDEConfig* config) const;
void readConfig(TDEConfig* config);

private:
class ArticleFilterPrivate;
@@ -90,8 +90,8 @@ class ArticleFilterList : public TQValueList<ArticleFilter>
{
public:
void writeConfig(KConfig* config) const;
void readConfig(KConfig* config);
void writeConfig(TDEConfig* config) const;
void readConfig(TDEConfig* config);
};

/** Abstract base class for matchers, a matcher just takes an article and checks whether the article matches some criterion or not.
@@ -107,8 +107,8 @@ class AbstractMatcher

virtual bool matches(const Article& article) const = 0;

virtual void writeConfig(KConfig* config) const = 0;
virtual void readConfig(KConfig* config) = 0;
virtual void writeConfig(TDEConfig* config) const = 0;
virtual void readConfig(TDEConfig* config) = 0;

virtual bool operator==(const AbstractMatcher&) const = 0;
virtual bool operator!=(const AbstractMatcher &other) const = 0;
@@ -129,8 +129,8 @@ class TagMatcher : public AbstractMatcher

virtual TagMatcher* clone() const;

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

TagMatcher& operator=(const TagMatcher& other);
virtual bool operator==(const AbstractMatcher&) const;
@@ -147,8 +147,8 @@ class AbstractAction
public:
virtual void exec(Article& article) = 0;

virtual void writeConfig(KConfig* config) const = 0;
virtual void readConfig(KConfig* config) = 0;
virtual void writeConfig(TDEConfig* config) const = 0;
virtual void readConfig(TDEConfig* config) = 0;

virtual AbstractAction* clone() const = 0;
virtual bool operator==(const AbstractAction& other) = 0;
@@ -159,8 +159,8 @@ class DeleteAction : public AbstractAction
public:
virtual void exec(Article& article);
virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

virtual DeleteAction* clone() const { return new DeleteAction; }
virtual bool operator==(const AbstractAction& other);
@@ -176,8 +176,8 @@ class SetStatusAction : public AbstractAction
int status() const;
void setStatus(int status);

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
virtual bool operator==(const AbstractAction& other);
@@ -196,8 +196,8 @@ class AssignTagAction : public AbstractAction
const TQString& tagID() const;
void setTagID(const TQString& tagID);

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

virtual AssignTagAction* clone() const { return new AssignTagAction(*this); }
virtual bool operator==(const AbstractAction& other);
@@ -236,8 +236,8 @@ class ArticleMatcher : public AbstractMatcher
virtual bool operator!=(const AbstractMatcher &other) const;
virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

private:

@@ -280,8 +280,8 @@ class Criterion
bool satisfiedBy( const Article &article ) const;

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
virtual void writeConfig(TDEConfig* config) const;
virtual void readConfig(TDEConfig* config);

Subject subject() const;
Predicate predicate() const;

+ 2
- 2
akregator/src/articleviewer.cpp View File

@@ -484,7 +484,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
//TQString url = article.enclosure().url();
//TQString type = article.enclosure().type();
//int length = article.enclosure().length();
//TQString lengthStr = KIO::convertSize(length);
//TQString lengthStr = TDEIO::convertSize(length);

//text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
}
@@ -744,7 +744,7 @@ void ArticleViewer::urlSelected(const TQString &url, int button, int state, cons
{
if(url == "config:/disable_introduction") {
if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) {
KConfig *conf = Settings::self()->config();
TDEConfig *conf = Settings::self()->config();
conf->setGroup("General");
conf->writeEntry("Disable Introduction", "true");
}

+ 3
- 3
akregator/src/configdialog.cpp View File

@@ -41,7 +41,7 @@
namespace Akregator
{

ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : TDEConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
{
addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
@@ -57,7 +57,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton*
void ConfigDialog::updateSettings()
{
Settings::setArchiveBackend(m_settingsAdvanced->selectedFactory());
KConfigDialog::updateSettings();
TDEConfigDialog::updateSettings();
}
void ConfigDialog::updateWidgets()
@@ -67,7 +67,7 @@ void ConfigDialog::updateWidgets()
m_settingsAppearance->slider_mediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
m_settingsAppearance->lbl_MinimumFontSize->setDisabled(m_config->isImmutable("MinimumFontSize"));
m_settingsAppearance->lbl_MediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
KConfigDialog::updateWidgets();
TDEConfigDialog::updateWidgets();
}
ConfigDialog::~ConfigDialog() {}

+ 3
- 3
akregator/src/configdialog.h View File

@@ -32,13 +32,13 @@ namespace Akregator {
class SettingsAdvanced;
class SettingsAppearance;

class ConfigDialog : public KConfigDialog
class ConfigDialog : public TDEConfigDialog
{
Q_OBJECT
public:
ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
ConfigDialog(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
virtual ~ConfigDialog();

@@ -49,7 +49,7 @@ class ConfigDialog : public KConfigDialog
virtual void updateWidgets();

private:
KConfigSkeleton* m_config;
TDEConfigSkeleton* m_config;
SettingsAdvanced* m_settingsAdvanced;
SettingsAppearance* m_settingsAppearance;

+ 1
- 1
akregator/src/frame.cpp View File

@@ -57,7 +57,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
if (ext)
connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) );

connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted()));
connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted()));
connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted()));
connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&)));
connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted()));

+ 7
- 7
akregator/src/librss/image.cpp View File

@@ -32,7 +32,7 @@ struct Image::Private : public Shared
unsigned int height;
unsigned int width;
TQBuffer *pixmapBuffer;
KIO::Job *job;
TDEIO::Job *job;
};

Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
d->pixmapBuffer = new TQBuffer;
d->pixmapBuffer->open(IO_WriteOnly);

d->job = KIO::get(d->url, false, false);
connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
d->job = TDEIO::get(d->url, false, false);
connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
}

void Image::slotData(KIO::Job *, const TQByteArray &data)
void Image::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->pixmapBuffer->writeBlock(data.data(), data.size());
}

void Image::slotResult(KIO::Job *job)
void Image::slotResult(TDEIO::Job *job)
{
TQPixmap pixmap;
if (!job->error())

+ 3
- 3
akregator/src/librss/image.h View File

@@ -17,7 +17,7 @@

class TQDomNode;

namespace KIO
namespace TDEIO
{
class Job;
}
@@ -161,8 +161,8 @@ namespace RSS
void gotPixmap(const TQPixmap &pixmap);

private slots:
void slotData(KIO::Job *job, const TQByteArray &data);
void slotResult(KIO::Job *job);
void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotResult(TDEIO::Job *job);

private:
struct Private;

+ 11
- 11
akregator/src/librss/loader.cpp View File

@@ -52,7 +52,7 @@ class FileRetriever::Private

TQBuffer *buffer;
int lastError;
KIO::Job *job;
TDEIO::Job *job;
static KStaticDeleter<TQString> userAgentsd;
static TQString* userAgent;
};
@@ -103,7 +103,7 @@ void FileRetriever::retrieveData(const KURL &url)
if (u.protocol()=="feed")
u.setProtocol("http");

d->job = KIO::get(u, false, false);
d->job = TDEIO::get(u, false, false);
d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");

TQString ua = userAgent();
@@ -113,11 +113,11 @@ void FileRetriever::retrieveData(const KURL &url)

TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));

connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
}

void FileRetriever::slotTimeout()
@@ -127,7 +127,7 @@ void FileRetriever::slotTimeout()
delete d->buffer;
d->buffer = NULL;

d->lastError = KIO::ERR_SERVER_TIMEOUT;
d->lastError = TDEIO::ERR_SERVER_TIMEOUT;

emit dataRetrieved(TQByteArray(), false);
}
@@ -137,12 +137,12 @@ int FileRetriever::errorCode() const
return d->lastError;
}

void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->buffer->writeBlock(data.data(), data.size());
}

void FileRetriever::slotResult(KIO::Job *job)
void FileRetriever::slotResult(TDEIO::Job *job)
{
TQByteArray data = d->buffer->buffer();
data.detach();
@@ -154,7 +154,7 @@ void FileRetriever::slotResult(KIO::Job *job)
emit dataRetrieved(data, d->lastError == 0);
}

void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
{
emit permanentRedirection(newUrl);
}

+ 4
- 4
akregator/src/librss/loader.h View File

@@ -17,7 +17,7 @@ class KURL;

#include <tqobject.h>

namespace KIO
namespace TDEIO
{
class Job;
}
@@ -139,9 +139,9 @@ namespace RSS
void slotTimeout();

private slots:
void slotData(KIO::Job *job, const TQByteArray &data);
void slotResult(KIO::Job *job);
void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotResult(TDEIO::Job *job);
void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
const KURL &toUrl);

private:

+ 2
- 2
akregator/src/mainwindow.cpp View File

@@ -163,7 +163,7 @@ void MainWindow::setupActions()
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
}

void MainWindow::saveProperties(KConfig* config)
void MainWindow::saveProperties(TDEConfig* config)
{
if (!m_part)
loadPart();
@@ -174,7 +174,7 @@ void MainWindow::saveProperties(KConfig* config)
//delete m_part;
}

void MainWindow::readProperties(KConfig* config)
void MainWindow::readProperties(TDEConfig* config)
{
if (!m_part)
loadPart();

+ 3
- 3
akregator/src/mainwindow.h View File

@@ -102,14 +102,14 @@ protected:
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfig *);
void saveProperties(TDEConfig *);

/**
* This method is called when this app is restored. The KConfig
* This method is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(KConfig *);
void readProperties(TDEConfig *);
/**
* Reimplemented to save settings
*/

+ 2
- 2
akregator/src/pageviewer.cpp View File

@@ -144,7 +144,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)),
this, TQT_SLOT(slotSetCaption (const TQString &)) );

connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));

@@ -337,7 +337,7 @@ void PageViewer::addHistoryEntry(const KURL& url)
}

// Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
void PageViewer::slotStarted( KIO::Job * )
void PageViewer::slotStarted( TDEIO::Job * )
{
d->stopAction->setEnabled(true);
}

+ 1
- 1
akregator/src/pageviewer.h View File

@@ -63,7 +63,7 @@ namespace Akregator

virtual void slotPaletteOrFontChanged();

void slotStarted(KIO::Job *);
void slotStarted(TDEIO::Job *);
void slotCompleted();
void slotCancelled(const TQString &errMsg);
void slotBackAboutToShow();

+ 3
- 3
akregator/src/viewer.cpp View File

@@ -57,8 +57,8 @@ Viewer::Viewer(TQWidget *parent, const char *name)
setStatusMessagesEnabled(true);

// change the cursor when loading stuff...
connect( this, TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SLOT(slotStarted(KIO::Job *)));
connect( this, TQT_SIGNAL(started(TDEIO::Job *)),
this, TQT_SLOT(slotStarted(TDEIO::Job *)));
connect( this, TQT_SIGNAL(completed()),
this, TQT_SLOT(slotCompleted()));

@@ -256,7 +256,7 @@ void Viewer::slotSaveLinkAs()
KParts::BrowserRun::simpleSave(tmp, tmp.fileName());
}

void Viewer::slotStarted(KIO::Job *)
void Viewer::slotStarted(TDEIO::Job *)
{
widget()->setCursor( waitCursor );
}

+ 2
- 2
akregator/src/viewer.h View File

@@ -29,7 +29,7 @@

class KURL;

namespace KIO
namespace TDEIO
{
class MetaData;
}
@@ -107,7 +107,7 @@ namespace Akregator
virtual void slotSaveLinkAs();

/** This changes cursor to wait cursor */
void slotStarted(KIO::Job *);
void slotStarted(TDEIO::Job *);

/** This reverts cursor back to normal one */
void slotCompleted();

+ 7
- 7
certmanager/certificatewizardimpl.cpp View File

@@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam
connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
this, TQT_SLOT( slotURLSelected( const TQString& ) ) );

const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
caEmailED->setText( config.readEntry( "CAEmailAddress" ) );

connect( this, TQT_SIGNAL( helpClicked() ),
@@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage()
TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1,
KDialog::marginHint(), KDialog::spacingHint() );

KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" );
if ( attrOrder.empty() )
attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!";
@@ -477,7 +477,7 @@ void CertificateWizardImpl::accept()
// Save in file/URL
KURL url = saveFileUrl();
bool overwrite = false;
if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) {
if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) {
if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
this,
i18n( "A file named \"%1\" already exists. "
@@ -488,10 +488,10 @@ void CertificateWizardImpl::accept()
overwrite = true;
}

KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
// Can't press finish again during the upload
setFinishEnabled( finishPage, false );
}
@@ -501,7 +501,7 @@ void CertificateWizardImpl::accept()
This slot is invoked by the KIO job used in newCertificate
to save/upload the certificate, when finished (success or error).
*/
void CertificateWizardImpl::slotUploadResult( KIO::Job* job )
void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )
{
if ( job->error() ) {
job->showErrorDialog();

+ 2
- 2
certmanager/certificatewizardimpl.h View File

@@ -42,7 +42,7 @@
namespace GpgME {
class KeyGenerationResult;
}
namespace KIO {
namespace TDEIO {
class Job;
}

@@ -75,7 +75,7 @@ private slots:

void slotHelpClicked();

void slotUploadResult( KIO::Job* );
void slotUploadResult( TDEIO::Job* );

private:
void createPersonalDataPage();

+ 17
- 17
certmanager/certmanager.cpp View File

@@ -218,7 +218,7 @@ CertManager::~CertManager() {
}

void CertManager::readConfig( bool noQueryGiven ) {
KConfig config( "kleopatrarc" );
TDEConfig config( "kleopatrarc" );
config.setGroup( "Display Options" );
mHierarchicalView = config.readBoolEntry( "hierarchicalView", false );
if ( noQueryGiven ) {
@@ -227,7 +227,7 @@ void CertManager::readConfig( bool noQueryGiven ) {
}

void CertManager::writeConfig() {
KConfig config( "kleopatrarc" );
TDEConfig config( "kleopatrarc" );
config.setGroup( "Display Options" );
config.writeEntry( "hierarchicalView", mKeyListView->hierarchical() );
config.writeEntry( "startInRemoteMode", mNextFindRemote );
@@ -685,10 +685,10 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
// Download the cert
KIOext::StoredTransferJob* importJob = KIOext::storedGet( certURL );
importJob->setWindow( this );
connect( importJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotImportResult(KIO::Job*)) );
connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
}

void CertManager::slotImportResult( KIO::Job* job )
void CertManager::slotImportResult( TDEIO::Job* job )
{
if ( job->error() ) {
job->showErrorDialog();
@@ -904,17 +904,17 @@ void CertManager::importCRLFromFile() {
KTempFile tempFile;
KURL destURL;
destURL.setPath( tempFile.name() );
KIO::Job* copyJob = KIO::file_copy( url, destURL, 0600, true, false );
TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
copyJob->setWindow( this );
connect( copyJob, TQT_SIGNAL( result( KIO::Job * ) ),
TQT_SLOT( slotImportCRLJobFinished( KIO::Job * ) ) );
connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
}
}
}

void CertManager::slotImportCRLJobFinished( KIO::Job *job )
void CertManager::slotImportCRLJobFinished( TDEIO::Job *job )
{
KIO::FileCopyJob* fcjob = static_cast<KIO::FileCopyJob*>( job );
TDEIO::FileCopyJob* fcjob = static_cast<TDEIO::FileCopyJob*>( job );
TQString tempFilePath = fcjob->destURL().path();
if ( job->error() ) {
job->showErrorDialog();
@@ -1234,7 +1234,7 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
// return true if we should proceed, false if we should abort
static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
{
if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
if ( KMessageBox::Cancel ==
KMessageBox::warningContinueCancel(
w,
@@ -1269,10 +1269,10 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
if ( !checkOverwrite( url, overwrite, this ) )
return;

KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}


@@ -1388,13 +1388,13 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
if ( !checkOverwrite( url, overwrite, this ) )
return;

KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
uploadJob->setWindow( this );
connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
}

void CertManager::slotUploadResult( KIO::Job* job )
void CertManager::slotUploadResult( TDEIO::Job* job )
{
if ( job->error() )
job->showErrorDialog();

+ 4
- 4
certmanager/certmanager.h View File

@@ -51,7 +51,7 @@ namespace Kleo {
class Job;
}

namespace KIO {
namespace TDEIO {
class Job;
}
class TDEProcess;
@@ -99,11 +99,11 @@ private slots:
void slotDeleteCertificate();
void slotExportSecretKey();
void slotExportCertificate();
void slotUploadResult( KIO::Job* job );
void slotUploadResult( TDEIO::Job* job );

void slotImportCertFromFile();
void slotImportCertFromFile( const KURL & filename );
void slotImportResult( KIO::Job* );
void slotImportResult( TDEIO::Job* );

void slotCertificateImportResult( const GpgME::ImportResult & result );
void slotCertificateDownloadResult( const GpgME::Error & error, const TQByteArray & keyData );
@@ -115,7 +115,7 @@ private slots:

void importCRLFromFile();
void importCRLFromLDAP();
void slotImportCRLJobFinished( KIO::Job * );
void slotImportCRLJobFinished( TDEIO::Job * );

void slotDirmngrExited();
void slotStderr( TDEProcess*, char*, int );

+ 3
- 3
certmanager/conf/appearanceconfigpage.cpp View File

@@ -39,7 +39,7 @@
#include <tdepimmacros.h>

AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
: KCModule( parent, name )
: TDECModule( parent, name )
{
TQVBoxLayout* lay = new TQVBoxLayout( this );
mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()

extern "C"
{
KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
{
AppearanceConfigurationPage *page =
new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
}
}

// tdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in TDECModule...
void AppearanceConfigurationPage::slotChanged()
{
emit changed(true);

+ 1
- 1
certmanager/conf/appearanceconfigpage.h View File

@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "Appearance" configuration page for kleopatra's configuration dialog
*/
class AppearanceConfigurationPage : public KCModule {
class AppearanceConfigurationPage : public TDECModule {
Q_OBJECT
public:

+ 6
- 6
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -66,7 +66,7 @@ using namespace Kleo;
class CategoryListViewItem : public TQListViewItem
{
public:
CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
: TQListViewItem( lv, prev ) {

setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
mDirty = false;
}

void save( KConfigBase& config ) {
void save( TDEConfigBase& config ) {
config.writeEntry( "Name", text( 0 ) );
config.writeEntry( "foreground-color", mForegroundColor );
config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
void AppearanceConfigWidget::load()
{
categoriesLV->clear();
KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
KConfigGroup cfg( config, *it );
TDEConfigGroup cfg( config, *it );
(void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
}
}

void AppearanceConfigWidget::save()
{
KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
// We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
TQListViewItemIterator lvit( categoriesLV );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
KConfigGroup cfg( config, *it );
TDEConfigGroup cfg( config, *it );
item->save( cfg );
}
config->sync();

+ 1
- 1
certmanager/conf/appearanceconfigwidget.h View File

@@ -36,7 +36,7 @@

#include "appearanceconfigwidgetbase.h"
#include <tqstringlist.h>
class KConfig;
class TDEConfig;

namespace Kleo {


+ 2
- 2
certmanager/conf/configuredialog.cpp View File

@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}

void ConfigureDialog::hideEvent( TQHideEvent * ) {
KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
geometry.writeEntry( "ConfigureDialogWidth", width() );
geometry.writeEntry( "ConfigureDialogHeight",height() );
}

+ 4
- 4
certmanager/conf/dirservconfigpage.cpp View File

@@ -116,7 +116,7 @@ public:
}

private:
KConfig mConfig;
TDEConfig mConfig;
};

#endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
static const char s_addnewservers_entryName[] = "add-servers";

DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
: KCModule( parent, name )
: TDECModule( parent, name )
{
mConfig = Kleo::CryptoBackendFactory::instance()->config();
TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()

extern "C"
{
KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
{
DirectoryServicesConfigurationPage *page =
new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
}
}

// tdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DirectoryServicesConfigurationPage::slotChanged()
{
emit changed(true);

+ 1
- 1
certmanager/conf/dirservconfigpage.h View File

@@ -50,7 +50,7 @@ namespace Kleo {
* The user can configure LDAP servers in this page, to be used for listing/fetching
* remote certificates in kleopatra.
*/
class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
Q_OBJECT
public:

+ 3
- 3
certmanager/conf/dnorderconfigpage.cpp View File

@@ -39,7 +39,7 @@
#include <tqlayout.h>

DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
: KCModule( parent, name )
: TDECModule( parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this );
mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
mWidget->defaults();
}

// tdelibs-3.2 didn't have the changed signal in KCModule...
// tdelibs-3.2 didn't have the changed signal in TDECModule...
void DNOrderConfigPage::slotChanged() {
emit changed(true);
}

extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
}


+ 1
- 1
certmanager/conf/dnorderconfigpage.h View File

@@ -41,7 +41,7 @@ namespace Kleo {
/**
* "DN Order" configuration page for kleopatra's configuration dialog
*/
class DNOrderConfigPage : public KCModule {
class DNOrderConfigPage : public TDECModule {
Q_OBJECT
public:

+ 1
- 1
certmanager/conf/kleopatra_config_appear.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
DocPath=kleopatra/configuration-appearance.html

X-TDE-ModuleType=Library

+ 1
- 1
certmanager/conf/kleopatra_config_dirserv.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=network
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
DocPath=kleopatra/configuration.html#configuration-directory-services

X-TDE-ModuleType=Library

+ 1
- 1
certmanager/conf/kleopatra_config_dnorder.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
DocPath=kleopatra/configuration-dn-order.html

X-TDE-ModuleType=Library

+ 2
- 2
certmanager/kwatchgnupg/kwatchgnupgconfig.cpp View File

@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {

void KWatchGnuPGConfig::loadConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()

void KWatchGnuPGConfig::saveConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
config->writeEntry( "Executable", mExeED->url() );
config->writeEntry( "Socket", mSocketED->url() );

+ 3
- 3
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher()
.arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
}
mWatcher->clearArguments();
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
*mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
*mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
if ( !cconfig )
return;
//Q_ASSERT( cconfig );
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("WatchGnuPG");
TQStringList comps = cconfig->componentList();
for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()

void KWatchGnuPGMainWindow::slotReadConfig()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("LogWindow");
mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
?TQTextEdit::WidgetWidth

+ 7
- 7
certmanager/lib/backends/chiasmus/chiasmusbackend.cpp View File

@@ -197,13 +197,13 @@ namespace {

TQVariant value() const { return mValue; }

void sync( KConfigBase * config ) {
void sync( TDEConfigBase * config ) {
if ( !mDirty )
return;
mDirty = false;
config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue );
}
void read( const KConfigBase * config ) {
void read( const TDEConfigBase * config ) {
mDirty = false;
mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() );
}
@@ -254,7 +254,7 @@ namespace {

class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup {
mutable std::map<TQString,ChiasmusConfigEntry*> mCache;
mutable KConfig * mConfigObject;
mutable TDEConfig * mConfigObject;
public:
ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {}
~ChiasmusGeneralGroup() { clear(); delete mConfigObject; }
@@ -271,7 +271,7 @@ namespace {
Kleo::CryptoConfigEntry * entry( const TQString & name ) const {
if ( ChiasmusConfigEntry * entry = mCache[name] )
return entry;
const KConfigGroup group( configObject(), "Chiasmus" );
const TDEConfigGroup group( configObject(), "Chiasmus" );
for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i )
if ( name == kleo_chiasmus_config_entries[i].name ) {
ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i );
@@ -282,17 +282,17 @@ namespace {
}

void sync() {
KConfigGroup group( configObject(), "Chiasmus" );
TDEConfigGroup group( configObject(), "Chiasmus" );
for ( std::map<TQString,ChiasmusConfigEntry*>::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it )
it->second->sync( &group );
group.sync();
clear();
}
private:
KConfig * configObject() const {
TDEConfig * configObject() const {
if ( !mConfigObject )
// this is unsafe. We're a lib, used by concurrent apps.
mConfigObject = new KConfig( "chiasmusbackendrc" );
mConfigObject = new TDEConfig( "chiasmusbackendrc" );
return mConfigObject;
}
void clear() {

+ 1
- 1
certmanager/lib/cryptplugwrapper.cpp View File

@@ -133,7 +133,7 @@ public:
_unknownAttrsHandling = unknownAttrsInfix;
_unknownAttrsHandlingChar = "INFIX";
}
DNBeautifier( KConfig* config,
DNBeautifier( TDEConfig* config,
const TQString& cfgGroup,
const TQString& cfgAttributeOrderEntry,
const TQString& cfgUnknownAttrsEntry,

+ 1
- 1
certmanager/lib/cryptplugwrapper.h View File

@@ -57,7 +57,7 @@
#include <tdepimmacros.h>


class KConfigBase;
class TDEConfigBase;
class QGpgMECryptoConfig;

namespace GpgME {

+ 4
- 4
certmanager/lib/kleo/cryptobackendfactory.cpp View File

@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
return new Kleo::BackendConfigWidget( mSelf, parent, name );
}

KConfig* Kleo::CryptoBackendFactory::configObject() const {
TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
if ( !mConfigObject )
// this is unsafe. We're a lib, used by concurrent apps.
mConfigObject = new KConfig( "libkleopatrarc" );
mConfigObject = new TDEConfig( "libkleopatrarc" );
return mConfigObject;
}

@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend

void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
const TQString name = backend ? backend->name() : TQString() ;
KConfigGroup group( configObject(), "Backends" );
TDEConfigGroup group( configObject(), "Backends" );
group.writeEntry( protocol, name );
configObject()->sync();
mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {

void Kleo::CryptoBackendFactory::readConfig() {
mBackends.clear();
const KConfigGroup group( configObject(), "Backends" );
const TDEConfigGroup group( configObject(), "Backends" );
for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
mBackends[*it] = backendByName( backend );

+ 3
- 3
certmanager/lib/kleo/cryptobackendfactory.h View File

@@ -46,7 +46,7 @@ namespace Kleo {
}

class TQString;
class KConfig;
class TDEConfig;

namespace Kleo {

@@ -76,7 +76,7 @@ namespace Kleo {

Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;

KConfig* configObject() const;
TDEConfig* configObject() const;

// The preferred backend for smime (can be 0) - currently unused
//const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {

protected:
std::vector<CryptoBackend*> mBackendList;
mutable KConfig* mConfigObject;
mutable TDEConfig* mConfigObject;
typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
BackendMap mBackends;
typedef std::vector<const char *> ProtocolSet;

+ 2
- 2
certmanager/lib/kleo/dn.cpp View File

@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()

Kleo::DNAttributeMapper::DNAttributeMapper() {
d = new Private();
const KConfigGroup config( kapp->config(), "DN" );
const TDEConfigGroup config( kapp->config(), "DN" );
d->attributeOrder = config.readListEntry( "AttributeOrder" );
if ( d->attributeOrder.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
if ( order.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
std::back_inserter( d->attributeOrder ) );
KConfigGroup config( kapp->config(), "DN" );
TDEConfigGroup config( kapp->config(), "DN" );
config.writeEntry( "AttributeOrder", order );
}


+ 4
- 4
certmanager/lib/kleo/kconfigbasedkeyfilter.cpp View File

@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
}


Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
: KeyFilter(),
mSpecificity( 0 ),
mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
}
}

Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {

}

bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
#ifdef MATCH
#undef MATCH
#endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
return font;
}

TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
if ( mUseFullFont )
return resizedFont( mFont, f.pointSize(), mStrikeOut );
else

+ 4
- 4
certmanager/lib/kleo/kconfigbasedkeyfilter.h View File

@@ -41,14 +41,14 @@

#include <gpgmepp/key.h>

class KConfigBase;
class TDEConfigBase;

namespace Kleo {

class KConfigBasedKeyFilter : public KeyFilter {
class TDEConfigBasedKeyFilter : public KeyFilter {
public:
explicit KConfigBasedKeyFilter( const KConfigBase & config );
~KConfigBasedKeyFilter();
explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
~TDEConfigBasedKeyFilter();
bool matches( const GpgME::Key & key ) const;

unsigned int specificity() const { return mSpecificity; }

+ 3
- 3
certmanager/lib/kleo/keyfiltermanager.cpp View File

@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
void Kleo::KeyFilterManager::reload() {
d->clear();

KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
if ( !config )
return;
const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
const KConfigGroup cfg( config, *it );
d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
const TDEConfigGroup cfg( config, *it );
d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
}
std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
}

+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.h View File

@@ -43,7 +43,7 @@ namespace Kleo {

/**
* Crypto Config Module widget, dynamically generated from CryptoConfig
* It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule.
* It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
*/
class CryptoConfigModule : public KJanusWidget {
Q_OBJECT

+ 2
- 2
certmanager/lib/ui/keyselectiondialog.cpp View File

@@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
TQSize dialogSize( 500, 400 );

KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
resize( dialogSize );
}
}

Kleo::KeySelectionDialog::~KeySelectionDialog() {
KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
dialogConfig.writeEntry( "Dialog size", size() );
dialogConfig.sync();
}

+ 10
- 10
certmanager/storedtransferjob.cpp View File

@@ -19,7 +19,7 @@

#include "storedtransferjob.h"

using namespace KIOext;
using namespace TDEIOext;

#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream

@@ -27,13 +27,13 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
const TQByteArray &packedArgs,
const TQByteArray &_staticData,
bool showProgressInfo)
: KIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
: TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
m_uploadOffset( 0 )
{
connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
TQT_SLOT( slotDataReq( KIO::Job *, TQByteArray & ) ) );
connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
}

void StoredTransferJob::setData( const TQByteArray& arr )
@@ -43,7 +43,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
m_data = arr;
}

void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
void StoredTransferJob::slotData( TDEIO::Job *, const TQByteArray &data )
{
// check for end-of-data marker:
if ( data.size() == 0 )
@@ -53,7 +53,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
memcpy( m_data.data() + oldSize, data.data(), data.size() );
}

void StoredTransferJob::slotDataReq( KIO::Job *, TQByteArray &data )
void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
{
// Inspired from kmail's KMKernel::byteArrayToRemoteFile
// send the data in 64 KB chunks
@@ -80,7 +80,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
{
// Send decoded path and encoded query
KIO_ARGS << url;
StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
if (reload)
job->addMetaData("cache", "reload");
return job;
@@ -90,7 +90,7 @@ StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int per
bool overwrite, bool resume, bool showProgressInfo )
{
KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
job->setData( arr );
return job;
}

+ 6
- 6
certmanager/storedtransferjob.h View File

@@ -23,28 +23,28 @@
#include <kio/job.h>

// To be moved to KIO?
namespace KIOext {
namespace TDEIOext {

/**
* StoredTransferJob is a TransferJob (for downloading or uploading data) that
* also stores a TQByteArray with the data, making it simpler to use than the
* standard TransferJob.
*
* For KIO::get it puts the data into the member TQByteArray, so the user
* For TDEIO::get it puts the data into the member TQByteArray, so the user
* of this class can get hold of the whole data at once by calling data()
* when the result signal is emitted.
* You should only use StoredTransferJob to download data if you cannot
* process the data by chunks while it's being downloaded, since storing
* everything in a TQByteArray can potentially require a lot of memory.
*
* For KIO::put the user of this class simply provides the bytearray from
* For TDEIO::put the user of this class simply provides the bytearray from
* the start, and the job takes care of uploading it.
* You should only use StoredTransferJob to upload data if you cannot
* provide the in chunks while it's being uploaded, since storing
* everything in a TQByteArray can potentially require a lot of memory.
*
*/
class StoredTransferJob : public KIO::TransferJob {
class StoredTransferJob : public TDEIO::TransferJob {
Q_OBJECT

@@ -76,8 +76,8 @@ public:
TQByteArray data() const { return m_data; }

private slots:
void slotData( KIO::Job *job, const TQByteArray &data );
void slotDataReq( KIO::Job *job, TQByteArray &data );
void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotDataReq( TDEIO::Job *job, TQByteArray &data );
private:
TQByteArray m_data;
int m_uploadOffset;

+ 1
- 1
kabc/kabcdistlistupdater/kabcdistlistupdater.cpp View File

@@ -85,7 +85,7 @@ int main( int argc, char **argv )
if ( args->isSet( "disable-autostart" ) ) {
kdDebug() << "Disable autostart." << endl;

KConfig *config = app.config();
TDEConfig *config = app.config();
config->setGroup( "Startup" );
config->writeEntry( "EnableAutostart", false );
}

+ 7
- 7
kaddressbook/addresseeconfig.cpp View File

@@ -48,7 +48,7 @@ Addressee AddresseeConfig::addressee()

void AddresseeConfig::setAutomaticNameParsing( bool value )
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "AutomaticNameParsing", value );
config.sync();
@@ -56,7 +56,7 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )

bool AddresseeConfig::automaticNameParsing()
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readBoolEntry( "AutomaticNameParsing",
KABPrefs::instance()->automaticNameParsing() );
@@ -64,7 +64,7 @@ bool AddresseeConfig::automaticNameParsing()

void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "NoDefaultAddrTypes", types );
config.sync();
@@ -72,14 +72,14 @@ void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )

TQValueList<int> AddresseeConfig::noDefaultAddrTypes() const
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readIntListEntry( "NoDefaultAddrTypes" );
}

void AddresseeConfig::setCustomFields( const TQStringList &fields )
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
config.writeEntry( "LocalCustomFields", fields );
config.sync();
@@ -87,13 +87,13 @@ void AddresseeConfig::setCustomFields( const TQStringList &fields )

TQStringList AddresseeConfig::customFields() const
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.setGroup( mAddressee.uid() );
return config.readListEntry( "LocalCustomFields" );
}

void AddresseeConfig::remove()
{
KConfig config( "kaddressbook_addrconfig" );
TDEConfig config( "kaddressbook_addrconfig" );
config.deleteGroup( mAddressee.uid() );
}

+ 2
- 2
kaddressbook/addresseeeditordialog.cpp View File

@@ -60,7 +60,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,

enableButton( KDialogBase::Apply, false );

KConfig config( "kaddressbookrc" );
TDEConfig config( "kaddressbookrc" );
config.setGroup( "AddresseeEditor" );
TQSize defaultSize( 750, 570 );
resize( config.readSizeEntry( "Size", &defaultSize ) );
@@ -70,7 +70,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
{
kdDebug(5720) << "~AddresseeEditorDialog()" << endl;

KConfig config( "kaddressbookrc" );
TDEConfig config( "kaddressbookrc" );
config.setGroup( "AddresseeEditor" );
config.writeEntry( "Size", size() );


+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -519,7 +519,7 @@ void AddresseeEditorWidget::load()
mNameEdit->blockSignals( false );

if ( mAddressee.formattedName().isEmpty() ) {
KConfig config( "kaddressbookrc" );
TDEConfig config( "kaddressbookrc" );
config.setGroup( "General" );
mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );

+ 9
- 9
kaddressbook/common/filter.cpp View File

@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
return mCategoryList;
}

void Filter::save( KConfig *config )
void Filter::save( TDEConfig *config )
{
config->writeEntry( "Name", mName );
config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
config->writeEntry( "MatchRule", (int)mMatchRule );
}

void Filter::restore( KConfig *config )
void Filter::restore( TDEConfig *config )
{
mName = config->readEntry( "Name", "<internal error>" );
mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
mIsEmpty = false;
}

void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
{
{
KConfigGroupSaver s( config, baseGroup );
TDEConfigGroupSaver s( config, baseGroup );

// remove the old filters
uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
Filter::List::Iterator iter;
for ( iter = list.begin(); iter != list.end(); ++iter ) {
if ( !(*iter).mInternal ) {
KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
.arg( index ) );
(*iter).save( config );
index++;
}
}

KConfigGroupSaver s( config, baseGroup );
TDEConfigGroupSaver s( config, baseGroup );
config->writeEntry( "Count", index );
}

Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
{
Filter::List list;
int count = 0;
Filter f;

{
KConfigGroupSaver s( config, baseGroup );
TDEConfigGroupSaver s( config, baseGroup );
count = config->readNumEntry( "Count", 0 );
}

for ( int i = 0; i < count; i++ ) {
{
KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
f.restore( config );
}


+ 4
- 4
kaddressbook/common/filter.h View File

@@ -102,12 +102,12 @@ class Filter
/**
Saves the filter to the config file. The group should already be set.
*/
void save( KConfig *config );
void save( TDEConfig *config );

/**
Loads the filter from the config file. The group should already be set.
*/
void restore( KConfig *config );
void restore( TDEConfig *config );

/**
Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
will be append for each filter saved.
@param list The list of filters to be saved.
*/
static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );

/**
Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter

@return The list of filters.
*/
static Filter::List restore( KConfig *config, const TQString &baseGroup );
static Filter::List restore( TDEConfig *config, const TQString &baseGroup );

/**
Sets the filter rule. If the rule is Filter::Matching (default),

+ 1
- 1
kaddressbook/common/kabprefs.cpp View File

@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
KABPrefs::KABPrefs()
: KABPrefsBase()
{
KConfigSkeleton::setCurrentGroup( "General" );
TDEConfigSkeleton::setCurrentGroup( "General" );

TQStringList defaultMap;
defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";

+ 1
- 1
kaddressbook/common/kabprefs.h View File

@@ -28,7 +28,7 @@
#include <tdepimmacros.h>
#include "kabprefs_base.h"

class KConfig;
class TDEConfig;

class KDE_EXPORT KABPrefs : public KABPrefsBase
{

+ 2
- 2
kaddressbook/imagewidget.cpp View File

@@ -67,11 +67,11 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
image.load( url.path() );
picture.setData( image );
(*ok) = true;
} else if ( KIO::NetAccess::download( url, tempFile, mParent ) ) {
} else if ( TDEIO::NetAccess::download( url, tempFile, mParent ) ) {
image.load( tempFile );
picture.setData( image );
(*ok) = true;
KIO::NetAccess::removeTempFile( tempFile );
TDEIO::NetAccess::removeTempFile( tempFile );
}

if ( !(*ok) ) {

+ 2
- 2
kaddressbook/interfaces/configurewidget.cpp View File

@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
{
}

void ConfigureWidget::restoreSettings( KConfig* )
void ConfigureWidget::restoreSettings( TDEConfig* )
{
// should be reimplemented in the views, extensions etc.
}

void ConfigureWidget::saveSettings( KConfig* )
void ConfigureWidget::saveSettings( TDEConfig* )
{
// should be reimplemented in the views, extensions etc.
}

+ 2
- 2
kaddressbook/interfaces/configurewidget.h View File

@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
values from the config file.
Important: Don't change the group of cfg!
*/
virtual void restoreSettings( KConfig *cfg );
virtual void restoreSettings( TDEConfig *cfg );

/**
This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
the GUI to the config file.
Important: Don't change the group of cfg!
*/
virtual void saveSettings( KConfig *cfg );
virtual void saveSettings( TDEConfig *cfg );


/**

+ 3
- 3
kaddressbook/interfaces/core.h View File

@@ -45,7 +45,7 @@ class Resource;
class TQWidget;