From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkpgp/kpgpui.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libkpgp/kpgpui.cpp') diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 37533220b..2e6d71606 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -543,13 +543,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", "Creation date: %1, Status: %2") - .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", "Creation date: %1, Status: %2 (%3)") - .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ) .arg( remark ); } @@ -1498,7 +1498,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, + marginHint() + 2; // don't make the dialog too large - TQRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = TDEGlobalSettings::desktopGeometry(this); int screenWidth = desk.width(); if( dialogWidth > 3*screenWidth/4 ) dialogWidth = 3*screenWidth/4; @@ -1635,7 +1635,7 @@ CipherTextDialog::CipherTextDialog( const TQCString & text, unicodeText = TQString::fromLocal8Bit(text.data()); else { bool ok=true; - TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(charset, ok); if(!ok) unicodeText = TQString::fromLocal8Bit(text.data()); else @@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize() #if KDE_IS_VERSION( 3, 1, 90 ) - int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100; + int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100; #else KConfig gc("kdeglobals", false, false); gc.setGroup("Windows"); -- cgit v1.2.1