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

Rename KShared

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 5b6f5139f2
commit 44ff5a3c79
24 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
kbabel/catalogmanager/catalogmanagerview.cpp
Unescape View File

@ -1119,7 +1119,7 @@ void CatalogManagerView::cvsDiff( )
void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templates ) void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templates )
{ {
KSharedConfig* config = _project->sharedConfig(); TDESharedConfig* config = _project->sharedConfig();
if ( marked ) { if ( marked ) {
if ( _markerList.isEmpty() ) return; if ( _markerList.isEmpty() ) return;
TQStringList fileList; TQStringList fileList;
@ -1231,7 +1231,7 @@ void CatalogManagerView::svnDiff( )
void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templates ) void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templates )
{ {
KSharedConfig* config = _project->sharedConfig(); TDESharedConfig* config = _project->sharedConfig();
if ( marked ) { if ( marked ) {
if ( _markerList.isEmpty() ) return; if ( _markerList.isEmpty() ) return;
TQStringList fileList; TQStringList fileList;

6
kbabel/catalogmanager/libcvs/cvsdialog.cpp
Unescape View File

@ -60,7 +60,7 @@
#include "cvsdialog.h" #include "cvsdialog.h"
CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ) CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* config )
: KDialog( parent, "CVSDIALOG", true ), m_config( config ) : KDialog( parent, "CVSDIALOG", true ), m_config( config )
{ {
_cmd = cmd; _cmd = cmd;
@ -373,7 +373,7 @@ TQString CVSDialog::statusOutput( )
void CVSDialog::readSettings( ) void CVSDialog::readSettings( )
{ {
KSharedConfig * config = m_config; TDESharedConfig * config = m_config;
config->setGroup( "CVSSupport" ); config->setGroup( "CVSSupport" );
if ( _cmd == CVS::Commit ) { if ( _cmd == CVS::Commit ) {
@ -404,7 +404,7 @@ void CVSDialog::readSettings( )
void CVSDialog::saveSettings( ) void CVSDialog::saveSettings( )
{ {
KSharedConfig * config = m_config; TDESharedConfig * config = m_config;
config->setGroup( "CVSSupport" ); config->setGroup( "CVSSupport" );
if ( _cmd == CVS::Commit ) { if ( _cmd == CVS::Commit ) {
config->writeEntry( "AutoAddFiles", autoAddBox->isChecked( ) ); config->writeEntry( "AutoAddFiles", autoAddBox->isChecked( ) );

4
kbabel/catalogmanager/libcvs/cvsdialog.h
Unescape View File

@ -73,7 +73,7 @@ class CVSDialog : public KDialog
* Constructor for creating the dialog. * Constructor for creating the dialog.
* @param cmd The type of command to be executed. * @param cmd The type of command to be executed.
*/ */
CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ); CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* config );
~CVSDialog(); ~CVSDialog();
/** /**
* Set the list of files which will be used for the CVS command. * Set the list of files which will be used for the CVS command.
@ -153,7 +153,7 @@ class CVSDialog : public KDialog
KComboBox* m_encodingComboBox; KComboBox* m_encodingComboBox;
/// Configuration data (of the KBabel project) /// Configuration data (of the KBabel project)
KSharedConfig* m_config; TDESharedConfig* m_config;
}; };
#endif // CVSDIALOG_H #endif // CVSDIALOG_H

6
kbabel/catalogmanager/libcvs/cvshandler.cpp
Unescape View File

@ -182,7 +182,7 @@ TQString CVSHandler::cvsStatus( const TQString& filename ) const
return map[filename]; return map[filename];
} }
void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, TDESharedConfig* config )
{ {
if ( !_isPORepository ) { if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-) // This message box should never be visible but who knows... ;-)
@ -221,7 +221,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
showDialog( parent, cmd, TQStringList( filename ), command, config ); showDialog( parent, cmd, TQStringList( filename ), command, config );
} }
void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, TDESharedConfig* config )
{ {
if ( !_isPORepository ) { if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-) // This message box should never be visible but who knows... ;-)
@ -270,7 +270,7 @@ void CVSHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update; _autoUpdateTemplates = update;
} }
void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, TDESharedConfig* config )
{ {
CVSDialog * dia = new CVSDialog( cmd, parent, config ); CVSDialog * dia = new CVSDialog( cmd, parent, config );
dia->setFiles( files ); dia->setFiles( files );

8
kbabel/catalogmanager/libcvs/cvshandler.h
Unescape View File

@ -46,7 +46,7 @@ class TQString;
class TQStringList; class TQStringList;
class TQWidget; class TQWidget;
class KSharedConfig; class TDESharedConfig;
/** /**
* This class is the backend for CVS support in Catalog Manager. * This class is the backend for CVS support in Catalog Manager.
@ -79,8 +79,8 @@ class CVSHandler : public TQObject
TQString fileStatus( const FileStatus status ) const; TQString fileStatus( const FileStatus status ) const;
TQString cvsStatus( const TQString& filename ) const; TQString cvsStatus( const TQString& filename ) const;
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, TDESharedConfig* config );
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, TDESharedConfig* config );
void setAutoUpdateTemplates( bool update ); void setAutoUpdateTemplates( bool update );
@ -95,7 +95,7 @@ class CVSHandler : public TQObject
void signalFilesCommitted( const TQStringList& ); void signalFilesCommitted( const TQStringList& );
private: private:
void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, TDESharedConfig* config );
void checkToAdd( const TQStringList& files ); void checkToAdd( const TQStringList& files );
void processStatusOutput( const TQString& status ); void processStatusOutput( const TQString& status );
void processDiff( TQString output ); void processDiff( TQString output );

6
kbabel/catalogmanager/libsvn/svndialog.cpp
Unescape View File

@ -57,7 +57,7 @@
#include "svndialog.h" #include "svndialog.h"
SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ) SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* config )
: KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config )
{ {
_cmd = cmd; _cmd = cmd;
@ -352,7 +352,7 @@ TQString SVNDialog::statusOutput( )
void SVNDialog::readSettings( ) void SVNDialog::readSettings( )
{ {
KSharedConfig * config = m_config; TDESharedConfig * config = m_config;
config->setGroup( "SVNSupport" ); config->setGroup( "SVNSupport" );
if ( _cmd == SVN::Commit ) { if ( _cmd == SVN::Commit ) {
@ -381,7 +381,7 @@ void SVNDialog::readSettings( )
void SVNDialog::saveSettings( ) void SVNDialog::saveSettings( )
{ {
KSharedConfig * config = m_config; TDESharedConfig * config = m_config;
config->setGroup( "SVNSupport" ); config->setGroup( "SVNSupport" );
if ( _cmd == SVN::Commit ) { if ( _cmd == SVN::Commit ) {
config->writeEntry( "AutoAddFiles", autoAddBox->isChecked( ) ); config->writeEntry( "AutoAddFiles", autoAddBox->isChecked( ) );

6
kbabel/catalogmanager/libsvn/svndialog.h
Unescape View File

@ -50,7 +50,7 @@ class TQTextEdit;
// Forwarding KDE classes // Forwarding KDE classes
class TDEProcess; class TDEProcess;
class KTempFile; class KTempFile;
class KSharedConfig; class TDESharedConfig;
/** /**
* This class represents the dialog which is used for executing SVN commands * This class represents the dialog which is used for executing SVN commands
@ -72,7 +72,7 @@ class SVNDialog : public KDialog
* Constructor for creating the dialog. * Constructor for creating the dialog.
* @param cmd The type of command to be executed. * @param cmd The type of command to be executed.
*/ */
SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ); SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* config );
~SVNDialog(); ~SVNDialog();
/** /**
* Set the list of files which will be used for the SVN command. * Set the list of files which will be used for the SVN command.
@ -146,7 +146,7 @@ class SVNDialog : public KDialog
KTempFile* m_tempFile; KTempFile* m_tempFile;
/// Configuration data (of the KBabel project) /// Configuration data (of the KBabel project)
KSharedConfig* m_config; TDESharedConfig* m_config;
}; };
#endif // SVNDIALOG_H #endif // SVNDIALOG_H

6
kbabel/catalogmanager/libsvn/svnhandler.cpp
Unescape View File

@ -274,14 +274,14 @@ TQString SVNHandler::svnStatus( const TQString& filename ) const
return map[filename]; return map[filename];
} }
void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config) void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, TDESharedConfig* config)
{ {
// Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!) // Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!)
// ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one // ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one
execSVNCommand( parent, cmd, TQStringList( filename ), templates, config ); execSVNCommand( parent, cmd, TQStringList( filename ), templates, config );
} }
void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, TDESharedConfig* config )
{ {
if ( !_isPORepository ) { if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-) // This message box should never be visible but who knows... ;-)
@ -336,7 +336,7 @@ void SVNHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update; _autoUpdateTemplates = update;
} }
void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, TDESharedConfig* config )
{ {
SVNDialog * dia = new SVNDialog( cmd, parent, config ); SVNDialog * dia = new SVNDialog( cmd, parent, config );
dia->setFiles( files ); dia->setFiles( files );

8
kbabel/catalogmanager/libsvn/svnhandler.h
Unescape View File

@ -45,7 +45,7 @@
class TQString; class TQString;
class TQStringList; class TQStringList;
class KSharedConfig; class TDESharedConfig;
/** /**
* This class is the backend for SVN support in Catalog Manager. * This class is the backend for SVN support in Catalog Manager.
@ -78,8 +78,8 @@ class SVNHandler : public TQObject
TQString fileStatus( const FileStatus status ) const; TQString fileStatus( const FileStatus status ) const;
TQString svnStatus( const TQString& filename ) const; TQString svnStatus( const TQString& filename ) const;
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, TDESharedConfig* config );
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, TDESharedConfig* config );
void setAutoUpdateTemplates( bool update ); void setAutoUpdateTemplates( bool update );
@ -94,7 +94,7 @@ class SVNHandler : public TQObject
void signalFilesCommitted( const TQStringList& ); void signalFilesCommitted( const TQStringList& );
private: private:
void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, TDESharedConfig* config );
/// Check quickly if the file is part of a SVN repository /// Check quickly if the file is part of a SVN repository
bool isInSvn( const TQString& path ); bool isInSvn( const TQString& path );
void checkToAdd( const TQStringList& files ); void checkToAdd( const TQStringList& files );

4
kbabel/common/kbproject.cpp
Unescape View File

@ -91,7 +91,7 @@ Project::Project( const TQString& file ) :
} }
} }
_config = KSharedConfig::openConfig (_filename, false, false); _config = TDESharedConfig::openConfig (_filename, false, false);
kdDebug (KBABEL) << "Opened project " << _filename << endl; kdDebug (KBABEL) << "Opened project " << _filename << endl;
// read the project name // read the project name
@ -196,7 +196,7 @@ TDEConfig* Project::config ()
return _config; return _config;
} }
KSharedConfig* Project::sharedConfig( void ) TDESharedConfig* Project::sharedConfig( void )
{ {
return _config; return _config;
} }

10
kbabel/common/kbproject.h
Unescape View File

@ -43,12 +43,12 @@ namespace KBabel
{ {
class ProjectSettingsBase; class ProjectSettingsBase;
class KDE_EXPORT Project : public TQObject, public KShared class KDE_EXPORT Project : public TQObject, public TDEShared
{ {
Q_OBJECT Q_OBJECT
public: public:
typedef KSharedPtr <Project> Ptr; typedef TDESharedPtr <Project> Ptr;
Project( const TQString& file ); Project( const TQString& file );
virtual ~Project (); virtual ~Project ();
@ -60,10 +60,10 @@ namespace KBabel
TDEConfig* config (); TDEConfig* config ();
/** /**
* Returns the KSharedConfig pointer of the project data * Returns the TDESharedConfig pointer of the project data
* @since 1.11.2 (KDE 3.5.2) * @since 1.11.2 (KDE 3.5.2)
*/ */
KSharedConfig* sharedConfig( void ); TDESharedConfig* sharedConfig( void );
ProjectSettingsBase* settings (); ProjectSettingsBase* settings ();
@ -101,7 +101,7 @@ namespace KBabel
TQString _filename; TQString _filename;
TQString _name; TQString _name;
bool _valid; bool _valid;
KSharedConfig::Ptr _config; TDESharedConfig::Ptr _config;
ProjectSettingsBase* _settings; ProjectSettingsBase* _settings;
}; };

2
kbabel/common/kbprojectmanager.cpp
Unescape View File

@ -93,7 +93,7 @@ Project::Ptr ProjectManager::create()
void ProjectManager::remove( Project* ref ) void ProjectManager::remove( Project* ref )
{ {
kdDebug() << k_funcinfo << " Final remove of project " << (void*) ref << " count remaining: " << ref->_KShared_count() << endl; kdDebug() << k_funcinfo << " Final remove of project " << (void*) ref << " count remaining: " << ref->_TDEShared_count() << endl;
p_list.remove (ref); p_list.remove (ref);
} }

4
kbabel/kbabel/kbabel.cpp
Unescape View File

@ -157,7 +157,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
void KBabelMW::init(KBCatalog* catalog) void KBabelMW::init(KBCatalog* catalog)
{ {
_config = KSharedConfig::openConfig( "kbabelrc" ); _config = TDESharedConfig::openConfig( "kbabelrc" );
_toolsShortcuts.clear(); _toolsShortcuts.clear();
@ -305,7 +305,7 @@ void KBabelMW::init(KBCatalog* catalog)
connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)), connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)),
bmHandler, TQT_SLOT(slotClearBookmarks())); bmHandler, TQT_SLOT(slotClearBookmarks()));
_config = KSharedConfig::openConfig( "kbabelrc" ); _config = TDESharedConfig::openConfig( "kbabelrc" );
restoreSettings(); restoreSettings();
_config->setGroup("KBabel"); _config->setGroup("KBabel");

2
kbabel/kbabel/kbabel.h
Unescape View File

@ -314,7 +314,7 @@ private:
// project file // project file
KBabel::Project::Ptr _project; KBabel::Project::Ptr _project;
KSharedConfig::Ptr _config; TDESharedConfig::Ptr _config;
KBabel::ProjectDialog* _projectDialog; KBabel::ProjectDialog* _projectDialog;
TQMap<TQString,TQString> _toolsShortcuts; TQMap<TQString,TQString> _toolsShortcuts;

2
kbabel/kbabel/kbabelview.cpp
Unescape View File

@ -133,7 +133,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project
_catalog=catalog; _catalog=catalog;
_catalog->registerView(this); _catalog->registerView(this);
_config = KSharedConfig::openConfig ("kbabelrc"); _config = TDESharedConfig::openConfig ("kbabelrc");
TDEConfigGroupSaver gs(_config,"Editor"); TDEConfigGroupSaver gs(_config,"Editor");
bool buildLeds=! KBabelSettings::ledInStatusbar(); bool buildLeds=! KBabelSettings::ledInStatusbar();

2
kbabel/kbabel/kbabelview.h
Unescape View File

@ -686,7 +686,7 @@ private:
private: private:
// configuration file // configuration file
KSharedConfig::Ptr _config; TDESharedConfig::Ptr _config;
// project file // project file
KBabel::Project::Ptr _project; KBabel::Project::Ptr _project;

2
kbabel/kbabel/kbcatalogview.cpp
Unescape View File

@ -45,7 +45,7 @@ KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr
_catalog=catalog; _catalog=catalog;
_catalog->registerView(this); _catalog->registerView(this);
_config = KSharedConfig::openConfig ("kbabelrc"); _config = TDESharedConfig::openConfig ("kbabelrc");
_currentIndex=1; // here we use 1 to accept update at opening a file _currentIndex=1; // here we use 1 to accept update at opening a file

2
kbabel/kbabel/kbcatalogview.h
Unescape View File

@ -95,7 +95,7 @@ protected:
uint _currentIndex; uint _currentIndex;
// configuration file // configuration file
KSharedConfig::Ptr _config; TDESharedConfig::Ptr _config;
// project file // project file
KBabel::Project::Ptr _project; KBabel::Project::Ptr _project;
}; };

2
kbugbuster/backend/bug.h
Unescape View File

@ -83,7 +83,7 @@ public:
private: private:
BugImpl *impl() const { return m_impl; } BugImpl *impl() const { return m_impl; }
KSharedPtr<BugImpl> m_impl; TDESharedPtr<BugImpl> m_impl;
}; };
#endif #endif

2
kbugbuster/backend/bugdetails.h
Unescape View File

@ -46,7 +46,7 @@ public:
private: private:
BugDetailsImpl *impl() const { return m_impl; } BugDetailsImpl *impl() const { return m_impl; }
KSharedPtr<BugDetailsImpl> m_impl; TDESharedPtr<BugDetailsImpl> m_impl;
}; };
#endif #endif

2
kbugbuster/backend/bugdetailsimpl.h
Unescape View File

@ -5,7 +5,7 @@
#include "bugdetailspart.h" #include "bugdetailspart.h"
struct BugDetailsImpl : public KShared struct BugDetailsImpl : public TDEShared
{ {
public: public:
BugDetailsImpl( const TQString &_version, const TQString &_source, BugDetailsImpl( const TQString &_version, const TQString &_source,

2
kbugbuster/backend/bugimpl.h
Unescape View File

@ -7,7 +7,7 @@
#include <kurl.h> #include <kurl.h>
#include <ksharedptr.h> #include <ksharedptr.h>
struct BugImpl : public KShared struct BugImpl : public TDEShared
{ {
public: public:
BugImpl( const TQString &_title, const Person &_submitter, TQString _number, BugImpl( const TQString &_title, const Person &_submitter, TQString _number,

2
kbugbuster/backend/package.h
Unescape View File

@ -34,7 +34,7 @@ public:
bool operator<( const Package &rhs ) const; bool operator<( const Package &rhs ) const;
private: private:
KSharedPtr<PackageImpl> m_impl; TDESharedPtr<PackageImpl> m_impl;
}; };
#endif #endif

2
kbugbuster/backend/packageimpl.h
Unescape View File

@ -7,7 +7,7 @@
#include <kurl.h> #include <kurl.h>
#include <ksharedptr.h> #include <ksharedptr.h>
struct PackageImpl : public KShared struct PackageImpl : public TDEShared
{ {
public: public:
PackageImpl( const TQString &_name, const TQString &_description, PackageImpl( const TQString &_name, const TQString &_description,

Write Preview
Loading…
Cancel
Save