diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
| commit | 934db26c3f8efe148a5680c22f965ee10f818a61 (patch) | |
| tree | 4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/bnpview.cpp | |
| parent | a1fb52e00e362130a46b34570e53f2c1f322f373 (diff) | |
| download | basket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/bnpview.cpp')
| -rw-r--r-- | src/bnpview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 48da913..1814615 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -93,7 +93,7 @@ BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, Global::bnpView = this; // Needed when loading the baskets: - Global::globalAccel = new KGlobalAccel(TQT_TQOBJECT(this)); // FIXME: might be null (KPart case)! + Global::globalAccel = new TDEGlobalAccel(TQT_TQOBJECT(this)); // FIXME: might be null (KPart case)! Global::backgroundManager = new BackgroundManager(); setupGlobalShortcuts(); @@ -205,11 +205,11 @@ void BNPView::addWelcomeBaskets() { // Possible paths where to find the welcome basket archive, trying the translated one, and falling back to the English one: TQStringList possiblePaths; - if (TQString(KGlobal::locale()->encoding()) == TQString("UTF-8")) { // Welcome baskets are encoded in UTF-8. If the system is not, then use the English version: - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + KGlobal::locale()->language() + ".baskets")); - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + TQStringList::split("_", KGlobal::locale()->language())[0] + ".baskets")); + if (TQString(TDEGlobal::locale()->encoding()) == TQString("UTF-8")) { // Welcome baskets are encoded in UTF-8. If the system is not, then use the English version: + possiblePaths.append(TDEGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + TDEGlobal::locale()->language() + ".baskets")); + possiblePaths.append(TDEGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + TQStringList::split("_", TDEGlobal::locale()->language())[0] + ".baskets")); } - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_en_US.baskets")); + possiblePaths.append(TDEGlobal::dirs()->findResource("data", "basket/welcome/Welcome_en_US.baskets")); // Take the first EXISTING basket archive found: TQDir dir; @@ -265,7 +265,7 @@ void BNPView::onFirstShow() void BNPView::setupGlobalShortcuts() { /* Global shortcuts */ - KGlobalAccel *globalAccel = Global::globalAccel; // Better for the following lines + TDEGlobalAccel *globalAccel = Global::globalAccel; // Better for the following lines // Ctrl+Shift+W only works when started standalone: TQWidget *basketMainWindow = (TQWidget*) (Global::bnpView->parent()->inherits("MainWindow") ? Global::bnpView->parent() : 0); @@ -1793,7 +1793,7 @@ void BNPView::saveAsArchive() TQDir dir; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Basket Archive"); TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/"; TQString url = folder + TQString(basket->basketName()).replace("/", "_") + ".baskets"; |