summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:19:13 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:19:13 -0600
commite9654e1a22ff355962fd97168f051336b814f4aa (patch)
tree582143becafd97ee1028fc88fa7a73a43f2d0680
parentf7fb2eae5da8b6f314574c0258756bfc0dd3c9b9 (diff)
downloadgwenview-e9654e1a22ff355962fd97168f051336b814f4aa.tar.gz
gwenview-e9654e1a22ff355962fd97168f051336b814f4aa.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--src/app/main.cpp4
-rw-r--r--src/app/mainwindow.cpp14
-rw-r--r--src/gvcore/deletedialog.cpp2
-rw-r--r--src/gvcore/document.cpp2
-rw-r--r--src/gvcore/externaltoolmanager.cpp4
-rw-r--r--src/gvcore/filedetailview.cpp2
-rw-r--r--src/gvcore/filedetailviewitem.cpp2
-rw-r--r--src/gvcore/filethumbnailview.cpp4
-rw-r--r--src/gvcore/imageview.cpp2
-rw-r--r--src/gvcore/thumbnailloadjob.cpp2
-rw-r--r--src/gvcore/timeutils.cpp2
-rw-r--r--src/gvdirpart/gvdirpart.cpp4
-rw-r--r--src/gvimagepart/gvimagepart.cpp4
13 files changed, 24 insertions, 24 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index b6734ab..038c5c3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -78,7 +78,7 @@ void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
bool ok = false;
TQDate date;
if (!filterFrom.isEmpty()) {
- date = KGlobal::locale()->readDate(filterFrom, &ok);
+ date = TDEGlobal::locale()->readDate(filterFrom, &ok);
if (!ok) {
kdWarning() << "Invalid value for filter-from option\n";
}
@@ -87,7 +87,7 @@ void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
date=TQDate();
if (!filterTo.isEmpty()) {
- date = KGlobal::locale()->readDate(filterTo, &ok);
+ date = TDEGlobal::locale()->readDate(filterTo, &ok);
if (!ok) {
kdWarning() << "Invalid value for filter-to option\n";
}
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index f2ebcdc..485a946 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -183,7 +183,7 @@ MainWindow::MainWindow()
createConnections();
mWindowListActions.setAutoDelete(true);
updateWindowActions();
- KMainWindow::applyMainWindowSettings(KGlobal::config(), "MainWindow");
+ KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
@@ -197,7 +197,7 @@ void MainWindow::setFullScreen(bool value) {
bool MainWindow::queryClose() {
mDocument->saveBeforeClosing();
- KConfig* config=KGlobal::config();
+ KConfig* config=TDEGlobal::config();
// Don't store dock layout if only the image dock is visible. This avoid
// saving layout when in "fullscreen" or "image only" mode.
@@ -216,7 +216,7 @@ bool MainWindow::queryClose() {
}
if (!mToggleFullScreen->isChecked()) {
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
MiscConfig::setHistory( mURLEdit->historyItems() );
MiscConfig::writeConfig();
@@ -570,7 +570,7 @@ void MainWindow::showToolBars() {
void MainWindow::toggleFullScreen() {
if (mToggleFullScreen->isChecked()) {
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
showFullScreen();
menuBar()->hide();
@@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() {
void MainWindow::showToolBarDialog() {
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),TQT_TQOBJECT(this),TQT_SLOT(applyMainWindowSettings()));
dlg.exec();
@@ -698,7 +698,7 @@ void MainWindow::showToolBarDialog() {
void MainWindow::applyMainWindowSettings() {
createGUI();
- KMainWindow::applyMainWindowSettings(KGlobal::config(), "MainWindow");
+ KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
@@ -856,7 +856,7 @@ void MainWindow::updateImageActions() {
* actions are created in createObjectInteractions
*/
void MainWindow::createWidgets() {
- KConfig* config=KGlobal::config();
+ KConfig* config=TDEGlobal::config();
mCentralStack=new TQWidgetStack(this);
setCentralWidget(mCentralStack);
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index 9fdfac5..0507cb3 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -98,7 +98,7 @@ void DeleteDialog::updateUI()
fileCount);
iconName = "trashcan_full";
}
- TQPixmap icon = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeMedium);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeMedium);
m_widget->ddDeleteText->setText(msg);
m_widget->ddWarningIcon->setPixmap(icon);
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index f4310cb..f6db357 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -367,7 +367,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
TQPaintDeviceMetrics pdMetrics(painter->device());
const int margin = pdMetrics.logicalDpiY() / 2; // half-inch margin
- painter->setFont( KGlobalSettings::generalFont() );
+ painter->setFont( TDEGlobalSettings::generalFont() );
TQFontMetrics fMetrics = painter->fontMetrics();
int x = 0;
diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
index 8872074..dc2f705 100644
--- a/src/gvcore/externaltoolmanager.cpp
+++ b/src/gvcore/externaltoolmanager.cpp
@@ -146,12 +146,12 @@ ExternalToolManager::ExternalToolManager() {
d=new ExternalToolManagerPrivate;
// Getting dirs
- d->mUserToolDir=KGlobal::dirs()->saveLocation("appdata", "tools");
+ d->mUserToolDir=TDEGlobal::dirs()->saveLocation("appdata", "tools");
d->mUserToolDir=addSlash(d->mUserToolDir);
Q_ASSERT(!d->mUserToolDir.isEmpty());
LOG("d->mUserToolDir:" << d->mUserToolDir);
- TQStringList dirs=KGlobal::dirs()->findDirs("appdata", "tools");
+ TQStringList dirs=TDEGlobal::dirs()->findDirs("appdata", "tools");
LOG("dirs:" << dirs.join(","));
// Loading desktop files
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index a7d9f64..28ac233 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -216,7 +216,7 @@ void FileDetailView::selected( TQListViewItem *item )
{
if ( !item ) return;
- if ( KGlobalSettings::singleClick() ) {
+ if ( TDEGlobalSettings::singleClick() ) {
const KFileItem *fi = ( (FileDetailViewItem*)item )->fileInfo();
if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) )
sig->activate( fi );
diff --git a/src/gvcore/filedetailviewitem.cpp b/src/gvcore/filedetailviewitem.cpp
index 6d5fead..2115386 100644
--- a/src/gvcore/filedetailviewitem.cpp
+++ b/src/gvcore/filedetailviewitem.cpp
@@ -39,7 +39,7 @@ void FileDetailViewItem::init()
setPixmap( COL_NAME, inf->pixmap(KIcon::SizeSmall));
setText( COL_NAME, inf->text() );
- setText( COL_SIZE, KGlobal::locale()->formatNumber( inf->size(), 0));
+ setText( COL_SIZE, TDEGlobal::locale()->formatNumber( inf->size(), 0));
setText( COL_DATE, TimeUtils::formatTime(time) );
setText( COL_PERM, inf->permissionsString() );
setText( COL_OWNER, inf->user() );
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 38bf9ff..57f436c 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -642,7 +642,7 @@ void FileThumbnailView::setSortingKey(TQIconViewItem *iconItem, const KFileItem
//--------------------------------------------------------------------------
void FileThumbnailView::slotDoubleClicked(TQIconViewItem* iconItem) {
if (!iconItem) return;
- if (KGlobalSettings::singleClick()) return;
+ if (TDEGlobalSettings::singleClick()) return;
FileThumbnailViewItem* thumbItem=static_cast<FileThumbnailViewItem*>(iconItem);
KFileItem* fileItem=thumbItem->fileItem();
@@ -655,7 +655,7 @@ void FileThumbnailView::slotDoubleClicked(TQIconViewItem* iconItem) {
void FileThumbnailView::slotClicked(TQIconViewItem* iconItem) {
if (!iconItem) return;
- if (!KGlobalSettings::singleClick()) return;
+ if (!TDEGlobalSettings::singleClick()) return;
FileThumbnailViewItem* thumbItem=static_cast<FileThumbnailViewItem*>(iconItem);
KFileItem* fileItem=thumbItem->fileItem();
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 5300cdb..36d8db4 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -1143,7 +1143,7 @@ void ImageView::slotSelectZoom() {
if (currentItem>=int(d->mZoomComboActions.count()) ) {
TQString txt=d->mZoomCombo->currentText();
txt=txt.left(txt.find('%'));
- double value=KGlobal::locale()->readNumber(txt) / 100.0;
+ double value=TDEGlobal::locale()->readNumber(txt) / 100.0;
updateZoom(ZOOM_FREE, value);
} else {
d->mZoomComboActions[currentItem]->activate();
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index 63b38e4..d7650ba 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -378,7 +378,7 @@ ThumbnailLoadJob::ThumbnailLoadJob(const TQValueVector<const KFileItem*>* items,
{
LOG("");
- mBrokenPixmap=KGlobal::iconLoader()->loadIcon("file_broken",
+ mBrokenPixmap=TDEGlobal::iconLoader()->loadIcon("file_broken",
KIcon::NoGroup, ThumbnailSize::MIN);
// Look for images and store the items in our todo list
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index fbd3a5a..eda6749 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -45,7 +45,7 @@ time_t getTime(const KFileItem* item) {
TQString formatTime(time_t time) {
TQDateTime dt;
dt.setTime_t(time);
- return KGlobal::locale()->formatDateTime(dt);
+ return TDEGlobal::locale()->formatDateTime(dt);
}
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 25d0a8a..14be72f 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -63,8 +63,8 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec
const TQStringList &) : KParts::ReadOnlyPart( parent, name ) {
GVDirFactory::instance()->iconLoader()->addAppDir( "gwenview");
setInstance( GVDirFactory::instance() );
- KGlobal::locale()->insertCatalogue("gwenview");
- KGlobal::locale()->setActiveCatalogue("gwenview");
+ TDEGlobal::locale()->insertCatalogue("gwenview");
+ TDEGlobal::locale()->setActiveCatalogue("gwenview");
mBrowserExtension = new GVDirPartBrowserExtension(this);
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 64453b8..68b75eb 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -82,8 +82,8 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO
, mLastDirection( DirectionUnknown ) {
GVImageFactory::instance()->iconLoader()->addAppDir( "gwenview");
setInstance( GVImageFactory::instance() );
- KGlobal::locale()->insertCatalogue("gwenview");
- KGlobal::locale()->setActiveCatalogue("gwenview");
+ TDEGlobal::locale()->insertCatalogue("gwenview");
+ TDEGlobal::locale()->setActiveCatalogue("gwenview");
mBrowserExtension = new GVImagePartBrowserExtension(this);