From b0a967eb693adc458fdf7d070379b8c1ec3e9415 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:25:21 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/ktechlab.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ktechlab.cpp') diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index 5553fc7..43a7a3b 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -80,7 +80,7 @@ KTechlab::KTechlab() setupToolDocks(); setupActions(); setupView(); - readProperties( KGlobal::config() ); + readProperties( TDEGlobal::config() ); // kdDebug() << "Constructor time: " << ct.elapsed() << endl; } @@ -158,7 +158,7 @@ void KTechlab::setupToolDocks() #endif TQPixmap pm; - KIconLoader * loader = KGlobal::iconLoader(); + KIconLoader * loader = TDEGlobal::iconLoader(); KateMDI::ToolView * tv = 0l; tv = createToolView( ProjectManager::toolViewIdentifier(), @@ -555,10 +555,10 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e ) e->accept(true); KPopupMenu dropMenu; - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 ); dropMenu.insertSeparator(); - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ), i18n("C&ancel"), 2 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ), i18n("C&ancel"), 2 ); connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) ); // dropMenu.exec(e->pos() + widget->pos() ); @@ -1007,7 +1007,7 @@ KURL::List KTechlab::getFileURLs() void KTechlab::slotDocModifiedChanged() { //BEGIN Set tab icons - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); const ViewContainerList::iterator vcEnd = m_viewContainerList.end(); for ( ViewContainerList::iterator it = m_viewContainerList.begin(); it != vcEnd; ++it ) { @@ -1129,7 +1129,7 @@ void KTechlab::slotFilePrint() bool KTechlab::queryClose() { - saveProperties( KGlobal::config() ); + saveProperties( TDEGlobal::config() ); if ( DocManager::self()->closeAll() && ProjectManager::self()->slotCloseProject() ) { -- cgit v1.2.1