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

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

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 79b21d47bc
commit cc74f360bb
746 changed files with 3622 additions and 3622 deletions
Show Stats Download Patch File Download Diff File

10
doc/ksplashml/index.docbook
Unescape Escape View File

@ -814,7 +814,7 @@ class Cfg2k: public ThemeEngineConfig
{
Q_OBJECT
public:
Cfg2k( KConfig * );
Cfg2k( TDEConfig * );
};
class ObjKsTheme;
@ -828,7 +828,7 @@ public:
{
return( QString("KSplash2k") );
}
inline const KDialogBase *config( KConfig *kc )
inline const KDialogBase *config( TDEConfig *kc )
{
return new Cfg2k( kc );
}
@ -924,7 +924,7 @@ void Theme2k::readSettings()
if( !mTheme )
return;
KConfig *cfg = mTheme->themeConfig();
TDEConfig *cfg = mTheme->themeConfig();
if( !cfg )
return;
@ -1099,7 +1099,7 @@ appropriate plugin.</para>
K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
Cfg2k::Cfg2k( KConfig * )
Cfg2k::Cfg2k( TDEConfig * )
{}
Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
@ -1164,7 +1164,7 @@ void Theme2k::readSettings()
if( !mTheme )
return;
KConfig *cfg = mTheme-&gt;themeConfig();
TDEConfig *cfg = mTheme-&gt;themeConfig();
if( !cfg )
return;

2
drkonqi/debugger.cpp
Unescape Escape View File

@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg )
{
bool ret = true;
KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
TDEConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{

6
drkonqi/krashconf.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
KStartupInfo::sendFinish( id );
}
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("drkonqi");
// maybe we should check if it's relative?
@ -98,7 +98,7 @@ void KrashConfig :: readConfig()
TQString debuggername = config->readEntry("Debugger",
TQString::fromLatin1("gdb"));
KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
TDEConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
true, false, "appdata");
debuggers.setGroup("General");
@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
TDEConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata");
preset.setGroup("ErrorDescription");

2
kate/app/kateapp.cpp
Unescape Escape View File

@ -352,7 +352,7 @@ bool KateApp::openInput (const TQString &text)
return true;
}
KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const TQString &sgroup)
KateMainWindow *KateApp::newMainWindow (TDEConfig *sconfig, const TQString &sgroup)
{
KateMainWindow *mainWindow = new KateMainWindow (sconfig, sgroup);
m_mainWindows.push_back (mainWindow);

2
kate/app/kateapp.h
Unescape Escape View File

@ -140,7 +140,7 @@ class KDE_EXPORT KateApp : public TDEApplication
* @param sgroup session group for this window
* @return new constructed main window
*/
KateMainWindow *newMainWindow (KConfig *sconfig = 0, const TQString &sgroup = "");
KateMainWindow *newMainWindow (TDEConfig *sconfig = 0, const TQString &sgroup = "");
/**
* removes the mainwindow given, DOES NOT DELETE IT

4
kate/app/kateconfigdialog.cpp
Unescape Escape View File

@ -68,7 +68,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
parent,
"configdialog" )
{
KConfig *config = KateApp::self()->config();
TDEConfig *config = KateApp::self()->config();
KWin::setIcons( winId(), KateApp::self()->icon(), KateApp::self()->miniIcon() );
@ -372,7 +372,7 @@ void KateConfigDialog::slotOk()
void KateConfigDialog::slotApply()
{
KConfig *config = KateApp::self()->config();
TDEConfig *config = KateApp::self()->config();
// if data changed apply the kate app stuff
if( dataChanged )

8
kate/app/katedocmanager.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ KateDocManager::KateDocManager (TQObject *parent)
m_dcop = new KateDocManagerDCOPIface (this);
m_metaInfos = new KConfig("metainfos", false, false, "appdata");
m_metaInfos = new TDEConfig("metainfos", false, false, "appdata");
createDoc ();
}
@ -315,7 +315,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
"Do you want to delete it anyway?").arg(m_tempFiles[ documentNumber ].first.prettyURL()),
i18n("Delete File?") ) == KMessageBox::Yes*/ )
{
KIO::del( m_tempFiles[ documentNumber ].first, false, false );
TDEIO::del( m_tempFiles[ documentNumber ].first, false, false );
kdDebug(13001)<<"Deleted temporary file "<<m_tempFiles[ documentNumber ].first<<endl;
m_tempFiles.remove( documentNumber );
}
@ -444,7 +444,7 @@ void KateDocManager::saveAll()
((Kate::View*)it.current()->views().first())->save();
}
void KateDocManager::saveDocumentList (KConfig* config)
void KateDocManager::saveDocumentList (TDEConfig* config)
{
TQString prevGrp=config->group();
config->setGroup ("Open Documents");
@ -466,7 +466,7 @@ void KateDocManager::saveDocumentList (KConfig* config)
config->setGroup(prevGrp);
}
void KateDocManager::restoreDocumentList (KConfig* config)
void KateDocManager::restoreDocumentList (TDEConfig* config)
{
TQString prevGrp=config->group();
config->setGroup ("Open Documents");

8
kate/app/katedocmanager.h
Unescape Escape View File

@ -36,7 +36,7 @@
namespace KParts { class Factory; }
class KConfig;
class TDEConfig;
class DCOPObject;
class KateDocumentInfo
@ -104,8 +104,8 @@ class KateDocManager : public TQObject
TQPtrList<Kate::Document> modifiedDocumentList();
bool queryCloseDocuments(KateMainWindow *w);
void saveDocumentList (class KConfig *config);
void restoreDocumentList (class KConfig *config);
void saveDocumentList (class TDEConfig *config);
void restoreDocumentList (class TDEConfig *config);
DCOPObject *dcopObject () { return m_dcop; };
@ -143,7 +143,7 @@ class KateDocManager : public TQObject
TQPtrDict<KateDocumentInfo> m_docInfos;
TQMap<uint,TPair> m_tempFiles;
TQGuardedPtr<Kate::Document> m_currentDoc;
KConfig *m_metaInfos;
TDEConfig *m_metaInfos;
bool m_saveMetaInfos;
int m_daysMetaInfos;

8
kate/app/kateexternaltools.cpp
Unescape Escape View File

@ -151,7 +151,7 @@ void KateExternalToolsCommand::reload () {
m_list.clear();
m_map.clear();
KConfig config("externaltools", false, false, "appdata");
TDEConfig config("externaltools", false, false, "appdata");
config.setGroup("Global");
TQStringList tools = config.readListEntry("tools");
@ -312,7 +312,7 @@ void KateExternalToolsMenuAction::reload()
popupMenu()->clear();
// load all the tools, and create a action for each of them
KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
TDEConfig *config = new TDEConfig( "externaltools", false, false, "appdata" );
config->setGroup( "Global" );
TQStringList tools = config->readListEntry( "tools" );
@ -601,7 +601,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
TQWhatsThis::add( lbTools, i18n(
"This list shows all the configured tools, represented by their menu text.") );
config = new KConfig("externaltools", false, false, "appdata");
config = new TDEConfig("externaltools", false, false, "appdata");
reload();
slotSelectionChanged();
}
@ -616,7 +616,7 @@ void KateExternalToolsConfigWidget::reload()
//m_tools.clear();
lbTools->clear();
// load the files from a KConfig
// load the files from a TDEConfig
config->setGroup( "Global" );
TQStringList tools = config->readListEntry("tools");

2
kate/app/kateexternaltools.h
Unescape Escape View File

@ -171,7 +171,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
class KListBox *lbTools;
class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn;
class KConfig *config;
class TDEConfig *config;
bool m_changed;
};

6
kate/app/katefilelist.cpp
Unescape Escape View File

@ -480,7 +480,7 @@ void KateFileList::updateSort ()
updateFileListLocations();
}
void KateFileList::readConfig( KConfig *config, const TQString &group )
void KateFileList::readConfig( TDEConfig *config, const TQString &group )
{
TQString oldgroup = config->group();
config->setGroup( group );
@ -495,7 +495,7 @@ void KateFileList::readConfig( KConfig *config, const TQString &group )
config->setGroup( oldgroup );
}
void KateFileList::writeConfig( KConfig *config, const TQString &group )
void KateFileList::writeConfig( TDEConfig *config, const TQString &group )
{
TQString oldgroup = config->group();
config->setGroup( group );
@ -715,7 +715,7 @@ void KFLConfigPage::apply()
void KFLConfigPage::reload()
{
// read in from config file
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "Filelist" );
cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );

4
kate/app/katefilelist.h
Unescape Escape View File

@ -102,8 +102,8 @@ class KateFileList : public KListView
TQColor viewShade() const { return m_viewShade; }
bool shadingEnabled() { return m_enableBgShading; }
void readConfig( class KConfig *config, const TQString &group );
void writeConfig( class KConfig *config, const TQString &group );
void readConfig( class TDEConfig *config, const TQString &group );
void writeConfig( class TDEConfig *config, const TQString &group );
/**
* reimplemented to remove the item from the history stacks

10
kate/app/katefileselector.cpp
Unescape Escape View File

@ -216,7 +216,7 @@ KateFileSelector::~KateFileSelector()
//BEGIN Public Methods
void KateFileSelector::readConfig(KConfig *config, const TQString & name)
void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
{
dir->setViewConfig( config, name + ":view" );
dir->readConfig(config, name + ":dir");
@ -258,7 +258,7 @@ void KateFileSelector::initialDirChangeHack()
setDir( waitingDir );
}
void KateFileSelector::setupToolbar( KConfig *config )
void KateFileSelector::setupToolbar( TDEConfig *config )
{
toolbar->clear();
TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@ -279,7 +279,7 @@ void KateFileSelector::setupToolbar( KConfig *config )
}
}
void KateFileSelector::writeConfig(KConfig *config, const TQString & name)
void KateFileSelector::writeConfig(TDEConfig *config, const TQString & name)
{
dir->writeConfig(config,name + ":dir");
@ -630,7 +630,7 @@ void KFSConfigPage::apply()
m_changed = false;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l;
@ -672,7 +672,7 @@ void KFSConfigPage::reload()
}
void KFSConfigPage::init()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l = config->readListEntry( "toolbar actions", ',' );

6
kate/app/katefileselector.h
Unescape Escape View File

@ -83,9 +83,9 @@ class KateFileSelector : public TQVBox
TQWidget * parent = 0, const char * name = 0 );
~KateFileSelector();
void readConfig( KConfig *, const TQString & );
void writeConfig( KConfig *, const TQString & );
void setupToolbar( KConfig * );
void readConfig( TDEConfig *, const TQString & );
void writeConfig( TDEConfig *, const TQString & );
void setupToolbar( TDEConfig * );
void setView( KFile::FileView );
KDirOperator *dirOperator(){ return dir; }
KActionCollection *actionCollection() { return mActionCollection; };

4
kate/app/kategrepdialog.h
Unescape Escape View File

@ -31,7 +31,7 @@ class TQListBox;
class KPushButton;
class TQLabel;
class TDEProcess;
class KConfig;
class TDEConfig;
class KURLRequester;
class TQEvent;
@ -85,7 +85,7 @@ private:
TDEProcess *childproc;
TQString buf;
TQString errbuf;
KConfig* config;
TDEConfig* config;
TQStringList lastSearchItems;
TQStringList lastSearchPaths;
TQStringList lastSearchFiles;

2
kate/app/katemain.h
Unescape Escape View File

@ -38,7 +38,7 @@ class TQWidgetStack;
class KAction;
class KActionMenu;
class KConfig;
class TDEConfig;
class KDirOperator;
class KEditToolbar;
class KFileViewItem;

14
kate/app/katemainwindow.cpp
Unescape Escape View File

@ -86,7 +86,7 @@
uint KateMainWindow::uniqueID = 1;
KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
: KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1())
{
// first the very important id
@ -402,7 +402,7 @@ void KateMainWindow::slotFileQuit()
void KateMainWindow::readOptions ()
{
KConfig *config = KateApp::self()->config ();
TDEConfig *config = KateApp::self()->config ();
config->setGroup("General");
syncKonsole = config->readBoolEntry("Sync Konsole", true);
@ -420,7 +420,7 @@ void KateMainWindow::readOptions ()
void KateMainWindow::saveOptions ()
{
KConfig *config = KateApp::self()->config ();
TDEConfig *config = KateApp::self()->config ();
config->setGroup("General");
@ -553,7 +553,7 @@ void KateMainWindow::editKeys()
}
}
externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new KConfig("externaltools", false, false, "appdata") );
externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new TDEConfig("externaltools", false, false, "appdata") );
}
void KateMainWindow::openURL (const TQString &name)
@ -823,7 +823,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc)
m_viewManager->activeView()->getDoc()->isModified());
}
void KateMainWindow::saveProperties(KConfig *config)
void KateMainWindow::saveProperties(TDEConfig *config)
{
TQString grp=config->group();
@ -833,7 +833,7 @@ void KateMainWindow::saveProperties(KConfig *config)
config->setGroup(grp);
}
void KateMainWindow::readProperties(KConfig *config)
void KateMainWindow::readProperties(TDEConfig *config)
{
TQString grp=config->group();
@ -844,7 +844,7 @@ void KateMainWindow::readProperties(KConfig *config)
config->setGroup(grp);
}
void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
void KateMainWindow::saveGlobalProperties( TDEConfig* sessionConfig )
{
KateDocManager::self()->saveDocumentList (sessionConfig);

8
kate/app/katemainwindow.h
Unescape Escape View File

@ -58,7 +58,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
* @param sconfig session config for this window, 0 if none
* @param sgroup session config group to use
*/
KateMainWindow (KConfig *sconfig, const TQString &sgroup);
KateMainWindow (TDEConfig *sconfig, const TQString &sgroup);
/**
* Destruct the nice window
@ -102,9 +102,9 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
KateTabWidget *tabWidget ();
public:
void readProperties(KConfig *config);
void saveProperties(KConfig *config);
void saveGlobalProperties( KConfig* sessionConfig );
void readProperties(TDEConfig *config);
void saveProperties(TDEConfig *config);
void saveGlobalProperties( TDEConfig* sessionConfig );
public:
bool queryClose_internal();

10
kate/app/katemdi.cpp
Unescape Escape View File

@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
// try to read the action shortcut
KShortcut sc;
KConfig *cfg = kapp->config();
TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup("Shortcuts");
sc = KShortcut( cfg->readEntry( aname, "" ) );
@ -542,7 +542,7 @@ class TmpToolViewSorter
unsigned int pos;
};
void Sidebar::restoreSession (KConfig *config)
void Sidebar::restoreSession (TDEConfig *config)
{
// get the last correct placed toolview
unsigned int firstWrong = 0;
@ -637,7 +637,7 @@ void Sidebar::restoreSession (KConfig *config)
m_ownSplit->hide();
}
void Sidebar::saveSession (KConfig *config)
void Sidebar::saveSession (TDEConfig *config)
{
// store the own splitter sizes
TQValueList<int> s = m_ownSplit->sizes();
@ -847,7 +847,7 @@ bool MainWindow::hideToolView (ToolView *widget)
return widget->sidebar()->hideWidget (widget);
}
void MainWindow::startRestore (KConfig *config, const TQString &group)
void MainWindow::startRestore (TDEConfig *config, const TQString &group)
{
// first save this stuff
m_restoreConfig = config;
@ -929,7 +929,7 @@ void MainWindow::finishRestore ()
m_restoreGroup = "";
}
void MainWindow::saveSession (KConfig *config, const TQString &group)
void MainWindow::saveSession (TDEConfig *config, const TQString &group)
{
if (!config)
return;

10
kate/app/katemdi.h
Unescape Escape View File

@ -207,13 +207,13 @@ class Sidebar : public KMultiTabBar
* restore the current session config from given object, use current group
* @param config config object to use
*/
void restoreSession (KConfig *config);
void restoreSession (TDEConfig *config);
/**
* save the current session config to given object, use current group
* @param config config object to use
*/
void saveSession (KConfig *config);
void saveSession (TDEConfig *config);
public slots:
// reimplemented, to block a show() call if we have no children or if
@ -370,7 +370,7 @@ class MainWindow : public KParts::MainWindow
* @param config config object to use
* @param group config group to use
*/
void startRestore (KConfig *config, const TQString &group);
void startRestore (TDEConfig *config, const TQString &group);
/**
* finish the restore
@ -382,7 +382,7 @@ class MainWindow : public KParts::MainWindow
* @param config config object to use
* @param group config group to use
*/
void saveSession (KConfig *config, const TQString &group);
void saveSession (TDEConfig *config, const TQString &group);
/**
* internal data ;)
@ -428,7 +428,7 @@ class MainWindow : public KParts::MainWindow
* config object for session restore, only valid between
* start and finish restore calls
*/
KConfig *m_restoreConfig;
TDEConfig *m_restoreConfig;
/**
* restore group

18
kate/app/katesession.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ bool KateSession::rename (const TQString &name)
m_sessionName = name;
KConfig config (sessionFile (), false, false);
TDEConfig config (sessionFile (), false, false);
config.setGroup ("General");
config.writeEntry ("Name", m_sessionName);
config.sync ();
@ -177,7 +177,7 @@ bool KateSession::rename (const TQString &name)
return true;
}
KConfig *KateSession::configRead ()
TDEConfig *KateSession::configRead ()
{
if (m_sessionFileRel.isEmpty())
return 0;
@ -188,7 +188,7 @@ KConfig *KateSession::configRead ()
return m_readConfig = new KSimpleConfig (sessionFile (), true);
}
KConfig *KateSession::configWrite ()
TDEConfig *KateSession::configWrite ()
{
if (m_sessionFileRel.isEmpty())
return 0;
@ -288,7 +288,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
// open the new session
Kate::Document::setOpenErrorDialogsActivated (false);
KConfig *sc = activeSession()->configRead();
TDEConfig *sc = activeSession()->configRead();
if (sc)
KateApp::self()->documentManager()->restoreDocumentList (sc);
@ -301,7 +301,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
// window config
if (sc)
{
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
if (c->readBoolEntry("Restore Window Configuration", true))
@ -371,7 +371,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
if (tryAsk)
{
// app config
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
TQString sesExit (c->readEntry ("Session Exit", "save"));
@ -407,7 +407,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
}
}
KConfig *sc = activeSession()->configWrite();
TDEConfig *sc = activeSession()->configWrite();
if (!sc)
return false;
@ -428,7 +428,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
if (rememberAsLast)
{
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
c->writeEntry ("Last Session", activeSession()->sessionFileRelative());
c->sync ();
@ -442,7 +442,7 @@ bool KateSessionManager::chooseSession ()
bool success = true;
// app config
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
// get last used session, default to default session

4
kate/app/katesession.h
Unescape Escape View File

@ -109,7 +109,7 @@ class KateSession : public KShared
* return 0 if we have no file to read config from atm
* @return config to read from
*/
KConfig *configRead ();
TDEConfig *configRead ();
/**
* config to write
@ -117,7 +117,7 @@ class KateSession : public KShared
* return 0 if we have no file to write config to atm
* @return config to write from
*/
KConfig *configWrite ();
TDEConfig *configWrite ();
/**
* count of documents in this session

4
kate/app/kateviewmanager.cpp
Unescape Escape View File

@ -463,7 +463,7 @@ void KateViewManager::setShowFullPath( bool enable )
* session config functions
*/
// FIXME 3.0 - make those config goups more streamlined: "objN:objN..."
void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
void KateViewManager::saveViewConfiguration(TDEConfig *config,const TQString& grp)
{
// Use the same group name for view configuration as usual for sessions.
// (When called by session manager grp is a 1-based index for the main window)
@ -481,7 +481,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
}
}
void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& grp)
void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQString& grp)
{
// Use the same group name for view configuration as usual for sessions.
// (When called by session manager grp is a 1-based index for the main window)

6
kate/app/kateviewmanager.h
Unescape Escape View File

@ -31,7 +31,7 @@
class KateMainWindow;
class KateViewSpaceContainer;
class KConfig;
class TDEConfig;
class KAction;
class TQToolButton;
@ -60,10 +60,10 @@ class KateViewManager : public TQObject
public:
/* This will save the splitter configuration */
void saveViewConfiguration(KConfig *config,const TQString& group);
void saveViewConfiguration(TDEConfig *config,const TQString& group);
/* restore it */
void restoreViewConfiguration (KConfig *config,const TQString& group);
void restoreViewConfiguration (TDEConfig *config,const TQString& group);
uint openURL (const KURL &url, const TQString& encoding, bool activate = true, bool isTempFile=false);

4
kate/app/kateviewspace.cpp
Unescape Escape View File

@ -233,7 +233,7 @@ void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr,
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const TQString& viewConfGrp)
void KateViewSpace::saveConfig ( TDEConfig* config, int myIndex ,const TQString& viewConfGrp)
{
// kdDebug()<<"KateViewSpace::saveConfig("<<myIndex<<", "<<viewConfGrp<<") - currentView: "<<currentView()<<")"<<endl;
TQString group = TQString(viewConfGrp+"-ViewSpace %1").arg( myIndex );
@ -272,7 +272,7 @@ void KateViewSpace::modifiedOnDisc(Kate::Document *, bool, unsigned char)
mStatusBar->updateMod( currentView()->getDoc()->isModified() );
}
void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group )
void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group )
{
config->setGroup (group);
TQString fn = config->readEntry( "Active View" );

6
kate/app/kateviewspace.h
Unescape Escape View File

@ -33,7 +33,7 @@
class KVSSBSep;
class KConfig;
class TDEConfig;
class KSqueezedTextLabel;
class KateViewSpaceContainer;
@ -88,8 +88,8 @@ class KateViewSpace : public TQVBox
Kate::View* currentView();
int viewCount() const { return mViewList.count(); }
void saveConfig (KConfig* config, int myIndex,const TQString& viewConfGrp);
void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group );
void saveConfig (TDEConfig* config, int myIndex,const TQString& viewConfGrp);
void restoreConfig ( class KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group );
protected:

8
kate/app/kateviewspacecontainer.cpp
Unescape Escape View File

@ -602,7 +602,7 @@ void KateViewSpaceContainer::setShowFullPath( bool enable )
* session config functions
*/
void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQString& group)
void KateViewSpaceContainer::saveViewConfiguration(TDEConfig *config,const TQString& group)
{
bool weHaveSplittersAlive (viewSpaceCount() > 1);
@ -629,7 +629,7 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQStrin
delete l;
}
void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQString& group)
void KateViewSpaceContainer::restoreViewConfiguration (TDEConfig *config, const TQString& group)
{
config->setGroup(group);
//config->setGroup ("View Configuration");
@ -665,7 +665,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
}
void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const TQString& viewConfGrp )
void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TDEConfig* config, const TQString& viewConfGrp )
{
TQString grp = TQString(viewConfGrp+"-Splitter %1").arg(idx);
config->setGroup(grp);
@ -712,7 +712,7 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
config->writeEntry("Children", childList);
}
void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
{
config->setGroup( group );

10
kate/app/kateviewspacecontainer.h
Unescape Escape View File

@ -29,7 +29,7 @@
#include "katemdi.h"
class KConfig;
class TDEConfig;
class KateMainWindow;
class KateViewSpaceContainer: public TQVBox
@ -48,10 +48,10 @@ class KateViewSpaceContainer: public TQVBox
public:
/* This will save the splitter configuration */
void saveViewConfiguration(KConfig *config,const TQString& group);
void saveViewConfiguration(TDEConfig *config,const TQString& group);
/* restore it */
void restoreViewConfiguration (KConfig *config,const TQString& group);
void restoreViewConfiguration (TDEConfig *config,const TQString& group);
private:
/**
@ -69,12 +69,12 @@ class KateViewSpaceContainer: public TQVBox
* If child splitters are found, it calls it self with those as the argument.
* If a viewspace child is found, it is asked to save its filelist.
*/
void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const TQString& viewConfGrp="");
void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, TDEConfig* config=0L, const TQString& viewConfGrp="");
/** Restore a single splitter.
* This is all the work is done for @see saveSplitterConfig()
*/
void restoreSplitter ( KConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
void restoreSplitter ( TDEConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
void removeViewSpace (KateViewSpace *viewspace);

20
kate/app/kwritemain.cpp
Unescape Escape View File

@ -248,7 +248,7 @@ void KWrite::slotOpen( const KURL& url )
{
if (url.isEmpty()) return;
if (!KIO::NetAccess::exists(url, true, this))
if (!TDEIO::NetAccess::exists(url, true, this))
{
KMessageBox::error (this, i18n("The given file could not be read, check if it exists or if it is readable for the current user."));
return;
@ -395,7 +395,7 @@ void KWrite::slotEnableActions( bool enable )
}
//common config
void KWrite::readConfig(KConfig *config)
void KWrite::readConfig(TDEConfig *config)
{
config->setGroup("General Options");
@ -413,7 +413,7 @@ void KWrite::readConfig(KConfig *config)
statusBar()->hide();
}
void KWrite::writeConfig(KConfig *config)
void KWrite::writeConfig(TDEConfig *config)
{
config->setGroup("General Options");
@ -431,23 +431,23 @@ void KWrite::writeConfig(KConfig *config)
//config file
void KWrite::readConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
readConfig(config);
}
void KWrite::writeConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
writeConfig(config);
}
// session management
void KWrite::restore(KConfig *config, int n)
void KWrite::restore(TDEConfig *config, int n)
{
readPropertiesInternal(config, n);
}
void KWrite::readProperties(KConfig *config)
void KWrite::readProperties(TDEConfig *config)
{
readConfig(config);
@ -455,7 +455,7 @@ void KWrite::readProperties(KConfig *config)
KTextEditor::sessionConfigInterface(m_view)->readSessionConfig(config);
}
void KWrite::saveProperties(KConfig *config)
void KWrite::saveProperties(TDEConfig *config)
{
writeConfig(config);
config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1);
@ -464,7 +464,7 @@ void KWrite::saveProperties(KConfig *config)
KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config);
}
void KWrite::saveGlobalProperties(KConfig *config) //save documents
void KWrite::saveGlobalProperties(TDEConfig *config) //save documents
{
config->setGroup("Number");
config->writeEntry("NumberOfDocuments",docList.count());
@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
//restore session
void KWrite::restore()
{
KConfig *config = kapp->sessionConfig();
TDEConfig *config = kapp->sessionConfig();
if (!config)
return;

12
kate/app/kwritemain.h
Unescape Escape View File

@ -91,21 +91,21 @@ class KWrite : public KParts::MainWindow
//config file functions
public:
void readConfig (KConfig *);
void writeConfig (KConfig *);
void readConfig (TDEConfig *);
void writeConfig (TDEConfig *);
void readConfig ();
void writeConfig ();
//session management
public:
void restore(KConfig *,int);
void restore(TDEConfig *,int);
static void restore();
private:
void readProperties(KConfig *);
void saveProperties(KConfig *);
void saveGlobalProperties(KConfig *);
void readProperties(TDEConfig *);
void saveProperties(TDEConfig *);
void saveGlobalProperties(TDEConfig *);
private:
KTextEditor::View * m_view;

2
kcminit/main.cpp
Unescape Escape View File

@ -175,7 +175,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
kapp->dcopClient()->attach();
// This key has no GUI apparently
KConfig config("kcmdisplayrc", true );
TDEConfig config("kcmdisplayrc", true );
config.setGroup("X11");
bool multihead = !config.readBoolEntry( "disableMultihead", false) &&
(ScreenCount(tqt_xdisplay()) > 1);

6
kcontrol/TODO
Unescape Escape View File

@ -80,7 +80,7 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s
* Remove old categories, for example X-TDE-settings-peripherals.
* Convert all options in "Internet & Network/Preferences" to KConfigXT and then remove the KCM.
* Convert all options in "Internet & Network/Preferences" to TDEConfigXT and then remove the KCM.
* Remove "KDE Components" and put the KCMs elsewhere, most of them in "System". Wake up: a non KDE hacker can't differentiate between KDE and other parts of the system.
@ -112,12 +112,12 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s
* A lot, perhaps even the majority, violate the HIG by not displaying
properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to iterate through all KCMs and file bug reports for each missbehaving. See the KDE UI Guidelines.
* KCMs needs to be converted to KConfigXT and use the global kdeglobals KConfigXT object.
* KCMs needs to be converted to TDEConfigXT and use the global kdeglobals TDEConfigXT object.
* Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue.
If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used.
* Rewrite kcmshell to the new KCModuleProxy and fix bugs. Move it to tdelibs.
* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
--------------------------------------------------------------------------

8
kcontrol/access/kaccess.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ int KAccessApp::newInstance()
void KAccessApp::readSettings()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
// bell ---------------------------------------------------------------
@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
unsigned int enabled = requestedFeatures & ~features;
unsigned int disabled = features & ~requestedFeatures;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
if (enabled & XkbSlowKeysMask)
@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
dialog->deleteLater();
dialog = 0;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:
@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
dialog = 0;
requestedFeatures = features;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:

14
kcontrol/access/kcmaccess.cpp
Unescape Escape View File

@ -101,7 +101,7 @@ void ExtendedIntNumInput::slotSliderValueChanged(int val)
m_spin->setValue ((int)floor(0.5 + linearVal));
}
static bool needToRunKAccessDaemon( KConfig *config )
static bool needToRunKAccessDaemon( TDEConfig *config )
{
// We always start the KAccess Daemon, if it is not needed,
// it will terminate itself after configuring the AccessX
@ -222,7 +222,7 @@ TQString mouseKeysShortcut (Display *display) {
}
KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
: KCModule(parent, "kcmaccess")
: TDECModule(parent, "kcmaccess")
{
TDEAboutData *about =
@ -602,7 +602,7 @@ void KAccessConfig::load()
void KAccessConfig::load( bool useDefaults )
{
KConfig *config = new KConfig("kaccessrc", true, false);
TDEConfig *config = new TDEConfig("kaccessrc", true, false);
config->setGroup("Bell");
config->setReadDefaults( useDefaults );
@ -657,7 +657,7 @@ void KAccessConfig::load( bool useDefaults )
void KAccessConfig::save()
{
KConfig *config= new KConfig("kaccessrc", false);
TDEConfig *config= new TDEConfig("kaccessrc", false);
config->setGroup("Bell");
@ -707,7 +707,7 @@ void KAccessConfig::save()
customBell->isChecked() ||
visibleBell->isChecked())
{
KConfig cfg("kdeglobals", false, false);
TDEConfig cfg("kdeglobals", false, false);
cfg.setGroup("General");
cfg.writeEntry("UseSystemBell", true);
cfg.sync();
@ -783,7 +783,7 @@ void KAccessConfig::checkAccess()
extern "C"
{
KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
{
return new KAccessConfig(parent, name);
}
@ -793,7 +793,7 @@ extern "C"
*/
KDE_EXPORT void init_access()
{
KConfig *config = new KConfig("kaccessrc", true, false);
TDEConfig *config = new TDEConfig("kaccessrc", true, false);
bool run = needToRunKAccessDaemon( config );
delete config;

2
kcontrol/access/kcmaccess.h
Unescape Escape View File

@ -57,7 +57,7 @@ class ExtendedIntNumInput : public KIntNumInput
int sliderMax;
};
class KAccessConfig : public KCModule
class KAccessConfig : public TDECModule
{
Q_OBJECT

8
kcontrol/accessibility/accessibility.cpp
Unescape Escape View File

@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib
* This function checks if the kaccess daemon needs to be run
* This function will be deprecated since the kaccess daemon will be part of kded
*/
// static bool needToRunKAccessDaemon( KConfig *config ){
// KConfigGroup group( config, "Bell" );
// static bool needToRunKAccessDaemon( TDEConfig *config ){
// TDEConfigGroup group( config, "Bell" );
//
// if(!group.readBoolEntry("SystemBell", true)){
// return true;
@ -85,7 +85,7 @@ void AccessibilityConfig::load( bool useDefaults )
{
kdDebug() << "Running: AccessibilityConfig::load()" << endl;
KConfig *bell = new KConfig("bellrc", true);
TDEConfig *bell = new TDEConfig("bellrc", true);
bell->setReadDefaults( useDefaults );
@ -114,7 +114,7 @@ void AccessibilityConfig::load( bool useDefaults )
void AccessibilityConfig::save(){
kdDebug() << "Running: AccessibilityConfig::save()" << endl;
KConfig *bell = new KConfig("bellrc");
TDEConfig *bell = new TDEConfig("bellrc");
bell->setGroup("General");
bell->writeEntry("SystemBell", systemBell->isChecked());

2
kcontrol/accessibility/accessibilityconfigwidget.ui
Unescape Escape View File

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>AccessibilityConfigWidget</class>
<author>José Pablo Ezequiel Fernández &lt;pupeno@kde.org&gt;</author>
<widget class="KCModule">
<widget class="TDECModule">
<property name="name">
<cstring>AccessibilityConfigWidget</cstring>
</property>

16
kcontrol/arts/arts.cpp
Unescape Escape View File

@ -55,7 +55,7 @@
extern "C" {
KDE_EXPORT void init_arts();
KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
{
TDEGlobal::locale()->insertCatalogue("kcmarts");
return new KArtsModule(parent, "kcmarts" );
@ -64,7 +64,7 @@ extern "C" {
static bool startArts()
{
KConfig *config = new KConfig("kcmartsrc", true, false);
TDEConfig *config = new TDEConfig("kcmartsrc", true, false);
config->setGroup("Arts");
bool startServer = config->readBoolEntry("StartServer",true);
@ -139,7 +139,7 @@ void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
}
KArtsModule::KArtsModule(TQWidget *parent, const char *name)
: KCModule(parent, name), configChanged(false)
: TDECModule(parent, name), configChanged(false)
{
setButtons(Default|Apply);
@ -157,7 +157,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
general = new generalTab(tab);
hardware = new hardwareTab(tab);
//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
//mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
//midi = new KMidConfig(tab, "kmidconfig");
general->layout()->setMargin( KDialog::marginHint() );
@ -211,7 +211,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
};
config = new KConfig("kcmartsrc");
config = new TDEConfig("kcmartsrc");
load();
suspendTime->setRange( 1, 999, 1, true );
@ -306,7 +306,7 @@ void KArtsModule::load( bool useDefaults )
// config->setGroup( "Mixer" );
// general->volumeSystray->setChecked( config->readBoolEntry( "VolumeControlOnSystray", true ) );
KConfig *midiConfig = new KConfig( "kcmmidirc", true );
TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", true );
midiConfig->setGroup( "Configuration" );
hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) );
@ -376,7 +376,7 @@ void KArtsModule::saveParams( void )
// config->setGroup( "Mixer" );
// config->writeEntry( "VolumeControlOnSystray", general->volumeSystray->isChecked() );
KConfig *midiConfig = new KConfig( "kcmmidirc", false );
TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", false );
midiConfig->setGroup( "Configuration" );
midiConfig->writeEntry( "midiDevice", hardware->midiDevice->currentItem() );
@ -385,7 +385,7 @@ void KArtsModule::saveParams( void )
delete midiConfig;
KConfig *knotifyConfig = new KConfig( "knotifyrc", false );
TDEConfig *knotifyConfig = new TDEConfig( "knotifyrc", false );
knotifyConfig->setGroup( "StartProgress" );
knotifyConfig->writeEntry( "Arts Init", startServer->isChecked() );

4
kcontrol/arts/arts.h
Unescape Escape View File

@ -46,7 +46,7 @@
class TDEProcess;
class DeviceManager;
class KArtsModule : public KCModule
class KArtsModule : public TDECModule
{
Q_OBJECT
@ -90,7 +90,7 @@ private:
KIntNumInput *suspendTime;
generalTab *general;
hardwareTab *hardware;
KConfig *config;
TDEConfig *config;
DeviceManager *deviceManager;
int latestProcessStatus;
int fragmentCount;

2
kcontrol/background/bgadvanced.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
if (m_multidesktop)
{
KConfig cfg(desktopConfigname(), false, false);
TDEConfig cfg(desktopConfigname(), false, false);
cfg.setGroup( "General" );
if (!cfg.readBoolEntry( "Enabled", true ))
{

4
kcontrol/background/bgdialog.cpp
Unescape Escape View File

@ -66,7 +66,7 @@
#define NR_PREDEF_PATTERNS 6
BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
: BGDialog_UI(parent, "BGDialog")
{
m_pGlobals = new TDEGlobalBackgroundSettings(_config);
@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
//FIXME set this to a server when we get one
//should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc
KConfig* config = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" );

2
kcontrol/background/bgdialog.h
Unescape Escape View File

@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI
{
Q_OBJECT
public:
BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true);
BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
~BGDialog();
void load( bool useDefaults );

6
kcontrol/background/bgrender.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
/**** KBackgroundRenderer ****/
KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
: KBackgroundSettings(desk, screen, drawBackgroundPerScreen, config)
{
m_State = 0;
@ -1019,7 +1019,7 @@ void KBackgroundRenderer::saveCacheFile()
}
//BEGIN class KVirtualBGRenderer
KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
KVirtualBGRenderer::KVirtualBGRenderer( int desk, TDEConfig *config )
{
m_pPixmap = 0l;
m_desk = desk;
@ -1038,7 +1038,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
else
configname.sprintf("kdesktop-screen-%drc", screen_number);
m_pConfig = new KConfig(configname, false, false);
m_pConfig = new TDEConfig(configname, false, false);
m_bDeleteConfig = true;
} else {
m_pConfig = config;

8
kcontrol/background/bgrender.h
Unescape Escape View File

@ -23,7 +23,7 @@ class TQRect;
class TQString;
class TQTimer;
class KConfig;
class TDEConfig;
class TDEProcess;
class KTempFile;
class KShellProcess;
@ -42,7 +42,7 @@ class KBackgroundRenderer:
Q_OBJECT
public:
KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0);
KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
~KBackgroundRenderer();
void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true);
@ -124,7 +124,7 @@ class KVirtualBGRenderer : public QObject
{
Q_OBJECT
public:
KVirtualBGRenderer(int desk, KConfig *config=0l);
KVirtualBGRenderer(int desk, TDEConfig *config=0l);
~KVirtualBGRenderer();
KBackgroundRenderer * renderer(unsigned screen);
@ -162,7 +162,7 @@ private:
TQSize renderSize(int screen); // the size the renderer should be
void initRenderers();
KConfig *m_pConfig;
TDEConfig *m_pConfig;
float m_scaleX;
float m_scaleY;
int m_desk;

6
kcontrol/background/bgsettings.cpp
Unescape Escape View File

@ -415,7 +415,7 @@ TQStringList KBackgroundProgram::list()
/**** KBackgroundSettings ****/
KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
: KBackgroundPattern(),
KBackgroundProgram()
{
@ -501,7 +501,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
else
configname.sprintf("kdesktop-screen-%drc", screen_number);
m_pConfig = new KConfig(configname, false, false);
m_pConfig = new TDEConfig(configname, false, false);
m_bDeleteConfig = true;
} else {
m_pConfig = config;
@ -1065,7 +1065,7 @@ void KBackgroundSettings::setEnabled(const bool enable)
/**** TDEGlobalBackgroundSettings ****/
TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(TDEConfig *_config)
{
m_pConfig = _config;

12
kcontrol/background/bgsettings.h
Unescape Escape View File

@ -19,7 +19,7 @@
template <class TQString, class T> class TQMap;
class KStandardDirs;
class KSimpleConfig;
class KConfig;
class TDEConfig;
class TQString;
class TQImage;
@ -156,7 +156,7 @@ public:
* mode) will be treated as one big display, and the "screen" paramater
* will be ignored.
*/
KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config);
KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config);
~KBackgroundSettings();
void copyConfig(const KBackgroundSettings*);
@ -282,7 +282,7 @@ private:
int m_CurrentWallpaper;
TQString m_CurrentWallpaperName;
KConfig *m_pConfig;
TDEConfig *m_pConfig;
KStandardDirs *m_pDirs;
bool m_bDeleteConfig;
bool m_bEnabled;
@ -305,7 +305,7 @@ public:
class TDEGlobalBackgroundSettings
{
public:
TDEGlobalBackgroundSettings(KConfig *config);
TDEGlobalBackgroundSettings(TDEConfig *config);
TQString deskName(int desk);
//void setDeskName(int desk, TQString name);
@ -347,7 +347,7 @@ public:
void readSettings();
void writeSettings();
KConfig* getConfig() { return m_pConfig; }
TDEConfig* getConfig() { return m_pConfig; }
private:
bool dirty;
@ -363,7 +363,7 @@ private:
bool m_shadowEnabled;
int m_textLines;
int m_textWidth;
KConfig *m_pConfig;
TDEConfig *m_pConfig;
bool m_bDeleteConfig;
TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk]
};

4
kcontrol/background/main.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ KBackground::~KBackground( )
}
KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */)
: KCModule(KBackGndFactory::instance(), parent, name)
: TDECModule(KBackGndFactory::instance(), parent, name)
{
int screen_number = 0;
if (tqt_xdisplay())
@ -52,7 +52,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
configname = "kdesktoprc";
else
configname.sprintf("kdesktop-screen-%drc", screen_number);
m_pConfig = new KConfig(configname, false, false);
m_pConfig = new TDEConfig(configname, false, false);
TQVBoxLayout *layout = new TQVBoxLayout(this);
m_base = new BGDialog(this, m_pConfig);

6
kcontrol/background/main.h
Unescape Escape View File

@ -12,13 +12,13 @@
#include <kcmodule.h>
class KConfig;
class TDEConfig;
class BGDialog;
/**
* The Desktop/Background tab in kcontrol.
*/
class KBackground: public KCModule
class KBackground: public TDECModule
{
Q_OBJECT
@ -33,7 +33,7 @@ public:
private:
BGDialog *m_base;
KConfig *m_pConfig;
TDEConfig *m_pConfig;
};

14
kcontrol/bell/bell.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
extern "C"
{
KDE_EXPORT KCModule *create_bell(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
{
return new KBellConfig(parent, "kcmbell");
}
@ -52,7 +52,7 @@ extern "C"
XGetKeyboardControl(kapp->getDisplay(), &kbd);
KConfig config("kcmbellrc", true, false);
TDEConfig config("kcmbellrc", true, false);
config.setGroup("General");
kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
@ -65,7 +65,7 @@ extern "C"
}
KBellConfig::KBellConfig(TQWidget *parent, const char *name):
KCModule(parent, name)
TDECModule(parent, name)
{
TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@ -160,7 +160,7 @@ void KBellConfig::load( bool useDefaults )
m_pitch->setValue(kbd.bell_pitch);
m_duration->setValue(kbd.bell_duration);
KConfig cfg("kdeglobals", false, false);
TDEConfig cfg("kdeglobals", false, false);
cfg.setReadDefaults( useDefaults );
cfg.setGroup("General");
m_useBell->setChecked(cfg.readBoolEntry("UseSystemBell", false));
@ -183,7 +183,7 @@ void KBellConfig::save()
KBBellPercent | KBBellPitch | KBBellDuration,
&kbd);
KConfig config("kcmbellrc", false, false);
TDEConfig config("kcmbellrc", false, false);
config.setGroup("General");
config.writeEntry("Volume",bellVolume);
config.writeEntry("Pitch",bellPitch);
@ -191,14 +191,14 @@ void KBellConfig::save()
config.sync();
KConfig cfg("kdeglobals", false, false);
TDEConfig cfg("kdeglobals", false, false);
cfg.setGroup("General");
cfg.writeEntry("UseSystemBell", m_useBell->isChecked());
cfg.sync();
if (!m_useBell->isChecked())
{
KConfig config("kaccessrc", false);
TDEConfig config("kaccessrc", false);
config.setGroup("Bell");
config.writeEntry("SystemBell", false);

2
kcontrol/bell/bell.h
Unescape Escape View File

@ -27,7 +27,7 @@ class TQCheckBox;
class KIntNumInput;
class TQPushButton;
class KBellConfig : public KCModule
class KBellConfig : public TDECModule
{
Q_OBJECT

4
kcontrol/clock/dtime.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ void Dtime::configChanged(){
void Dtime::load()
{
KConfig config("kcmclockrc", true, false);
TDEConfig config("kcmclockrc", true, false);
config.setGroup("NTP");
timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers",
i18n("Public Time Server (pool.ntp.org),\
@ -263,7 +263,7 @@ oceania.pool.ntp.org"))));
void Dtime::save()
{
KConfig config("kcmclockrc", false, false);
TDEConfig config("kcmclockrc", false, false);
config.setGroup("NTP");
// Save the order, but don't duplicate!

2
kcontrol/clock/main.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ typedef KGenericFactory<KclockModule, TQWidget> KlockModuleFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock"))
KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KlockModuleFactory::instance(), parent, name)
: TDECModule(KlockModuleFactory::instance(), parent, name)
{
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),

2
kcontrol/clock/main.h
Unescape Escape View File

@ -28,7 +28,7 @@ class Tzone;
class TQTabWidget;
class KclockModule : public KCModule
class KclockModule : public TDECModule
{
Q_OBJECT

2
kcontrol/clock/tzone.cpp
Unescape Escape View File

@ -176,7 +176,7 @@ void Tzone::save()
//After the KDE 3.2 release, need to add an error message
}
else
if (!KIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime")))
if (!TDEIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime")))
KMessageBox::error( 0, i18n("Error setting new timezone."),
i18n("Timezone Error"));

20
kcontrol/colors/colorscm.cpp
Unescape Escape View File

@ -93,7 +93,7 @@ TQPixmap mkColorPreview(const WidgetCanvas *cs)
/**** KColorScheme ****/
KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KolorFactory::instance(), parent, name)
: TDECModule(KolorFactory::instance(), parent, name)
{
nSysSchemes = 2;
@ -110,7 +110,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
" Non-TDE applications may also obey some or all of the color"
" settings, if this option is enabled."));
KConfig *cfg = new KConfig("kcmdisplayrc");
TDEConfig *cfg = new TDEConfig("kcmdisplayrc");
cfg->setGroup("X11");
useRM = cfg->readBoolEntry("useResourceManager", true);
delete cfg;
@ -308,7 +308,7 @@ void KColorScheme::load()
}
void KColorScheme::load( bool useDefaults )
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setReadDefaults( useDefaults );
config->setGroup("KDE");
sCurrentScheme = config->readEntry("colorScheme");
@ -324,7 +324,7 @@ void KColorScheme::load( bool useDefaults )
sb->setValue(cs->contrast);
sb->blockSignals(false);
KConfig cfg("kcmdisplayrc", true, false);
TDEConfig cfg("kcmdisplayrc", true, false);
cfg.setGroup("X11");
bool exportColors = cfg.readBoolEntry("exportKDEColors", true);
cbExportColors->setChecked(exportColors);
@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )
void KColorScheme::save()
{
KConfig *cfg = TDEGlobal::config();
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( "General" );
cfg->writeEntry("background", cs->back, true, true);
cfg->writeEntry("selectBackground", cs->select, true, true);
@ -383,7 +383,7 @@ void KColorScheme::save()
config->sync();
delete config;
KConfig cfg2("kcmdisplayrc", false, false);
TDEConfig cfg2("kcmdisplayrc", false, false);
cfg2.setGroup("X11");
bool exportColors = cbExportColors->isChecked();
cfg2.writeEntry("exportKDEColors", exportColors);
@ -587,9 +587,9 @@ void KColorScheme::slotImport()
return;
//kdDebug() << "Location: " << location << endl;
if (!KIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) )
if (!TDEIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) )
{
KMessageBox::error(this, KIO::NetAccess::lastErrorString(),i18n("Import failed."));
KMessageBox::error(this, TDEIO::NetAccess::lastErrorString(),i18n("Import failed."));
return;
}
else
@ -700,7 +700,7 @@ void KColorScheme::slotWidgetColor(int indx)
if (wcCombo->currentItem() != indx)
wcCombo->setCurrentItem( indx );
// Do not emit KCModule::changed()
// Do not emit TDECModule::changed()
colorButton->blockSignals( true );
TQColor col = color(indx);
@ -734,7 +734,7 @@ void KColorScheme::slotShadeSortColumnChanged(bool b)
*/
void KColorScheme::readScheme( int index )
{
KConfigBase* config;
TDEConfigBase* config;
TQColor widget(239, 239, 239);
TQColor trinity4Blue(103,141,178);

4
kcontrol/colors/colorscm.h
Unescape Escape View File

@ -27,14 +27,14 @@ class KLineEdit;
class TQPalette;
class KListBox;
class KColorButton;
class KConfig;
class TDEConfig;
class KStdDirs;
class KColorSchemeList;
/**
* The Desktop/Colors tab in kcontrol.
*/
class KColorScheme: public KCModule
class KColorScheme: public TDECModule
{
Q_OBJECT

2
kcontrol/colors/widgetcanvas.cpp
Unescape Escape View File

@ -278,7 +278,7 @@ void WidgetCanvas::drawSampleWidgets()
int textLen, tmp;
int highlightVal, lowlightVal;
KConfig * c = new KConfig("kcmfonts");
TDEConfig * c = new TDEConfig("kcmfonts");
// Keep in sync with kglobalsettings.

30
kcontrol/componentchooser/componentchooser.cpp
Unescape Escape View File

@ -61,13 +61,13 @@ void CfgComponent::slotComponentChanged(const TQString&) {
emit changed(true);
}
void CfgComponent::save(KConfig *cfg) {
void CfgComponent::save(TDEConfig *cfg) {
// yes, this can happen if there are NO KTrader offers for this component
if (!m_lookupDict[ComponentSelector->currentText()])
return;
TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
store->setGroup(cfg->readEntry("valueSection"));
store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]);
store->sync();
@ -75,7 +75,7 @@ void CfgComponent::save(KConfig *cfg) {
emit changed(false);
}
void CfgComponent::load(KConfig *cfg) {
void CfgComponent::load(TDEConfig *cfg) {
ComponentSelector->clear();
m_lookupDict.clear();
@ -93,7 +93,7 @@ void CfgComponent::load(KConfig *cfg) {
m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name()));
}
KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
store->setGroup(cfg->readEntry("valueSection"));
TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null"));
delete store;
@ -139,7 +139,7 @@ void CfgEmailClient::defaults()
load(0L);
}
void CfgEmailClient::load(KConfig *)
void CfgEmailClient::load(TDEConfig *)
{
TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram);
bool useKMail = (emailClient.isEmpty());
@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@ -184,7 +184,7 @@ void CfgEmailClient::selectEmailClient()
}
void CfgEmailClient::save(KConfig *)
void CfgEmailClient::save(TDEConfig *)
{
if (kmailCB->isChecked())
{
@ -234,8 +234,8 @@ void CfgTerminalEmulator::defaults()
}
void CfgTerminalEmulator::load(KConfig *) {
KConfig *config = new KConfig("kdeglobals", true);
void CfgTerminalEmulator::load(TDEConfig *) {
TDEConfig *config = new TDEConfig("kdeglobals", true);
config->setGroup("General");
TQString terminal = config->readPathEntry("TerminalApplication","konsole");
if (terminal == "konsole")
@ -253,9 +253,9 @@ void CfgTerminalEmulator::load(KConfig *) {
emit changed(false);
}
void CfgTerminalEmulator::save(KConfig *) {
void CfgTerminalEmulator::save(TDEConfig *) {
KConfig *config = new KConfig("kdeglobals");
TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup("General");
config->writePathEntry("TerminalApplication",terminalCB->isChecked()?"konsole":terminalLE->text(), true, true);
config->sync();
@ -306,8 +306,8 @@ void CfgBrowser::defaults()
}
void CfgBrowser::load(KConfig *) {
KConfig *config = new KConfig("kdeglobals", true);
void CfgBrowser::load(TDEConfig *) {
TDEConfig *config = new TDEConfig("kdeglobals", true);
config->setGroup("General");
TQString exec = config->readEntry("BrowserApplication");
if (exec.isEmpty())
@ -340,9 +340,9 @@ void CfgBrowser::load(KConfig *) {
emit changed(false);
}
void CfgBrowser::save(KConfig *) {
void CfgBrowser::save(TDEConfig *) {
KConfig *config = new KConfig("kdeglobals");
TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup("General");
TQString exec;
if (radioExec->isChecked())

22
kcontrol/componentchooser/componentchooser.h
Unescape Escape View File

@ -28,7 +28,7 @@
class TQListBoxItem;
class KEMailSettings;
class KConfig;
class TDEConfig;
/* The CfgPlugin class is an exception. It is LGPL. It will be parted of the plugin interface
which I plan for KDE 3.2.
@ -38,8 +38,8 @@ class CfgPlugin
public:
CfgPlugin(){};
virtual ~CfgPlugin(){};
virtual void load(KConfig *cfg)=0;
virtual void save(KConfig *cfg)=0;
virtual void load(TDEConfig *cfg)=0;
virtual void save(TDEConfig *cfg)=0;
virtual void defaults()=0;
};
@ -50,8 +50,8 @@ Q_OBJECT
public:
CfgComponent(TQWidget *parent);
virtual ~CfgComponent();
virtual void load(KConfig *cfg);
virtual void save(KConfig *cfg);
virtual void load(TDEConfig *cfg);
virtual void save(TDEConfig *cfg);
virtual void defaults();
protected:
@ -70,8 +70,8 @@ Q_OBJECT
public:
CfgEmailClient(TQWidget *parent);
virtual ~CfgEmailClient();
virtual void load(KConfig *cfg);
virtual void save(KConfig *cfg);
virtual void load(TDEConfig *cfg);
virtual void save(TDEConfig *cfg);
virtual void defaults();
private:
@ -90,8 +90,8 @@ Q_OBJECT
public:
CfgTerminalEmulator(TQWidget *parent);
virtual ~CfgTerminalEmulator();
virtual void load(KConfig *cfg);
virtual void save(KConfig *cfg);
virtual void load(TDEConfig *cfg);
virtual void save(TDEConfig *cfg);
virtual void defaults();
protected slots:
@ -108,8 +108,8 @@ Q_OBJECT
public:
CfgBrowser(TQWidget *parent);
virtual ~CfgBrowser();
virtual void load(KConfig *cfg);
virtual void save(KConfig *cfg);
virtual void load(TDEConfig *cfg);
virtual void save(TDEConfig *cfg);
virtual void defaults();
protected slots:

4
kcontrol/componentchooser/kcm_componentchooser.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
KCModule(parent,name) {
TDECModule(parent,name) {
(new TQVBoxLayout(this))->setAutoAdd(true);
m_chooser=new ComponentChooser(this,"ComponentChooser");
@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){
extern "C"
{
KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
{
TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
return new KCMComponentChooser( parent, "kcmcomponentchooser" );

2
kcontrol/componentchooser/kcm_componentchooser.h
Unescape Escape View File

@ -22,7 +22,7 @@
class TDEAboutData;
class KCMComponentChooser : public KCModule
class KCMComponentChooser : public TDECModule
{
Q_OBJECT
public:

8
kcontrol/crypto/crypto.cpp
Unescape Escape View File

@ -217,7 +217,7 @@ TQString CAItem::configName() const
KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KryptoFactory::instance(), parent, name)
: TDECModule(KryptoFactory::instance(), parent, name)
{
TQGridLayout *grid;
TQBoxLayout *top = new TQVBoxLayout(this);
@ -307,7 +307,7 @@ TQString whatstr;
#endif
// no need to parse kdeglobals.
config = new KConfig("cryptodefaults", false, false);
config = new TDEConfig("cryptodefaults", false, false);
policies = new KSimpleConfig("ksslpolicies", false);
pcerts = new KSimpleConfig("ksslcertificates", false);
authcfg = new KSimpleConfig("ksslauthmap", false);
@ -1009,7 +1009,7 @@ void KCryptoConfig::load( bool useDefaults )
}
groups = _signers->list();
KConfig sigcfg("ksslcalist", true, false);
TDEConfig sigcfg("ksslcalist", true, false);
caList->clear();
for (TQStringList::Iterator i = groups.begin();
i != groups.end();
@ -2066,7 +2066,7 @@ void KCryptoConfig::slotCARestore() {
TQStringList groups = _signers->list();
KConfig sigcfg("ksslcalist", true, false);
TDEConfig sigcfg("ksslcalist", true, false);
for (TQStringList::Iterator i = groups.begin();
i != groups.end();

6
kcontrol/crypto/crypto.h
Unescape Escape View File

@ -215,7 +215,7 @@ private:
class KCryptoConfig : public KCModule
class KCryptoConfig : public TDECModule
{
Q_OBJECT
public:
@ -352,9 +352,9 @@ private:
KSSLSigners *_signers;
TQLabel *cHash;
KConfig *config;
TDEConfig *config;
KSimpleConfig *policies, *pcerts, *authcfg;
KConfig *cacfg;
TDEConfig *cacfg;
bool ___lehack; // to hack around a lineedit problem
};

8
kcontrol/css/kcmcss.cpp
Unescape Escape View File

@ -26,7 +26,7 @@ typedef KGenericFactory<CSSConfig, TQWidget> CSSFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") )
CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(CSSFactory::instance(), parent, name)
: TDECModule(CSSFactory::instance(), parent, name)
{
customDialogBase = new KDialogBase(this, "customCSSDialog", true, TQString::null,
KDialogBase::Close, KDialogBase::Close, true );
@ -104,7 +104,7 @@ void CSSConfig::load()
void CSSConfig::load( bool useDefaults )
{
KConfig *c = new KConfig("kcmcssrc", false, false);
TDEConfig *c = new TDEConfig("kcmcssrc", false, false);
c->setReadDefaults( useDefaults );
c->setGroup("Stylesheet");
@ -151,7 +151,7 @@ void CSSConfig::load( bool useDefaults )
void CSSConfig::save()
{
// write to config file
KConfig *c = new KConfig("kcmcssrc", false, false);
TDEConfig *c = new TDEConfig("kcmcssrc", false, false);
c->setGroup("Stylesheet");
if (configDialog->useDefault->isChecked())
@ -200,7 +200,7 @@ void CSSConfig::save()
}
// make konqueror use the right stylesheet
c = new KConfig("konquerorrc", false, false);
c = new TDEConfig("konquerorrc", false, false);
c->setGroup("HTML Settings");
c->writeEntry("UserStyleSheetEnabled", !configDialog->useDefault->isChecked());

2
kcontrol/css/kcmcss.h
Unescape Escape View File

@ -29,7 +29,7 @@ class CSSCustomDialog;
class KDialogBase;
class CSSConfig : public KCModule
class CSSConfig : public TDECModule
{
Q_OBJECT

12
kcontrol/display/display.cpp
Unescape Escape View File

@ -31,7 +31,7 @@ typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory;
K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) )
KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& )
: KCModule( parent, name )
: TDECModule( parent, name )
, m_changed(false)
{
m_tabs = new TQTabWidget( this );
@ -56,7 +56,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
TQWidget *page = new TQWidget( m_tabs, name.latin1() );
TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() );
KCModule *kcm = KCModuleLoader::loadModule( name, page );
TDECModule *kcm = TDECModuleLoader::loadModule( name, page );
if ( kcm )
{
@ -72,20 +72,20 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
void KCMDisplay::load()
{
for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
it.key()->load();
}
void KCMDisplay::save()
{
for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
for (TQMap<TDECModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
if (it.data())
it.key()->save();
}
void KCMDisplay::moduleChanged( bool isChanged )
{
TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
Q_ASSERT(currentModule != m_modules.end());
if (currentModule.data() == isChanged)
return;
@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged )
bool c = false;
for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
if (it.data()) {
c = true;
break;

4
kcontrol/display/display.h
Unescape Escape View File

@ -24,7 +24,7 @@
class TQTabWidget;
class KCMDisplay : public KCModule
class KCMDisplay : public TDECModule
{
Q_OBJECT
@ -40,7 +40,7 @@ class KCMDisplay : public KCModule
void addTab( const TQString &name, const TQString &label );
TQTabWidget *m_tabs;
TQMap<KCModule*, bool> m_modules;
TQMap<TDECModule*, bool> m_modules;
bool m_changed;
};

6
kcontrol/displayconfig/displayconfig.cpp
Unescape Escape View File

@ -740,7 +740,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
/**** KDisplayConfig ****/
KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
: TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
@ -1905,13 +1905,13 @@ void KDisplayConfig::processLockoutControls() {
base->loadExistingProfile->hide(); // Same as above
}
KCModule* KDisplayConfig::addTab( const TQString name, const TQString label )
TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label )
{
// [FIXME] This is incomplete...Apply may not work...
TQWidget *page = new TQWidget( base->mainTabContainerWidget, name.latin1() );
TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() );
KCModule *kcm = KCModuleLoader::loadModule( name, page );
TDECModule *kcm = TDECModuleLoader::loadModule( name, page );
if ( kcm )
{

10
kcontrol/displayconfig/displayconfig.h
Unescape Escape View File

@ -40,13 +40,13 @@
#include "monitorworkspace.h"
#include "displayconfigbase.h"
class KConfig;
class TDEConfig;
class KPopupMenu;
class KListViewItem;
typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;
class KDisplayConfig : public KCModule, public DCOPObject
class KDisplayConfig : public TDECModule, public DCOPObject
{
K_DCOP
Q_OBJECT
@ -70,8 +70,8 @@ k_dcop:
private:
KConfig *config;
KCModule *iccTab;
TDEConfig *config;
TDECModule *iccTab;
bool _ok;
Display *randr_display;
ScreenInfo *randr_screen_info;
@ -91,7 +91,7 @@ private:
TQString startupProfileName;
int realResolutionSliderValue();
void setRealResolutionSliderValue(int index);
KCModule* addTab( const TQString name, const TQString label );
TDECModule* addTab( const TQString name, const TQString label );
void moveMonitor(DraggableMonitor* monitor, int realx, int realy);
bool applyMonitorLayoutRules(void);
bool applyMonitorLayoutRules(DraggableMonitor* primary_monitor);

2
kcontrol/dnssd/configdialog.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigDialog</class>
<widget class="KCModule">
<widget class="TDECModule">
<property name="name">
<cstring>ConfigDialog</cstring>
</property>

4
kcontrol/dnssd/kcmdnssd.cpp
Unescape Escape View File

@ -85,7 +85,7 @@ KCMDnssd::~KCMDnssd()
void KCMDnssd::save()
{
setCursor(TQCursor(Qt::BusyCursor));
KCModule::save();
TDECModule::save();
if (geteuid()==0 && m_wdchanged) saveMdnsd();
domain->setFileWriteMode(0644); // this should be readable for everyone
domain->writeEntry("PublishDomain",domainedit->text());
@ -132,7 +132,7 @@ void KCMDnssd::load()
} else if (exitStatus == 2) { // custom setup
enableZeroconf->setEnabled(false);
}
KCModule::load();
TDECModule::load();
}
// hack to work around not working isModified() for KPasswordEdit

2
kcontrol/ebrowsing/filteropts.cpp
Unescape Escape View File

@ -30,7 +30,7 @@
#include "filteropts.h"
FilterOptions::FilterOptions(TQWidget *parent, const char *name)
:KCModule(parent, name)
:TDECModule(parent, name)
{
TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5);

2
kcontrol/ebrowsing/filteropts.h
Unescape Escape View File

@ -27,7 +27,7 @@
class TQListBox;
class FilterOptions : public KCModule
class FilterOptions : public TDECModule
{
Q_OBJECT

14
kcontrol/ebrowsing/main.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") )
class FilterOptions;
KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(KURIFactory::instance(), parent, name)
:TDECModule(KURIFactory::instance(), parent, name)
{
filter = KURIFilter::self();
@ -66,11 +66,11 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
modules.setAutoDelete(true);
TQMap<TQString,KCModule*> helper;
TQMap<TQString,TDECModule*> helper;
TQPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator();
for (; it.current(); ++it)
{
KCModule *module = it.current()->configModule(this, 0);
TDECModule *module = it.current()->configModule(this, 0);
if (module)
{
modules.append(module);
@ -83,7 +83,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
{
TQTabWidget *tab = new TQTabWidget(this);
TQMapIterator<TQString,KCModule*> it2;
TQMapIterator<TQString,TDECModule*> it2;
for (it2 = helper.begin(); it2 != helper.end(); ++it2)
{
tab->addTab(it2.data(), it2.key());
@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
void KURIFilterModule::load()
{
TQPtrListIterator<KCModule> it(modules);
TQPtrListIterator<TDECModule> it(modules);
for (; it.current(); ++it)
{
it.current()->load();
@ -112,7 +112,7 @@ void KURIFilterModule::load()
void KURIFilterModule::save()
{
TQPtrListIterator<KCModule> it(modules);
TQPtrListIterator<TDECModule> it(modules);
for (; it.current(); ++it)
{
it.current()->save();
@ -121,7 +121,7 @@ void KURIFilterModule::save()
void KURIFilterModule::defaults()
{
TQPtrListIterator<KCModule> it(modules);
TQPtrListIterator<TDECModule> it(modules);
for (; it.current(); ++it)
{
it.current()->defaults();

4
kcontrol/ebrowsing/main.h
Unescape Escape View File

@ -29,7 +29,7 @@
class KURIFilter;
class KURIFilterModule : public KCModule {
class KURIFilterModule : public TDECModule {
Q_OBJECT
public:
@ -45,7 +45,7 @@ private:
TQWidget *widget;
FilterOptions *opts;
TQPtrList<KCModule> modules;
TQPtrList<TDECModule> modules;
};
#endif

6
kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
Unescape Escape View File

@ -76,7 +76,7 @@ private:
};
FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name)
:KCModule(instance, parent, name)
:TDECModule(instance, parent, name)
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint());
@ -114,7 +114,7 @@ void FilterOptions::load( bool useDefaults )
// Clear state first.
m_dlg->lvSearchProviders->clear();
KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
config.setReadDefaults( useDefaults );
@ -207,7 +207,7 @@ void FilterOptions::setDelimiter (char sep)
void FilterOptions::save()
{
KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
config.setGroup("General");
config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked());

2
kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
Unescape Escape View File

@ -30,7 +30,7 @@ class FilterOptionsUI;
class SearchProvider;
class SearchProviderItem;
class FilterOptions : public KCModule
class FilterOptions : public TDECModule
{
Q_OBJECT

2
kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
Unescape Escape View File

@ -521,7 +521,7 @@ void KURISearchFilterEngine::loadConfig()
PIDDBG << "Keywords Engine: Loading config..." << endl;
// Load the config.
KConfig config( name() + "rc", false, false );
TDEConfig config( name() + "rc", false, false );
config.setGroup( "General" );
m_cKeywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');

2
kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const
return false;
}
KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const
TDECModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const
{
return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt");
}

2
kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
Unescape Escape View File

@ -39,7 +39,7 @@ public:
~KURISearchFilter();
virtual bool filterURI( KURIFilterData& ) const;
virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const;
virtual TDECModule *configModule(TQWidget *parent = 0, const char *name = 0) const;
virtual TQString configName() const;
k_dcop:

4
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
Unescape Escape View File

@ -533,7 +533,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
return false;
}
KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
{
return 0; //new KShortURIOptions( parent, name );
}
@ -545,7 +545,7 @@ TQString KShortURIFilter::configName() const
void KShortURIFilter::configure()
{
KConfig config( name() + QFL1("rc"), false, false );
TDEConfig config( name() + QFL1("rc"), false, false );
m_bVerbose = config.readBoolEntry( "Verbose", false );
if ( m_bVerbose )

2
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
Unescape Escape View File

@ -84,7 +84,7 @@ public:
*
* @return the config module
*/
virtual KCModule* configModule( TQWidget*, const char* ) const;
virtual TDECModule* configModule( TQWidget*, const char* ) const;
public:
k_dcop:

12
kcontrol/energy/energy.cpp
Unescape Escape View File

@ -85,13 +85,13 @@ static const int DFLT_OFF = 60;
extern "C" {
KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) {
KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
return new KEnergy(parent, "kcmenergy");
}
KDE_EXPORT void init_energy() {
#ifdef HAVE_DPMS
KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
cfg->setGroup("DisplayEnergy");
Display *dpy = tqt_xdisplay();
@ -132,7 +132,7 @@ extern "C" {
/**** KEnergy ****/
KEnergy::KEnergy(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
m_bChanged = false;
m_bEnabled = false;
@ -221,11 +221,11 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
top->addStretch();
if (m_bDPMS)
setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply );
else
setButtons( KCModule::Help );
setButtons( TDECModule::Help );
m_pConfig = new KConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/);
m_pConfig = new TDEConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/);
m_pConfig->setGroup("DisplayEnergy");
load();

6
kcontrol/energy/energy.h
Unescape Escape View File

@ -19,14 +19,14 @@
class TQCheckBox;
class KIntNumInput;
class KConfig;
class TDEConfig;
extern "C" void init_energy();
/**
* The Desktop/Energy tab in kcontrol.
*/
class KEnergy: public KCModule
class KEnergy: public TDECModule
{
Q_OBJECT
@ -62,7 +62,7 @@ private:
KIntNumInput *m_pStandbySlider;
KIntNumInput *m_pSuspendSlider;
KIntNumInput *m_pOffSlider;
KConfig *m_pConfig;
TDEConfig *m_pConfig;
};
#endif // __Energy_h_Included__

2
kcontrol/filetypes/control.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
extern "C"
{
KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
{
return new FileTypesView(parent, "filetypes");
}

2
kcontrol/filetypes/filetypesview.cpp
Unescape Escape View File

@ -25,7 +25,7 @@
#include <ksycoca.h>
FileTypesView::FileTypesView(TQWidget *p, const char *name)
: KCModule(p, name)
: TDECModule(p, name)
{
m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);

2
kcontrol/filetypes/filetypesview.h
Unescape Escape View File

@ -21,7 +21,7 @@ class FileTypeDetails;
class FileGroupDetails;
class TQWidgetStack;
class FileTypesView : public KCModule
class FileTypesView : public TDECModule
{
Q_OBJECT
public:

20
kcontrol/filetypes/typeslistitem.cpp
Unescape Escape View File

@ -273,9 +273,9 @@ void TypesListItem::sync()
if (isMimeTypeDirty())
{
// We must use KConfig otherwise config.deleteEntry doesn't
// We must use TDEConfig otherwise config.deleteEntry doesn't
// properly cancel out settings already present in system files.
KConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
TDEConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
config.setDesktopGroup();
config.writeEntry("Type", "MimeType");
@ -293,7 +293,7 @@ void TypesListItem::sync()
m_bNewItem = false;
}
KConfig profile("profilerc", false, false);
TDEConfig profile("profilerc", false, false);
// Deleting current contents in profilerc relating to
// this service type
@ -357,15 +357,15 @@ void TypesListItem::sync()
if ( mimeTypeList.contains( name() ) ) {
// The mimetype is listed explicitly in the .desktop files, so
// just remove it and we're done
KConfig *desktop;
TDEConfig *desktop;
if ( !isApplication )
{
desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
}
else
{
TQString path = pService->locateLocal();
KConfig orig(pService->desktopEntryPath(), true, false, "apps");
TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
desktop = orig.copyTo(path);
}
desktop->setDesktopGroup();
@ -452,7 +452,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
return 0;
}
void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType )
void TypesListItem::saveServices( TDEConfig & profile, TQStringList services, const TQString & genericServiceType )
{
TQStringList::Iterator it(services.begin());
for (int i = services.count(); it != services.end(); ++it, i--) {
@ -482,15 +482,15 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
{
KConfig *desktop;
TDEConfig *desktop;
if ( pService->type() == TQString("Service") )
{
desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
}
else
{
TQString path = pService->locateLocal();
KConfig orig(pService->desktopEntryPath(), true, false, "apps");
TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
desktop = orig.copyTo(path);
}

2
kcontrol/filetypes/typeslistitem.h
Unescape Escape View File

@ -96,7 +96,7 @@ public:
private:
void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const;
void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 );
void saveServices( TDEConfig & profile, TQStringList services, const TQString & servicetype2 );
void initMeta( const TQString & major );
void init(KMimeType::Ptr mimetype);
static int readAutoEmbed( KMimeType::Ptr mimetype );

16
kcontrol/fonts/fonts.cpp
Unescape Escape View File

@ -158,14 +158,14 @@ void FontUseItem::setDefault()
void FontUseItem::readFont( bool useDefaults )
{
KConfigBase *config;
TDEConfigBase *config;
bool deleteme = false;
if (_rcfile.isEmpty())
config = TDEGlobal::config();
else
{
config = new KConfig(_rcfile, true);
config = new TDEConfig(_rcfile, true);
deleteme = true;
}
@ -179,7 +179,7 @@ void FontUseItem::readFont( bool useDefaults )
void FontUseItem::writeFont()
{
KConfigBase *config;
TDEConfigBase *config;
if (_rcfile.isEmpty()) {
config = TDEGlobal::config();
@ -326,7 +326,7 @@ bool FontAASettings::load( bool useDefaults )
if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle)
{
KConfig kglobals("kdeglobals", false, false);
TDEConfig kglobals("kdeglobals", false, false);
kglobals.setReadDefaults( useDefaults );
@ -350,7 +350,7 @@ bool FontAASettings::load( bool useDefaults )
bool FontAASettings::save( bool useAA )
{
KXftConfig xft(KXftConfig::constStyleSettings);
KConfig kglobals("kdeglobals", false, false);
TDEConfig kglobals("kdeglobals", false, false);
kglobals.setGroup("General");
@ -507,7 +507,7 @@ static TQCString desktopConfigName()
}
KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(FontFactory::instance(), parent, name)
: TDECModule(FontFactory::instance(), parent, name)
{
TQStringList nameGroupKeyRc;
@ -693,7 +693,7 @@ void KFonts::load( bool useDefaults )
useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
cbAA->setCurrentItem( useAA );
KConfig cfgfonts("kcmfonts", true);
TDEConfig cfgfonts("kcmfonts", true);
cfgfonts.setGroup("General");
int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 );
DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone;
@ -715,7 +715,7 @@ void KFonts::save()
i->writeFont();
TDEGlobal::config()->sync();
KConfig cfgfonts("kcmfonts");
TDEConfig cfgfonts("kcmfonts");
cfgfonts.setGroup("General");
DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem());
const int dpi2value[] = { 0, 96, 120 };

2
kcontrol/fonts/fonts.h
Unescape Escape View File

@ -89,7 +89,7 @@ private:
/**
* The Desktop/fonts tab in kcontrol.
*/
class KFonts : public KCModule
class KFonts : public TDECModule
{
Q_OBJECT

2
kcontrol/hwmanager/hwmanager.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
/**** TDEHWManager ****/
TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(TDEHWManagerFactory::instance(), parent, name)
: TDECModule(TDEHWManagerFactory::instance(), parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));

6
kcontrol/hwmanager/hwmanager.h
Unescape Escape View File

@ -34,11 +34,11 @@
#include "devicepropsdlg.h"
#include "deviceiconview.h"
class KConfig;
class TDEConfig;
class KPopupMenu;
class KListViewItem;
class TDEHWManager : public KCModule, public DCOPObject
class TDEHWManager : public TDECModule, public DCOPObject
{
K_DCOP
Q_OBJECT
@ -65,7 +65,7 @@ private slots:
private:
TDEHWManagerBase *base;
KConfig *config;
TDEConfig *config;
};
#endif

2
kcontrol/iccconfig/iccconfig.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
/**** KICCConfig ****/
KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
: TDECModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
{
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());

6
kcontrol/iccconfig/iccconfig.h
Unescape Escape View File

@ -31,11 +31,11 @@
#include "iccconfigbase.h"
class KConfig;
class TDEConfig;
class KPopupMenu;
class KListViewItem;
class KICCConfig : public KCModule, public DCOPObject
class KICCConfig : public TDECModule, public DCOPObject
{
K_DCOP
Q_OBJECT
@ -59,7 +59,7 @@ public:
private:
KConfig *config;
TDEConfig *config;
bool _ok;
Display *randr_display;
ScreenInfo *randr_screen_info;

6
kcontrol/icons/icons.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
/**** KIconConfig ****/
KIconConfig::KIconConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQGridLayout *top = new TQGridLayout(this, 4, 2,
@ -289,7 +289,7 @@ void KIconConfig::read()
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
KConfigGroup g( TDEGlobal::config(), "KDE" );
TDEConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
@ -473,7 +473,7 @@ void KIconConfig::save()
mpKickerConfig->setGroup("General");
mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);
KConfigGroup g( TDEGlobal::config(), "KDE" );
TDEConfigGroup g( TDEGlobal::config(), "KDE" );
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);

6
kcontrol/icons/icons.h
Unescape Escape View File

@ -35,7 +35,7 @@ class TQTabWidget;
class TQWidget;
class KColorButton;
class KConfig;
class TDEConfig;
class KIconEffect;
class KIconLoader;
class KIconTheme;
@ -53,7 +53,7 @@ struct Effect
/**
* The General Icons tab in kcontrol.
*/
class KIconConfig: public KCModule
class KIconConfig: public TDECModule
{
Q_OBJECT
@ -106,7 +106,7 @@ private:
KIconEffect *mpEffect;
KIconTheme *mpTheme;
KIconLoader *mpLoader;
KConfig *mpConfig;
TDEConfig *mpConfig;
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;

12
kcontrol/icons/iconthemes.cpp
Unescape Escape View File

@ -52,7 +52,7 @@
#include "iconthemes.h"
IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
@ -160,7 +160,7 @@ void IconThemesConfig::installNewTheme()
TQString themeTmpFile;
// themeTmpFile contains the name of the downloaded file
if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
if (!TDEIO::NetAccess::download(themeURL, themeTmpFile, this)) {
TQString sorryText;
if (themeURL.isLocalFile())
sorryText = i18n("Unable to find the icon theme archive %1.");
@ -176,7 +176,7 @@ void IconThemesConfig::installNewTheme()
TQString invalidArch(i18n("The file is not a valid icon theme archive."));
KMessageBox::error(this, invalidArch);
KIO::NetAccess::removeTempFile(themeTmpFile);
TDEIO::NetAccess::removeTempFile(themeTmpFile);
return;
}
@ -189,7 +189,7 @@ void IconThemesConfig::installNewTheme()
KMessageBox::error(this, somethingWrong);
}
KIO::NetAccess::removeTempFile(themeTmpFile);
TDEIO::NetAccess::removeTempFile(themeTmpFile);
TDEGlobal::instance()->newIconLoader();
loadThemes();
@ -296,11 +296,11 @@ void IconThemesConfig::removeSelectedTheme()
KIconTheme icontheme(m_themeNames[selected->text(0)]);
// delete the index file before the async KIO::del so loadThemes() will
// delete the index file before the async TDEIO::del so loadThemes() will
// ignore that dir.
unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data());
unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
KIO::del(KURL( icontheme.dir() ));
TDEIO::del(KURL( icontheme.dir() ));
TDEGlobal::instance()->newIconLoader();

2
kcontrol/icons/iconthemes.h
Unescape Escape View File

@ -30,7 +30,7 @@ class TQCheckBox;
class TQStringList;
class IconThemesConfig : public KCModule
class IconThemesConfig : public TDECModule
{
Q_OBJECT

2
kcontrol/icons/main.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
/**** IconModule ****/
IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(IconsFactory::instance(), parent, name)
: TDECModule(IconsFactory::instance(), parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);

6
kcontrol/icons/main.h
Unescape Escape View File

@ -29,7 +29,7 @@
#include <tqtabwidget.h>
#include <kcmodule.h>
class IconModule : public KCModule
class IconModule : public TDECModule
{
Q_OBJECT
@ -47,8 +47,8 @@ protected slots:
private:
TQTabWidget *tab;
KCModule *tab1;
KCModule *tab2;
TDECModule *tab1;
TDECModule *tab2;
};

4
kcontrol/info/info.cpp
Unescape Escape View File

@ -399,7 +399,7 @@ TQString KInfoListWidget::quickHelp() const
KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name,
bool _getlistbox(TQListView *lbox))
: KCModule(parent, name),
: TDECModule(parent, name),
title(_title)
{
TDEAboutData *about =
@ -411,7 +411,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
about->addAuthor("Helge Deller", 0, "deller@kde.org");
setAboutData( about );
setButtons(KCModule::Help);
setButtons(TDECModule::Help);
getlistbox = _getlistbox;
GetInfo_ErrorString = 0;
TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());

2
kcontrol/info/info.h
Unescape Escape View File

@ -32,7 +32,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox );
bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */
extern bool GetInfo_OpenGL( TQListView *lBox );
class KInfoListWidget : public KCModule
class KInfoListWidget : public TDECModule
{
public:
KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0);

6
kcontrol/info/info_netbsd.cpp
Unescape Escape View File

@ -43,7 +43,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
#include <kio/global.h> /* for KIO::convertSize() */
#include <kio/global.h> /* for TDEIO::convertSize() */
typedef struct
{
@ -295,9 +295,9 @@ bool GetInfo_Partitions (TQListView *lbox)
big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root?
// convert to strings
vv[0] = KIO::convertSize(big[0]);
vv[0] = TDEIO::convertSize(big[0]);
vv[1] = TQString::fromLatin1("%1 (%2%%)")
.arg(KIO::convertSize(big[1]))
.arg(TDEIO::convertSize(big[1]))
.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
// FIXME: these two are large enough to punctuate

26
kcontrol/info/main.cpp
Unescape Escape View File

@ -34,7 +34,7 @@
extern "C"
{
KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_CPU_AVAILABLE
return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU);
@ -43,7 +43,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_IRQ_AVAILABLE
return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ);
@ -52,7 +52,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_PCI_AVAILABLE
return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI);
@ -61,7 +61,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_DMA_AVAILABLE
return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA);
@ -70,7 +70,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_IOPORTS_AVAILABLE
return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports);
@ -79,7 +79,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_SOUND_AVAILABLE
return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound);
@ -88,7 +88,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_SCSI_AVAILABLE
return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI);
@ -97,7 +97,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_DEVICES_AVAILABLE
return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
@ -106,7 +106,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_PARTITIONS_AVAILABLE
return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions);
@ -115,7 +115,7 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_XSERVER_AVAILABLE
return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video);
@ -124,12 +124,12 @@ extern "C"
#endif
}
KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
{
return new KMemoryWidget(parent, "kcminfo");
}
KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * )
KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
{
#ifdef INFO_OPENGL_AVAILABLE
return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
@ -139,7 +139,7 @@ extern "C"
}
/* create_cdinfo function for CD-ROM Info ~Jahshan */
KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_CD_ROM_AVAILABLE
return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM);

2
kcontrol/info/memory.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ static TQString formatted_unit(t_memsize value)
}
KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TDEAboutData *about =

2
kcontrol/info/memory.h
Unescape Escape View File

@ -27,7 +27,7 @@ typedef unsigned long t_memsize;
#define COLOR_USED_RAM TQColor(220,200,88)
#define COLOR_FREE_MEMORY TQColor(127,255,212)
class KMemoryWidget:public KCModule {
class KMemoryWidget:public TDECModule {
Q_OBJECT
public:

10
kcontrol/input/core/themepage.cpp
Unescape Escape View File

@ -93,7 +93,7 @@ void ThemePage::save()
bool whiteCursor = selectedTheme.right( 5 ) == "White";
bool largeCursor = selectedTheme.left( 5 ) == "Large";
KConfig c( "kcminputrc" );
TDEConfig c( "kcminputrc" );
c.setGroup( "Mouse" );
c.writeEntry( "LargeCursor", largeCursor );
c.writeEntry( "WhiteCursor", whiteCursor );
@ -116,7 +116,7 @@ void ThemePage::load( bool useDefaults )
{
bool largeCursor, whiteCursor;
KConfig c( "kcminputrc" );
TDEConfig c( "kcminputrc" );
c.setReadDefaults( useDefaults );
@ -179,14 +179,14 @@ void ThemePage::fixCursorFile()
// Run mkfontdir to update fonts.dir in that dir.
TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TDEIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
KURL installedFont;
installedFont.setPath( overrideDir + "cursor.pcf.gz" );
if ( currentTheme == "SmallBlack" )
KIO::NetAccess::del( installedFont, this );
TDEIO::NetAccess::del( installedFont, this );
else {
KURL source;
@ -197,7 +197,7 @@ void ThemePage::fixCursorFile()
else if ( currentTheme == "SmallWhite" )
source.setPath( locate("data", "kcminput/cursor_small_white.pcf.gz") );
KIO::NetAccess::file_copy( source, installedFont, -1, true );
TDEIO::NetAccess::file_copy( source, installedFont, -1, true );
}
TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" );

2
kcontrol/input/logitechmouse.cpp
Unescape Escape View File

@ -233,7 +233,7 @@ void LogitechMouse::applyChanges()
}
}
void LogitechMouse::save(KConfig * /*config*/)
void LogitechMouse::save(TDEConfig * /*config*/)
{
kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl;
}

2
kcontrol/input/logitechmouse.h
Unescape Escape View File

@ -52,7 +52,7 @@ public:
LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 );
~LogitechMouse();
void applyChanges();
void save(KConfig *config);
void save(TDEConfig *config);
protected slots:
void setChannel1();

4
kcontrol/input/main.cpp
Unescape Escape View File

@ -41,14 +41,14 @@
extern "C"
{
KDE_EXPORT KCModule *create_mouse(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
{
return new MouseConfig(parent, "kcminput");
}
KDE_EXPORT void init_mouse()
{
KConfig *config = new KConfig("kcminputrc", true, false); // Read-only, no globals
TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals
MouseSettings settings;
settings.load(config);
settings.apply(true); // force

16
kcontrol/input/mouse.cpp
Unescape Escape View File

@ -75,7 +75,7 @@
#undef Below
MouseConfig::MouseConfig (TQWidget * parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
@ -483,7 +483,7 @@ void MouseConfig::load()
void MouseConfig::load( bool useDefaults )
{
KConfig config( "kcminputrc", true );
TDEConfig config( "kcminputrc", true );
config.setReadDefaults( useDefaults );
@ -516,7 +516,7 @@ void MouseConfig::load( bool useDefaults )
slotClick();
KConfig ac("kaccessrc", true);
TDEConfig ac("kaccessrc", true);
ac.setGroup("Mouse");
mouseKeys->setChecked(ac.readBoolEntry("MouseKeys", false));
@ -568,10 +568,10 @@ void MouseConfig::save()
settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
settings->apply();
KConfig config( "kcminputrc" );
TDEConfig config( "kcminputrc" );
settings->save(&config);
KConfig ac("kaccessrc", false);
TDEConfig ac("kaccessrc", false);
ac.setGroup("Mouse");
@ -593,7 +593,7 @@ void MouseConfig::save()
// restart kaccess
kapp->startServiceByDesktopName("kaccess");
KCModule::changed(false);
TDECModule::changed(false);
}
@ -624,7 +624,7 @@ void MouseConfig::slotHandedChanged(int val){
settings->m_handedNeedsApply = true;
}
void MouseSettings::load(KConfig *config)
void MouseSettings::load(TDEConfig *config)
{
int accel_num, accel_den, threshold;
double accel;
@ -799,7 +799,7 @@ void MouseSettings::apply(bool force)
#endif
}
void MouseSettings::save(KConfig *config)
void MouseSettings::save(TDEConfig *config)
{
config->setGroup("Mouse");
config->writeEntry("Acceleration",accelRate);

6
kcontrol/input/mouse.h
Unescape Escape View File

@ -62,8 +62,8 @@ class TQTabWidget;
class MouseSettings
{
public:
void save(KConfig *);
void load(KConfig *);
void save(TDEConfig *);
void load(TDEConfig *);
void apply(bool force=false);
public:
int num_buttons;
@ -89,7 +89,7 @@ public:
#endif
};
class MouseConfig : public KCModule
class MouseConfig : public TDECModule
{
Q_OBJECT
public:

12
kcontrol/input/xcursor/themepage.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ void ThemePage::save()
if ( currentTheme == selectedTheme )
return;
KConfig c( "kcminputrc" );
TDEConfig c( "kcminputrc" );
c.setGroup( "Mouse" );
c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
@ -162,7 +162,7 @@ void ThemePage::load( bool useDefaults )
currentTheme = theme;
// Get the name of the theme TDE is configured to use
KConfig c( "kcminputrc" );
TDEConfig c( "kcminputrc" );
c.setReadDefaults( useDefaults );
c.setGroup( "Mouse" );
currentTheme = c.readEntry( "cursorTheme", currentTheme );
@ -221,7 +221,7 @@ void ThemePage::installClicked()
return;
TQString tmpFile;
if ( !KIO::NetAccess::download( url, tmpFile, this ) ) {
if ( !TDEIO::NetAccess::download( url, tmpFile, this ) ) {
TQString text;
if ( url.isLocalFile() )
@ -238,7 +238,7 @@ void ThemePage::installClicked()
KMessageBox::error( this, i18n( "The file %1 does not appear to be a valid "
"cursor theme archive.").arg( url.fileName() ) );
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}
@ -257,7 +257,7 @@ void ThemePage::removeClicked()
// Delete the theme from the harddrive
KURL u;
u.setPath( themeInfo[ selectedTheme ]->path );
KIO::del( u );
TDEIO::del( u );
// Remove the theme from the listview and from the themeinfo dict
delete listview->findItem( selectedTheme, DirColumn );
@ -268,7 +268,7 @@ void ThemePage::removeClicked()
// Since it's possible to substitute cursors in a system theme by adding a local
// theme with the same name, we shouldn't remove the theme from the list if it's
// still available elsewhere. This could be solved by calling insertThemes() here,
// but since KIO::del() is an asynchronos operation, the theme we're deleting will
// but since TDEIO::del() is an asynchronos operation, the theme we're deleting will
// be readded to the list again before KIO has removed it.
}

16
kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
Unescape Escape View File

@ -49,12 +49,12 @@ typedef KGenericFactory<KCMIOSlaveInfo, TQWidget> SlaveFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") )
KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
:TDECModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
{
TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves."));
setButtons( KCModule::Help );
setButtons( TDECModule::Help );
TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this);
TQHBox *hbox=new TQHBox(this);
@ -80,7 +80,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
m_ioslavesLb->sort();
m_ioslavesLb->setSelected(0, true);
setButtons(KCModule::Help);
setButtons(TDECModule::Help);
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmioslaveinfo"),
@ -94,7 +94,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
}
void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data)
void KCMIOSlaveInfo::slaveHelp( TDEIO::Job *, const TQByteArray &data)
{
if ( data.size() == 0 ) { // EOF
int index = helpData.find( "<meta http-equiv=\"Content-Type\"" );
@ -111,7 +111,7 @@ void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data)
helpData += data;
}
void KCMIOSlaveInfo::slotResult(KIO::Job *)
void KCMIOSlaveInfo::slotResult(TDEIO::Job *)
{
m_tfj = 0;
}
@ -129,9 +129,9 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol)
if (!file.isEmpty())
{
helpData.truncate( 0 );
m_tfj = KIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
connect( m_tfj, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( KIO::Job *, const TQByteArray &) ) );
connect( m_tfj, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) );
m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
return;
}
m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol));

10
kcontrol/ioslaveinfo/kcmioslaveinfo.h
Unescape Escape View File

@ -36,9 +36,9 @@
class KIOTimeoutControl;
class TQTabWidget;
class TQSpinBox;
class KConfig;
class TDEConfig;
class KCMIOSlaveInfo : public KCModule
class KCMIOSlaveInfo : public TDECModule
{
Q_OBJECT
public:
@ -48,14 +48,14 @@ protected:
KListBox *m_ioslavesLb;
KTextBrowser *m_info;
TQCString helpData;
KIO::Job *m_tfj;
TDEIO::Job *m_tfj;
protected slots:
void showInfo(const TQString& protocol);
void showInfo(TQListBoxItem *item);
void slaveHelp( KIO::Job *, const TQByteArray &data);
void slotResult( KIO::Job * );
void slaveHelp( TDEIO::Job *, const TQByteArray &data);
void slotResult( TDEIO::Job * );
};
#endif

4
kcontrol/joystick/joystick.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ extern "C"
//---------------------------------------------------------------------------------------------
joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(JoystickFactory::instance(), parent, name)
: TDECModule(JoystickFactory::instance(), parent, name)
{
setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
I18N_NOOP("TDE Control Center Module to test Joysticks"),
@ -97,7 +97,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
setMinimumSize(joyWidget->minimumSize());
setButtons(KCModule::Default);
setButtons(TDECModule::Default);
}
//---------------------------------------------------------------------------------------------

2
kcontrol/joystick/joystick.h
Unescape Escape View File

@ -25,7 +25,7 @@
class JoyWidget;
class joystick: public KCModule
class joystick: public TDECModule
{
Q_OBJECT

2
kcontrol/kcontrol/aboutwidget.h
Unescape Escape View File

@ -24,7 +24,7 @@
#include <tqlistview.h>
#include <tqhbox.h>
class KCModuleInfo;
class TDECModuleInfo;
class TQPixmap;
class KPixmap;
class ConfigModule;

2
kcontrol/kcontrol/kcrootonly.cpp
Unescape Escape View File

@ -24,7 +24,7 @@
#include "kcrootonly.h"
KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout=new TQVBoxLayout(this);
TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"

2
kcontrol/kcontrol/kcrootonly.h
Unescape Escape View File

@ -4,7 +4,7 @@
#include <kcmodule.h>
class KCRootOnly: public KCModule {
class KCRootOnly: public TDECModule {
public:
KCRootOnly(TQWidget *parent, const char *name);
};

4
kcontrol/kcontrol/main.cpp
Unescape Escape View File

@ -65,7 +65,7 @@ KControlApp::KControlApp()
connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
// Initial size is:
// never bigger than workspace as reported by desk
@ -88,7 +88,7 @@ KControlApp::~KControlApp()
{
if (toplevel)
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());

2
kcontrol/kcontrol/moduleIface.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ TQPalette ModuleIface::getPalette(){
}
TQString ModuleIface::getStyle() {
KConfig config( "kdeglobals" );
TDEConfig config( "kdeglobals" );
config.setGroup( "General" );
return config.readEntry("widgetStyle");
}

8
kcontrol/kcontrol/modules.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ template class TQPtrList<ConfigModule>;
ConfigModule::ConfigModule(const KService::Ptr &s)
: KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
: TDECModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
_rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0)
{
}
@ -64,12 +64,12 @@ ProxyWidget *ConfigModule::module()
bool run_as_root = needsRootPrivileges() && (getuid() != 0);
KCModule *modWidget = 0;
TDECModule *modWidget = 0;
if (run_as_root && isHiddenByDefault())
modWidget = new KCRootOnly(0, "root_only");
else
modWidget = KCModuleLoader::loadModule(*this);
modWidget = TDECModuleLoader::loadModule(*this);
if (modWidget)
{
@ -110,7 +110,7 @@ void ConfigModule::deleteClient()
delete _embedLayout;
_embedLayout = 0;
KCModuleLoader::unloadModule(*this);
TDECModuleLoader::unloadModule(*this);
_changed = false;
}

4
kcontrol/kcontrol/modules.h
Unescape Escape View File

@ -28,7 +28,7 @@
template<class ConfigModule> class TQPtrList;
class TQStringList;
class TDEAboutData;
class KCModule;
class TDECModule;
class ProxyWidget;
class TDEProcess;
class QXEmbed;
@ -36,7 +36,7 @@ class TQVBoxLayout;
class TQVBox;
class TQWidgetStack;
class ConfigModule : public TQObject, public KCModuleInfo
class ConfigModule : public TQObject, public TDECModuleInfo
{
Q_OBJECT

16
kcontrol/kcontrol/proxywidget.cpp
Unescape Escape View File

@ -103,13 +103,13 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0)
class ProxyView : public TQScrollView
{
public:
ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
ProxyView(TDECModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
private:
virtual void resizeEvent(TQResizeEvent *);
TQWidget *contentWidget;
KCModule *client;
TDECModule *client;
bool scroll;
};
@ -124,7 +124,7 @@ public:
};
ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
ProxyView::ProxyView(TDECModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
: TQScrollView(parent, name), client(_client)
{
setResizePolicy(TQScrollView::AutoOneFit);
@ -157,7 +157,7 @@ void ProxyView::resizeEvent(TQResizeEvent *e)
////////////////////////////////////////////////////////////////////////////////////////////////////////
ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
bool run_as_root)
: TQWidget(0, name)
, _client(client)
@ -215,10 +215,10 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
// only enable the requested buttons
int b = _client->buttons();
trinity_setVisible(_handbook, (b & KCModule::Help));
trinity_setVisible(_default, mayModify && (b & KCModule::Default));
trinity_setVisible(_apply, mayModify && (b & KCModule::Apply));
trinity_setVisible(_reset, mayModify && (b & KCModule::Apply));
trinity_setVisible(_handbook, (b & TDECModule::Help));
trinity_setVisible(_default, mayModify && (b & TDECModule::Default));
trinity_setVisible(_apply, mayModify && (b & TDECModule::Apply));
trinity_setVisible(_reset, mayModify && (b & TDECModule::Apply));
trinity_setVisible(_root, run_as_root);
// disable initial buttons

6
kcontrol/kcontrol/proxywidget.h
Unescape Escape View File

@ -28,7 +28,7 @@ class TQWidget;
class TQPushButton;
class TQFrame;
class KCModule;
class TDECModule;
class TDEAboutData;
#include "dockcontainer.h"
@ -42,7 +42,7 @@ class ProxyWidget : public TQWidget
public:
ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false);
ProxyWidget(TDECModule *client, TQString title, const char *name=0, bool run_as_root = false);
~ProxyWidget();
TQString quickHelp() const;
@ -73,7 +73,7 @@ private:
TQPushButton *_handbook, *_default, *_apply, *_reset, *_root;
TQFrame *_sep;
KCModule *_client;
TDECModule *_client;
ProxyView *view;
};

4
kcontrol/kcontrol/toplevel.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name)
report_bug = 0;
// read settings
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Index");
TQString viewmode = config->readEntry("ViewMode", "Tree");
@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name)
TopLevel::~TopLevel()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Index");
if (KCGlobal::viewMode() == Tree)
config->writeEntry("ViewMode", "Tree");

14
kcontrol/kded/kcmkded.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
KCModule( KDEDFactory::instance(), parent, name )
TDECModule( KDEDFactory::instance(), parent, name )
{
TDEAboutData *about =
new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
@ -110,7 +110,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
load();
}
void setModuleGroup(KConfig *config, const TQString &filename)
void setModuleGroup(TDEConfig *config, const TQString &filename)
{
TQString module = filename;
int i = module.findRev('/');
@ -123,13 +123,13 @@ void setModuleGroup(KConfig *config, const TQString &filename)
config->setGroup(TQString("Module-%1").arg(module));
}
bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename)
bool KDEDConfig::autoloadEnabled(TDEConfig *config, const TQString &filename)
{
setModuleGroup(config, filename);
return config->readBoolEntry("autoload", true);
}
void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b)
void KDEDConfig::setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b)
{
setModuleGroup(config, filename);
return config->writeEntry("autoload", b);
@ -141,7 +141,7 @@ void KDEDConfig::load() {
void KDEDConfig::load( bool useDefaults ) {
KConfig kdedrc("kdedrc", true, false);
TDEConfig kdedrc("kdedrc", true, false);
kdedrc.setReadDefaults( useDefaults );
_lvStartup->clear();
@ -190,13 +190,13 @@ void KDEDConfig::save() {
TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
KConfig kdedrc("kdedrc", false, false);
TDEConfig kdedrc("kdedrc", false, false);
for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
if ( KDesktopFile::isDesktopFile( *it ) ) {
KConfig file( *it, false, false, "services" );
TDEConfig file( *it, false, false, "services" );
file.setGroup("Desktop Entry");
if (file.readBoolEntry("X-TDE-Kded-autoload")){

6
kcontrol/kded/kcmkded.h
Unescape Escape View File

@ -28,7 +28,7 @@ class KListView;
class TQStringList;
class TQPushButton;
class KDEDConfig : public KCModule
class KDEDConfig : public TDECModule
{
Q_OBJECT
public:
@ -49,8 +49,8 @@ protected slots:
void slotItemChecked(TQCheckListItem *item);
void getServiceStatus();
bool autoloadEnabled(KConfig *config, const TQString &filename);
void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
bool autoloadEnabled(TDEConfig *config, const TQString &filename);
void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
private:
KListView *_lvLoD;

10
kcontrol/keys/kaccelaction.h
Unescape Escape View File

@ -33,8 +33,8 @@
class KAccelBase;
class TQObject;
class KConfig;
class KConfigBase;
class TDEConfig;
class TDEConfigBase;
/*
KAccelAction holds information an a given action, such as "Run Command"
@ -156,7 +156,7 @@ class KAccelActions
void clear();
bool init( const KAccelActions& );
bool init( KConfigBase& config, const TQString& sGroup );
bool init( TDEConfigBase& config, const TQString& sGroup );
void updateShortcuts( KAccelActions& );
@ -176,8 +176,8 @@ class KAccelActions
KAccelAction* insert( const TQString& sName, const TQString& sLabel );
bool remove( const TQString& sAction );
bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
bool bWriteAll = false, bool bGlobal = false ) const;
void emitKeycodeChanged();

8
kcontrol/keys/keyconfig.cpp
Unescape Escape View File

@ -179,7 +179,7 @@ KKeyModule::~KKeyModule (){
delete sFileList;
}
bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig )
bool KKeyModule::writeSettings( const TQString& sGroup, TDEConfig* pConfig )
{
kc->commitChanges();
actions.writeActions( sGroup, pConfig, true, false );
@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index )
//else if( index == 2 )
// kc->allDefault( true );
else {
KConfigBase* config = 0;
if( index == 0 ) config = new KConfig( "kdeglobals" );
TDEConfigBase* config = 0;
if( index == 0 ) config = new TDEConfig( "kdeglobals" );
//else config = new KSimpleConfig( *sFileList->at( index ), true );
actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
@ -472,7 +472,7 @@ void KKeyModule::init()
kdDebug(125) << "KKeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();

2
kcontrol/keys/keyconfig.h
Unescape Escape View File

@ -41,7 +41,7 @@ public:
virtual void defaults();
static void init();
bool writeSettings( const TQString& sGroup, KConfig* pConfig );
bool writeSettings( const TQString& sGroup, TDEConfig* pConfig );
bool writeSettingsGlobal( const TQString& sGroup );
public slots:

10
kcontrol/keys/main.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ o Pre-set scheme <Remove Scheme>
Global Shortcuts
*/
KeyModule::KeyModule( TQWidget *parent, const char *name )
: KCModule( parent, name )
: TDECModule( parent, name )
{
setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be"
" triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to"
@ -129,7 +129,7 @@ void KeyModule::resizeEvent( TQResizeEvent * )
extern "C"
{
KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
TDEGlobal::locale()->insertCatalogue("twin");
@ -142,7 +142,7 @@ extern "C"
{
kdDebug(125) << "KeyModule::initModifiers()" << endl;
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
if( bMacSwap )
ModifiersModule::setupMacModifierKeys();
@ -153,7 +153,7 @@ extern "C"
kdDebug(125) << "KeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
@ -179,7 +179,7 @@ extern "C"
// This is needed to be able to check for conflicts with global keys in app's keyconfig
// dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
// However, avoid writing at every KDE startup, just update them after every rebuild of this file.
KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
TDEConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
// Check for old group,

2
kcontrol/keys/main.h
Unescape Escape View File

@ -31,7 +31,7 @@ class CommandShortcutsModule;
class ShortcutsModule;
class ModifiersModule;
class KeyModule : public KCModule
class KeyModule : public TDECModule
{
Q_OBJECT
public:

4
kcontrol/keys/modifiers.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
void ModifiersModule::load( bool useDefaults )
{
KConfig *c = TDEGlobal::config();
TDEConfig *c = TDEGlobal::config();
c->setReadDefaults( useDefaults );
@ -82,7 +82,7 @@ void ModifiersModule::save()
{
kdDebug(125) << "ModifiersModule::save()" << endl;
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
if( m_plblCtrl->text() != "Ctrl" )
TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );

20
kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
Unescape Escape View File

@ -76,7 +76,7 @@ namespace KFI
{
CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
: KCModule(parent, "kfontinst"),
: TDECModule(parent, "kfontinst"),
#ifdef HAVE_XFT
itsPreview(NULL),
#endif
@ -464,8 +464,8 @@ void CKCmFontInst::removeFonts()
if(doIt)
{
KIO::DeleteJob *job = KIO::del(urls, false, true);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *)));
TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
@ -558,7 +558,7 @@ static TQString family(const TQString &name)
void CKCmFontInst::updateInformation(int, int fonts)
{
KIO::filesize_t size=0;
TDEIO::filesize_t size=0;
TQString text(i18n("One Font", "%n Fonts", fonts));
TQStringList families;
@ -579,14 +579,14 @@ void CKCmFontInst::updateInformation(int, int fonts)
if(fonts>0)
{
text+=" ";
text+=i18n("(%1 Total)").arg(KIO::convertSize(size));
text+=i18n("(%1 Total)").arg(TDEIO::convertSize(size));
}
text+=" - ";
text+=i18n("One Family", "%n Families", families.count());
itsStatusLabel->setText(text);
}
void CKCmFontInst::delResult(KIO::Job *job)
void CKCmFontInst::delResult(TDEIO::Job *job)
{
//
// To speed up font deletion, we dont rescan font list each time - so after this has completed, we need
@ -596,11 +596,11 @@ void CKCmFontInst::delResult(KIO::Job *job)
stream << KFI::SPECIAL_RESCAN;
KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
jobResult(job);
}
void CKCmFontInst::jobResult(KIO::Job *job)
void CKCmFontInst::jobResult(TDEIO::Job *job)
{
//
// Force an update of the view. For some reason the view is not automatically updated when
@ -636,8 +636,8 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
copy+=associatedUrls;
}
KIO::CopyJob *job=KIO::copy(copy, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *)));
TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}

8
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
Unescape Escape View File

@ -56,7 +56,7 @@ class KFileItem;
namespace KFI
{
class CKCmFontInst : public KCModule
class CKCmFontInst : public TDECModule
{
Q_OBJECT
@ -84,8 +84,8 @@ class CKCmFontInst : public KCModule
void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls);
void infoMessage(const TQString &msg);
void updateInformation(int dirs, int fonts);
void delResult(KIO::Job *job);
void jobResult(KIO::Job *job);
void delResult(TDEIO::Job *job);
void jobResult(TDEIO::Job *job);
private:
@ -106,7 +106,7 @@ class CKCmFontInst : public KCModule
KParts::ReadOnlyPart *itsPreview;
#endif
TQSplitter *itsSplitter;
KConfig itsConfig;
TDEConfig itsConfig;
bool itsEmbeddedAdmin;
TQLabel *itsStatusLabel;
};

4
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
Unescape Escape View File

@ -614,13 +614,13 @@ void CKFileFontView::contentsDropEvent(TQDropEvent *e)
}
}
void CKFileFontView::readConfig(KConfig *kc, const TQString &group)
void CKFileFontView::readConfig(TDEConfig *kc, const TQString &group)
{
restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
slotSortingChanged(sortColumn());
}
void CKFileFontView::writeConfig(KConfig *kc, const TQString &group)
void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)
{
saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
}

4
kcontrol/kfontinst/kcmfontinst/KFileFontView.h
Unescape Escape View File

@ -142,8 +142,8 @@ class CKFileFontView : public KListView, public KFileView
virtual KFileItem * prevItem(const KFileItem *i) const;
virtual void insertItem( KFileItem *i);
void readConfig(KConfig *kc, const TQString &group);
void writeConfig(KConfig *kc, const TQString &group);
void readConfig(TDEConfig *kc, const TQString &group);
void writeConfig(TDEConfig *kc, const TQString &group);
// implemented to get noticed about sorting changes (for sortingIndicator)
virtual void setSorting(TQDir::SortSpec s);

6
kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
"that this will also slow down the installation process.</p><p>As most applications can, and do, embed "
"the fonts into the PostScript before sending this to Ghostscript, this option can safely be disabled."));
KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
itsDoX->setChecked(cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X));
itsDoGs->setChecked(cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS));
@ -71,7 +71,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
void CSettingsDialog::slotOk()
{
KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
bool oldDoX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
oldDoGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()
stream << KFI::SPECIAL_RECONFIG;
KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
}
hide();

4
kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
Unescape Escape View File

@ -327,7 +327,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
what=0;
if(!fontsProt && !fileProt && KIO::NetAccess::download(url, fName, NULL))
if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL))
{
downloaded=true;
url=KURL(fName);
@ -413,7 +413,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
}
if(downloaded)
KIO::NetAccess::removeTempFile(fName);
TDEIO::NetAccess::removeTempFile(fName);
}
return status;

198
kcontrol/kfontinst/kio/KioFonts.cpp
Unescape Escape View File

@ -231,16 +231,16 @@ static int getSize(TQValueList<FcPattern *> &patterns)
return size;
}
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
{
KIO::UDSAtom atom;
TDEIO::UDSAtom atom;
atom.m_uds = ID;
atom.m_long = l;
atom.m_str = s;
entry.append(atom);
}
static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
{
KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl;
@ -251,7 +251,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
if(-1!=KDE_lstat(cPath, &buff))
{
addAtom(entry, KIO::UDS_NAME, 0, name);
addAtom(entry, TDEIO::UDS_NAME, 0, name);
if (S_ISLNK(buff.st_mode))
{
@ -262,49 +262,49 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
if(n!= -1)
buffer2[n]='\0';
addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
// It is a link pointing to nowhere
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
addAtom(entry, KIO::UDS_SIZE, 0);
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
addAtom(entry, TDEIO::UDS_SIZE, 0);
goto notype;
}
}
addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
addAtom(entry, KIO::UDS_SIZE, buff.st_size);
addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
addAtom(entry, TDEIO::UDS_SIZE, buff.st_size);
notype:
addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys
addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
? KFI_KIO_FONTS_PROTOCOL"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder");
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
{
KFI_DBUG << "Default system folder (" << path << ") does not yet exist, so create dummy entry" << endl;
addAtom(entry, KIO::UDS_NAME, 0, name);
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_ACCESS, 0744);
addAtom(entry, KIO::UDS_USER, 0, "root");
addAtom(entry, KIO::UDS_GROUP, 0, "root");
addAtom(entry, KIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
addAtom(entry, TDEIO::UDS_NAME, 0, name);
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, TDEIO::UDS_ACCESS, 0744);
addAtom(entry, TDEIO::UDS_USER, 0, "root");
addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
return true;
}
@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
return false;
}
static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
{
KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl;
@ -344,7 +344,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
end=sortedPatterns.end();
entry.clear();
addAtom(entry, KIO::UDS_SIZE, getSize(patterns));
addAtom(entry, TDEIO::UDS_SIZE, getSize(patterns));
for(it=sortedPatterns.begin(); it!=end; ++it)
{
@ -354,7 +354,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
if(-1!=KDE_lstat(cPath, &buff))
{
addAtom(entry, KIO::UDS_NAME, 0, name);
addAtom(entry, TDEIO::UDS_NAME, 0, name);
if (S_ISLNK(buff.st_mode))
{
@ -366,32 +366,32 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
if(n!= -1)
buffer2[n]='\0';
addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
// It is a link pointing to nowhere
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
goto notype;
}
}
addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
notype:
addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
@ -404,7 +404,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
url+=name+TQString::fromLatin1(constMultipleExtension);
else
url+=Misc::getFile(path);
addAtom(entry, KIO::UDS_URL, 0, url);
addAtom(entry, TDEIO::UDS_URL, 0, url);
return true; // This file was OK, so use its values...
}
}
@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
}
CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
: KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
: TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
itsRoot(Misc::root()),
itsUsingFcFpe(false),
itsUsingXfsFpe(false),
@ -830,7 +830,7 @@ void CKioFonts::listDir(const KURL &url)
if(updateFontList() && checkUrl(url, true))
{
KIO::UDSEntry entry;
TDEIO::UDSEntry entry;
int size=0;
if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0)
@ -861,7 +861,7 @@ void CKioFonts::listDir(const KURL &url)
listEntry(entry, false);
}
listEntry(size ? entry : KIO::UDSEntry(), true);
listEntry(size ? entry : TDEIO::UDSEntry(), true);
finished();
}
@ -878,12 +878,12 @@ void CKioFonts::stat(const KURL &url)
if(path.isEmpty())
{
error(KIO::ERR_COULD_NOT_STAT, url.prettyURL());
error(TDEIO::ERR_COULD_NOT_STAT, url.prettyURL());
return;
}
TQStringList pathList(TQStringList::split('/', path, false));
KIO::UDSEntry entry;
TDEIO::UDSEntry entry;
bool err=false;
switch(pathList.count())
@ -901,7 +901,7 @@ void CKioFonts::stat(const KURL &url)
err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
else
{
error(KIO::ERR_SLAVE_DEFINED,
error(TDEIO::ERR_SLAVE_DEFINED,
i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
@ -912,7 +912,7 @@ void CKioFonts::stat(const KURL &url)
if(err)
{
error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
return;
}
@ -921,7 +921,7 @@ void CKioFonts::stat(const KURL &url)
}
}
bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder)
bool CKioFonts::createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder)
{
KFI_DBUG << "createStatEntry " << url.path() << endl;
@ -1003,17 +1003,17 @@ void CKioFonts::get(const KURL &url)
KFI_DBUG << "real: " << realPathC << endl;
if (-2==KDE_stat(realPathC.data(), &buff))
error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
else if (S_ISDIR(buff.st_mode))
error(KIO::ERR_IS_DIRECTORY, url.prettyURL());
error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL());
else if (!S_ISREG(buff.st_mode))
error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
else
{
int fd = KDE_open(realPathC.data(), O_RDONLY);
if (fd < 0)
error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
else
{
// Determine the mimetype of the file to be retrieved, and emit it.
@ -1022,7 +1022,7 @@ void CKioFonts::get(const KURL &url)
totalSize(buff.st_size);
KIO::filesize_t processed=0;
TDEIO::filesize_t processed=0;
char buffer[MAX_IPC_SIZE];
TQByteArray array;
@ -1033,7 +1033,7 @@ void CKioFonts::get(const KURL &url)
{
if (errno == EINTR)
continue;
error(KIO::ERR_COULD_NOT_READ, url.prettyURL());
error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL());
close(fd);
if(multiple)
::unlink(realPathC);
@ -1068,7 +1068,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(isHidden(u))
{
error(KIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
error(TDEIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
return;
}
@ -1088,7 +1088,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if (destExists && !overwrite && !resume)
{
error(KIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
return;
}
@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(passwd.isEmpty())
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
return;
}
}
@ -1205,7 +1205,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
partExists = false;
else
{
error(KIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
error(TDEIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
return false;
}
}
@ -1236,7 +1236,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (fd < 0)
{
error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
return false;
}
@ -1252,12 +1252,12 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
{
if(ENOSPC==errno) // disk full
{
error(KIO::ERR_DISK_FULL, destOrig);
error(TDEIO::ERR_DISK_FULL, destOrig);
result = -2; // means: remove dest file
}
else
{
error(KIO::ERR_COULD_NOT_WRITE, destOrig);
error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
result = -1;
}
}
@ -1288,14 +1288,14 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (close(fd))
{
error(KIO::ERR_COULD_NOT_WRITE, destOrig);
error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
return false;
}
// after full download rename the file back to original name
if (markPartial && ::rename(destC.data(), destOrigC.data()))
{
error(KIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
return false;
}
@ -1313,7 +1313,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(isHidden(d))
{
error(KIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
error(TDEIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
return;
}
@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
}
else
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@ -1407,7 +1407,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(-1==KDE_stat(realSrc.data(), &buffSrc))
{
error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return;
}
@ -1415,7 +1415,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if (srcFd<0)
{
error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
return;
}
@ -1428,14 +1428,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if (destFd<0)
{
error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
close(srcFd);
return;
}
totalSize(buffSrc.st_size);
KIO::filesize_t processed = 0;
TDEIO::filesize_t processed = 0;
char buffer[MAX_IPC_SIZE];
TQByteArray array;
@ -1447,7 +1447,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
{
if (errno == EINTR)
continue;
error(KIO::ERR_COULD_NOT_READ, src.prettyURL());
error(TDEIO::ERR_COULD_NOT_READ, src.prettyURL());
close(srcFd);
close(destFd);
return;
@ -1461,11 +1461,11 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
close(destFd);
if (ENOSPC==errno) // disk full
{
error(KIO::ERR_DISK_FULL, dest.prettyURL());
error(TDEIO::ERR_DISK_FULL, dest.prettyURL());
remove(realDest.data());
}
else
error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
return;
}
@ -1477,7 +1477,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(close(destFd))
{
error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
return;
}
@ -1512,9 +1512,9 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
KFI_DBUG << "rename " << src.prettyURL() << " - " << d.prettyURL() << ", " << overwrite << endl;
if(src.directory()==d.directory())
error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
else if(itsRoot) // Should never happen...
error(KIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, KIO::CMD_RENAME));
error(TDEIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, TDEIO::CMD_RENAME));
else
{
//
@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
else
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
return;
}
}
@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
if(doRootCmd(cmd))
modified(FOLDER_SYS, clearList, modifiedDirs);
else
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
}
else
{
@ -1666,10 +1666,10 @@ void CKioFonts::del(const KURL &url, bool)
if (0!=unlink(TQFile::encodeName(file).data()))
error(EACCES==errno || EPERM==errno
? KIO::ERR_ACCESS_DENIED
? TDEIO::ERR_ACCESS_DENIED
: EISDIR==errno
? KIO::ERR_IS_DIRECTORY
: KIO::ERR_CANNOT_DELETE,
? TDEIO::ERR_IS_DIRECTORY
: TDEIO::ERR_CANNOT_DELETE,
file);
else
{
@ -1760,7 +1760,7 @@ void CKioFonts::special(const TQByteArray &a)
finished();
break;
default:
error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
}
}
else
@ -1899,7 +1899,7 @@ void CKioFonts::doModified()
TQString CKioFonts::getRootPasswd(bool askPasswd)
{
KFI_DBUG << "getRootPasswd" << endl;
KIO::AuthInfo authInfo;
TDEIO::AuthInfo authInfo;
SuProcess proc(SYS_USER);
bool error=false;
int attempts=0;
@ -2064,7 +2064,7 @@ bool CKioFonts::updateFontList()
if(NULL==itsFontList)
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
return false;
}
@ -2099,7 +2099,7 @@ TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
if(it!=itsFolders[getFolder(url)].fontMap.end())
return &(it.data());
error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
return NULL;
}
@ -2143,7 +2143,7 @@ bool CKioFonts::checkFile(const TQString &file)
return true;
}
error(KIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
error(TDEIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
"extract the components, and install individually.</p>").arg(constMultipleExtension));
return false;
}
@ -2205,24 +2205,24 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
if (-1==KDE_stat(realSrc.data(), &buffSrc))
{
error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return false;
}
if(S_ISDIR(buffSrc.st_mode))
{
error(KIO::ERR_IS_DIRECTORY, src.prettyURL());
error(TDEIO::ERR_IS_DIRECTORY, src.prettyURL());
return false;
}
if(S_ISFIFO(buffSrc.st_mode) || S_ISSOCK(buffSrc.st_mode))
{
error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
return false;
}
}
}
else
{
error(KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
return false;
}
@ -2234,7 +2234,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol
if(!overwrite && (Misc::fExists(itsFolders[destFolder].location+src.fileName()) ||
Misc::fExists(itsFolders[destFolder].location+modifyName(src.fileName())) ) )
{
error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
@ -2250,7 +2250,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
dest.directory()==src.directory()) // Check whether confirmUrl changed a "cp fonts:/System fonts:/"
// to "cp fonts:/System fonts:/System"
{
error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
@ -2262,7 +2262,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
for(; fIt!=fEnd; ++fIt)
if(NULL!=getEntry(destFolder, fIt.data()) || NULL!=getEntry(destFolder, modifyName(fIt.data())))
{
error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
return false;
}
}
@ -2320,7 +2320,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
"The other affected fonts are:</p><ul>%1</ul><p>\n Do you wish to "
"delete all of these?</p>").arg(out)))
{
error(KIO::ERR_USER_CANCELED, url.prettyURL());
error(TDEIO::ERR_USER_CANCELED, url.prettyURL());
return false;
}
}
@ -2368,7 +2368,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
else
if(!isSysFolder(sect) && !isUserFolder(sect))
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
return false;
}
@ -2388,7 +2388,7 @@ bool CKioFonts::checkAllowed(const KURL &u)
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
return false;
}
@ -2460,7 +2460,7 @@ void CKioFonts::reparseConfig()
if(itsRoot)
{
KConfig cfg(KFI_ROOT_CFG_FILE);
TDEConfig cfg(KFI_ROOT_CFG_FILE);
bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@ -2483,7 +2483,7 @@ void CKioFonts::reparseConfig()
}
else
{
KConfig rootCfg(KFI_ROOT_CFG_FILE);
TDEConfig rootCfg(KFI_ROOT_CFG_FILE);
bool rootDoX=rootCfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
rootDoGs=rootCfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@ -2517,7 +2517,7 @@ void CKioFonts::reparseConfig()
if(0==itsNrsKfiParams[1])
itsNrsKfiParams[0]=0;
KConfig cfg(KFI_CFG_FILE);
TDEConfig cfg(KFI_CFG_FILE);
bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);

4
kcontrol/kfontinst/kio/KioFonts.h
Unescape Escape View File

@ -44,7 +44,7 @@
namespace KFI
{
class CKioFonts : public KIO::SlaveBase
class CKioFonts : public TDEIO::SlaveBase
{
private:
@ -101,7 +101,7 @@ class CKioFonts : public KIO::SlaveBase
void listDir(const KURL &url);
void stat(const KURL &url);
bool createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder);
bool createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder);
void get(const KURL &url);
void put(const KURL &url, int mode, bool overwrite, bool resume);
void copy(const KURL &src, const KURL &dest, int mode, bool overwrite);

12
kcontrol/kfontinst/lib/FcEngine.cpp
Unescape Escape View File

@ -687,7 +687,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
TQString CFcEngine::getPreviewString()
{
KConfig cfg(KFI_UI_CFG_FILE);
TDEConfig cfg(KFI_UI_CFG_FILE);
cfg.setGroup(KFI_PREVIEW_GROUP);
@ -700,7 +700,7 @@ TQString CFcEngine::getPreviewString()
void CFcEngine::setPreviewString(const TQString &str)
{
KConfig cfg(KFI_UI_CFG_FILE);
TDEConfig cfg(KFI_UI_CFG_FILE);
cfg.setGroup(KFI_PREVIEW_GROUP);
cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str);
@ -911,17 +911,17 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
//
if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
{
KIO::UDSEntry udsEntry;
TDEIO::UDSEntry udsEntry;
TQString name;
FcInitReinitialize();
if(KIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name...
if(TDEIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name...
{
KIO::UDSEntry::Iterator it(udsEntry.begin()),
TDEIO::UDSEntry::Iterator it(udsEntry.begin()),
end(udsEntry.end());
for( ; it != end; ++it)
if (KIO::UDS_NAME==(*it).m_uds)
if (TDEIO::UDS_NAME==(*it).m_uds)
{
name=(*it).m_str;
break;

2
kcontrol/kfontinst/lib/KfiConstants.h
Unescape Escape View File

@ -21,7 +21,7 @@
#define KFI_DEFAULT_CFG_X true
#define KFI_DEFAULT_CFG_GS false
// KIO::special
// TDEIO::special
namespace KFI
{

8
kcontrol/kfontinst/lib/Misc.cpp
Unescape Escape View File

@ -190,11 +190,11 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg
for(e=0; afm[e]; ++e)
{
KURL statUrl(url);
KIO::UDSEntry uds;
TDEIO::UDSEntry uds;
statUrl.setPath(changeExt(url.path(), afm[e]));
if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget))
if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget))
{
list.append(statUrl);
gotAfm=true;
@ -206,10 +206,10 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg
for(e=0; pfm[e]; ++e)
{
KURL statUrl(url);
KIO::UDSEntry uds;
TDEIO::UDSEntry uds;
statUrl.setPath(changeExt(url.path(), pfm[e]));
if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget))
if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget))
{
list.append(statUrl);
break;

12
kcontrol/kfontinst/viewpart/FontViewPart.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ bool CFontViewPart::openURL(const KURL &url)
bool CFontViewPart::openFile()
{
// NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up.
// NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
// Bug report 111535 indicates that calling "konqueror <font>" crashes.
TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
return true;
@ -165,17 +165,17 @@ void CFontViewPart::timeout()
if(Misc::root())
{
destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
}
@ -220,7 +220,7 @@ void CFontViewPart::install()
{
KURL destUrl(getDest(m_url, KMessageBox::No==resp));
if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
if(TDEIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
{
//
// OK file copied, now look for any AFM or PFM file...
@ -236,7 +236,7 @@ void CFontViewPart::install()
for(it=urls.begin(); it!=end; ++it)
{
destUrl=getDest(*it, KMessageBox::No==resp);
KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
TDEIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
}
}

4
kcontrol/kfontinst/viewpart/FontViewerApp.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
itsPreview->openURL(openURL);
TQSize defSize(450, 380);
KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
show();
@ -83,7 +83,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
{
KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
kapp->config()->writeEntry(CFG_SIZE_KEY, size());
kapp->config()->sync();
}

6
kcontrol/kicker/advancedDialog.cpp
Unescape Escape View File

@ -78,7 +78,7 @@ advancedDialog::~advancedDialog()
void advancedDialog::load()
{
KConfig c(KickerConfig::the()->configName(), false, false);
TDEConfig c(KickerConfig::the()->configName(), false, false);
c.setGroup("General");
bool fadedOut = c.readBoolEntry("FadeOutAppletHandles", true);
@ -112,7 +112,7 @@ void advancedDialog::load()
void advancedDialog::save()
{
KConfig c(KickerConfig::the()->configName(), false, false);
TDEConfig c(KickerConfig::the()->configName(), false, false);
c.setGroup("General");
c.writeEntry("FadeOutAppletHandles",
@ -149,7 +149,7 @@ void advancedDialog::save()
// set config group
c.setGroup(group);
KConfig extConfig(c.readEntry("ConfigFile"));
TDEConfig extConfig(c.readEntry("ConfigFile"));
extConfig.setGroup("General");
extConfig.writeEntry("FadeOutAppletHandles",
m_advancedWidget->fadeOutHandles->isChecked());

4
kcontrol/kicker/applettab_impl.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ void AppletTab::load()
void AppletTab::load( bool useDefaults )
{
KConfig c(KickerConfig::the()->configName(), false, false);
TDEConfig c(KickerConfig::the()->configName(), false, false);
c.setReadDefaults( useDefaults );
c.setGroup("General");
@ -153,7 +153,7 @@ void AppletTab::load( bool useDefaults )
void AppletTab::save()
{
KConfig c(KickerConfig::the()->configName(), false, false);
TDEConfig c(KickerConfig::the()->configName(), false, false);
c.setGroup("General");
int level = 0;

6
kcontrol/kicker/extensionInfo.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ void ExtensionInfo::load()
if (_customSizeMax < _customSizeMin) _customSizeMax = _customSizeMin;
if (_customSize < _customSizeMin) _customSize = _customSizeMin;
KConfig c(_configFile);
TDEConfig c(_configFile);
c.setGroup("General");
_position = c.readNumEntry ("Position", _position);
@ -159,7 +159,7 @@ void ExtensionInfo::load()
void ExtensionInfo::configChanged()
{
KConfig c(_configFile);
TDEConfig c(_configFile);
c.setGroup("General");
// check to see if the new value is different from both
@ -223,7 +223,7 @@ void ExtensionInfo::setDefaults()
void ExtensionInfo::save()
{
KConfig c(_configFile);
TDEConfig c(_configFile);
c.setGroup("General");
c.writeEntry("Position", _position);

10
kcontrol/kicker/hidingconfig.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include "hidingconfig.moc"
HidingConfig::HidingConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new HidingTab(this);
@ -58,7 +58,7 @@ void HidingConfig::notChanged()
void HidingConfig::load()
{
m_widget->load();
KCModule::load();
TDECModule::load();
}
void HidingConfig::aboutToNotifyKicker()
@ -69,7 +69,7 @@ void HidingConfig::aboutToNotifyKicker()
// which is send before Kicker is notified.
// See comment in save().
m_widget->save();
KCModule::save();
TDECModule::save();
}
void HidingConfig::save()
@ -85,9 +85,9 @@ void HidingConfig::save()
void HidingConfig::defaults()
{
m_widget->defaults();
KCModule::defaults();
TDECModule::defaults();
// KConfigDialogManager may queue an changed(false) signal,
// TDEConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
TQTimer::singleShot(0, this, TQT_SLOT(changed()));

2
kcontrol/kicker/hidingconfig.h
Unescape Escape View File

@ -22,7 +22,7 @@
class HidingTab;
class HidingConfig : public KCModule
class HidingConfig : public TDECModule
{
Q_OBJECT

10
kcontrol/kicker/lookandfeelconfig.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include "lookandfeelconfig.moc"
LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new LookAndFeelTab(this);
@ -57,7 +57,7 @@ void LookAndFeelConfig::notChanged()
void LookAndFeelConfig::load()
{
KCModule::load();
TDECModule::load();
m_widget->load();
}
@ -68,7 +68,7 @@ void LookAndFeelConfig::aboutToNotifyKicker()
// This slot is triggered by the signal,
// which is send before Kicker is notified.
// See comment in save().
KCModule::save();
TDECModule::save();
m_widget->save();
}
@ -84,10 +84,10 @@ void LookAndFeelConfig::save()
void LookAndFeelConfig::defaults()
{
KCModule::defaults();
TDECModule::defaults();
m_widget->defaults();
// KConfigDialogManager may queue an changed(false) signal,
// TDEConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
TQTimer::singleShot(0, this, TQT_SLOT(changed()));

2
kcontrol/kicker/lookandfeelconfig.h
Unescape Escape View File

@ -22,7 +22,7 @@
class LookAndFeelTab;
class LookAndFeelConfig : public KCModule
class LookAndFeelConfig : public TDECModule
{
Q_OBJECT

6
kcontrol/kicker/lookandfeeltab_impl.cpp
Unescape Escape View File

@ -129,7 +129,7 @@ void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew)
KickerLib::colorize(tmpImg);
theme_preview.convertFromImage(tmpImg);
if(!theme_preview.isNull()) {
// avoid getting changed(true) from KConfigDialogManager for the default value
// avoid getting changed(true) from TDEConfigDialogManager for the default value
if( KickerSettings::backgroundTheme() == themepath )
KickerSettings::setBackgroundTheme( theme );
kcfg_BackgroundTheme->lineEdit()->setText(theme);
@ -154,7 +154,7 @@ void LookAndFeelTab::load()
void LookAndFeelTab::load(bool useDefaults)
{
KConfig config(KickerConfig::the()->configName(), false, false);
TDEConfig config(KickerConfig::the()->configName(), false, false);
config.setReadDefaults( useDefaults );
@ -227,7 +227,7 @@ void LookAndFeelTab::load(bool useDefaults)
void LookAndFeelTab::save()
{
KConfig config(KickerConfig::the()->configName(), false, false);
TDEConfig config(KickerConfig::the()->configName(), false, false);
config.setGroup("General");

2
kcontrol/kicker/lookandfeeltab_kcm.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include <kdialog.h>
LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TDEAboutData *about =

2
kcontrol/kicker/lookandfeeltab_kcm.h
Unescape Escape View File

@ -22,7 +22,7 @@
class LookAndFeelTab;
class LookAndFeelConfig : public KCModule
class LookAndFeelConfig : public TDECModule
{
Q_OBJECT

16
kcontrol/kicker/main.cpp
Unescape Escape View File

@ -171,7 +171,7 @@ void KickerConfig::notifyKicker()
kapp->dcopClient()->send(appname, appname, "configure()", data);
}
void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists)
void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
{
config.setGroup("General");
TQStringList elist = config.readListEntry("Extensions2");
@ -353,7 +353,7 @@ TQString KickerConfig::quickHelp() const
TDEAboutData *KickerConfig::aboutData()
{
// the TDEAboutDatas are deleted by the KCModules
// the TDEAboutDatas are deleted by the TDECModules
TDEAboutData *about
= new TDEAboutData(I18N_NOOP("kcmkicker"),
I18N_NOOP("TDE Panel Control Module"),
@ -371,9 +371,9 @@ TDEAboutData *KickerConfig::aboutData()
extern "C"
{
KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
{
KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker");
TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
container->addModule("kicker_config_arrangement");
container->addModule("kicker_config_hiding");
container->addModule("kicker_config_menus");
@ -381,26 +381,26 @@ extern "C"
return container;
}
KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
{
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new PositionConfig(parent, "kcmkicker");
}
KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
{
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new HidingConfig(parent, "kcmkicker");
}
KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
{
return new MenuConfig(parent, "kcmkicker");
}
KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
{
KImageIO::registerFormats();
TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +

2
kcontrol/kicker/main.h
Unescape Escape View File

@ -65,7 +65,7 @@ signals:
protected:
void init();
void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false);
void setupExtensionInfo(TDEConfig& c, bool checkExists, bool reloadIfExists = false);
protected slots:
void configChanged(const TQString&);

10
kcontrol/kicker/menuconfig.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include "menuconfig.moc"
MenuConfig::MenuConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new MenuTab(this);
@ -58,7 +58,7 @@ void MenuConfig::notChanged()
void MenuConfig::load()
{
m_widget->load();
KCModule::load();
TDECModule::load();
}
void MenuConfig::aboutToNotifyKicker()
@ -69,7 +69,7 @@ void MenuConfig::aboutToNotifyKicker()
// which is send before Kicker is notified.
// See comment in save().
m_widget->save();
KCModule::save();
TDECModule::save();
}
void MenuConfig::save()
@ -85,9 +85,9 @@ void MenuConfig::save()
void MenuConfig::defaults()
{
m_widget->defaults();
KCModule::defaults();
TDECModule::defaults();
// KConfigDialogManager may queue an changed(false) signal,
// TDEConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changedm,
// while we manage some of the widgets ourselves
TQTimer::singleShot(0, this, TQT_SLOT(changed()));

2
kcontrol/kicker/menuconfig.h
Unescape Escape View File

@ -22,7 +22,7 @@
class MenuTab;
class MenuConfig : public KCModule
class MenuConfig : public TDECModule
{
Q_OBJECT

8
kcontrol/kicker/menutab_impl.cpp
Unescape Escape View File

@ -93,8 +93,8 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
KConfig *config;
config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
TDEConfig *config;
config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
config->setGroup(TQString::fromLatin1("RecentDocuments"));
maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
@ -267,8 +267,8 @@ void MenuTab::save()
c->sync();
// Save recent documents
KConfig *config;
config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
TDEConfig *config;
config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
config->setGroup(TQString::fromLatin1("RecentDocuments"));
config->writeEntry("MaxEntries", maxrecentdocs->value());
config->sync();

10
kcontrol/kicker/positionconfig.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include "positionconfig.moc"
PositionConfig::PositionConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new PositionTab(this);
@ -58,7 +58,7 @@ void PositionConfig::notChanged()
void PositionConfig::load()
{
m_widget->load();
KCModule::load();
TDECModule::load();
}
void PositionConfig::aboutToNotifyKicker()
@ -69,7 +69,7 @@ void PositionConfig::aboutToNotifyKicker()
// which is send before Kicker is notified.
// See comment in save().
m_widget->save();
KCModule::save();
TDECModule::save();
}
void PositionConfig::save()
@ -85,9 +85,9 @@ void PositionConfig::save()
void PositionConfig::defaults()
{
m_widget->defaults();
KCModule::defaults();
TDECModule::defaults();
// KConfigDialogManager may queue an changed(false) signal,
// TDEConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
TQTimer::singleShot(0, this, TQT_SLOT(changed()));

2
kcontrol/kicker/positionconfig.h
Unescape Escape View File

@ -22,7 +22,7 @@
class PositionTab;
class PositionConfig : public KCModule
class PositionConfig : public TDECModule
{
Q_OBJECT

20
kcontrol/kio/cache.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
#include "cache_ui.h"
KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent )
:KCModule( parent, "kcmkio" )
:TDECModule( parent, "kcmkio" )
{
TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
m_dlg = new CacheDlgUI(this);
@ -54,15 +54,15 @@ void KCacheConfigDialog::load()
m_dlg->cbUseCache->setChecked(KProtocolManager::useCache());
m_dlg->sbMaxCacheSize->setValue( KProtocolManager::maxCacheSize() );
KIO::CacheControl cc = KProtocolManager::cacheControl();
TDEIO::CacheControl cc = KProtocolManager::cacheControl();
if (cc==KIO::CC_Verify)
if (cc==TDEIO::CC_Verify)
m_dlg->rbVerifyCache->setChecked( true );
else if (cc==KIO::CC_Refresh)
else if (cc==TDEIO::CC_Refresh)
m_dlg->rbVerifyCache->setChecked( true );
else if (cc==KIO::CC_CacheOnly)
else if (cc==TDEIO::CC_CacheOnly)
m_dlg->rbOfflineMode->setChecked( true );
else if (cc==KIO::CC_Cache)
else if (cc==TDEIO::CC_Cache)
m_dlg->rbCacheIfPossible->setChecked( true );
// Config changed notifications...
@ -79,13 +79,13 @@ void KCacheConfigDialog::save()
KSaveIOConfig::setMaxCacheSize( m_dlg->sbMaxCacheSize->value() );
if ( !m_dlg->cbUseCache->isChecked() )
KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh);
else if ( m_dlg->rbVerifyCache->isChecked() )
KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh);
else if ( m_dlg->rbOfflineMode->isChecked() )
KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly);
KSaveIOConfig::setCacheControl(TDEIO::CC_CacheOnly);
else if ( m_dlg->rbCacheIfPossible->isChecked() )
KSaveIOConfig::setCacheControl(KIO::CC_Cache);
KSaveIOConfig::setCacheControl(TDEIO::CC_Cache);
// Update running io-slaves...
KSaveIOConfig::updateRunningIOSlaves (this);

2
kcontrol/kio/cache.h
Unescape Escape View File

@ -26,7 +26,7 @@
class CacheDlgUI;
class KCacheConfigDialog : public KCModule
class KCacheConfigDialog : public TDECModule
{
Q_OBJECT

4
kcontrol/kio/kcookiesmain.cpp
Unescape Escape View File

@ -17,7 +17,7 @@
#include "kcookiesmanagement.h"
KCookiesMain::KCookiesMain(TQWidget *parent)
: KCModule(parent, "kcmkio")
: TDECModule(parent, "kcmkio")
{
management = 0;
bool managerOK = true;
@ -70,7 +70,7 @@ void KCookiesMain::save()
void KCookiesMain::defaults()
{
KCModule* module = static_cast<KCModule*>(tab->currentPage());
TDECModule* module = static_cast<TDECModule*>(tab->currentPage());
if ( module == policies )
policies->defaults();

2
kcontrol/kio/kcookiesmain.h
Unescape Escape View File

@ -13,7 +13,7 @@ class DCOPClient;
class KCookiesPolicies;
class KCookiesManagement;
class KCookiesMain : public KCModule
class KCookiesMain : public TDECModule
{
Q_OBJECT
public:

2
kcontrol/kio/kcookiesmanagement.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ TQString CookieListViewItem::text(int f) const
}
KCookiesManagement::KCookiesManagement(TQWidget *parent)
: KCModule(parent, "kcmkio")
: TDECModule(parent, "kcmkio")
{
// Toplevel layout
TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),

2
kcontrol/kio/kcookiesmanagement.h
Unescape Escape View File

@ -59,7 +59,7 @@ private:
bool mCookiesLoaded;
};
class KCookiesManagement : public KCModule
class KCookiesManagement : public TDECModule
{
Q_OBJECT

6
kcontrol/kio/kcookiespolicies.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
#include "kcookiespoliciesdlg_ui.h"
KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
:KCModule(parent, "kcmkio")
:TDECModule(parent, "kcmkio")
{
TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0);
@ -283,7 +283,7 @@ void KCookiesPolicies::load()
d_itemsSelected = 0;
d_configChanged = false;
KConfig cfg ("kcookiejarrc", true);
TDEConfig cfg ("kcookiejarrc", true);
cfg.setGroup ("Cookie Policy");
bool enableCookies = cfg.readBoolEntry("Cookies", true);
@ -365,7 +365,7 @@ void KCookiesPolicies::save()
if (!d_configChanged)
return;
KConfig cfg ( "kcookiejarrc" );
TDEConfig cfg ( "kcookiejarrc" );
cfg.setGroup( "Cookie Policy" );
bool state = dlg->cbEnableCookies->isChecked();

2
kcontrol/kio/kcookiespolicies.h
Unescape Escape View File

@ -36,7 +36,7 @@ class TQListViewItem;
class DCOPClient;
class KCookiesPolicyDlgUI;
class KCookiesPolicies : public KCModule
class KCookiesPolicies : public TDECModule
{
Q_OBJECT

8
kcontrol/kio/kproxydlg.cpp
Unescape Escape View File

@ -41,7 +41,7 @@
#include "kproxydlg_ui.h"
KProxyOptions::KProxyOptions (TQWidget* parent )
:KCModule (parent, "kcmkio")
:TDECModule (parent, "kcmkio")
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
@ -85,9 +85,9 @@ TQString KProxyOptions::quickHelp() const
{
TQWidget *w = mTab->currentPage();
if (w && w->inherits("KCModule"))
if (w && w->inherits("TDECModule"))
{
KCModule *m = static_cast<KCModule *>(w);
TDECModule *m = static_cast<TDECModule *>(w);
return m->quickHelp();
}
@ -96,7 +96,7 @@ TQString KProxyOptions::quickHelp() const
KProxyDialog::KProxyDialog( TQWidget* parent)
:KCModule( parent, "kcmkio" )
:TDECModule( parent, "kcmkio" )
{
TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );

8
kcontrol/kio/kproxydlg.h
Unescape Escape View File

@ -31,7 +31,7 @@ class TQTabWidget;
class KProxyData;
class KProxyDialogUI;
class KProxyOptions : public KCModule
class KProxyOptions : public TDECModule
{
Q_OBJECT
@ -45,12 +45,12 @@ public:
virtual TQString quickHelp() const;
private:
KCModule* mProxy;
KCModule* mSocks;
TDECModule* mProxy;
TDECModule* mSocks;
TQTabWidget* mTab;
};
class KProxyDialog : public KCModule
class KProxyDialog : public TDECModule
{
Q_OBJECT

56
kcontrol/kio/ksaveioconfig.cpp
Unescape Escape View File

@ -32,8 +32,8 @@ public:
KSaveIOConfigPrivate ();
~KSaveIOConfigPrivate ();
KConfig* config;
KConfig* http_config;
TDEConfig* config;
TDEConfig* http_config;
};
static KSaveIOConfigPrivate *ksiocpref = 0;
@ -51,24 +51,24 @@ KSaveIOConfigPrivate::~KSaveIOConfigPrivate ()
KSaveIOConfigPrivate* KSaveIOConfig::d = 0;
KConfig* KSaveIOConfig::config()
TDEConfig* KSaveIOConfig::config()
{
if (!d)
d = new KSaveIOConfigPrivate;
if (!d->config)
d->config = new KConfig("kioslaverc", false, false);
d->config = new TDEConfig("kioslaverc", false, false);
return d->config;
}
KConfig* KSaveIOConfig::http_config()
TDEConfig* KSaveIOConfig::http_config()
{
if (!d)
d = new KSaveIOConfigPrivate;
if (!d->http_config)
d->http_config = new KConfig("kio_httprc", false, false);
d->http_config = new TDEConfig("kio_httprc", false, false);
return d->http_config;
}
@ -81,7 +81,7 @@ void KSaveIOConfig::reparseConfiguration ()
void KSaveIOConfig::setReadTimeout( int _timeout )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
@ -89,7 +89,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout )
void KSaveIOConfig::setConnectTimeout( int _timeout )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
@ -97,7 +97,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout )
void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
@ -105,7 +105,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
void KSaveIOConfig::setResponseTimeout( int _timeout )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
@ -114,7 +114,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout )
void KSaveIOConfig::setMarkPartial( bool _mode )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry( "MarkPartial", _mode );
cfg->sync();
@ -122,7 +122,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode )
void KSaveIOConfig::setMinimumKeepSize( int _size )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry( "MinimumKeepSize", _size );
cfg->sync();
@ -130,7 +130,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size )
void KSaveIOConfig::setAutoResume( bool _mode )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( TQString() );
cfg->writeEntry( "AutoResume", _mode );
cfg->sync();
@ -138,36 +138,36 @@ void KSaveIOConfig::setAutoResume( bool _mode )
void KSaveIOConfig::setUseCache( bool _mode )
{
KConfig* cfg = http_config ();
TDEConfig* cfg = http_config ();
cfg->writeEntry( "UseCache", _mode );
cfg->sync();
}
void KSaveIOConfig::setMaxCacheSize( int cache_size )
{
KConfig* cfg = http_config ();
TDEConfig* cfg = http_config ();
cfg->writeEntry( "MaxCacheSize", cache_size );
cfg->sync();
}
void KSaveIOConfig::setCacheControl(KIO::CacheControl policy)
void KSaveIOConfig::setCacheControl(TDEIO::CacheControl policy)
{
KConfig* cfg = http_config ();
TQString tmp = KIO::getCacheControlString(policy);
TDEConfig* cfg = http_config ();
TQString tmp = TDEIO::getCacheControlString(policy);
cfg->writeEntry("cache", tmp);
cfg->sync();
}
void KSaveIOConfig::setMaxCacheAge( int cache_age )
{
KConfig* cfg = http_config ();
TDEConfig* cfg = http_config ();
cfg->writeEntry( "MaxCacheAge", cache_age );
cfg->sync();
}
void KSaveIOConfig::setUseReverseProxy( bool mode )
{
KConfig* cfg = config ();
TDEConfig* cfg = config ();
cfg->setGroup( "Proxy Settings" );
cfg->writeEntry("ReversedException",