From 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:52 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kpovmodeler/pmcommentedit.cpp | 2 +- kpovmodeler/pmdialogview.cpp | 2 +- kpovmodeler/pmdockwidget.cpp | 6 +++--- kpovmodeler/pmlibrarymanager.cpp | 2 +- kpovmodeler/pmpart.h | 4 ++-- kpovmodeler/pmpovrayoutputwidget.cpp | 2 +- kpovmodeler/pmpovrayrenderwidget.cpp | 24 ++++++++++++------------ kpovmodeler/pmpovrayrenderwidget.h | 12 ++++++------ kpovmodeler/pmpovraywidget.cpp | 2 +- kpovmodeler/pmrawedit.cpp | 2 +- kpovmodeler/pmshell.cpp | 10 +++++----- kpovmodeler/pmtreeview.cpp | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) (limited to 'kpovmodeler') diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index 92cdbfa3..2fd58468 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -36,7 +36,7 @@ void PMCommentEdit::createTopWidgets( ) m_pEdit = new TQMultiLineEdit( this ); m_pEdit->setTextFormat( TQt::PlainText ); m_pEdit->setWordWrap( TQTextEdit::NoWrap ); - m_pEdit->setFont( KGlobalSettings::fixedFont( ) ); + m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) ); topLayout( )->addWidget( m_pEdit, 2 ); connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index fce0e170..6a2c1455 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -281,7 +281,7 @@ void PMDialogView::slotHelp( ) { // Instead of calling invokeBrowser run konqueror directly. // invokeBrowser was ignoring html anchors. - url = "konqueror " + KProcess::quote(url); + url = "konqueror " + TDEProcess::quote(url); KRun::runCommand( url ); } } diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 46a028ea..2eff4a8c 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -179,7 +179,7 @@ void PMDockMainWindow::createGUI( Part * part ) if( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -2003,7 +2003,7 @@ void PMDockManager::readConfig(TQDomElement &base) void PMDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2121,7 +2121,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) #include void PMDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); diff --git a/kpovmodeler/pmlibrarymanager.cpp b/kpovmodeler/pmlibrarymanager.cpp index 0e4b17dd..358789a1 100644 --- a/kpovmodeler/pmlibrarymanager.cpp +++ b/kpovmodeler/pmlibrarymanager.cpp @@ -82,7 +82,7 @@ void PMLibraryManager::scanLibraries( ) TQStringList libraryDirectories; // Search for sub directories in /usr/share/kpovmodeler/library - libraryDirectories = KGlobal::dirs( )->findDirs( "data", "kpovmodeler/library" ); + libraryDirectories = TDEGlobal::dirs( )->findDirs( "data", "kpovmodeler/library" ); for( TQStringList::Iterator i = libraryDirectories.begin( ); i != libraryDirectories.end( ); ++i ) { diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h index b276aaa5..ee2b071d 100644 --- a/kpovmodeler/pmpart.h +++ b/kpovmodeler/pmpart.h @@ -62,7 +62,7 @@ class KSelectAction; class PMComboAction; class PMSpinBoxAction; class PMLabelAction; -class KProcess; +class TDEProcess; /** * The part for kpovmodeler (povray document) @@ -1032,7 +1032,7 @@ public: PMBrowserExtension( PMPart* parent ) : KParts::BrowserExtension( parent, "PMBrowserExtension" ) { - KGlobal::locale()->insertCatalogue("kpovmodeler"); + TDEGlobal::locale()->insertCatalogue("kpovmodeler"); } virtual ~PMBrowserExtension( ) diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index b2230272..bf3962a8 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -37,7 +37,7 @@ PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name ) m_pTextView = new TQTextEdit( this ); topLayout->addWidget( m_pTextView, 1 ); - m_pTextView->setFont( KGlobalSettings::fixedFont( ) ); + m_pTextView->setFont( TDEGlobalSettings::fixedFont( ) ); m_pTextView->setTextFormat( TQt::PlainText ); m_pTextView->setReadOnly( true ); diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index ce7ff716..560d8303 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -86,13 +86,13 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene, dstr->writeRawBytes( scene.data( ), scene.size( ) ); m_pTempFile->close( ); - m_pProcess = new KProcess( ); - connect( m_pProcess, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - TQT_SLOT( slotPovrayImage( KProcess*, char*, int ) ) ); - connect( m_pProcess, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - TQT_SLOT( slotPovrayMessage( KProcess*, char*, int ) ) ); - connect( m_pProcess, TQT_SIGNAL( processExited( KProcess* ) ), - TQT_SLOT( slotRenderingFinished( KProcess* ) ) ); + m_pProcess = new TDEProcess( ); + connect( m_pProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQT_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) ); + connect( m_pProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQT_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) ); + connect( m_pProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), + TQT_SLOT( slotRenderingFinished( TDEProcess* ) ) ); *m_pProcess << s_povrayCommand; @@ -136,7 +136,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene, m_bPixmapUpToDate = false; repaint( ); - if( !m_pProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if( !m_pProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( this, i18n( "Couldn't call povray.\n" "Please check your installation " @@ -179,7 +179,7 @@ void PMPovrayRenderWidget::resumeRendering( ) } } -void PMPovrayRenderWidget::slotPovrayMessage( KProcess*, +void PMPovrayRenderWidget::slotPovrayMessage( TDEProcess*, char* buffer, int buflen ) { TQString str; @@ -188,7 +188,7 @@ void PMPovrayRenderWidget::slotPovrayMessage( KProcess*, emit povrayMessage( str ); } -void PMPovrayRenderWidget::slotPovrayImage( KProcess*, char* buffer, int buflen ) +void PMPovrayRenderWidget::slotPovrayImage( TDEProcess*, char* buffer, int buflen ) { int index = 0; int i; @@ -349,7 +349,7 @@ void PMPovrayRenderWidget::setPixel( int x, int y, uint c ) } /** -void PMPovrayRenderWidget::slotWroteStdin( KProcess* ) +void PMPovrayRenderWidget::slotWroteStdin( TDEProcess* ) { if( m_pProcess ) m_pProcess->closeStdin( ); @@ -357,7 +357,7 @@ void PMPovrayRenderWidget::slotWroteStdin( KProcess* ) } */ -void PMPovrayRenderWidget::slotRenderingFinished( KProcess* ) +void PMPovrayRenderWidget::slotRenderingFinished( TDEProcess* ) { if( m_pProcess->normalExit( ) ) emit( finished( m_pProcess->exitStatus( ) ) ); diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h index 48dc7d35..0f2900f9 100644 --- a/kpovmodeler/pmpovrayrenderwidget.h +++ b/kpovmodeler/pmpovrayrenderwidget.h @@ -31,7 +31,7 @@ #include "pmrendermode.h" #include "pmdragwidget.h" -class KProcess; +class TDEProcess; class KConfig; class KURL; class KTempFile; @@ -130,19 +130,19 @@ protected slots: /** * Receive povray messages */ - void slotPovrayMessage( KProcess* proc, char* buffer, int buflen ); + void slotPovrayMessage( TDEProcess* proc, char* buffer, int buflen ); /** * Receive rendered image */ - void slotPovrayImage( KProcess* proc, char* buffer, int buflen ); + void slotPovrayImage( TDEProcess* proc, char* buffer, int buflen ); /** * Called when output has been written to the povray process */ - //void slotWroteStdin( KProcess* proc ); + //void slotWroteStdin( TDEProcess* proc ); /** * Called when the process has finished */ - void slotRenderingFinished( KProcess* proc ); + void slotRenderingFinished( TDEProcess* proc ); protected: virtual void paintEvent( TQPaintEvent* ); @@ -151,7 +151,7 @@ private: void setPixel( int x, int y, uint c ); void cleanup( ); - KProcess* m_pProcess; + TDEProcess* m_pProcess; bool m_bSuspended; PMRenderMode m_renderMode; TQImage m_image; diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index 04564b93..4cca5e50 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -158,7 +158,7 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m, if( h > dw->height( ) ) h = dw->height( ); #else - TQRect dw = KGlobalSettings::desktopGeometry(this); + TQRect dw = TDEGlobalSettings::desktopGeometry(this); if( w > dw.width() ) w = dw.width(); if( h > dw.height() ) diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index 98cc5ec1..5720d615 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -39,7 +39,7 @@ void PMRawEdit::createTopWidgets( ) m_pEdit = new TQMultiLineEdit( this ); m_pEdit->setTextFormat( TQt::PlainText ); m_pEdit->setWordWrap( TQTextEdit::NoWrap ); - m_pEdit->setFont( KGlobalSettings::fixedFont( ) ); + m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) ); topLayout( )->addWidget( m_pEdit, 2 ); connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index fd0c5a73..fe7e8f6d 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -531,7 +531,7 @@ void PMShell::slotSettings( ) void PMShell::slotConfigureToolbars( ) { - saveMainWindowSettings( KGlobal::config( ), "Appearance" ); + saveMainWindowSettings( TDEGlobal::config( ), "Appearance" ); KEditToolbar dlg( factory( ) ); connect( &dlg, TQT_SIGNAL( newToolbarConfig( ) ), this, TQT_SLOT( slotNewToolbarConfig( ) ) ); @@ -543,22 +543,22 @@ void PMShell::slotNewToolbarConfig( ) createGUI( 0 ); createShellGUI( false ); createGUI( m_pPart ); - applyMainWindowSettings( KGlobal::config( ), "Appearance" ); + applyMainWindowSettings( TDEGlobal::config( ), "Appearance" ); } void PMShell::updateGUI( ) { - saveMainWindowSettings( KGlobal::config( ), "Appearance" ); + saveMainWindowSettings( TDEGlobal::config( ), "Appearance" ); createGUI( 0 ); createShellGUI( false ); createGUI( m_pPart ); - applyMainWindowSettings( KGlobal::config( ), "Appearance" ); + applyMainWindowSettings( TDEGlobal::config( ), "Appearance" ); } void PMShell::saveOptions( ) { kdDebug( PMArea ) << "Saving configuration" << endl; - KConfig* config = KGlobal::config( ); + KConfig* config = TDEGlobal::config( ); // set group config->setGroup( "Appearance" ); diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index a555e12e..e1fa9e97 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -541,8 +541,8 @@ void PMTreeView::viewportMouseMoveEvent( TQMouseEvent *e ) int y = e->pos( ).y( ); //Is it time to start a drag? - if( abs( x - m_pressedPos.x( ) ) > KGlobalSettings::dndEventDelay( ) || - abs( y - m_pressedPos.y( ) ) > KGlobalSettings::dndEventDelay( ) ) + if( abs( x - m_pressedPos.x( ) ) > TDEGlobalSettings::dndEventDelay( ) || + abs( y - m_pressedPos.y( ) ) > TDEGlobalSettings::dndEventDelay( ) ) { m_selectOnReleaseEvent = false; -- cgit v1.2.3