From 8f61d29f9c7b9387d5bfe5d269273650d9089b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 8 Apr 2016 03:07:15 +0200 Subject: Initial TDE conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- dominoConfig/Makefile.am | 10 +++++----- dominoConfig/dominoconf.cpp | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'dominoConfig') diff --git a/dominoConfig/Makefile.am b/dominoConfig/Makefile.am index 4b13841..e218975 100644 --- a/dominoConfig/Makefile.am +++ b/dominoConfig/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = $(all_includes) $(FT2_CFLAGS) noinst_HEADERS = dominoconf.h -kde_module_LTLIBRARIES = kstyle_domino_config.la -kstyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kstyle_domino_config_la_LIBADD = $(LIB_KDEUI) ../domino/libdomino_style.la $(LIB_QT) $(LIB_KDECORE) -lkdefx $(LIB_KIO) -kstyle_domino_config_la_SOURCES = dominoconf.cpp -kstyle_domino_config_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = tdestyle_domino_config.la +tdestyle_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +tdestyle_domino_config_la_LIBADD = $(LIB_TDEUI) ../domino/libdomino_style.la $(LIB_QT) $(LIB_TDECORE) -ltdefx $(LIB_TDEIO) +tdestyle_domino_config_la_SOURCES = dominoconf.cpp +tdestyle_domino_config_la_METASOURCES = AUTO diff --git a/dominoConfig/dominoconf.cpp b/dominoConfig/dominoconf.cpp index 410e08f..2861b29 100644 --- a/dominoConfig/dominoconf.cpp +++ b/dominoConfig/dominoconf.cpp @@ -31,8 +31,8 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include -#include +#include +#include #include #include #include @@ -57,12 +57,12 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include @@ -77,9 +77,9 @@ DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) + KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) { - KGlobal::locale()->insertCatalogue("kstyle_domino_config"); + TDEGlobal::locale()->insertCatalogue("tdestyle_domino_config"); return new DominoStyleConfig(parent); } } @@ -98,7 +98,7 @@ DominoStyleConfig::DominoStyleConfig(TQWidget* parent): TQWidget(parent) //Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 1); - KGlobal::locale()->insertCatalogue("kstyle_domino_config"); + TDEGlobal::locale()->insertCatalogue("tdestyle_domino_config"); DominoKTabWidget *tabWidget = new DominoKTabWidget(this); layout->addWidget(tabWidget); @@ -3916,9 +3916,9 @@ void DominoStyleConfig::slotImport() { } TQString saveDir = TQDir::homeDirPath() + "/.qt/"; - if (!KIO::NetAccess::file_copy(file, KURL( saveDir+fName ), -1, true ) ) + if (!TDEIO::NetAccess::file_copy(file, KURL( saveDir+fName ), -1, true ) ) { - KMessageBox::error(this, KIO::NetAccess::lastErrorString(),i18n("Import failed.")); + KMessageBox::error(this, TDEIO::NetAccess::lastErrorString(),i18n("Import failed.")); return; } } -- cgit v1.2.1