diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
commit | 3a044decb0a5d7be822c888b2d5374573d7df96e (patch) | |
tree | ddf4681e0233c25203fc927596aa7b3bdb5f2efa /languages/fortran/compiler/pgioptions | |
parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'languages/fortran/compiler/pgioptions')
-rw-r--r-- | languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp | 6 | ||||
-rw-r--r-- | languages/fortran/compiler/pgioptions/pgioptionsfactory.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index e6d58fb3..eb9aeb2e 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -57,11 +57,11 @@ TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name, } -KInstance *PgiOptionsFactory::s_instance = 0; -KInstance *PgiOptionsFactory::instance() +TDEInstance *PgiOptionsFactory::s_instance = 0; +TDEInstance *PgiOptionsFactory::instance() { if (!s_instance) - s_instance = new KInstance("kdevpgioptions"); + s_instance = new TDEInstance("kdevpgioptions"); return s_instance; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index 0f38025b..d8947476 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -26,10 +26,10 @@ public: virtual TQObject* createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; }; #endif |