Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 15 insertions, 15 deletions

diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp
index 0b7c8076..00424746 100644
--- a/kalzium/src/detailedgraphicaloverview.cpp
+++ b/kalzium/src/detailedgraphicaloverview.cpp
@@ -83,9 +83,9 @@ void DetailedGraphicalOverview::paintEvent( TQPaintEvent* )
 		p.setBrush( TQt::black );
 		p.setBrush(TQt::NoBrush);
 
-		TQFont fA = KGlobalSettings::generalFont();
-		TQFont fB = KGlobalSettings::generalFont();
-		TQFont fC = KGlobalSettings::generalFont();
+		TQFont fA = TDEGlobalSettings::generalFont();
+		TQFont fB = TDEGlobalSettings::generalFont();
+		TQFont fC = TDEGlobalSettings::generalFont();
 
 		TQString strLocalizedMass = KalziumUtils::localizedValue( m_element->mass(), 6 );
 
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 8a1ace69..c9791771 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -53,11 +53,11 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na
 {
 	m_element = el;
 
-	m_baseHtml = KGlobal::dirs()->findResourceDir("data", "kalzium/data/" );
+	m_baseHtml = TDEGlobal::dirs()->findResourceDir("data", "kalzium/data/" );
 	m_baseHtml.append("kalzium/data/htmlview/");
 	m_baseHtml.append("style.css");
 
-	m_picsdir = KGlobal::dirs()->findResourceDir( "appdata", "elempics/" ) + "elempics/";
+	m_picsdir = TDEGlobal::dirs()->findResourceDir( "appdata", "elempics/" ) + "elempics/";
 
 	( actionButton( KDialogBase::Close ) )->setFocus();
 	
@@ -176,7 +176,7 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type)
 			
 			if ( m_element->abundance() > 0 ){
 			html.append( "<tr><td><img src=\"abundance.png\" alt=\"icon\"/></td><td>" );
-			html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) );
+			html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( TDEGlobal::locale()->formatLong( m_element->abundance() ) ) );
 			html.append( "</td></tr>" );
 			}
 			
@@ -319,7 +319,7 @@ TQString DetailedInfoDlg::isotopeTable()
 		html.append( ( *it )->spin() );
 		html.append( "</td><td>" );
 		if ( !( *it )->magmoment().isEmpty() ) {
-			TQString v = KGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 );
+			TQString v = TDEGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 );
 			html.append( i18n( "%1 %2<sub>n</sub>" ).arg( v ).arg( TQChar( 956 ) ) );
 		}	
 		html.append( "</td></tr>" );
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index fee6e9c7..d2fa73c7 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -60,7 +60,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent)
     l->addWidget(m_eqedit, 1, 1);
     l->addWidget(m_eqclear, 1, 0);
 
-    m_eqclear->setIconSet( KGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", 
+    m_eqclear->setIconSet( TDEGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", 
 		KIcon::NoGroup, 22 /*KIcon::SizeSmallMedium*/) );
 
     connect(m_eqclear, TQT_SIGNAL(clicked()), m_eqedit, TQT_SLOT(clear()) );
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 8ff66e4d..53470b2e 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -85,11 +85,11 @@ Kalzium::Kalzium()
 	setupActions();
 
 	// adding the libtdeedu catalog
-	KGlobal::locale()->insertCatalogue( "libtdeedu" );
+	TDEGlobal::locale()->insertCatalogue( "libtdeedu" );
 
 	// creating the glossary dialog and loading the glossaries we have
 	m_glossarydlg = new GlossaryDialog( true, this, "glossary" );
-	TQString dir = KGlobal::dirs()->findResourceDir( "data", "kalzium/data/" );
+	TQString dir = TDEGlobal::dirs()->findResourceDir( "data", "kalzium/data/" );
 	TQString picturepath = dir + "kalzium/data/bg.jpg";
 	KURL u = dir + "kalzium/data/knowledge.xml";
 	Glossary *g = Glossary::readFromXML( u );
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index 462d76f8..aaef4e7e 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -45,7 +45,7 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid
 	resize(0,0);
 	hide(); //initailly hide it
 	m_richText = 0;
-	m_noElemIcon = KGlobal::iconLoader()->loadIcon( "orbits", KIcon::NoGroup, 64 );
+	m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", KIcon::NoGroup, 64 );
 	setMouseTracking(true); // receice mouse move events
 	
 	connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp
index 38dd9786..8498962b 100644
--- a/kalzium/src/kalziumutils.cpp
+++ b/kalzium/src/kalziumutils.cpp
@@ -76,10 +76,10 @@ double KalziumUtils::strippedValue( double num )
 	
 TQString KalziumUtils::localizedValue( double val, int precision, unsigned long options  )
 {
-	TQString str = KGlobal::locale()->formatNumber( val, precision ); 
+	TQString str = TDEGlobal::locale()->formatNumber( val, precision ); 
 	while( str.endsWith("0") )
 		str.truncate( str.length()-1);
-	if ( str.endsWith( KGlobal::locale()->decimalSymbol()  ) )
+	if ( str.endsWith( TDEGlobal::locale()->decimalSymbol()  ) )
 	{
 		// we do not want trailing ',' values so readd trailing 0 
 		str.append( '0' ); // 
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index 1f4ed64d..548974d1 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -461,7 +461,7 @@ void PerodicTableView::drawLegendToolTip( TQPainter* p )
 
 	static const int padding = 3;
 
-	TQFont fB = KGlobalSettings::generalFont();
+	TQFont fB = TDEGlobalSettings::generalFont();
 	fB.setPointSize( fB.pointSize() + 4 );
 	p->setFont( fB );
 
@@ -545,7 +545,7 @@ void PerodicTableView::drawLegend( TQPainter* p )
 	 * does not collide with the elements
 	 */
 	
-	TQFont legendFont = KGlobalSettings::generalFont();
+	TQFont legendFont = TDEGlobalSettings::generalFont();
 	legendFont.setPointSize( legendFont.pointSize() + 1 );
 	p->setFont( legendFont );