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

master
Timothy Pearson 11 years ago
parent 9e1442a361
commit b4e45bde66

@ -68,7 +68,7 @@ TQString FileCache::tempDir()
KTempDir * FileCache::createTempDir() KTempDir * FileCache::createTempDir()
{ {
TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); TQString tmpName = TQString::fromLatin1( TDEGlobal::instance()->instanceName() );
tmpName.append( TQString::number( getpid() ) ); tmpName.append( TQString::number( getpid() ) );
TQString dirName = locateLocal( "tmp", tmpName ); TQString dirName = locateLocal( "tmp", tmpName );
KTempDir *dir = new KTempDir( dirName ); KTempDir *dir = new KTempDir( dirName );

@ -52,16 +52,16 @@ FileFinder::FileFinder( TQWidget *parent, const char *name )
setAutoDeleteCompletionObject( true ); setAutoDeleteCompletionObject( true );
setFocusPolicy( TQ_ClickFocus ); setFocusPolicy( TQ_ClickFocus );
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "GeneralConfiguration" ); KConfigGroupSaver cs( config, "GeneralConfiguration" );
setCompletionMode( (KGlobalSettings::Completion) setCompletionMode( (TDEGlobalSettings::Completion)
config->readNumEntry( "FileFinderCompletionMode", config->readNumEntry( "FileFinderCompletionMode",
KGlobalSettings::completionMode())); TDEGlobalSettings::completionMode()));
} }
FileFinder::~FileFinder() FileFinder::~FileFinder()
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "GeneralConfiguration" ); KConfigGroupSaver cs( config, "GeneralConfiguration" );
config->writeEntry( "FileFinderCompletionMode", completionMode() ); config->writeEntry( "FileFinderCompletionMode", completionMode() );
} }

@ -43,16 +43,16 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name )
setEnableDirHighlighting( true ); setEnableDirHighlighting( true );
#if TDE_VERSION >= 310 #if TDE_VERSION >= 310
setViewConfig( KGlobal::config(), "Filebrowser" ); setViewConfig( TDEGlobal::config(), "Filebrowser" );
#endif #endif
readConfig( KGlobal::config(), "Filebrowser" ); readConfig( TDEGlobal::config(), "Filebrowser" );
setView( KFile::Default ); setView( KFile::Default );
// setOnlyDoubleClickSelectsFiles( true ); // setOnlyDoubleClickSelectsFiles( true );
reloadConfiguration(); reloadConfiguration();
completionObject()->setCompletionMode( KGlobalSettings::CompletionAuto ); completionObject()->setCompletionMode( TDEGlobalSettings::CompletionAuto );
dirCompletionObject()->setCompletionMode( KGlobalSettings::CompletionAuto); dirCompletionObject()->setCompletionMode( TDEGlobalSettings::CompletionAuto);
slotViewChanged(); slotViewChanged();
connect( this, TQT_SIGNAL( viewChanged( KFileView * )), connect( this, TQT_SIGNAL( viewChanged( KFileView * )),
@ -155,8 +155,8 @@ void FileWidget::findCompletion( const TQString& text )
text.find('/') != -1 ) { text.find('/') != -1 ) {
TQString t = m_fileFinder->completion()->makeCompletion( text ); TQString t = m_fileFinder->completion()->makeCompletion( text );
if (m_fileFinder->completionMode() == KGlobalSettings::CompletionPopup || if (m_fileFinder->completionMode() == TDEGlobalSettings::CompletionPopup ||
m_fileFinder->completionMode() == KGlobalSettings::CompletionPopupAuto) m_fileFinder->completionMode() == TDEGlobalSettings::CompletionPopupAuto)
m_fileFinder->setCompletedItems( m_fileFinder->setCompletedItems(
m_fileFinder->completion()->allMatches() ); m_fileFinder->completion()->allMatches() );
else else

@ -321,7 +321,7 @@ void ImageWindow::centerImage()
int w, h; int w, h;
if ( myIsFullscreen ) if ( myIsFullscreen )
{ {
TQRect desktopRect = KGlobalSettings::desktopGeometry( this ); TQRect desktopRect = TDEGlobalSettings::desktopGeometry( this );
w = desktopRect.width(); w = desktopRect.width();
h = desktopRect.height(); h = desktopRect.height();
} }
@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
{ {
if ( myIsFullscreen || totalScreen ) if ( myIsFullscreen || totalScreen )
{ {
return KGlobalSettings::desktopGeometry(topLevelWidget()).width(); return TDEGlobalSettings::desktopGeometry(topLevelWidget()).width();
} else } else
return Kuick::workArea().width(); return Kuick::workArea().width();
} }
@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
int ImageWindow::desktopHeight( bool totalScreen ) const int ImageWindow::desktopHeight( bool totalScreen ) const
{ {
if ( myIsFullscreen || totalScreen ) { if ( myIsFullscreen || totalScreen ) {
return KGlobalSettings::desktopGeometry(topLevelWidget()).height(); return TDEGlobalSettings::desktopGeometry(topLevelWidget()).height();
} else { } else {
return Kuick::workArea().height(); return Kuick::workArea().height();
} }
@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
TQSize ImageWindow::maxImageSize() const TQSize ImageWindow::maxImageSize() const
{ {
if ( myIsFullscreen ) { if ( myIsFullscreen ) {
return KGlobalSettings::desktopGeometry(topLevelWidget()).size(); return TDEGlobalSettings::desktopGeometry(topLevelWidget()).size();
} }
else { else {
return Kuick::workArea().size() - Kuick::frameSize( winId() ); return Kuick::workArea().size() - Kuick::frameSize( winId() );
@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) ) if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
return false; return false;
TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size(); TQSize desktopSize = TDEGlobalSettings::desktopGeometry(topLevelWidget()).size();
int desktopArea = desktopSize.width() * desktopSize.height(); int desktopArea = desktopSize.width() * desktopSize.height();
int imageArea = newWidth * newHeight; int imageArea = newWidth * newHeight;

@ -81,7 +81,7 @@ void KuickConfigDialog::applyConfig()
imageKeyChooser->save(); imageKeyChooser->save();
browserKeyChooser->save(); browserKeyChooser->save();
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }

@ -70,7 +70,7 @@ KuickData::~KuickData()
void KuickData::load() void KuickData::load()
{ {
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
KuickData def; KuickData def;
@ -134,7 +134,7 @@ void KuickData::load()
void KuickData::save() void KuickData::save()
{ {
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
kc->setGroup( "GeneralConfiguration" ); kc->setGroup( "GeneralConfiguration" );
kc->writeEntry( "FileFilter", fileFilter ); kc->writeEntry( "FileFilter", fileFilter );

@ -114,7 +114,7 @@ KuickShow::KuickShow( const char *name )
connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() )); connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() ));
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
bool isDir = false; // true if we get a directory on the commandline bool isDir = false; // true if we get a directory on the commandline
@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir )
coll, "kuick_print" ); coll, "kuick_print" );
print->setText( i18n("Print Image...") ); print->setText( i18n("Print Image...") );
KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure", KAction *configure = new KAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
KShortcut(), KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( configuration() ), TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
coll, "kuick_configure" ); coll, "kuick_configure" );
@ -374,7 +374,7 @@ void KuickShow::initGUI( const KURL& startDir )
fileWidget->setFocus(); fileWidget->setFocus();
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
kc->setGroup("SessionSettings"); kc->setGroup("SessionSettings");
bool oneWindow = kc->readBoolEntry("OpenImagesInActiveWindow", true ); bool oneWindow = kc->readBoolEntry("OpenImagesInActiveWindow", true );
oneWindowAction->setChecked( oneWindow ); oneWindowAction->setChecked( oneWindow );
@ -1197,7 +1197,7 @@ void KuickShow::saveProperties( KConfig *kc )
void KuickShow::saveSettings() void KuickShow::saveSettings()
{ {
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
kc->setGroup("SessionSettings"); kc->setGroup("SessionSettings");
if ( oneWindowAction ) if ( oneWindowAction )

@ -82,7 +82,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
p.begin( &printer ); p.begin( &printer );
TQPaintDeviceMetrics metrics( &printer ); TQPaintDeviceMetrics metrics( &printer );
p.setFont( KGlobalSettings::generalFont() ); p.setFont( TDEGlobalSettings::generalFont() );
TQFontMetrics fm = p.fontMetrics(); TQFontMetrics fm = p.fontMetrics();
int w = metrics.width(); int w = metrics.width();

Loading…
Cancel
Save