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

pull/1/head
Timothy Pearson 10 years ago
parent cee429821a
commit 9f2c757e1a
  1. 4
      blinken/src/button.cpp
  2. 2
      blinken/src/fontchecker.cpp
  3. 4
      blinken/src/highscoredialog.cpp
  4. 2
      doc/kiten/index.docbook
  5. 2
      doc/klettres/index.docbook
  6. 6
      kalzium/src/kalzium.cpp
  7. 4
      kanagram/src/kanagram.cpp
  8. 2
      kanagram/src/kanagram.h
  9. 4
      kanagram/src/keduvocdocument.cpp
  10. 8
      kanagram/src/mainsettings.cpp
  11. 4
      kanagram/src/mainsettings.h
  12. 6
      kbruch/src/mainqtwidget.cpp
  13. 4
      keduca/keduca/keduca.cpp
  14. 4
      keduca/keduca/keduca_part.cpp
  15. 4
      keduca/keduca/keducaprefs.cpp
  16. 2
      keduca/keduca/keducaview.cpp
  17. 4
      keduca/keducabuilder/kcontroladdedit.cpp
  18. 8
      keduca/keducabuilder/kcontrolheader.cpp
  19. 6
      keduca/keducabuilder/keducabuilder.cpp
  20. 2
      keduca/keducabuilder/keducaeditorstartdialog.cpp
  21. 22
      keduca/libkeduca/fileread.cpp
  22. 2
      keduca/libkeduca/fileread.h
  23. 8
      keduca/libkeduca/kgallerydialog.cpp
  24. 2
      keduca/libkeduca/kgallerydialog.h
  25. 2
      khangman/khangman/fontchecker.cpp
  26. 10
      khangman/khangman/khangman.cpp
  27. 2
      khangman/khangman/khangman.kcfg
  28. 6
      kig/kig/kig.cpp
  29. 8
      kig/kig/kig.h
  30. 2
      kiten/asyndeta.cpp
  31. 2
      kiten/asyndeta.h
  32. 6
      kiten/configdictionaries.cpp
  33. 4
      kiten/configdictionaries.h
  34. 4
      kiten/kloader.cpp
  35. 2
      kiten/kloader.h
  36. 2
      kiten/ksaver.cpp
  37. 2
      kiten/ksaver.h
  38. 6
      kiten/learn.cpp
  39. 2
      kiten/main.cpp
  40. 4
      kiten/optiondialog.cpp
  41. 2
      kiten/optiondialog.h
  42. 4
      klatin/klatin/klatin.cpp
  43. 2
      klatin/klatin/klatin.h
  44. 2
      klatin/klatin/klatin.kcfg
  45. 2
      klatin/klatin/klatinvocab.cpp
  46. 2
      klettres/AUTHORS
  47. 8
      klettres/klettres/klettres.cpp
  48. 2
      klettres/klettres/main.cpp
  49. 20
      kmplot/kmplot/MainDlg.cpp
  50. 6
      kmplot/kmplot/MainDlg.h
  51. 2
      kmplot/kmplot/View.h
  52. 6
      kmplot/kmplot/coordsconfigdialog.cpp
  53. 2
      kmplot/kmplot/coordsconfigdialog.h
  54. 4
      kmplot/kmplot/kmplot.cpp
  55. 6
      kmplot/kmplot/kmplot.h
  56. 8
      kmplot/kmplot/kmplotio.cpp
  57. 12
      kmplot/kmplot/kparametereditor.cpp
  58. 4
      kmplot/kmplot/ksliderwindow.cpp
  59. 2
      kstars/kstars/ccdpreviewwg.cpp
  60. 4
      kstars/kstars/colorscheme.cpp
  61. 6
      kstars/kstars/colorscheme.h
  62. 8
      kstars/kstars/imageviewer.cpp
  63. 4
      kstars/kstars/imageviewer.h
  64. 12
      kstars/kstars/kstarsactions.cpp
  65. 4
      kstars/kstars/kstarsdcop.cpp
  66. 2
      kstars/kstars/skymap.h
  67. 2
      kstars/kstars/streamwg.cpp
  68. 24
      kstars/kstars/thumbnailpicker.cpp
  69. 4
      kstars/kstars/thumbnailpicker.h
  70. 6
      kstars/kstars/tools/lcgenerator.cpp
  71. 4
      kstars/kstars/tools/lcgenerator.h
  72. 2
      kstars/kstars/tools/observinglist.cpp
  73. 4
      kstars/kstars/tools/scriptbuilder.cpp
  74. 8
      ktouch/ChangeLog
  75. 10
      ktouch/src/ktouch.cpp
  76. 4
      ktouch/src/ktouch.h
  77. 8
      ktouch/src/ktouchcolorscheme.cpp
  78. 16
      ktouch/src/ktouchkeyboard.cpp
  79. 6
      ktouch/src/ktouchkeyboardwidget.cpp
  80. 16
      ktouch/src/ktouchlecture.cpp
  81. 8
      ktouch/src/ktouchstatisticsdata.cpp
  82. 2
      kturtle/TODO
  83. 14
      kturtle/src/kturtle.cpp
  84. 2
      kturtle/src/kturtle.h
  85. 2
      kturtle/src/kturtle.kcfg
  86. 4
      kverbos/kverbos/kverbos.cpp
  87. 8
      kverbos/kverbos/kverbos.h
  88. 2
      kverbos/kverbos/kverbos.kcfg
  89. 4
      kverbos/kverbos/kverbosdoc.cpp
  90. 4
      kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
  91. 6
      kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
  92. 8
      kvoctrain/kvoctrain/kva_config.cpp
  93. 4
      kvoctrain/kvoctrain/kvoctrain.h
  94. 6
      kvoctrain/kvoctrain/kvt-core/QueryManager.h
  95. 2
      kvoctrain/kvoctrain/kvt-core/UsageManager.h
  96. 4
      kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
  97. 2
      kvoctrain/kvoctrain/main.cpp
  98. 6
      kwordquiz/src/kwordquiz.cpp
  99. 6
      kwordquiz/src/kwordquiz.h
  100. 4
      kwordquiz/src/kwordquizdoc.cpp
  101. 20
      kwordquiz/src/kwordquizprefs.cpp
  102. 6
      kwordquiz/src/kwordquizprefs.h

@ -17,7 +17,7 @@
button::button(blinkenGame::color c) : m_selected(false), m_color(c)
{
KConfig *kc = kapp->config();
TDEConfig *kc = kapp->config();
kc->setGroup("General");
TQString cs = getColorString();
TQString pixmap = TQString("images/%1h.png").arg(cs);
@ -58,7 +58,7 @@ void button::setShortcut(int key)
m_key = key;
m_selected = false;
KConfig *kc = kapp->config();
TDEConfig *kc = kapp->config();
kc->setGroup("General");
kc->writeEntry(getColorString(), key);
kc->sync();

@ -20,7 +20,7 @@ bool fontChecker::checkInstalled(const TQFont &font, const TQString &fontPath)
// Works with Steve may need some tweaking to work with other fonts
if (!fi.exactMatch())
{
bool success = KIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
bool success = TDEIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
return !success;
}
return true;

@ -130,7 +130,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
m_tw = new myTabWidget(this);
setMainWidget(m_tw);
KConfig *cfg = kapp -> config();
TDEConfig *cfg = kapp -> config();
for (int i = 1; i <= 3; i++)
{
cfg -> setGroup(TQString("Level%1").arg(i));
@ -169,7 +169,7 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
m_scores[level].insert(it, tqMakePair(score, name));
m_scores[level].remove(--m_scores[level].end());
KConfig *cfg = kapp -> config();
TDEConfig *cfg = kapp -> config();
cfg -> setGroup(TQString("Level%1").arg(level + 1));
int j;
for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)

@ -496,7 +496,7 @@ given for you to guess on.</para>
<para>Jim Breen <email>jwb@csse.monash.edu.au</email> - Wrote xjdic, of which &kiten; borrows code, and the xjdic index file generator. Also is main author of edict and kanjidic, which &kiten; essentially require.</para>
</listitem>
<listitem>
<para>Paul Temple <email>paul.temple@gmx.net</email> - Port to KConfig XT and bug fixing.</para>
<para>Paul Temple <email>paul.temple@gmx.net</email> - Port to TDEConfig XT and bug fixing.</para>
</listitem>
</itemizedlist>

@ -712,7 +712,7 @@ I am very grateful to the following people whose contribution has been greatly v
<email>chris@os11.com</email></para></listitem>
<listitem><para>Code for generating special characters icons: Peter Hedlund
<email>peter@peterandlinda.com</email></para></listitem>
<listitem><para>Port to KConfig XT, coding help: &Waldo.Bastian;
<listitem><para>Port to TDEConfig XT, coding help: &Waldo.Bastian;
<email>&Waldo.Bastian.mail;</email></para></listitem>
<listitem><para>Kids and grownup SVG icons, desert theme: &Danny.Allen;
<email>dannya40uk@yahoo.co.uk</email></para></listitem>

@ -393,11 +393,11 @@ void Kalzium::slotSwitchtoNumeration( int index )
void Kalzium::showSettingsDialog()
{
if (KConfigDialog::showDialog("settings"))
if (TDEConfigDialog::showDialog("settings"))
return;
//KConfigDialog didn't find an instance of this dialog, so lets create it :
KConfigDialog *dialog = new KConfigDialog(this,"settings", Prefs::self());
//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
TDEConfigDialog *dialog = new TDEConfigDialog(this,"settings", Prefs::self());
connect( dialog, TQT_SIGNAL( settingsChanged() ), this , TQT_SLOT( slotUpdateSettings() ) );
connect( dialog, TQT_SIGNAL( settingsChanged() ), m_somWidget, TQT_SLOT( reloadUnits() ) );
dialog->addPage( new setColors( 0, "colors_page"), i18n("Colors"), "colorize");

@ -736,10 +736,10 @@ void Kanagram::randomHintImage()
void Kanagram::showSettings()
{
if(KConfigDialog::showDialog("settings"))
if(TDEConfigDialog::showDialog("settings"))
return;
KConfigDialog *configDialog = new KConfigDialog( this, "settings", KanagramSettings::self() );
TDEConfigDialog *configDialog = new TDEConfigDialog( this, "settings", KanagramSettings::self() );
configDialog->addPage( new MainSettings( configDialog ), i18n( "General" ), "configure" );
m_vocabSettings = new VocabSettings( configDialog );
configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" );

@ -49,7 +49,7 @@ namespace KDE
using namespace std;
class KHelpMenu;
class KConfigDialog;
class TDEConfigDialog;
class KRandomSequence;
class KanagramGame;
class VocabSettings;

@ -102,7 +102,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
// TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
TQString tmpfile;
if (KIO::NetAccess::download( url, tmpfile, 0 ))
if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
{
TQFile f(tmpfile);
if (!f.open(IO_ReadOnly))
@ -174,7 +174,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
}
}
f.close();
KIO::NetAccess::removeTempFile( tmpfile );
TDEIO::NetAccess::removeTempFile( tmpfile );
}
return true;
}

@ -37,7 +37,7 @@
MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
{
m_parent = (KConfigDialog*)parent;
m_parent = (TDEConfigDialog*)parent;
connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
@ -49,7 +49,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
cboxTranslation->insertStringList(languageNames);
//the language code/name
KConfig entry(locate("locale", "all_languages"));
TDEConfig entry(locate("locale", "all_languages"));
TQString code = KanagramSettings::dataLanguage();
entry.setGroup(code);
if (code == "sr")
@ -117,7 +117,7 @@ void MainSettings::setupTranslations()
return;
//the language code/name
KConfig entry(locate("locale", "all_languages"));
TDEConfig entry(locate("locale", "all_languages"));
const TQStringList::ConstIterator itEnd = languages.end();
for (TQStringList::ConstIterator it = languages.begin(); it != itEnd; ++it) {
entry.setGroup(*it);
@ -135,7 +135,7 @@ void MainSettings::setupTranslations()
void MainSettings::getAndInstallFont()
{
bool success = KIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
bool success = TDEIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
if (success)
{
getFontsButton->hide();

@ -25,7 +25,7 @@
#include "mainsettingswidget.h"
class KConfigDialog;
class TDEConfigDialog;
class MainSettings : public MainSettingsWidget
{
@ -46,7 +46,7 @@ Q_OBJECT
TQMap<TQString, TQString> m_languageCodeMap;
void setupTranslations();
KConfigDialog *m_parent;
TDEConfigDialog *m_parent;
};
#endif

@ -416,11 +416,11 @@ void MainQtWidget::OperationBoxSlot()
void MainQtWidget::slotPrefs()
{
// do not show dialog twice
if (KConfigDialog::showDialog("settings"))
if (TDEConfigDialog::showDialog("settings"))
return;
//KConfigDialog didn't find an instance of this dialog, so lets create it :
KConfigDialog* configDialog = new KConfigDialog( this, "settings", SettingsClass::self() );
//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
TDEConfigDialog* configDialog = new TDEConfigDialog( this, "settings", SettingsClass::self() );
TaskViewerOptionsBase * taskViewerOptions = new TaskViewerOptionsBase(0, "TaskViewerOptionsBase");

@ -97,7 +97,7 @@ bool Keduca::queryClose()
void Keduca::configRead()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "keduca" );
applyMainWindowSettings( config, "keduca" );
_recentFiles->loadEntries(config);
@ -105,7 +105,7 @@ void Keduca::configRead()
void Keduca::configWrite()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "keduca" );
saveMainWindowSettings( config, "keduca" );

@ -76,10 +76,10 @@ void KEducaPart::setupActions()
void KEducaPart::slotConfigure()
{
if ( KConfigDialog::showDialog( "KEducaSettings" ) )
if ( TDEConfigDialog::showDialog( "KEducaSettings" ) )
return;
KConfigDialog *dialog = new KConfigDialog( widget(), "KEducaSettings", Settings::self() );
TDEConfigDialog *dialog = new TDEConfigDialog( widget(), "KEducaSettings", Settings::self() );
ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" );
dialog->addPage( confDlg, i18n("General"), "keduca" );

@ -82,7 +82,7 @@ void KEducaPrefs::setPageGeneral()
/** Read settings */
void KEducaPrefs::configRead()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Options");
TQSize defaultSize(500,400);
resize( config->readSizeEntry("Geometry", &defaultSize ) );
@ -94,7 +94,7 @@ void KEducaPrefs::configRead()
/** Write settings */
void KEducaPrefs::configWrite()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Options");
config->writeEntry("Geometry", size() );
config->writeEntry("ResultFinish", _resultAfterFinish->isChecked() );

@ -176,7 +176,7 @@ void KEducaView::slotButtonSave()
newURL.setPath( newURL.path() + extension );
}
if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
bOk = KMessageBox::warningContinueCancel( this,
i18n("A document with this name already exists.\n"\
"Do you want to overwrite it?"),

@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion()
/** Read config settings */
void KControlAddEdit::configRead()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("AddModify Window");
TQSize defaultSize(500,400);
resize( config->readSizeEntry("Geometry", &defaultSize ) );
@ -234,7 +234,7 @@ void KControlAddEdit::configRead()
/** Write config settings */
void KControlAddEdit::configWrite()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("AddModify Window");
config->writeEntry("Geometry", size() );
config->sync();

@ -226,7 +226,7 @@ void KControlHeader::insertHeader()
TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() );
if( tmpResult.count() == 0 )
{
KConfig *appconfig = TDEGlobal::config();
TDEConfig *appconfig = TDEGlobal::config();
_defaultCategories.append( _headerCategory->currentText() );
appconfig->setGroup("General");
appconfig->writeEntry( "Categories", _defaultCategories);
@ -306,8 +306,8 @@ void KControlHeader::slotOk()
/** Read settings */
void KControlHeader::configRead()
{
KConfig *config = new KConfig("emaildefaults");
KConfig *appconfig = TDEGlobal::config();
TDEConfig *config = new TDEConfig("emaildefaults");
TDEConfig *appconfig = TDEGlobal::config();
config->setGroup("UserInfo");
@ -369,7 +369,7 @@ void KControlHeader::configRead()
/** Write settings */
void KControlHeader::configWrite()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("kcontrolheader");
config->writeEntry("Geometry", size() );
config->sync();

@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item )
/** Read config data */
void KEducaBuilder::configRead()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "keducacontrol" );
applyMainWindowSettings( config, "keducacontrol" );
@ -268,7 +268,7 @@ void KEducaBuilder::configRead()
/** Write settings */
void KEducaBuilder::configWrite()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "keducacontrol" );
saveMainWindowSettings( config, "keducacontrol" );
@ -445,7 +445,7 @@ bool KEducaBuilder::fileSaveAs()
newURL.setPath( newURL.path() + extension );
}
if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
bOk = KMessageBox::warningContinueCancel( this,
i18n("A document with this name already exists.\n"\
"Do you want to overwrite it?"),

@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList()
TQString key;
TQString value;
TQString oldGroup;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
oldGroup = config->group();

@ -43,7 +43,7 @@ FileRead::~FileRead()
bool FileRead::openFile(const KURL &url) {
TQString tmpFile;
bool returnval=false;
if( KIO::NetAccess::download( url, tmpFile, 0 ) )
if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
{
returnval=loadFile( tmpFile );
if (returnval) {
@ -51,7 +51,7 @@ bool FileRead::openFile(const KURL &url) {
kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
}
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}else
kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
@ -584,11 +584,11 @@ TQPixmap FileRead::getPicturePixmap()
KURL picture ( getPicture() );
TQPixmap pict;
if( KIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
if( TDEIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
{
kdDebug()<<"... load successful: "<< _tmpfileImage <<endl;
pict = TQPixmap( _tmpfileImage );
KIO::NetAccess::removeTempFile( _tmpfileImage );
TDEIO::NetAccess::removeTempFile( _tmpfileImage );
}
else
{
@ -669,8 +669,8 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed )
// otherwise, we already had a temp file
if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) {
// upload the file
KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
return true;
}
}
@ -804,9 +804,9 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
if( copyimages == true && copyJOB.count() > 0 )
{
KURL::List KurlLIST( copyJOB );
KIO::CopyJob *copyjob;
TDEIO::CopyJob *copyjob;
copyjob = KIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
copyjob = TDEIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
}
_changed=false;
return true;
@ -846,8 +846,8 @@ bool FileRead::saveResults( const KURL &url, const TQString &results )
// otherwise, we already had a temp file
if( saveResults(_tmpfile->name(), results) ) {
// upload the file
KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
return true;
}
}
@ -934,7 +934,7 @@ bool FileRead::isResult()
return _listResults.count() > 0 ? true : false;
}
void FileRead::slotUploadFinished( KIO::Job * job )
void FileRead::slotUploadFinished( TDEIO::Job * job )
{
if (job->error()) {
emit canceled( job->errorString() );

@ -232,7 +232,7 @@ protected:
bool saveResults( const TQString &filename, const TQString &results );
protected slots:
void slotUploadFinished( KIO::Job * job );
void slotUploadFinished( TDEIO::Job * job );
signals:
/* Stolen from kparts */

@ -44,7 +44,7 @@ KGalleryDialog::~KGalleryDialog()
bool KGalleryDialog::openFile(const KURL &url) {
TQString tmpFile;
bool returnval=false;
if( KIO::NetAccess::download( url, tmpFile, this ) )
if( TDEIO::NetAccess::download( url, tmpFile, this ) )
{
returnval=loadFile( tmpFile );
if (returnval) {
@ -52,7 +52,7 @@ bool KGalleryDialog::openFile(const KURL &url) {
kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
}
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}else
kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
@ -104,7 +104,7 @@ bool KGalleryDialog::loadFile( const TQString &filename )
/** Read servers */
void KGalleryDialog::configRead()
{
KConfig *appconfig = TDEGlobal::config();
TDEConfig *appconfig = TDEGlobal::config();
TQStringList servers;
TQStringList ipservers;
TQStringList::Iterator it_ipservers;
@ -140,7 +140,7 @@ void KGalleryDialog::configWrite()
{
TQStringList servers;
TQStringList ipservers;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "kgallerydialog" );
config->writeEntry("Splitter_size", _split->sizes() );

@ -31,7 +31,7 @@
// forward declarations
class KTempFile;
namespace KIO { class Job; }
namespace TDEIO { class Job; }
class KGalleryDialog : public KGalleryDialogBase {
Q_OBJECT

@ -20,7 +20,7 @@ bool fontChecker::checkInstalled(const TQFont &font, const TQString &fontPath)
// Works with Steve may need some tweaking to work with other fonts
if (!fi.exactMatch())
{
bool success = KIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
bool success = TDEIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
return !success;
}
return true;

@ -223,7 +223,7 @@ void KHangMan::setLanguages()
temp_languages.clear();
// Write the present languages in config so they cannot be downloaded.
KConfig *config=kapp->config();
TDEConfig *config=kapp->config();
config->setGroup("KNewStuffStatus");
for (uint i=0; i<m_languages.count(); i++) {
TQString tmp = m_languages[i];
@ -234,7 +234,7 @@ void KHangMan::setLanguages()
// We look in $TDEDIR/share/locale/all_languages from
// tdelibs/tdecore/all_languages to find the name of the country
// corresponding to the code and the language the user set.
KConfig entry(locate("locale", "all_languages"));
TDEConfig entry(locate("locale", "all_languages"));
const TQStringList::ConstIterator itEnd = m_languages.end();
for (TQStringList::Iterator it = m_languages.begin();
it != m_languages.end(); ++it) {
@ -358,14 +358,14 @@ void KHangMan::loadLevels()
void KHangMan::optionsPreferences()
{
if ( KConfigDialog::showDialog( "settings" ) ) {
if ( TDEConfigDialog::showDialog( "settings" ) ) {
mAdvanced->kcfg_Hint->setEnabled(m_view->hintExists());
mAdvanced->kcfg_AccentedLetters->setEnabled(m_view->accentedLetters());
return;
}
//KConfigDialog didn't find an instance of this dialog, so lets create it :
KConfigDialog* dialog = new KConfigDialog( this, "settings", Prefs::self() );
//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Prefs::self() );
// Add the Normal Settings page
normal *mNormal = new normal( 0, "Normal Settings" );
dialog->addPage(mNormal, i18n("General"), "colorize");

@ -20,7 +20,7 @@
<entry name="SelectedLanguage" type="String">
<label>The language selected by the user</label>
<code>
KConfigBase *globalConf = TDEGlobal::config();
TDEConfigBase *globalConf = TDEGlobal::config();
globalConf->setGroup("Locale");
QString userLanguage = globalConf->readEntry("Language", "en");
if (userLanguage.isEmpty())

@ -46,7 +46,7 @@ Kig::Kig()
: KParts::MainWindow( 0L, "Kig" ), m_part( 0 )
{
// setting the configation file
config = new KConfig( "kigrc" );
config = new TDEConfig( "kigrc" );
// set the shell's ui resource file
setXMLFile("kigui.rc");
// then, setup our actions
@ -131,7 +131,7 @@ void Kig::setupActions()
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
}
void Kig::saveProperties(KConfig* config)
void Kig::saveProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@ -139,7 +139,7 @@ void Kig::saveProperties(KConfig* config)
config->writePathEntry("fileName", m_part->url().path());
}
void Kig::readProperties(KConfig* config)
void Kig::readProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever

@ -103,14 +103,14 @@ class Kig : public KParts::MainWindow
* 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 *);
private slots:
void fileNew();
@ -141,7 +141,7 @@ class Kig : public KParts::MainWindow
//#endif
KRecentFilesAction *m_recentFilesAction;
KConfig* config;
TDEConfig* config;
static bool kimageioRegistered;
};

@ -60,7 +60,7 @@ Dict::Index *Asyndeta::retrieveIndex()
void Asyndeta::readKitenConfiguration()
{
KStandardDirs *dirs = TDEGlobal::dirs();
KConfig config(dirs->findResource("config", "kitenrc"));
TDEConfig config(dirs->findResource("config", "kitenrc"));
TQString globaledict = dirs->findResource("data", "kiten/edict");
TQString globalkanjidic = dirs->findResource("data", "kiten/kanjidic");

@ -21,7 +21,7 @@
#ifndef ASYNDETA_H
#define ASYNDETA_H
class KConfig;
class TDEConfig;
namespace Dict
{

@ -94,7 +94,7 @@ void ConfigDictionaries::readDictionaryList(const TQString& group)
{
TQString name = group + "_" + *it;
if (!config->findItem(name))
config->addItem(new KConfigSkeleton::ItemString(group, *it, *new TQString()), name);
config->addItem(new TDEConfigSkeleton::ItemString(group, *it, *new TQString()), name);
}
config->readConfig();
list->clear();
@ -117,10 +117,10 @@ void ConfigDictionaries::writeDictionaryList(const TQString& group)
{
names.append(it.current()->text(0));
TQString name = group + "_" + it.current()->text(0);
KConfigSkeletonItem* item = config->findItem(name);
TDEConfigSkeletonItem* item = config->findItem(name);
if (!item)
{
item = new KConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
item = new TDEConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
config->addItem(item, name);
}
item->setProperty(it.current()->text(1));

@ -32,13 +32,13 @@ public:
ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
void readDictionaries();
// KConfig stuff
// TDEConfig stuff
void updateWidgets();
void updateWidgetsDefault();
void updateSettings();
bool hasChanged();
bool isDefault();
// KConfig stuff
// TDEConfig stuff
signals:
void widgetChanged();

@ -85,7 +85,7 @@ bool KLoader::open(void)
}
else
{
if(!KIO::NetAccess::download(d->url, d->tempFile))
if(!TDEIO::NetAccess::download(d->url, d->tempFile))
{
d->error = i18n("Could not read from %1.").arg(d->url.prettyURL());
return false;
@ -110,7 +110,7 @@ void KLoader::close(void)
d->file = 0;
if(!d->isLocal)
KIO::NetAccess::removeTempFile(d->tempFile);
TDEIO::NetAccess::removeTempFile(d->tempFile);
}
TQString KLoader::error(void)

@ -35,7 +35,7 @@ class KLoader
public:
/**
* The constructor takes the url and decides the best way to save,
* which will mean using something like KIO::NetAccess or TQFile.
* which will mean using something like TDEIO::NetAccess or TQFile.
*/
KLoader(const KURL &_target);

@ -118,7 +118,7 @@ bool KSaver::close(void)
d->tempFile->close();
bool retval = KIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
delete d->tempFile;
d->tempFile = 0;

@ -35,7 +35,7 @@ class KSaver
public:
/**
* The constructor takes the url and decides the best way to save,
* which will mean using something like KIO::NetAccess or TQFile.
* which will mean using something like TDEIO::NetAccess or TQFile.
*/
KSaver(const KURL &_target);

@ -461,7 +461,7 @@ void Learn::write(const KURL &url)
void Learn::saveScores()
{
KConfig &config = *Config::self()->config();
TDEConfig &config = *Config::self()->config();
config.setGroup("Learn Scores");
for (TQListViewItemIterator it(List); it.current(); ++it)
config.writeEntry(it.current()->text(0), it.current()->text(4).toInt());
@ -493,7 +493,7 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
statusBar()->message(i18n("%1 added to your list").arg(kanji));
KConfig &config = *Config::self()->config();
TDEConfig &config = *Config::self()->config();
int score = 0;
config.setGroup("Learn Scores");
score = config.readNumEntry(kanji, score);
@ -633,7 +633,7 @@ void Learn::answerClicked(int i)
return;
int newscore = 0;
// KConfig &config = *Config::self()->config();
// TDEConfig &config = *Config::self()->config();
// config.setGroup("Learn");
bool donew = false;

@ -48,7 +48,7 @@ int main(int argc, char *argv[])
aboutData.addCredit("Jim Breen", I18N_NOOP("Wrote xjdic, of which Kiten borrows code, and the xjdic index file generator.\nAlso is main author of edict and kanjidic, which Kiten essentially require."), "jwb@csse.monash.edu.au");
aboutData.addAuthor("Neil Stevens", I18N_NOOP("Code simplification, UI suggestions."), "neil@qualityassistant.com");
aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to KConfig XT, bug fixing"), "paul.temple@gmx.net");
aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to TDEConfig XT, bug fixing"), "paul.temple@gmx.net");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.

@ -40,7 +40,7 @@
#include "configlearn.h"
#include "configsearching.h"
ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self())
ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self())
{
configDic = new ConfigDictionaries(0, "dictionaries_page");
connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
@ -71,7 +71,7 @@ void ConfigureDialog::updateWidgets()
{
bool changed = hasChanged();
configDic->updateSettings();
if (changed) KConfigDialog::settingsChangedSlot();
if (changed) TDEConfigDialog::settingsChangedSlot();
}
//////////////////////////////////////////////////////////////////////

@ -38,7 +38,7 @@ class DictList;
#include "kitenconfig.h"
#include "configdictionaries.h"
class ConfigureDialog : public KConfigDialog
class ConfigureDialog : public TDEConfigDialog
{
Q_OBJECT

@ -156,10 +156,10 @@ void KLatin::loadRevision()
void KLatin::loadSettings()
{
if (KConfigDialog::showDialog("settings"))
if (TDEConfigDialog::showDialog("settings"))
return;
KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self());
vocabPage = new VocabPage(0);
vocabPage->kcfg_DefaultFile->setMode(KFile::File | KFile::LocalOnly);

@ -61,7 +61,7 @@ public slots:
void resetGUI();
private slots:
/// Slot for when settings are changed in the KConfig XT dialog
/// Slot for when settings are changed in the TDEConfig XT dialog
void settingsChanged();
void slotWriteMsg(const TQString&);

@ -8,7 +8,7 @@
<entry name="UserLanguage" type="String">
<label>The language selected by the user</label>
<code>
KConfigBase *globalConf = TDEGlobal::config();
TDEConfigBase *globalConf = TDEGlobal::config();
globalConf->setGroup("Locale");
TQString m_language = globalConf->readEntry("Language", "en");
//keep only the first 2 characters

@ -87,7 +87,7 @@ void KLatinVocab::parseVocab(TQString customFile)
// Check whether file exists or not
// If not then regenerate working default
if (TQFile::exists(fileName) == FALSE) {
KConfigBase *globalConf = TDEGlobal::config();
TDEConfigBase *globalConf = TDEGlobal::config();
globalConf->setGroup("Locale");
TQString language = globalConf->readEntry("Language", "en");

@ -35,4 +35,4 @@ Peter Hedlund
Code for generating special characters icons
Waldo Bastian
Port to KConfig XT, coding help
Port to TDEConfig XT, coding help

@ -121,7 +121,7 @@ void KLettres::findLanguages()
//TODO TEST in FRENCH
m_languages.sort();
//write the present languages in config so they cannot be downloaded
KConfig *config=kapp->config();
TDEConfig *config=kapp->config();
config->setGroup("KNewStuffStatus");
for (uint i=0; i<m_languages.count(); i++)
{
@ -132,7 +132,7 @@ void KLettres::findLanguages()
//we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages
//to find the name of the country
//corresponding to the code and the language the user set
KConfig entry(locate("locale", "all_languages"));
TDEConfig entry(locate("locale", "all_languages"));
const TQStringList::ConstIterator itEnd = m_languages.end();
for (TQStringList::Iterator it = m_languages.begin(); it != m_languages.end(); ++it) {
if (*it == "hi-ro")
@ -264,10 +264,10 @@ void KLettres::setupToolbars()
void KLettres::optionsPreferences()
{
if(KConfigDialog::showDialog("settings"))
if(TDEConfigDialog::showDialog("settings"))
return;
KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self());
TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self());
dialog->addPage(new fontsdlg(0, "mFont"), i18n("Font Settings"), "fonts");
//fontsdlg is the page name, mFont is the widget name, Font Settings is the page display string
//fonts is the icon

@ -85,7 +85,7 @@ int main(int argc, char **argv)
about.addCredit("Peter Hedlund",
I18N_NOOP("Code for generating special characters' icons"), "peter.hedlund AT kdemail.net");
about.addCredit("Waldo Bastian",
I18N_NOOP("Port to KConfig XT, coding help"), "bastian AT kde.org");
I18N_NOOP("Port to TDEConfig XT, coding help"), "bastian AT kde.org");
about.addCredit("Danny Allen",
I18N_NOOP("Kids and grown-up SVG icons"), "danny AT dannyallen.co.uk");
about.addCredit("Michael Goettsche",

@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
m_recentFiles->loadEntries( m_config );
// Let's create a Configure Diloag
m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() );
m_settingsDialog = new TDEConfigDialog( parentWidget, "settings", Settings::self() );
m_settingsDialog->setHelp("general-config");
// create and add the page(s)
@ -268,7 +268,7 @@ void MainDlg::slotSaveas()
if ( !url.isEmpty() )
{
// check if file exists and overwriting is ok.
if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
if( !TDEIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
{
if ( !kmplotio->save( url ) )
KMessageBox::error(m_parent, i18n("The file could not be saved") );
@ -293,7 +293,7 @@ void MainDlg::slotExport()
if(!url.isEmpty())
{
// check if file exists and overwriting is ok.
if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
if( TDEIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
if( url.fileName().right(4).lower()==".svg")
{
@ -305,7 +305,7 @@ void MainDlg::slotExport()
{
KTempFile tmp;
pic.save( tmp.name(), "SVG");
if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
tmp.unlink();
}
@ -321,7 +321,7 @@ void MainDlg::slotExport()
{
KTempFile tmp;
pic.save( tmp.name(), "BMP");
if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
tmp.unlink();
}
@ -337,7 +337,7 @@ void MainDlg::slotExport()
{
KTempFile tmp;
pic.save( tmp.name(), "PNG");
if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
tmp.unlink();
}
@ -402,7 +402,7 @@ void MainDlg::slotPrint()
void MainDlg::editColors()
{
// create a config dialog and add a colors page
KConfigDialog* colorsDialog = new KConfigDialog( m_parent, "colors", Settings::self() );
TDEConfigDialog* colorsDialog = new TDEConfigDialog( m_parent, "colors", Settings::self() );
colorsDialog->setHelp("color-config");
colorsDialog->addPage( new SettingsPageColor(</