diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konsole/konsole/kwrited.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/kwrited.cpp')
| -rw-r--r-- | konsole/konsole/kwrited.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index c1bc0a06c..6802db6fa 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -66,8 +66,8 @@ KWrited::KWrited() : TQTextEdit() { int pref_width, pref_height; - setFont(KGlobalSettings::fixedFont()); - pref_width = (2 * KGlobalSettings::desktopGeometry(0).width()) / 3; + setFont(TDEGlobalSettings::fixedFont()); + pref_width = (2 * TDEGlobalSettings::desktopGeometry(0).width()) / 3; pref_height = fontMetrics().lineSpacing() * 10; setMinimumWidth(pref_width); setMinimumHeight(pref_height); @@ -125,14 +125,14 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos ) KWritedModule::KWritedModule( const TQCString& obj ) : KDEDModule( obj ) { - KGlobal::locale()->insertCatalogue("konsole"); + TDEGlobal::locale()->insertCatalogue("konsole"); pro = new KWrited; } KWritedModule::~KWritedModule() { delete pro; - KGlobal::locale()->removeCatalogue("konsole"); + TDEGlobal::locale()->removeCatalogue("konsole"); } extern "C" |