Rename KStandard for enhanced compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 356c5b48d0
commit 6d70eafec0

@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin"
KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const TQStringList & /* list */ ) KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const TQStringList & /* list */ )
:KonqPopupMenuPlugin (pPopupmenu, name) :KonqPopupMenuPlugin (pPopupmenu, name)
{ {
if (KStandardDirs::findExe ("kdiff3").isNull ()) if (TDEStandardDirs::findExe ("kdiff3").isNull ())
return; return;
m_pParentWidget = pPopupmenu->parentWidget(); m_pParentWidget = pPopupmenu->parentWidget();

@ -423,7 +423,7 @@ void KMainWindow::slotHelp()
} }
TQString KStandardDirs::findResource(const TQString& resource, const TQString& /*appName*/) TQString TDEStandardDirs::findResource(const TQString& resource, const TQString& /*appName*/)
{ {
if (resource=="config") if (resource=="config")
{ {
@ -445,7 +445,7 @@ void TDEConfig::readConfigFile( const TQString& configFileName )
} }
else else
{ {
m_fileName = KStandardDirs().findResource("config","kdiff3rc"); m_fileName = TDEStandardDirs().findResource("config","kdiff3rc");
} }
TQFile f( m_fileName ); TQFile f( m_fileName );

@ -310,7 +310,7 @@ public:
void setPageSelection(e_PageSelection); void setPageSelection(e_PageSelection);
}; };
class KStandardDirs class TDEStandardDirs
{ {
public: public:
TQString findResource(const TQString& resource, const TQString& appName); TQString findResource(const TQString& resource, const TQString& appName);

@ -65,7 +65,7 @@ static KCmdLineOptions options2[] =
void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions) void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions)
{ {
vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options))); vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options)));
TQString configFileName = KStandardDirs().findResource("config","kdiff3rc"); TQString configFileName = TDEStandardDirs().findResource("config","kdiff3rc");
TQFile configFile( configFileName ); TQFile configFile( configFileName );
if ( configFile.open( IO_ReadOnly ) ) if ( configFile.open( IO_ReadOnly ) )
{ {

Loading…
Cancel
Save