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 /klipper/toplevel.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 'klipper/toplevel.h')
| -rw-r--r-- | klipper/toplevel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/klipper/toplevel.h b/klipper/toplevel.h index b072bd187..1d967a213 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -55,7 +55,7 @@ k_dcop: TQString getClipboardHistoryItem(int i); public: - KlipperWidget( TQWidget *parent, KConfig* config ); + KlipperWidget( TQWidget *parent, TDEConfig* config ); ~KlipperWidget(); virtual void adjustSize(); @@ -88,8 +88,8 @@ protected: void paintEvent(TQPaintEvent *); void mousePressEvent(TQMouseEvent *); - void readProperties(KConfig *); - void readConfiguration(KConfig *); + void readProperties(TDEConfig *); + void readConfiguration(TDEConfig *); /** * Loads history from disk. @@ -101,7 +101,7 @@ protected: */ void saveHistory(); - void writeConfiguration(KConfig *); + void writeConfiguration(TDEConfig *); /** * @returns the contents of the selection or, if empty, the contents of * the clipboard. @@ -127,7 +127,7 @@ protected: void setClipboard( const HistoryItem& item, int mode ); bool ignoreClipboardChanges() const; - KConfig* config() const { return m_config; } + TDEConfig* config() const { return m_config; } bool isApplet() const { return m_config != kapp->config(); } protected slots: @@ -199,7 +199,7 @@ private: URLGrabber *myURLGrabber; TQString m_lastURLGrabberTextSelection; TQString m_lastURLGrabberTextClipboard; - KConfig* m_config; + TDEConfig* m_config; TQTimer m_overflowClearTimer; TQTimer m_pendingCheckTimer; bool m_pendingContentsCheck; |