Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
55a8cf1a39
4 changed files with 18 additions and 18 deletions
  1. +13
    -13
      acinclude.m4
  2. +2
    -2
      src/fetch/fetcher.h
  3. +1
    -1
      src/main.cpp
  4. +2
    -2
      src/mainwindow.h

+ 13
- 13
acinclude.m4 View File

@@ -1983,20 +1983,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>

int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");


+ 2
- 2
src/fetch/fetcher.h View File

@@ -17,7 +17,7 @@
#include "fetch.h"
#include "../datavectors.h"

#include <kapplication.h> // for KApplication::random()
#include <kapplication.h> // for TDEApplication::random()

#include <tqobject.h>
#include <tqstring.h>
@@ -137,7 +137,7 @@ private:
class SearchResult {
public:
SearchResult(Fetcher::Ptr f, const TQString& t, const TQString& d, const TQString& i)
: uid(KApplication::random()), fetcher(f), title(t), desc(d), isbn(i) {}
: uid(TDEApplication::random()), fetcher(f), title(t), desc(d), isbn(i) {}
Data::EntryPtr fetchEntry();
uint uid;
Fetcher::Ptr fetcher;


+ 1
- 1
src/main.cpp View File

@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app;
TDEApplication app;

if(app.isRestored()) {
RESTORE(Tellico::MainWindow);


+ 2
- 2
src/mainwindow.h View File

@@ -65,7 +65,7 @@ namespace Tellico {
* for main window handling and supports full session management as well as
* using KActions.
* @see KMainWindow
* @see KApplication
* @see TDEApplication
* @see KConfig
*
* @author Robby Stephenson
@@ -334,7 +334,7 @@ private:
/**
* Saves the window properties for each open window during session end to the
* session config file, including saving the currently opened file by a temporary
* filename provided by KApplication.
* filename provided by TDEApplication.
* @see KMainWindow::saveProperties
*
* @param cfg The config class with the properties to restore


Loading…
Cancel
Save