diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:17:06 -0600 |
| commit | 6d70eafec07c8700ad99ad334c92c01119b947bf (patch) | |
| tree | 9d6275aa29c496dc823bd7b7d78dbf6e2476a788 | |
| parent | 356c5b48d05c5ad10f88f9d87b2d70729619314b (diff) | |
| download | kdiff3-6d70eafec07c8700ad99ad334c92c01119b947bf.tar.gz kdiff3-6d70eafec07c8700ad99ad334c92c01119b947bf.zip | |
Rename KStandard for enhanced compatibility with KDE4
| -rwxr-xr-x | kdiff3plugin/kdiff3plugin.cpp | 2 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.cpp | 4 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.h | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index 1d518cc..92f0639 100755 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin" KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const TQStringList & /* list */ ) :KonqPopupMenuPlugin (pPopupmenu, name) { - if (KStandardDirs::findExe ("kdiff3").isNull ()) + if (TDEStandardDirs::findExe ("kdiff3").isNull ()) return; m_pParentWidget = pPopupmenu->parentWidget(); diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index 3aad865..fae9723 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -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") { @@ -445,7 +445,7 @@ void TDEConfig::readConfigFile( const TQString& configFileName ) } else { - m_fileName = KStandardDirs().findResource("config","kdiff3rc"); + m_fileName = TDEStandardDirs().findResource("config","kdiff3rc"); } TQFile f( m_fileName ); diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index dae652f..b3bcfaf 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -310,7 +310,7 @@ public: void setPageSelection(e_PageSelection); }; -class KStandardDirs +class TDEStandardDirs { public: TQString findResource(const TQString& resource, const TQString& appName); diff --git a/src/main.cpp b/src/main.cpp index 429dc2a..e3a163c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -65,7 +65,7 @@ static KCmdLineOptions options2[] = void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions) { 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 ); if ( configFile.open( IO_ReadOnly ) ) { |