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 /kdesktop/kdiconview.h | |
| 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 'kdesktop/kdiconview.h')
| -rw-r--r-- | kdesktop/kdiconview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index 34028d84c..f951765ba 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -124,7 +124,7 @@ protected slots: void slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global); void slotEnableAction( const char * name, bool enabled ); public slots: - void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files); + void slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files); protected slots: void slotItemRenamed(TQIconViewItem*, const TQString &name); @@ -270,7 +270,7 @@ private: bool m_needDesktopAlign; TQListView *mMediaListView; - KConfig *g_pConfig; + TDEConfig *g_pConfig; }; #endif |