diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/view1394 | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/view1394')
| -rw-r--r-- | kcontrol/view1394/view1394.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/view1394/view1394.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index c1443b221..09214adbd 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -58,7 +58,7 @@ int my_reset_handler(raw1394handle_t handle, unsigned int ) View1394::View1394(TQWidget *parent, const char *name) -:KCModule(parent,name) +:TDECModule(parent,name) ,m_insideRescanBus(false) { setQuickHelp( i18n("On the right hand side you can see some information about " @@ -75,7 +75,7 @@ View1394::View1394(TQWidget *parent, const char *name) "<b>Acc</b>: the cycle clock accuracy of the node, valid from 0 to 100<br>" "<b>Speed</b>: the speed of the node<br>")); - setButtons( KCModule::Help ); + setButtons( TDECModule::Help ); m_ouiDb=new OuiDb(); TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid) extern "C" { - KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index 6d7a3b2c9..c88722b82 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -43,7 +43,7 @@ class OuiDb TQMap<TQString, TQString> m_vendorIds; }; -class View1394: public KCModule +class View1394: public TDECModule { Q_OBJECT public: |