From e573b522d42007cb46c3ab952696df4a41363c38 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 4 Jul 2011 21:00:34 +0000 Subject: [PATCH] TQt4 port keep This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/keep@1239292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- keep/app/actionview.ui | 70 ++++++------ keep/app/addbackupwizard.cpp | 36 +++--- keep/app/addbackupwizard.h | 9 +- keep/app/addbackupwizard1view.ui | 28 ++--- keep/app/addbackupwizard2view.ui | 26 ++--- keep/app/addbackupwizard3view.ui | 62 +++++------ keep/app/advancedbackupconfigdialog.cpp | 30 ++--- keep/app/advancedbackupconfigdialog.h | 9 +- keep/app/advancedbackupconfigview.ui | 8 +- keep/app/backupconfigdialog.cpp | 24 ++-- keep/app/backupconfigdialog.h | 3 +- keep/app/backuplistview.ui | 14 +-- keep/app/backuplistwidget.cpp | 32 +++--- keep/app/backuplistwidget.h | 3 +- keep/app/forcebackupdialog.cpp | 40 +++---- keep/app/forcebackupdialog.h | 5 +- keep/app/forcebackupdialogview.ui | 8 +- keep/app/generalconfigview.ui | 32 +++--- keep/app/includeexcludedialog.cpp | 32 +++--- keep/app/includeexcludedialog.h | 7 +- keep/app/includeexcludeview.ui | 26 ++--- keep/app/keepmainwindow.cpp | 78 ++++++------- keep/app/keepmainwindow.h | 5 +- keep/app/logdialog.cpp | 32 +++--- keep/app/logdialog.h | 5 +- keep/app/logview.ui | 8 +- keep/app/restorebackupwizard.cpp | 102 ++++++++--------- keep/app/restorebackupwizard.h | 11 +- keep/app/restorebackupwizard1view.ui | 32 +++--- keep/app/restorebackupwizard2view.ui | 36 +++--- keep/app/restorebackupwizard3view.ui | 32 +++--- keep/common/backup.cpp | 30 ++--- keep/common/backup.h | 30 ++--- keep/common/backupconfig.cpp | 30 ++--- keep/common/backupconfig.h | 10 +- keep/common/backuplistviewitem.cpp | 14 +-- keep/common/backuplistviewitem.h | 4 +- keep/common/includeexcludeitem.cpp | 14 +-- keep/common/includeexcludeitem.h | 12 +- keep/common/incrementlistviewitem.cpp | 10 +- keep/common/incrementlistviewitem.h | 14 +-- keep/common/listviewtooltip.h | 36 +++--- keep/common/rdblistener.cpp | 6 +- keep/common/rdblistener.h | 17 +-- keep/common/rdbmanager.cpp | 142 ++++++++++++------------ keep/common/rdbmanager.h | 29 ++--- keep/kded/keepkded.cpp | 34 +++--- keep/kded/keepkded.h | 13 ++- 48 files changed, 651 insertions(+), 639 deletions(-) diff --git a/keep/app/actionview.ui b/keep/app/actionview.ui index 95eacd9..1377be9 100644 --- a/keep/app/actionview.ui +++ b/keep/app/actionview.ui @@ -1,6 +1,6 @@ ActionView - + ActionView @@ -27,15 +27,15 @@ unnamed - + - layout22 + tqlayout22 unnamed - + m_grpSystem @@ -54,17 +54,17 @@ unnamed - + - layout21 + tqlayout21 unnamed - + - layout15 + tqlayout15 @@ -82,13 +82,13 @@ 0 - + 35 35 - + 35 32767 @@ -116,9 +116,9 @@ - + - layout16 + tqlayout16 @@ -136,13 +136,13 @@ 0 - + 35 35 - + 35 35 @@ -170,9 +170,9 @@ - + - layout17 + tqlayout17 @@ -190,13 +190,13 @@ 0 - + 35 35 - + 35 32767 @@ -224,9 +224,9 @@ - + - layout15 + tqlayout15 @@ -244,13 +244,13 @@ 0 - + 35 35 - + 35 32767 @@ -278,9 +278,9 @@ - + - layout15_4 + tqlayout15_4 @@ -298,13 +298,13 @@ 0 - + 35 35 - + 35 32767 @@ -336,7 +336,7 @@ - + m_grpDaemon @@ -355,17 +355,17 @@ unnamed - + - layout13 + tqlayout13 unnamed - + - layout5 + tqlayout5 @@ -445,9 +445,9 @@ Horizontal - + - layout4 + tqlayout4 @@ -493,7 +493,7 @@ Expanding - + 20 85 @@ -506,7 +506,7 @@ - + kpushbutton.h kactivelabel.h diff --git a/keep/app/addbackupwizard.cpp b/keep/app/addbackupwizard.cpp index f82baa2..0c4bf24 100644 --- a/keep/app/addbackupwizard.cpp +++ b/keep/app/addbackupwizard.cpp @@ -18,17 +18,17 @@ #include "addbackupwizard.h" -#include +#include #include -#include +#include #include #include #include -AddBackupWizard::AddBackupWizard(QWidget *parent,const char* name): KWizard( parent, name, true) +AddBackupWizard::AddBackupWizard(TQWidget *tqparent,const char* name): KWizard( tqparent, name, true) { initView(); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); setNextEnabled(page1,false); setNextEnabled(page2,false); @@ -39,7 +39,7 @@ AddBackupWizard::AddBackupWizard(QWidget *parent,const char* name): KWizard( par initConnections(); } -AddBackupWizard::AddBackupWizard(Backup backup,QWidget *parent,const char* name): KWizard( parent, name, true) +AddBackupWizard::AddBackupWizard(Backup backup,TQWidget *tqparent,const char* name): KWizard( tqparent, name, true) { initView(); @@ -58,7 +58,7 @@ AddBackupWizard::AddBackupWizard(Backup backup,QWidget *parent,const char* name) includeExcludeDialog->setIncludeExcludeList(backup.includeExcludeList()); advancedBackupConfigDialog->setOptionList(backup.optionList()); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); setNextEnabled(page1,true); setNextEnabled(page2,true); @@ -82,16 +82,16 @@ void AddBackupWizard::initView() void AddBackupWizard::initConnections() { - connect( addBackupWizard1View->source, SIGNAL( textChanged(const QString&)), this, SLOT( slotPage1Changed() ) ); - connect( addBackupWizard2View->dest, SIGNAL( textChanged(const QString&)), this, SLOT( slotPage2Changed() ) ); - connect( addBackupWizard3View->advancedConfig, SIGNAL( clicked()),this,SLOT(slotShowAdvancedConfig())); - connect( addBackupWizard1View->includeExclude, SIGNAL( clicked()),this,SLOT(slotShowIncludeExclude())); - connect( finishButton(), SIGNAL( clicked()), this, SLOT( slotFinishClicked() ) ); + connect( addBackupWizard1View->source, TQT_SIGNAL( textChanged(const TQString&)), this, TQT_SLOT( slotPage1Changed() ) ); + connect( addBackupWizard2View->dest, TQT_SIGNAL( textChanged(const TQString&)), this, TQT_SLOT( slotPage2Changed() ) ); + connect( addBackupWizard3View->advancedConfig, TQT_SIGNAL( clicked()),this,TQT_SLOT(slotShowAdvancedConfig())); + connect( addBackupWizard1View->includeExclude, TQT_SIGNAL( clicked()),this,TQT_SLOT(slotShowIncludeExclude())); + connect( finishButton(), TQT_SIGNAL( clicked()), this, TQT_SLOT( slotFinishClicked() ) ); } void AddBackupWizard::setupPage1() { - page1 = new QHBox( this ); + page1 = new TQHBox( this ); page1->setSpacing(0); page1->setMargin(0); @@ -105,7 +105,7 @@ void AddBackupWizard::setupPage1() void AddBackupWizard::setupPage2() { - page2 = new QHBox( this ); + page2 = new TQHBox( this ); page2->setSpacing(0); page2->setMargin(0); @@ -117,7 +117,7 @@ void AddBackupWizard::setupPage2() void AddBackupWizard::setupPage3() { - page3 = new QHBox( this ); + page3 = new TQHBox( this ); page3->setSpacing(0); page3->setMargin(0); @@ -164,17 +164,17 @@ void AddBackupWizard::slotShowIncludeExclude() Backup AddBackupWizard::backup() { - QString source = addBackupWizard1View->source->url(); - QString dest = addBackupWizard2View->dest->url(); + TQString source = addBackupWizard1View->source->url(); + TQString dest = addBackupWizard2View->dest->url(); int interval = addBackupWizard3View->interval->value(); int deleteAfter = addBackupWizard3View->deleteAfter->value(); bool neverDelete = addBackupWizard3View->neverDelete->isChecked(); bool useCompression = addBackupWizard3View->useCompression->isChecked(); bool excludeSpecialFiles = addBackupWizard3View->excludeSpecialFiles->isChecked(); bool useAdvancedConfig = addBackupWizard3View->useAdvancedConfig->isChecked(); - QStringList optionList = advancedBackupConfigDialog->optionList(); + TQStringList optionList = advancedBackupConfigDialog->optionList(); bool useIncludeExclude = addBackupWizard1View->useIncludeExclude->isChecked(); - QStringList includeExcludeList = includeExcludeDialog->includeExcludeList(); + TQStringList includeExcludeList = includeExcludeDialog->includeExcludeList(); Backup backup(source,dest,interval,deleteAfter,neverDelete,useCompression,excludeSpecialFiles,useAdvancedConfig,optionList,useIncludeExclude,includeExcludeList); return backup; diff --git a/keep/app/addbackupwizard.h b/keep/app/addbackupwizard.h index 05aa46a..2302775 100644 --- a/keep/app/addbackupwizard.h +++ b/keep/app/addbackupwizard.h @@ -20,7 +20,7 @@ #define _ADDBACKUPWIZARD_H_ #include -#include +#include #include "backup.h" #include "advancedbackupconfigdialog.h" @@ -32,9 +32,10 @@ class AddBackupWizard: public KWizard { Q_OBJECT + TQ_OBJECT public: - AddBackupWizard(QWidget *parent, const char *name); - AddBackupWizard(Backup backup,QWidget *parent, const char *name); + AddBackupWizard(TQWidget *tqparent, const char *name); + AddBackupWizard(Backup backup,TQWidget *tqparent, const char *name); Backup backup(); @@ -58,7 +59,7 @@ private: void initView(); void initConnections(); - QHBox *page1,*page2,*page3; + TQHBox *page1,*page2,*page3; AddBackupWizard1View *addBackupWizard1View; AddBackupWizard2View *addBackupWizard2View; AddBackupWizard3View *addBackupWizard3View; diff --git a/keep/app/addbackupwizard1view.ui b/keep/app/addbackupwizard1view.ui index eb31bca..b136dc5 100644 --- a/keep/app/addbackupwizard1view.ui +++ b/keep/app/addbackupwizard1view.ui @@ -1,6 +1,6 @@ AddBackupWizard1View - + AddBackupWizard1View @@ -30,23 +30,23 @@ 0 - + - layout17 + tqlayout17 unnamed - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -67,7 +67,7 @@ Expanding - + 20 130 @@ -76,9 +76,9 @@ - + - layout16 + tqlayout16 @@ -113,15 +113,15 @@ - + - layout11 + tqlayout11 unnamed - + useIncludeExclude @@ -163,7 +163,7 @@ Expanding - + 20 260 @@ -191,7 +191,7 @@ setEnabled(bool) - + kactivelabel.h kurlrequester.h diff --git a/keep/app/addbackupwizard2view.ui b/keep/app/addbackupwizard2view.ui index c9ad2c7..36c27e4 100644 --- a/keep/app/addbackupwizard2view.ui +++ b/keep/app/addbackupwizard2view.ui @@ -1,6 +1,6 @@ AddBackupWizard2View - + AddBackupWizard2View @@ -30,9 +30,9 @@ 0 - + - layout10 + tqlayout10 @@ -41,15 +41,15 @@ 0 - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -70,7 +70,7 @@ Expanding - + 20 130 @@ -79,9 +79,9 @@ - + - layout9 + tqlayout9 @@ -90,9 +90,9 @@ 0 - + - layout8 + tqlayout8 @@ -140,7 +140,7 @@ Expanding - + 20 381 @@ -162,7 +162,7 @@ 89504e470d0a1a0a0000000d49484452000000640000015e08060000007374ba2b0000200049444154789ced9d79741cf77dd83fbf39f6dec5028b1b588020085e124589a444ebb00e4bbe645b9263c7711ca7766cf7394ed3ba4dd2a67dcdebcb4b5ff352f78fb4751bc7769c387123cb922dd99668dd1275d012258a146f520449dcf7b538f69e99fe31bb0b2cb00b2c40801850f3790f6fafd9c5ccef33dfefef98dfcc88f14bbb0d6c2c83b4de2b60938f2dc462d8422c86a5854c4752ebbd0a571d65bd57603ea9a4ce8b3f1de0e4e171a626d2ecd85bc6477eab8e508df38a7e373a9de6c8c1516445d0b62b4075836b95d6787511566a650df6c478f46f3a19ee4d2084c030cc55f30715fee57f69231872ace877cfbf3bc9a3ffb7935452cfbdb7ffbe101ffe5c1d0ea7bc2aebbe5a5846c8db2f8df2f4c3bda453062e87ca75adf54cce24b8d0350040659d93affdd9163cbee505f5e9b72778ec3b9de81a48422214f4333c1e01a0bccac1435f0dd3b2c3b7eadbb352d65d486c46e3177fdfcd99236621d584fcec6ca9439625741ddabb87e91a1805a0a9cdc397fe432baaa3b4aaeff8a1711eff7e178601b224b3a3254cc0e7623a1ae342573fb14412805b3e14e2c3bf5587d3b5fed1b2ae42bada6778ec6f3a898ca69024c1752d35846bcbd174d00d035d075d873397fb191c35856ddf13e0f3ff7a13922416fded770e8ef2cb1ff66018a0c832db3785f17b5dc8124812601874f40fd335300640b052e5a1af86d9bcd3bfd69bbd28eb2244d70d5e3f30c44b8f0fa0ebe0f738d9b7b3019fdb896e600a9923259d363875b197b1c969006ebe27c4a7bedc58f4f7df786e98a7ffb90f005551d8d612c6e776220b5386249113333913e7f4c53e6662c9dc6f7fe4b7ea70bad7275aaeba90a989143ffb6e1797ce9885db521fe486b61a84903212160ad17548a575de7daf8be9681c800ffd462d773f58b3e0f75f7b6a88e71feb07405555b63587f1b91df922c4ac1049126018bcd73dcca51e33359685cc6869bdeeea47cb551572e1c4243ffb5e17d1290d5591d8b7b38ec6ea404e849e1351584a3ca571fc7c672ef73ff4d546f6dc19cafdfe4b8f0f70f0178300385495ed9b9a703bd5bc88c87b2e44eeb92cc1c4748ca3e7fa999a4900b0efee0a3efaf9faab1a2d574588963678feb17e7efdcc300095656e6edfdd80dbade649584a886ec04c2cc5f1f73a49a5d348127ce1dfb6b0757780671fe9e3d0d3e6ef3b5507db3635e1722a66610b0a48111929e449310c8333978739d7390a069455a83cf895305b765d9d685973216383091efb4e27bd9763005cbf39c48ddbaa0181a61b0b44649f6b79efe74b999c8e73e24217baa1a33a24b6eef673fa6db3d277399d6c6d0ae374280ba3625eaacafb7c9eb4f1c9186f9ce8279289963d7755f0b1dfaec7b5c6d1b2a6424ebc31ce933fec2111d7713b15eedc534f7da52f57f08b09592c4a741dc622339cbed403ccaebedbe5a22d1cc6e990910a4645e15455589a40370c4eb60f73a27d040c0894ab3cf89546da6e08ac5591ad8d906442e3c08f7a39f6da38008dd55eeededb80cba91428f0954589aec3c0e824ed5d7d20c0e372b3251cc6a14a45f7fab9a92a5bf885a589bc681a8bc438f84e1fe35366b4dcf4c1723efe85065c9ed58f96551732d0650e7f8cf49bc31ffbafafe2c6ad951846b108584194ccf9ac67708cd18969b63436a0a8f2127bfdd2a9aa98343038726698a3e747310c037fb9c283bf1766ebeed58d96551572f885119ef9711f5ada20e055f9f86d8d5495bb4b28f052a264e1325aa68f124bea28b2bcc45e0fb2100bd3578154b5e0f339bf393c11e7b9377b198d98d172e3ede57cfc771a707b57275a564548743acdcf7fd0cdb9a39300b48503dc774b3d4e87b430f5cc2df06242e62ca3e52d9f1f2553d124c74e75e170aaecdc124655a545a42c3f5515922604689ac19ba787397226132d4185077eaf916d3796adbf90cef7a679ec3b5d4c8ea55024c15dfb6ad9d55a9efbdc30e615ea2a4549ef608453e7fbd13303b88a22d8737d135e8f7b5e545c59aa9afbf9fcd19aa1b138cfbdd9c748c4ecaceebead9cfbbf588fdbbbf2a31a2b16a2eb06af3e39c8cb4f0c6218102a7372ffed8d84ca161eb75820a460811b0565cd8f92644ae34cfb205dbd9105ff47550437eea8a12c18442e3555e5e42c9eaacc7aa47039bc797a84b74f8f601806be328507bedcc8f63d2b8b961509991c4bf1d3ef76d2716e0680ebb79473d79e5a54b9f0805f6951b2b490f1489ca3a77a999c4ee6fdbe24cccfb334d579d9de5a87ea504a4e5585c6b9e6a7aac5181a8bf3dce13e4626cc68b9e1d620f77fb161d9870b962de4fcbb119ef87e37d1690da72a73effe3ab686976e696845449412259a0eed9d639c3c3784a62f5c5d5916685afefb2e87c4be1b6a0995972dac13c4e2a92aed6bc570d6e09bfa75c154550c5d37387c7a84b732d1e20d98d1b2636fe9d152b290745ae7b99ff4f3e6732300d456bab9ffb646025eb5a47fb454941413124f68bc7db28feefee9a2bfad2a8254baf066b43507d8b9b51667a6495c2c5509d54db2e23662a17b483beb01085ffa631cbad9973280b87b27c248e18a5f58745b87c7cdba6538132dbb3e10e413bf5b5ab49424647420c1a37fd3497f670c01ecdb59c9adbbaa58ea98c47c168b925959b352fa87a3bc71b49799587ad1df75a812c9945ef4739f47e1b69beaa9acf02e4855ba6f0b89cabb4896df8c8e8acba5e276bb181b9b24dcfb5f51b571a603771009dc4d5aad44d2a668b9fccd25b755d70dde3a33c2e1539968f12b7cee0f9b69d9bef8d1c92585bc7b688ca7feb1976442c7e352f8d8ad0d34d57a975ca142941a259a6670fcfc08c7cf8ea0b802041a77131ded2236d6c5dca1922c2ea7443c515c48965d5bcbb9615b158acb4fbaf2369255779376d601505d5d4e385c43656590eeee414e9fbe8427d94ec2d58a818cdbed4008c1cc748cb68eaf2358faff41b6dfd2c7f0781cd521f1cd6f6d27505e3cab2c1a43ef1d9fe4f1ef7503d05cebe3a3b7d6e3715d41932e53390aa3f8f3683ccd2b6ff5d23f1445f59473fd67bf85abac1621045a7286a9de93447a4f13e93dc5f4d0453074c452356e86be44133edfa7a9d9710f480a2ea7caa6a63a1a1bab71b91c2412492e5feea5b3b31f210471571bd5d51584c3358442659c397389a9a9289ae445d1a74afa9f554117bffd91161e7ee632239138178e4fb2f7ee50d1e58b96ae963678fae13e8410dcbebb9abddb434bb6344a2157f8059e77f74f72f0ad7ee2090dd9e165db27ff1cd557454b4b3d0e87c2d8d814aacb4ff9e60f98b352b42491de53c4874e337cf92493fde731f4fcf4a6ba0334ddf43136ddfc10de501360505d1ba2a9a996caca20002323139c397389a1a1310c03dc6e275bb7866968a8c1e99cdd9b555541d775d292bf642100afbd3b98ebabd46d722fba6c512189b8c6f85002c3009f5b591519503832f4b4c1af8f0d72fcbc797c5b529cb47efccf709687d9b9b385f2f200a9548aad5b9b1042303919656c2cc2e86804d5e9466bde4bc37e81a1a799ec3b47a4e7247a2a4a65f3f5d4eeb813495670b91c6cda544f385c83d3e9201e4f72f1620fdddd8344a3098480da8ca850a8ac60d4a9aa8aa6e9a4a5d267a9bc7274806399ed0ab77aa8dfe45974f9a2423c3e85b61b029c7f7792e70ef7e171292bae3be6323f3226a6123cfd6a2fc363e61e2424994df7fe099eaa2db4b585696aaa4592244e9e6c479264eaeb2b09067d545404686b6b4292045353338c8e4618198930e272130cef420861461182aaaaf25c414f4c4cd3d57591c14173d8c3e371b37d7b338d8df9d150885c8488d2ca61ae8cb290ca67bfd1bce47716ad10eef9740d97ce4c934aea3cf95a37bf79ef26aa2bae7cc65f56c8d9f6095e7ca37f4e9355d070c71fe2adbf814d9bea696d6dcc4c9633b8fefa569e79e60deeb86337d5d515cc56ee8240c04730e867cb9630424844a3318687c71919996064244247475fae5e9024094992a8ac2ca3b5354c7d7d65c9ebed709811922a41c87c195ff94f5b28af5a7aa29ffc1fbf59fbe7c53ef40755ea9add9c3a3c81a6195cec9d624b3880cb7165239ba994ceb3aff7f1c6bb23b9b128809afd5f25d8fa411a1b6bd8b5ab355380e69e2ecb12e5e5015e78e16dc2e11adc6e572ead988f221315e0743a282f0fd0d8584d5b5b132d2df5949707703a5592c9248944929999383d3d43f4f50d3339394d3aada1aa2aaa5a7c1f4da534dadb7bf0a63bf1a72f165d6ea53260092100a15a27652107e78e4e924aeb74f44db3adb90c552932b8b3048323317ef274175dfdd1bcf72b777f8ef26d1fa5b636c44d376d4308292723fbe8f77b8846e31c3d7a9e70b81697cb5950caec6bf351551582411f757555b4b535d1dada484545192e978368344e7fff287d7d235cbcd84d77f72091c834a9541a4591713866d39861189c3bd7812bdd4f307db6e0f65d890c58464ffde02f0679e971735a676d859bcfdcdbbc6c29474e8d72f0ad85c31f65db3e4ee58d9fa7b232c8fefdd7e37028c8b2944b2fd9e7e66c4683279f7c0d80fbefbf8db232df1c69529e40c88e4189798fe455daa9543a97de4647278844a6300c7319b7db492814a4b2b28c60d0cf534fbd4e28758cadb1ffb760fbae54062c732cebc91ff6f0f6cbe6dca54df53e1ef86053d151d0b9c4e2690ebcdac7c5ae85c31fbe4d7752b9efcb04837e6ebd75174ea7035996906579818cece3c0c0282fbf7c8440c0cb473e722b8180274fca7285cc47d334464727191d9d607434c2c4c434baaee75222c908b5d1e77127dec395ec4660ac8a0c58a6105d3778e47f7770ee987920eabacd413ebcbf7ed1ef74f5cdf0e4c15ea6a30b873f5c757b09ddf2fbf8fd1e6ebf7d372e970345919165392365a18cece39b6f9ea2a3a39f60d0c77df7edc7e7732f9002f385b020a595b6dd3ae3e35399a6f62463631174dd4008908c248991d3749c798b8eb71fc31fd4572c034aa843e6228460fb9e322e9f9966723cc5f0781c1d08d72c6c75e8bac1a1a3c33cfd7a7fc1712647e50e2a6efe7d5c6e17fbf75f8fcbe598576fe4a79ff98f7575212e5fee251e4f3238384253536da6422e5ef8cb8992f9dbedf1b80885ca686cac66cb96303535217c3e37b2e22421828436ed23357d9e2ffc816bc53280e59f41a53a247ee78f5a08d59a07a2de3a35ccc90be379cb4ccea4f8f1af3a38746c04a340fc29c116caf67e035955d9b76f070e8723b39c915b3edbdc2df6a8aa0a37dfbc13c330989a8af1ca2b47492412cbdd9c1521842018f4b17973033b77b6a0690633639779e80ba3572403562004cc4ee3bff893cdf8cacc26e24beff473b1c71c4a387b6992ef3fda4ecf40ace077655f1d813dff0a5951d9bb77072e978b6c411b0699c7ec73f33b851e0d031a1b6b686aaacd4889f2faebc7492693057682c5b3b2ae1ba4d31ac9648a6432452a95269dd64a2a8b13272ea0691ae75ffc6b92f12b3f056f59296b2e6eaf4c63ab9763af9915d9a59e293a07544e5e54482567308c85694ab842f8f6fe1b6497973d7b76cc6921490bf27ff6af50ba9afbbca6a682cb97fb310c83544a636c2c42434315b22ccf49490689448a6834c6cc4c8cc9c9192291192626a6989898666626463c9e249dd6729577b6be5a8cc1c1314e9fbec8c88557b87cf811ce1d8b70dd2dc12b9aafb5e2a1db444ce385cc2c730043041999f4212be02d6b263633483a393b00271c01dc37fe01a83eaebb6e0b8180372f22606e9a221725e6fbb38ff3df733a1decd9b3952347ce01061313d31c3a749c5028483a9d26994ca3691aaaaaa0280aaa2a2f7854551997cb89cbe5c0e1509614016645ffce3b67d1d30976184f724e114c4da4f9a7ff716945677a655951ca8acd68fce3b72ed1f99e794c5d962b5094aadce74248787c75b83ce61c5e6437ce5d5f074790eddb37515e1e5820a250ca323f9bfb9e294cd37462b138e3e3530c0e8e610e9fcc0a9e9e8ed1db3bc4d8d824f17822f73fb2b21545c2eff75255554e63630df5f55504833e5c2e47493200ce9deb64727286ba9967a80fc4f9c41d61848091fe040fffcfcb79e7332e87656b9c994af38fdfbac440975947c872258a52517059b72788d3e5215e730f86ab9ad6d6309595c122f5c55c11b30292c934e974924442239d4e934aa548a7f55cf3d74c2d328d8d35b4b77701cc130db22c515111a0bc3c4059992f33ec62aee3729abf59a2d138274e5cc0a90d51137f19804d753e3e7c4b3dcf1deea3eb4294c7bed359d2995ef3599690e9488a7ff8ef1719ee35f73a59ae4251ca172c979ddd2149e0501db8a60ee3a9afa6a6e6a6057bfcec5e6f904c264826539982d748a552b9e10b97cb89d3e9c0e7f3e2742a389d2a0e878aaa3a703a156459c1ed7670ead4456459c6eff7e0f5ba09047c3437d7664672679bbc57c291236749a5d2b4c51f4762b6f2dfb939c8742ccdaf4f0c71eee824077ed4cba7be54fc4caf42942c243296e4877f7589d1415386a25423cbc1bc650485669a832cd2e8ed4f302486a9bdf9f31886423299ca9cfa0c60204902a7d381d3e92410f0e2743a71bb9da8aabc680731db20008396967a42217388439625229169a6a6a20c0e8e515d5d8ecb959d336664d676f90c0c8c72e9520f6a6a98f2f4f9059fdf725d25d3d11427dac779fba55102e52a773db0f04caf629424647c38c93ffcd5452646ccf9508a52832ce74f6d293ae7694eb4c43a0ed117e9a4f6f6afe3ab6c4051141445cef5ce1545ca7b9edd9b176ffe1a39b142906bb9190604837e3c1e17a3a3930c0f4f100a05f078dc08f32cb6cca35172dad27583d75f3f8ea619a8d397a1c891887bf6d5128da769ef99e2c59f0de00faaecb9b3705a9fcf9235d8e840821ffc65fb1c1975793244668e93229b7fb23ce7b9947d2d5064812c8331d5c3d04bff8de9aeb716695de53f9fdf31cc4f77b0b09f31fbdae974505717c2ed76323e3ec5cc4ce1fe51299c3e7d91b1b1083333332452c5250a21f8d86d0dd4579a876b7ff90fddbc777cb2a4ffb1a890a1de383ff8cb7626c7cc0e8fa2d423cbb3a77649122852111152be084536979565908d38e387ff960bcf7d9bee2e73f8a3b08885cddfe24de1f9cde4d9d792246552998fa9a919a6a6f287fe4b21164bf0d65ba7f0785c689a414c5bfc409d224b3c705713150107ba0e3ff93f9d0cf7c597fc3f453b86ba6ef0bdbfb8c0e4781a10284a03b26c1e4b16223f02e439d121e70a5ee4bf2fcd5b460667b29f999ea3bc792e4e7bc728e3e3932412491c0e736ed4fcd1dbc5c6b6f247740bbd368ff8399d4ea2d118e9b486d3a9e67e77295e7df52803036378bd2efafb47f04a136c719f59524a4b839ff7ba268927340c03b6ddb8f82ccfa2a3bd678e4478e4db1d8040551b9024f3e0fcdccaba709d517cd272b1e584e2a4cb790f1d53d5b90274bb9dd4d757515f5f49385c434d4d28d7692b54b9e74b92f204ceed5b64afa1323313c3300c0201ef925206064678f4d11748a534a627a708bbdab9c9f70665cac4a2859be542d724070ef5e00f2afcfbff75dda2cb16add4bb329d3e49f220843b5757149e1b9b152416add40b9d83610a4bd0967a869aca7d547fe06b8c8ecd303030424fcf10972ff7e68632b2721a1b6b08876bf07866c7c1e656ece66bc8b6a4e657dcd9a38ff1788ac9c9999c94421886c18b2fbe8daeeb84f543ecac7a1b8f5c7aca3bd711e1c5b7cd8b18dcf4c1a52bf6a242b6ef0df0eb6787d1f519d2a96e5cae3a64592d324b5c1489827922e645cb7cc1958923a8a723ecbaf34fd9b76f074248442253f4f58dd0df3f4c5fdf086fbc7112214e21c4ec6c92e6e63a9a9a6aa8a8086018624e2bcac8bd9e53c46445b95c661f261a8de3f1b80af6d24f9cb8407fff286dea6176f95e2959445ad339f8ce00a72e9a515456a1f2c14f562ff9bd450f501d7a6688e71ee9cf6c9c8ccf5387d3e15938737c9142ce3b59a6c84930f34f25931d5e82fbbf89bbe9f64c5acace161144a371fafa46e8ed1da2a3a38f48c48ce4ec5edfdc5cc7a64d753437d7515b5b99693e2f7dc02a994c679adcb352e2f104dffdeee388d4381f757f1f55ca3f0da218e393090e1cea6164c2ecb36ddee9e3b3df68c217587a62fa92470c2f9c98e4a77fdb456cc6ec91fa3c95f8bde5e6b045b1732ac43c1105d25c29cbb9db1ec073c357505407d9e3eb9224d0348daeaec15c937668689cbebe617a7a86e8ef1f21994c2384598937379b725a5ab293e4f27bec730f62699a9eab77009e79e60d8e1d3bcfaddea768520b4f6a98cff9ce082fbcd54f2aad2304dcfd500d773d5053f2104a498770c787933cf2ed0efa3bcd36bcdbe9a3aaa276f644cb82694a148882d2eb9cdc2903e55b71dffca7283ef3924d86a1d3d13180dfefa6bebe3a2769b62237a786f6f40cd3db3b444fcf205353d15c655f5717a2a5a5211349b5f8fdbe3c3966735b303030c2dffffd2fa852fab8d7ffc892432e694de795770638994951de80c26f7ea369d957172af9987a2aa973e047bd1c7dd53cfea12a2af5550db85dce792dafc2e7f2e5a7b3522aff39cb39bc28bbff1da2fa163a3b0708067dd4d656327bcc445af4792432cdbbefbec79933978944a673852f84a0bcdc9713d4dc5c979984073ff8c1cfe9eb1be2c3be7fa65c194108e6889b9d818980c8549203af77339c49512d3bbc7cf6f79bf1074b3b77664542b2bc737094a77ed48b96365b2e0dd5b554940532512016dddb4d4105cef75bb05ce13a2712bc17d1f6152a2acb174446f6f5dce7894492d3a72f71ecd839c6c7a7116834aaed6c52df035962345dcba856cfb85e878e9c696e3ba8ae0ed1d33344abe33837795ec99bfeca9ce70268ef89f0f291d91475e7a76ab8e7d3a5a7a82b1602d07739ca8fbfdd4164d4ecc157959713aead367be545d35491ca7f41142dbc28cc5cc1946d2375dd9f227b6be748c88f8aa1a1314e9cb8c0d9b397d13403af14a1593943b3e33c4e3941b6459c2d6803c1a45ec5985ecb9856cfb8d180579ee656d7cf7148c9fc88c80931e8eb1be6576f99679479fc329ffd7af3155fa466c567e146a7d3fcf43b5db49f328f0afa3c6eb66f6ac4e5940b3481459168595ac45c19b9c146c5477afb1f216a3e908b104dd3696fefe2c48976868727009d2aa99366e50c5572efec5e9d295c447eea29f41eccfd8ec8a528190d9f32c93b674778e3bd1495754ebefca7ad8b9e88532a2b3e84ebf1297cf18f5b78f989015ef9e510d3d118673bc7b8aeb5069f532f696f9f5ff917af4bf2ffb7484fa39cfa0bb4c86f3012fa0c67ce7671fe7c07c9641aa788d12cced2209fc32d451106a435f222a2a09002f543fe7b6667d3a92409a8d348c24008735fae09bb5645065ce1757b254970ef67ea98184d71fcd03829cda06fca4d0d49aa7ce9e2957aeefda5eb9c629958004af7e324cebdc1899e8f5266f4b3599ca5924eb3b03448e9f30464f6f2250bbf488a2a7727f13b134808aa9c93a8c29cfc5768aad34a59950b292bca6ca74b9204a35127295d261c4ce40616f39bc04b8b28a54ed474c18c1ee2f3adafd273e9129aa6a3619ec738b7a06723c258244a44d1c8516483da4012a7a2e1940daa9d93a842237b606c895946cb2bcbd5f8118fdffc19494fa10803430866920a97c7253687e238546341542cd6342e05dd808e3107dbc2d30859e06eabe5f4997e8ccc14cf2553d482f78c829113f0405d85862c047e3545c8318584004346080dd0e61c97b9725645486e43d0f0483324840743c8a475998b231e36552608f9b425ea92d9df590add808e5117d1944299c720a94be0f7b0b5ad8653a7070a0a59f05e5e2a5b98b62401f59582aa321048849c51026a020c050c1d848e24a5018d0253d056cc2a09992d49551828528c046e74218310748eb948a453348792b3296c055101a68cce311733290587a451e616243583784aa1a2c24f5b9bc6d97343050a5f141732afce703a04ad61059f0b14a151e38ee2943430e4d92f18b343f696ab4344a64005d99464a012252e3c689897db1b9e5149e812db6ae238e4d99657a951011919e3a60c5982a023819064bcaa408d09529a4c5d6d39b1b84efbc59179516214495b22efbd5050a12dec44910d3c4a922a770c19ccc84007a181210073d012ac28245ba8c2c8eb79fb8812c78d26ccb378671232a7fadcecac4b10f42e2fceb332a249054908fc6a02a7a283644661c00da33366c96e6ea9241a4bd3d93d5142b3d6c8a5a82dcd1ec2b50e300cca5d31ca1d0930245386d04d11860074404748592196ab436677f3ec5e9f15e323461c1769a1220468bac4993e179baa52d4074b9b9cac1bd035ee229654910438640dbf9a349bc5420121f0bb74c66312ba21013ad7eda8251ad3e81f985a3245b95d1237ee2823e89791844e8d278a5b5e98a232df5a90b256936564efe2cc5daff995b522835f89e39692b9c1472489ae3127ed434eb425024537a07bdc452ca5222490248332671c59367f1f218190916419bfcb4c250809212becbda981b23237a93445ff424117b7edab2158e6c2a90a1a0349dcaa00a1987f9232fb7cceebe1498333dde6f1919af0eadd8b64552244cef443344d4312e6a4374998652565d2814f24480071c399db3bc7a32af101892d55715ceac2b03765b889a695dc6ff994242e45cfa519b390cc3d36e0d689c4337bb1a1232b2ab7ed6fe6c5572e31399598d78a12ecda51ced69600183a016792902b8540caf42b0a4786aec3c113110ebc35462a6d5e0cf3960f957e6af552ac4a84346d35cfa08a25931cbfd0493c9158307a2b4902af9cc4afc4f39ab9494de6fc90878958fe147edd809e09534636fd39648d802399d77c36eb1073af5515058fcb8c18840cc8389c0eeeba6333aaaa924a433a6d5e00e0aedb1ad9da5a819024aafd3a955e1d918d0649cefc6ee62ff3ba7f3ccd5f3fdec3cf7f3d4a2a6dd0b2c3cbd7fe731bc1ca2b3b49672eab72114c5d37f8f9df75f3ee21f34c2a49085ac3956caa0b21cb22b73767a3266528cc68eefc013f6150ed4b51e34f62003d1137d19492ebb14b9241952b8a43d6f3a2af75c72dc892596f60e8c4923afd11324d1ff33d0c838948945f3d7f91ea4a371fdcdf80d32150259d1a6f0287ac6596d3e77c67f6b596d678fe483fcfbe3588a61b385d121ffd7c3d7befae58f57a64552f13db7e728ad77f3594bbf341d0ef66f7d67afc1e474e4ab6c24f190ad39acb1c5f9266fb0a3e873906164d2bb9d42609f03b12b9e81073e4b66cbfcd3c0e6e689959733a3de33a49cdc8c9300bd6606a2a8ecfab2030f03a34aa3c4924f44565740d4cf1f07317e91b318f966edd1de0812f3712a8589dc1c4f9acfa85940dc3e0ed974679ee27fd24133ab224d8d1524d6b6395084c030000099e4944415479ae6e913202d286cc54da9de90bcc0efc4973224712a04a1a55aea89939e62dd3bce30e6449ce2bc4a998cef0542642c81723302877a709bad2c545183aa9749aa70f5de6c523e64d613c3e99fbbfd8c00db72e9cedbf9aacd9b5dfc787133cf177ddb90b6556063decdb5987dfe3c84b399a213399f660cceba0cd16bc41953b93aaa4d9cfb234efbc6b5648a660755da77b4c372f5060cc4a91854eb52f8d5b59242a0c9d8b3d633cfcf46986c7333710b8c5bc449f37b0f637b55bd38bf11b86c1e1174679fed13e5249035912dcb8b59ab6a6f24cdd22325714959848b931849457e0920481b9a9aac0707cf375f79a42e615ecd88cce4474b60e71a93a35be34b2c8468c86296ab6fe482493fcf2e5b3bc76b40b30ef0ef7c92f35b26385977c5d0957e5fe21638366b4644f81ab0d79b9f5863a02ded9bac5403091f2a019b3525445a3da155d7488a5f9fa8f20cb32f373bfa669748dea188641995ba7c2ad23281e15672ff5f3c881638c4f9a51b1e74ef3662eab7509f152b96a77d8d17583379f1fe185c7fa49a70c1459e296eb6bd8b1a97c568a104c24dda40d19491854bba338147dd1536b9a777d7c56c8bc821e99d270ab3a5e8751344545a3719e78fe28878f7700e6cdc11efccafadcee08aea2902ca303091eff7e17ddede6fcd8c66a2f77eda9c7ef55331d3d184fba71cb1a01e7d233059b6ff824b29c19f89b1725f3a360fe7bc7cf76f0d881c34c4ec71002f6df57c97dbf59bbae379b5cb7bbb4bdf1ec302ffe6c8074cac0a148dc71532d3b5b8279876d4b69e237ef7e1059519625636a6a86c70e1ce2ddd39701f3a6950f7d354c53db955f31ef4a59d7fb180ef7c579e2efbae9b968464b4bbd8ffb6ea9c3eb2ebd8ddf7cd367cc08c9157cb63fa2cd6961cd56dc6f1f3bcbcf0ebc4e34668e26dc7e7f35f73c5483a2aecaa0c515b3ee77fad47583434f0ff3d2e303686903a72a71cfbe3ab66f2aad65d3bce773b34216495be313117ef2c4f39c39df01406d938b4f7f2d4c5df3e217a5bcdaacbb902c43bd719ef87e57eee661ad0d7e3e74731d5ef7e26dffa63d9f4751d5a229cad0357efde6517ef1ab83c41349644570f78335dcf1896ae422370f584f2c2304cc6879eda9210efe7c104d337039643eb4af96adcdc5a325bcf70ba8aab360540c0f8ff0e3477f49fba54e73d9560f0f7d2d4c55bd356fdd0d16139265b027c6e3dfebcecdb66f0b07f8d0cdb5b89d0ba3a571cfefe070baf37bea5a9a83afbcce81a75f24954aa13a24eefb6c2dfb3f5cb9e239b7570b4b0a01f3b642af3d35c8c15f0ca26be076ca7ce8e63adae6dd1aa361cfefe27479312b739dfebe3e1efef1a374769a9748dfbcd3c7835f69a4bc6ae18d66ac8865856419e88af1f8f7bb18e8324f29ded61ce09ebd75b8327d85fa3d5fc6e5f1a2a5533cffecb33cfbec73689a86d32df1b1dfae67ef5dc5afb36e452c2f04ccebd0bff2e420affe72105d078f4be6be5bead9dce0a776cfef31323ac6c3fff44ff4f5f502b0eda6009ffa52e3aacdb7bd9a6c082159fa3ba3fcec7bdd0cf598d1b2a3a58ceae61b79f59557310c038f5fe6135f6c60d707d676887c2dd95042c0bcd3cfc19f0ff2fa81a1bcab62effa8079cf27af7fed87c8d7920d2724cb705f9c936f4e90886becdc17a479ebfa0f7bac061b56c8b58a3506706c72d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c467666b23d9dd42264ceb8b7b10a0ad77e746ca8edb385580c5b88c5b0eb108bf17e88900d852dc462d8422c862dc4625cab4236ec365d8b4236f4f6d8422c86dd0fb118d762846c686c2116c31662316c2116e35a11722d6c03600bb11cd782908dbefe79d8fd108b712d44c835852dc462d8422c862dc4626c64211b75bd1765a30ad988eb5c12b6108b61f7432cc6468d906b165b88c5b085580c5b88b5303692908db29e57842dc4626c14211b611d5705bb1f6231364a84bc6fb08558839c035bc8fa9357feb690f5674309b1f2baad09561662d5f55a536c2116c3ee87580c2b47c8fb125bc8fa50b4cc6d21eb832dc4422c5ade561362a57559176c2116c34a42acb21eeb8add0fb118568a101b6c21578b92cbd8167275b085588c0d2564bdffbfa5586f21b68c79d8422c86dd0fb118eb1d2136f3b085ac1d2b2a575bc8da610bb1102b2ed3f51062ef008b600bb118575b882d6309ec7e88c5b02b758b610b593d56a51c6d21ab872dc4626c2821b6f412b91a426c19cbc06ef65a0cbb0eb118b6902b63d5cbce167265d8422cc49a94db5a0ab145af80b51262cb5821b6108b61f7432c865da95b0c5bc8f259d3f2b2852c8f352f2b5bc8f2d850426cb1ab802dc462ac96105bc62a61f7432c865da95b0c5bc8d25cd5f2b1852c8d2dc4425cf5b2b95221b6cc55e64a84d832d6005b88c5b0fb2116c3aed42d862da430eb5626b69085ac6b79d84216b2a184d8f2d6185b88c5588e105bc655c0ee87580cbb52b718b61013cb94812dc4c43265600bb1d8f69722c4522b7cadb394105bc655c6166231ec7e88c5b02b758bf17e1662c9ed7ebf0ab1ec36db422c462121965dd9f703b6108b315f882d639db1fb2116e3fd5aa95b96f793900db19db6108bf17e11b261b6312b64c3acf0b58eddcab218ef9794b561b085580c5b88c5b8d6856cb86dbb96856cc8edb285580cbbd96b31aee508d990d8422c862dc462d8422cc6b52664c36f8b2dc4625c4b42ae89edb0fb2116e35a8a906b025b88c5b085580c5b88c5b816846cf4f5cf63a30bd9c8eb5e10bbd96b31367a845c73d8422c862dc462d8422cc64615b211d7b92436a2908db6becbc2166231ec7e88c5d88811724d630bb116862dc43a1860478895d8504236c23aae0ab6108bb11184587dfd5615bb1f6231364284bcafb085ac2f0bcade16b2bed8422c44c172b7b210abaed79a625521565ca7ab822dc462d8fd108b61d50879df620bb9fa2c5adeb690abcb92656d0bb9ba6c282156598f75c5166231ac22c40aeb6009ec7e88c5b04a84d864b085ac3dcb2a5f5bc8da630bb110cb2edbf51462ef0805b085580c5b88c5b0fb2116c3aed42d862d646d587199da42569f2b2a4f5bc8eab3a184d8f297c0166231aea6105b4609d8fd108b6157ea16c316b23aac5a19da4256075b888558d5f25b6b21b6ec65620bb118b6108b61f7432c865da95b0c5bc8ca599372b385ac8c352b335bc8cad850426cc157c06a0bb1655c21b6108b61f7432c865da95b0c5b48e95c9572b285948e2dc4425cb5325a0d21b6d055c41662316c2116c3ee87580c6118f60e6e25a4f55e019b7c6c2116c31662316c2116c3166231fe3f815c7042bc8ddc990000000049454e44ae426082 - + kactivelabel.h kurlrequester.h diff --git a/keep/app/addbackupwizard3view.ui b/keep/app/addbackupwizard3view.ui index e392165..e3e1cee 100644 --- a/keep/app/addbackupwizard3view.ui +++ b/keep/app/addbackupwizard3view.ui @@ -1,6 +1,6 @@ AddBackupWizard3View - + AddBackupWizard3View @@ -30,23 +30,23 @@ 0 - + - layout16 + tqlayout16 unnamed - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -75,7 +75,7 @@ Expanding - + 20 130 @@ -84,9 +84,9 @@ - + - layout15 + tqlayout15 @@ -108,7 +108,7 @@ Set the desired options for your backup. - + groupBox2 @@ -127,25 +127,25 @@ unnamed - + - layout8 + tqlayout8 unnamed - + - layout6_2 + tqlayout6_2 unnamed - + - layout5 + tqlayout5 @@ -185,9 +185,9 @@ - + - layout4 + tqlayout4 @@ -247,15 +247,15 @@ - + - layout7 + tqlayout7 unnamed - + neverDelete @@ -277,7 +277,7 @@ - + groupBox3 @@ -296,15 +296,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + useCompression @@ -323,7 +323,7 @@ true - + excludeSpecialFiles @@ -334,15 +334,15 @@ true - + - layout11 + tqlayout11 unnamed - + useAdvancedConfig @@ -388,7 +388,7 @@ Expanding - + 20 46 @@ -434,7 +434,7 @@ setEnabled(bool) - + kactivelabel.h kactivelabel.h diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp index de8babd..74168e5 100644 --- a/keep/app/advancedbackupconfigdialog.cpp +++ b/keep/app/advancedbackupconfigdialog.cpp @@ -19,32 +19,32 @@ #include "advancedbackupconfigdialog.h" #include -#include +#include #include #include #include #include #include -#include +#include #include #include -#include +#include #include -AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(QWidget *parent):KDialogBase(Plain, i18n("Advanced Backup Configuration"), - Help|Ok, Ok, parent, "advancedBackupConfigDialog", true, false) +AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *tqparent):KDialogBase(Plain, i18n("Advanced Backup Configuration"), + Help|Ok, Ok, tqparent, "advancedBackupConfigDialog", true, false) { - QGridLayout *topLayout = new QGridLayout(plainPage()); + TQGridLayout *topLayout = new TQGridLayout(plainPage()); m_advancedBackupConfigView = new AdvancedBackupConfigView(plainPage()); topLayout->addWidget( m_advancedBackupConfigView,0,0 ); m_advancedBackupConfigView->optionList->availableListBox()->insertStringList(allOptionList()); - resize( QSize(350,450).expandedTo(minimumSizeHint()) ); + resize( TQSize(350,450).expandedTo(tqminimumSizeHint()) ); } -QStringList AdvancedBackupConfigDialog::optionList() +TQStringList AdvancedBackupConfigDialog::optionList() { - QStringList options; + TQStringList options; for (uint i=0;ioptionList->selectedListBox()->count();i++) { options.append(m_advancedBackupConfigView->optionList->selectedListBox()->text(i)); @@ -52,11 +52,11 @@ QStringList AdvancedBackupConfigDialog::optionList() return options; } -void AdvancedBackupConfigDialog::setOptionList(QStringList optionList) +void AdvancedBackupConfigDialog::setOptionList(TQStringList optionList) { - QStringList alloptions = allOptionList(); - QStringList available; - for ( QStringList::Iterator it = alloptions.begin(); it != alloptions.end(); ++it ) + TQStringList alloptions = allOptionList(); + TQStringList available; + for ( TQStringList::Iterator it = alloptions.begin(); it != alloptions.end(); ++it ) { if ( optionList.grep(*it).size() == 0 ) { @@ -69,9 +69,9 @@ void AdvancedBackupConfigDialog::setOptionList(QStringList optionList) m_advancedBackupConfigView->optionList->selectedListBox()->insertStringList(optionList); } -QStringList AdvancedBackupConfigDialog::allOptionList() +TQStringList AdvancedBackupConfigDialog::allOptionList() { - QStringList options; + TQStringList options; options.append("--no-hard-links"); options.append("--exclude-special-files"); options.append("--exclude-device-files"); diff --git a/keep/app/advancedbackupconfigdialog.h b/keep/app/advancedbackupconfigdialog.h index 26ed7b9..a6cdcb7 100644 --- a/keep/app/advancedbackupconfigdialog.h +++ b/keep/app/advancedbackupconfigdialog.h @@ -26,16 +26,17 @@ class AdvancedBackupConfigDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AdvancedBackupConfigDialog(QWidget *parent); + AdvancedBackupConfigDialog(TQWidget *tqparent); ~AdvancedBackupConfigDialog() {}; - QStringList optionList(); - void setOptionList(QStringList optionList); + TQStringList optionList(); + void setOptionList(TQStringList optionList); private: - QStringList allOptionList(); + TQStringList allOptionList(); AdvancedBackupConfigView *m_advancedBackupConfigView; }; diff --git a/keep/app/advancedbackupconfigview.ui b/keep/app/advancedbackupconfigview.ui index 75dde46..1a4e588 100644 --- a/keep/app/advancedbackupconfigview.ui +++ b/keep/app/advancedbackupconfigview.ui @@ -1,6 +1,6 @@ AdvancedBackupConfigView - + AdvancedBackupConfigView @@ -22,9 +22,9 @@ 0 - + - layout3 + tqlayout3 @@ -82,7 +82,7 @@ - + kactivelabel.h kactionselector.h diff --git a/keep/app/backupconfigdialog.cpp b/keep/app/backupconfigdialog.cpp index 4ac8784..3b4abff 100644 --- a/keep/app/backupconfigdialog.cpp +++ b/keep/app/backupconfigdialog.cpp @@ -19,40 +19,40 @@ #include "backupconfigdialog.h" #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include "backupconfig.h" -BackupConfigDialog::BackupConfigDialog(QWidget *parent):KDialogBase(Plain, i18n("Configure backups"), - Help|Cancel|Ok, Cancel, parent, "configBackups", true, false) +BackupConfigDialog::BackupConfigDialog(TQWidget *tqparent):KDialogBase(Plain, i18n("Configure backups"), + Help|Cancel|Ok, Cancel, tqparent, "configBackups", true, false) { KIconLoader *icons = KGlobal::iconLoader(); - QFrame *page = plainPage(); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + TQFrame *page = plainPage(); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); m_backupListWidget = new BackupListWidget(page,"backupListWidget"); topLayout->addWidget( m_backupListWidget ); setMainWidget(page); - connect( this, SIGNAL( okClicked()),this, SLOT(saveSettings())); + connect( this, TQT_SIGNAL( okClicked()),this, TQT_SLOT(saveSettings())); } void BackupConfigDialog::saveSettings() diff --git a/keep/app/backupconfigdialog.h b/keep/app/backupconfigdialog.h index 0e79655..e893b21 100644 --- a/keep/app/backupconfigdialog.h +++ b/keep/app/backupconfigdialog.h @@ -27,9 +27,10 @@ class BackupConfigDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - BackupConfigDialog(QWidget *parent); + BackupConfigDialog(TQWidget *tqparent); ~BackupConfigDialog() {}; public slots: diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui index f887fb0..6136056 100644 --- a/keep/app/backuplistview.ui +++ b/keep/app/backuplistview.ui @@ -1,6 +1,6 @@ BackupListView - + BackupListView @@ -30,9 +30,9 @@ 0 - + - layout4 + tqlayout4 @@ -90,9 +90,9 @@ LastColumn - + - layout3 + tqlayout3 @@ -132,7 +132,7 @@ Expanding - + 20 480 @@ -147,7 +147,7 @@ - + klistview.h kpushbutton.h diff --git a/keep/app/backuplistwidget.cpp b/keep/app/backuplistwidget.cpp index 854e6c3..a7bb266 100644 --- a/keep/app/backuplistwidget.cpp +++ b/keep/app/backuplistwidget.cpp @@ -18,9 +18,9 @@ #include "backuplistwidget.h" -#include +#include #include -#include +#include #include #include @@ -29,15 +29,15 @@ #include "addbackupwizard.h" #include "backupconfig.h" -BackupListWidget::BackupListWidget(QWidget *parent,char *name): BackupListView(parent,name) +BackupListWidget::BackupListWidget(TQWidget *tqparent,char *name): BackupListView(tqparent,name) { - QToolTip::remove(m_lstBackup); + TQToolTip::remove(m_lstBackup); new ListViewToolTip(m_lstBackup); slotReadSettings(); - connect( m_btnAdd, SIGNAL( clicked()), this, SLOT( slotAddClicked() ) ); - connect( m_btnRemove, SIGNAL( clicked()), this, SLOT( slotRemoveClicked() ) ); - connect( m_btnEdit, SIGNAL( clicked()), this, SLOT( slotEditClicked() ) ); + connect( m_btnAdd, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotAddClicked() ) ); + connect( m_btnRemove, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotRemoveClicked() ) ); + connect( m_btnEdit, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEditClicked() ) ); } BackupListWidget::~BackupListWidget() @@ -48,8 +48,8 @@ void BackupListWidget::slotReadSettings() { m_lstBackup->clear(); BackupConfig *backupConfig = new BackupConfig(); - QValueList backupList = backupConfig->backupList(); - QValueList::iterator it; + TQValueList backupList = backupConfig->backupList(); + TQValueList::iterator it; for ( it = backupList.begin(); it != backupList.end(); ++it ) { BackupListViewItem *item = new BackupListViewItem(m_lstBackup,*it); @@ -59,10 +59,10 @@ void BackupListWidget::slotReadSettings() void BackupListWidget::slotSaveSettings() { - QValueList backupList; - QListViewItemIterator it( m_lstBackup ); + TQValueList backupList; + TQListViewItemIterator it( m_lstBackup ); while ( it.current() ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); BackupListViewItem *backupItem = static_cast(item); backupList.append(backupItem->backup()); ++it; @@ -75,18 +75,18 @@ void BackupListWidget::slotSaveSettings() void BackupListWidget::slotAddClicked() { AddBackupWizard *wizard = new AddBackupWizard(this,"addBackupWizard"); - connect(wizard,SIGNAL(backupSetted(Backup) ), this, SLOT(slotAddBackup(Backup))); + connect(wizard,TQT_SIGNAL(backupSetted(Backup) ), this, TQT_SLOT(slotAddBackup(Backup))); wizard->show(); } void BackupListWidget::slotEditClicked() { - QListViewItem *item = m_lstBackup->currentItem(); + TQListViewItem *item = m_lstBackup->currentItem(); if ( item ) { BackupListViewItem *backupItem = static_cast(item); AddBackupWizard *wizard = new AddBackupWizard(backupItem->backup(),this,"addBackupWizard"); - connect(wizard,SIGNAL(backupSetted(Backup) ), this, SLOT(slotUpdateBackup(Backup))); + connect(wizard,TQT_SIGNAL(backupSetted(Backup) ), this, TQT_SLOT(slotUpdateBackup(Backup))); wizard->show(); } } @@ -103,7 +103,7 @@ void BackupListWidget::slotAddBackup(Backup backup) void BackupListWidget::slotUpdateBackup(Backup backup) { - QListViewItem *item = m_lstBackup->currentItem(); + TQListViewItem *item = m_lstBackup->currentItem(); if ( item ) { BackupListViewItem *backupItem = static_cast(item); diff --git a/keep/app/backuplistwidget.h b/keep/app/backuplistwidget.h index 3ffe0d5..7d7a9cb 100644 --- a/keep/app/backuplistwidget.h +++ b/keep/app/backuplistwidget.h @@ -25,8 +25,9 @@ class BackupListWidget: public BackupListView { Q_OBJECT + TQ_OBJECT public: - BackupListWidget(QWidget *parent, char *name); + BackupListWidget(TQWidget *tqparent, char *name); ~BackupListWidget(); public slots: diff --git a/keep/app/forcebackupdialog.cpp b/keep/app/forcebackupdialog.cpp index 5db53b0..4b46fae 100644 --- a/keep/app/forcebackupdialog.cpp +++ b/keep/app/forcebackupdialog.cpp @@ -19,42 +19,42 @@ #include "forcebackupdialog.h" #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include "backupconfig.h" #include "backuplistviewitem.h" -ForceBackupDialog::ForceBackupDialog(QWidget *parent):KDialogBase(Plain, i18n("Backup now"), - Help|Cancel|Ok, Cancel, parent, "forceBackupDialog", true, false) +ForceBackupDialog::ForceBackupDialog(TQWidget *tqparent):KDialogBase(Plain, i18n("Backup now"), + Help|Cancel|Ok, Cancel, tqparent, "forceBackupDialog", true, false) { - QGridLayout* toplayout = new QGridLayout(plainPage()); + TQGridLayout* toptqlayout = new TQGridLayout(plainPage()); m_view = new ForceBackupDialogView(plainPage()); - toplayout->addWidget(m_view,0,0); + toptqlayout->addWidget(m_view,0,0); loadBackupList(); m_manager = new RDBManager(); - connect( m_manager, SIGNAL(backupError(Backup,QString)), this, SLOT(slotBackupError(Backup,QString)) ); + connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotBackupError(Backup,TQString)) ); - connect( this, SIGNAL(okClicked()), this, SLOT(slotForceBackup())); + connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotForceBackup())); } ForceBackupDialog::~ForceBackupDialog() @@ -65,8 +65,8 @@ ForceBackupDialog::~ForceBackupDialog() void ForceBackupDialog::loadBackupList() { BackupConfig backupConfig; - QValueList backupList = backupConfig.backupList(); - QValueList::iterator it; + TQValueList backupList = backupConfig.backupList(); + TQValueList::iterator it; for ( it = backupList.begin(); it != backupList.end(); ++it ) { new BackupListViewItem(m_view->m_lstBackup,*it); @@ -75,11 +75,11 @@ void ForceBackupDialog::loadBackupList() void ForceBackupDialog::slotForceBackup() { - QValueList backupList; - QListViewItemIterator it( m_view->m_lstBackup ); + TQValueList backupList; + TQListViewItemIterator it( m_view->m_lstBackup ); while ( it.current() ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); if ( item->isSelected() ) { BackupListViewItem *backupItem = static_cast(item); @@ -91,9 +91,9 @@ void ForceBackupDialog::slotForceBackup() m_manager->slotForceBackup(backupList); } -void ForceBackupDialog::slotBackupError(Backup backup,QString errorMessage) +void ForceBackupDialog::slotBackupError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage)); } #include "forcebackupdialog.moc" diff --git a/keep/app/forcebackupdialog.h b/keep/app/forcebackupdialog.h index be12538..613e938 100644 --- a/keep/app/forcebackupdialog.h +++ b/keep/app/forcebackupdialog.h @@ -29,14 +29,15 @@ class ForceBackupDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ForceBackupDialog(QWidget *parent); + ForceBackupDialog(TQWidget *tqparent); ~ForceBackupDialog(); public slots: void slotForceBackup(); - void slotBackupError(Backup backup,QString errorMessage); + void slotBackupError(Backup backup,TQString errorMessage); private: void loadBackupList(); diff --git a/keep/app/forcebackupdialogview.ui b/keep/app/forcebackupdialogview.ui index 8d8ecac..41488dd 100644 --- a/keep/app/forcebackupdialogview.ui +++ b/keep/app/forcebackupdialogview.ui @@ -1,6 +1,6 @@ ForceBackupDialogView - + ForceBackupDialogView @@ -22,9 +22,9 @@ 0 - + - layout21 + tqlayout21 @@ -121,7 +121,7 @@ - + kactivelabel.h klistview.h diff --git a/keep/app/generalconfigview.ui b/keep/app/generalconfigview.ui index 11df24f..fdd6717 100644 --- a/keep/app/generalconfigview.ui +++ b/keep/app/generalconfigview.ui @@ -1,6 +1,6 @@ GeneralConfigView - + GeneralConfigView @@ -19,15 +19,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + groupBox4 @@ -38,15 +38,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + kcfg_NotifyBackupError @@ -54,7 +54,7 @@ Notify backup error - + kcfg_NotifyBackupSuccess @@ -66,7 +66,7 @@ - + groupBox4_2 @@ -77,15 +77,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + kcfg_ControlRDBPriority @@ -93,9 +93,9 @@ Control rdiff-backup priority - + - layout4 + tqlayout4 @@ -147,7 +147,7 @@ Expanding - + 20 120 @@ -166,7 +166,7 @@ setEnabled(bool) - + knuminput.h knuminput.h diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp index 2759a46..5a10b30 100644 --- a/keep/app/includeexcludedialog.cpp +++ b/keep/app/includeexcludedialog.cpp @@ -19,27 +19,27 @@ #include "includeexcludedialog.h" #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include #include "includeexcludeitem.h" -IncludeExcludeDialog::IncludeExcludeDialog(QWidget *parent):KDialogBase(Plain, i18n("Inclusion/Exclusion Configuration"), - Help|Ok, Ok, parent, "includeExcludeDialog", true, false) +IncludeExcludeDialog::IncludeExcludeDialog(TQWidget *tqparent):KDialogBase(Plain, i18n("Inclusion/Exclusion Configuration"), + Help|Ok, Ok, tqparent, "includeExcludeDialog", true, false) { - QGridLayout *topLayout = new QGridLayout(plainPage()); + TQGridLayout *topLayout = new TQGridLayout(plainPage()); m_view = new IncludeExcludeView(plainPage()); topLayout->addWidget( m_view,0,0 ); @@ -49,19 +49,19 @@ IncludeExcludeDialog::IncludeExcludeDialog(QWidget *parent):KDialogBase(Plain, i m_view->includeExcludeList->setSorting(-1); - connect(m_view->include,SIGNAL(clicked()),this,SLOT(slotInclude())); - connect(m_view->exclude,SIGNAL(clicked()),this,SLOT(slotExclude())); - connect(m_view->remove,SIGNAL(clicked()),this,SLOT(slotRemove())); + connect(m_view->include,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotInclude())); + connect(m_view->exclude,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExclude())); + connect(m_view->remove,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRemove())); - resize( QSize(450,450).expandedTo(minimumSizeHint()) ); + resize( TQSize(450,450).expandedTo(tqminimumSizeHint()) ); } -QStringList IncludeExcludeDialog::includeExcludeList() +TQStringList IncludeExcludeDialog::includeExcludeList() { - QStringList includeExcludeList; - QListViewItemIterator it( m_view->includeExcludeList ); + TQStringList includeExcludeList; + TQListViewItemIterator it( m_view->includeExcludeList ); while ( it.current() ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); IncludeExcludeItem *includeExcludeItem = static_cast(item); includeExcludeList.append(includeExcludeItem->includeExclude()); ++it; @@ -69,10 +69,10 @@ QStringList IncludeExcludeDialog::includeExcludeList() return includeExcludeList; } -void IncludeExcludeDialog::setIncludeExcludeList(QStringList includeExcludeList) +void IncludeExcludeDialog::setIncludeExcludeList(TQStringList includeExcludeList) { m_view->includeExcludeList->clear(); - QStringList::iterator it; + TQStringList::iterator it; IncludeExcludeItem *lastItem; for ( it = includeExcludeList.begin(); it != includeExcludeList.end(); ++it ) { diff --git a/keep/app/includeexcludedialog.h b/keep/app/includeexcludedialog.h index b9dab60..0147d55 100644 --- a/keep/app/includeexcludedialog.h +++ b/keep/app/includeexcludedialog.h @@ -27,13 +27,14 @@ class IncludeExcludeDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IncludeExcludeDialog(QWidget *parent); + IncludeExcludeDialog(TQWidget *tqparent); ~IncludeExcludeDialog() {}; - QStringList includeExcludeList(); - void setIncludeExcludeList(QStringList includeExcludeList); + TQStringList includeExcludeList(); + void setIncludeExcludeList(TQStringList includeExcludeList); public slots: void slotInclude(); diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui index fb6c8cf..5c54f3b 100644 --- a/keep/app/includeexcludeview.ui +++ b/keep/app/includeexcludeview.ui @@ -1,6 +1,6 @@ IncludeExcludeView - + IncludeExcludeView @@ -22,9 +22,9 @@ 0 - + - layout6 + tqlayout6 @@ -59,9 +59,9 @@ - + - layout18 + tqlayout18 @@ -77,7 +77,7 @@ Expanding - + 61 20 @@ -102,7 +102,7 @@ - + groupBox3 @@ -113,9 +113,9 @@ unnamed - + - layout7 + tqlayout7 @@ -157,9 +157,9 @@ true - + - layout3 + tqlayout3 @@ -183,7 +183,7 @@ Expanding - + 20 121 @@ -202,7 +202,7 @@ - + kactivelabel.h kurlrequester.h diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index 088b1d2..b4151a5 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -18,9 +18,9 @@ #include "keepmainwindow.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -44,7 +44,7 @@ #include "keepsettings.h" #include "logdialog.h" -KeepMainWindow::KeepMainWindow(QWidget *parent, const char *name): KMainWindow(parent,name) +KeepMainWindow::KeepMainWindow(TQWidget *tqparent, const char *name): KMainWindow(tqparent,name) { setCaption(i18n("Backup System")); @@ -63,7 +63,7 @@ KeepMainWindow::KeepMainWindow(QWidget *parent, const char *name): KMainWindow(p initActions(); initConnections(); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); createGUI(0L); @@ -78,26 +78,26 @@ KeepMainWindow::~KeepMainWindow() void KeepMainWindow::initActions() { - KStdAction::quit(this, SLOT(close()), actionCollection()); - new KAction( i18n("Check rdiff-backup"), "info", "", this, SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" ); - new KAction( i18n("Configure backups"), "configure", "", this, SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" ); - new KAction( i18n("Configure"), "configure", "", this, SLOT(slotConfigure()), actionCollection(), "configure_keep" ); - new KAction( i18n("Add Backup"), "add_backup", "", this, SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" ); - new KAction( i18n("Restore Backup"), "restore_dir", "", this, SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" ); - new KAction( i18n("Backup Now"), "force_backup", "", this, SLOT(slotForceBackup()), actionCollection(), "force_backup" ); - new KAction( i18n("View log"), "log", "", this, SLOT(slotViewLog()), actionCollection(), "view_log"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + new KAction( i18n("Check rdiff-backup"), "info", "", TQT_TQOBJECT(this), TQT_SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" ); + new KAction( i18n("Configure backups"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" ); + new KAction( i18n("Configure"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "configure_keep" ); + new KAction( i18n("Add Backup"), "add_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" ); + new KAction( i18n("Restore Backup"), "restore_dir", "", TQT_TQOBJECT(this), TQT_SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" ); + new KAction( i18n("Backup Now"), "force_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotForceBackup()), actionCollection(), "force_backup" ); + new KAction( i18n("View log"), "log", "", TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "view_log"); } void KeepMainWindow::initConnections() { - connect( m_actionView->m_btnAddWizard, SIGNAL( clicked()), this, SLOT( slotAddBackupWizard() ) ); - connect( m_actionView->m_btnRestoreWizard, SIGNAL( clicked()), this, SLOT( slotRestoreBackupWizard() ) ); - connect( m_actionView->m_btnForce, SIGNAL( clicked()), this, SLOT( slotForceBackup() ) ); - connect( m_actionView->m_btnBackupConfig, SIGNAL( clicked()), this, SLOT( slotConfigureBackup() ) ); - connect( m_actionView->m_btnLog, SIGNAL( clicked()), this, SLOT( slotViewLog() ) ); - connect( m_actionView->m_btnLoadDaemon, SIGNAL( clicked()), this, SLOT( slotLoadDaemon() ) ); - connect( m_actionView->m_btnUnloadDaemon, SIGNAL( clicked()), this, SLOT( slotUnloadDaemon() ) ); - connect( m_actionView->m_btnReloadDaemon, SIGNAL( clicked()), this, SLOT( slotReloadDaemon() ) ); + connect( m_actionView->m_btnAddWizard, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotAddBackupWizard() ) ); + connect( m_actionView->m_btnRestoreWizard, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotRestoreBackupWizard() ) ); + connect( m_actionView->m_btnForce, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotForceBackup() ) ); + connect( m_actionView->m_btnBackupConfig, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureBackup() ) ); + connect( m_actionView->m_btnLog, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotViewLog() ) ); + connect( m_actionView->m_btnLoadDaemon, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotLoadDaemon() ) ); + connect( m_actionView->m_btnUnloadDaemon, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotUnloadDaemon() ) ); + connect( m_actionView->m_btnReloadDaemon, TQT_SIGNAL( clicked()), TQT_TQOBJECT(this), TQT_SLOT( slotReloadDaemon() ) ); } void KeepMainWindow::slotRefreshGUI() @@ -125,7 +125,7 @@ void KeepMainWindow::slotCheckRDB() { RDBManager manager; if ( manager.isRDB() ) - KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").arg(manager.RDBVersion())); + KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").tqarg(manager.RDBVersion())); else KMessageBox::error(this,i18n("The application rdiff-backup has not been detected on your system.

If rdiff-backup is not installed, Keep will not be able to make backups. To fix this problem, install rdiff-backup on your system.")); @@ -169,7 +169,7 @@ void KeepMainWindow::slotConfigure() void KeepMainWindow::slotAddBackupWizard() { AddBackupWizard *addBackupWizard = new AddBackupWizard(this, "addBackupWizard"); - connect( addBackupWizard, SIGNAL( backupSetted(Backup)), this, SLOT( slotAddBackup(Backup) ) ); + connect( addBackupWizard, TQT_SIGNAL( backupSetted(Backup)), TQT_TQOBJECT(this), TQT_SLOT( slotAddBackup(Backup) ) ); addBackupWizard->show(); } @@ -190,27 +190,27 @@ void KeepMainWindow::slotDaemonAlertState(bool state) { if ( !state ) { - m_actionView->m_ledDaemonState->setColor(Qt::green); + m_actionView->m_ledDaemonState->setColor(TQt::green); } else { - m_actionView->m_ledDaemonState->setColor(Qt::red); + m_actionView->m_ledDaemonState->setColor(TQt::red); } } bool KeepMainWindow::backupSystemRunning() { QCStringList modules; - QCString replyType; - QByteArray replyData; + TQCString replyType; + TQByteArray replyData; - if ( !kapp->dcopClient()->call( "kded", "kded", "loadedModules()", QByteArray(), replyType, replyData ) ) + if ( !kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData ) ) return false; else { if ( replyType == "QCStringList" ) { - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); reply >> modules; } } @@ -225,15 +225,15 @@ bool KeepMainWindow::backupSystemRunning() void KeepMainWindow::slotLoadDaemon() { - QCString service = "keep"; + TQCString service = "keep"; - QByteArray data, replyData; - QCString replyType; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg( data, IO_WriteOnly ); arg << service; - if ( kapp->dcopClient()->call( "kded", "kded", "loadModule(QCString)", data, replyType, replyData ) ) + if ( kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) { - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); if ( replyType == "bool" ) { bool result; @@ -260,13 +260,13 @@ void KeepMainWindow::slotLoadDaemon() void KeepMainWindow::slotUnloadDaemon() { - QCString service = "keep"; + TQCString service = "keep"; - QByteArray data; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream arg( data, IO_WriteOnly ); arg << service; - if ( !kapp->dcopClient()->send( "kded", "kded", "unloadModule(QCString)", data ) ) + if ( !kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) { KMessageBox::error( this, i18n( "Unable to stop service." ) ); return; diff --git a/keep/app/keepmainwindow.h b/keep/app/keepmainwindow.h index 185539a..6786de1 100644 --- a/keep/app/keepmainwindow.h +++ b/keep/app/keepmainwindow.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "backup.h" #include "actionview.h" @@ -29,8 +29,9 @@ class KeepMainWindow: public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KeepMainWindow(QWidget *parent, const char *name); + KeepMainWindow(TQWidget *tqparent, const char *name); ~KeepMainWindow(); public slots: diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp index 4043661..9205135 100644 --- a/keep/app/logdialog.cpp +++ b/keep/app/logdialog.cpp @@ -19,33 +19,33 @@ #include "logdialog.h" #include -#include +#include #include #include #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include "logview.h" -LogDialog::LogDialog(QWidget *parent): KDialogBase(Plain, i18n("View log"), - Help|Ok, Cancel, parent, "logDialog", true, false) +LogDialog::LogDialog(TQWidget *tqparent): KDialogBase(Plain, i18n("View log"), + Help|Ok, Cancel, tqparent, "logDialog", true, false) { m_logFilePath = locateLocal( "data", "keep/keep.log", true ); - QFrame *page = plainPage(); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + TQFrame *page = plainPage(); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); m_view = new LogView(page,"logDialog"); topLayout->addWidget( m_view ); setMainWidget(page); @@ -59,13 +59,13 @@ LogDialog::LogDialog(QWidget *parent): KDialogBase(Plain, i18n("View log"), void LogDialog::slotLoadLog() { m_view->logList->clear(); - QFile file( m_logFilePath ); + TQFile file( m_logFilePath ); if ( file.open( IO_ReadOnly ) ) { - QTextStream stream( &file ); - QString line; + TQTextStream stream( &file ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' - QStringList params = QStringList::split("\t",line); + TQStringList params = TQStringList::split("\t",line); KListViewItem *item = new KListViewItem(m_view->logList,params[0],params[1],params[2]); } file.close(); diff --git a/keep/app/logdialog.h b/keep/app/logdialog.h index 2010a3c..be22ede 100644 --- a/keep/app/logdialog.h +++ b/keep/app/logdialog.h @@ -26,9 +26,10 @@ class LogDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LogDialog(QWidget *parent); + LogDialog(TQWidget *tqparent); ~LogDialog() {}; public slots: @@ -36,7 +37,7 @@ public slots: private: LogView *m_view; - QString m_logFilePath; + TQString m_logFilePath; }; diff --git a/keep/app/logview.ui b/keep/app/logview.ui index 6ff45d3..24d765c 100644 --- a/keep/app/logview.ui +++ b/keep/app/logview.ui @@ -1,6 +1,6 @@ LogView - + LogView @@ -24,9 +24,9 @@ unnamed - + - layout2 + tqlayout2 @@ -79,7 +79,7 @@ - + klistview.h diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index de238e0..d25f558 100644 --- a/keep/app/restorebackupwizard.cpp +++ b/keep/app/restorebackupwizard.cpp @@ -18,17 +18,17 @@ #include "restorebackupwizard.h" -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include "backuplistviewitem.h" @@ -37,10 +37,10 @@ #include "listviewtooltip.h" #include "incrementlistviewitem.h" -RestoreBackupWizard::RestoreBackupWizard(QWidget *parent,const char* name): KWizard( parent, name, true) +RestoreBackupWizard::RestoreBackupWizard(TQWidget *tqparent,const char* name): KWizard( tqparent, name, true) { m_manager = new RDBManager(); - connect( m_manager, SIGNAL(backupError(Backup,QString)), this, SLOT(slotRestoreError(Backup,QString)) ); + connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotRestoreError(Backup,TQString)) ); KIconLoader icons; this->setIcon( icons.loadIcon( "wizard",KIcon::Small )); @@ -48,9 +48,9 @@ RestoreBackupWizard::RestoreBackupWizard(QWidget *parent,const char* name): KWiz m_popup = new KPopupMenu(this); m_popup->insertTitle(i18n("Menu")); - m_popup->insertItem(i18n("Show differences destination/backup"), this, SLOT(slotShowDiff())); - m_popup->insertItem(i18n("List changed files"), this, SLOT(slotShowChanged())); - m_popup->insertItem(i18n("List files"), this, SLOT(slotShowList())); + m_popup->insertItem(i18n("Show differences destination/backup"), this, TQT_SLOT(slotShowDiff())); + m_popup->insertItem(i18n("List changed files"), this, TQT_SLOT(slotShowChanged())); + m_popup->insertItem(i18n("List files"), this, TQT_SLOT(slotShowList())); setupPage1(); setupPage2(); @@ -62,7 +62,7 @@ RestoreBackupWizard::RestoreBackupWizard(QWidget *parent,const char* name): KWiz setNextEnabled(page2,true); setFinishEnabled(page3, false); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); } RestoreBackupWizard::~RestoreBackupWizard() @@ -73,25 +73,25 @@ RestoreBackupWizard::~RestoreBackupWizard() void RestoreBackupWizard::initConnections() { // If custom source setted - connect(restoreBackupWizard1View->btnCustomSource, SIGNAL( toggled(bool)),this,SLOT(slotCustomSourceChecked(bool))); + connect(restoreBackupWizard1View->btnCustomSource, TQT_SIGNAL( toggled(bool)),this,TQT_SLOT(slotCustomSourceChecked(bool))); // Date selection popup menu - connect(restoreBackupWizard3View->incrementList, SIGNAL(contextMenu (KListView *, QListViewItem *, const QPoint &)), this, SLOT(slotContextMenu(KListView *,QListViewItem*,const QPoint&))); + connect(restoreBackupWizard3View->incrementList, TQT_SIGNAL(contextMenu (KListView *, TQListViewItem *, const TQPoint &)), this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&))); // Page 1 changes - connect(restoreBackupWizard1View->m_lstBackup,SIGNAL(selectionChanged()),this,SLOT(slotPage1Changed())); - connect(restoreBackupWizard1View->btnCustomSource,SIGNAL(toggled(bool)),this,SLOT(slotPage1Changed())); - connect(restoreBackupWizard1View->customSource,SIGNAL(textChanged(const QString &)),this,SLOT(slotPage1Changed())); + connect(restoreBackupWizard1View->m_lstBackup,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotPage1Changed())); + connect(restoreBackupWizard1View->btnCustomSource,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotPage1Changed())); + connect(restoreBackupWizard1View->customSource,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotPage1Changed())); // Page 2 changes - connect(restoreBackupWizard2View->btnCustomDest,SIGNAL(toggled(bool)),this,SLOT(slotPage2Changed())); - connect(restoreBackupWizard2View->customDest,SIGNAL(textChanged(const QString &)),this,SLOT(slotPage2Changed())); + connect(restoreBackupWizard2View->btnCustomDest,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotPage2Changed())); + connect(restoreBackupWizard2View->customDest,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotPage2Changed())); // Page 3 Changes - connect(restoreBackupWizard3View->incrementList,SIGNAL(selectionChanged()),this,SLOT(slotPage3Changed())); + connect(restoreBackupWizard3View->incrementList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotPage3Changed())); // Finish button - connect(finishButton(),SIGNAL(clicked()),this,SLOT(slotRestoreBackup())); + connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRestoreBackup())); } void RestoreBackupWizard::slotPage1Changed() @@ -101,7 +101,7 @@ void RestoreBackupWizard::slotPage1Changed() // Checks if a standard backup is selected. if ( !restoreBackupWizard1View->btnCustomSource->isChecked() ) { - QListViewItem *item = restoreBackupWizard1View->m_lstBackup->selectedItem(); + TQListViewItem *item = restoreBackupWizard1View->m_lstBackup->selectedItem(); if ( item ) { BackupListViewItem *backupItem = static_cast(item); @@ -117,13 +117,13 @@ void RestoreBackupWizard::slotPage1Changed() if ( b.dest() != "" ) { RDBManager manager; - QDateTime lastBackup = manager.lastIncrement(b); + TQDateTime lastBackup = manager.lastIncrement(b); restoreBackupWizard3View->lblLastBackup->setText(lastBackup.toString(Qt::LocalDate)); - QValueList increments = manager.incrementList(b); + TQValueList increments = manager.incrementList(b); if ( increments.size() != 0 ) { restoreBackupWizard3View->incrementList->clear(); - QValueList::iterator it; + TQValueList::iterator it; for ( it = increments.begin(); it != increments.end(); ++it ) { IncrementListViewItem *item = new IncrementListViewItem(restoreBackupWizard3View->incrementList,(*it)); @@ -139,14 +139,14 @@ void RestoreBackupWizard::slotPage2Changed() setNextEnabled(page2,false); if ( !restoreBackupWizard2View->btnCustomDest->isChecked() ) { - QListViewItem *item = restoreBackupWizard1View->m_lstBackup->selectedItem(); + TQListViewItem *item = restoreBackupWizard1View->m_lstBackup->selectedItem(); BackupListViewItem *backupItem = static_cast(item); setBackup(backupItem->backup()); setNextEnabled(page2,true); } else { - QDir dir( restoreBackupWizard2View->customDest->url() ); + TQDir dir( restoreBackupWizard2View->customDest->url() ); if ( dir.exists() && restoreBackupWizard2View->customDest->url() != "" ) { Backup b = backup(); @@ -160,7 +160,7 @@ void RestoreBackupWizard::slotPage2Changed() void RestoreBackupWizard::slotPage3Changed() { setFinishEnabled(page3,false); - QListViewItem *item = restoreBackupWizard3View->incrementList->selectedItem(); + TQListViewItem *item = restoreBackupWizard3View->incrementList->selectedItem(); if ( item ) setFinishEnabled(page3,true); } @@ -178,20 +178,20 @@ void RestoreBackupWizard::slotCustomSourceChecked(bool value) void RestoreBackupWizard::setupPage1() { - page1 = new QHBox( this ); + page1 = new TQHBox( this ); page1->setSpacing(0); page1->setMargin(0); restoreBackupWizard1View = new RestoreBackupWizard1View(page1,"restoreBackupWizard1View"); BackupConfig *backupConfig = new BackupConfig(); - QValueList backupList = backupConfig->backupList(); - QValueList::iterator it; + TQValueList backupList = backupConfig->backupList(); + TQValueList::iterator it; for ( it = backupList.begin(); it != backupList.end(); ++it ) { new BackupListViewItem(restoreBackupWizard1View->m_lstBackup,*it); } - QToolTip::remove(restoreBackupWizard1View->m_lstBackup); + TQToolTip::remove(restoreBackupWizard1View->m_lstBackup); new ListViewToolTip(restoreBackupWizard1View->m_lstBackup); restoreBackupWizard1View->customSource->setMode(KFile::Directory); @@ -202,7 +202,7 @@ void RestoreBackupWizard::setupPage1() void RestoreBackupWizard::setupPage2() { - page2 = new QHBox( this ); + page2 = new TQHBox( this ); page2->setSpacing(0); page2->setMargin(0); @@ -215,18 +215,18 @@ void RestoreBackupWizard::setupPage2() void RestoreBackupWizard::setupPage3() { - page3 = new QHBox( this ); + page3 = new TQHBox( this ); page3->setSpacing(0); page3->setMargin(0); restoreBackupWizard3View = new RestoreBackupWizard3View(page3,"restoreBackupWizard3View"); restoreBackupWizard3View->incrementList->setSorting(0,false); - restoreBackupWizard3View->lblDate->setText(QDateTime::currentDateTime().toString(Qt::LocalDate)); + restoreBackupWizard3View->lblDate->setText(TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate)); addPage( page3, "Date to restore" ); } -void RestoreBackupWizard::slotContextMenu(KListView *list,QListViewItem *item,const QPoint&p) +void RestoreBackupWizard::slotContextMenu(KListView *list,TQListViewItem *item,const TQPoint&p) { m_popup->popup(p, 1); } @@ -244,50 +244,50 @@ void RestoreBackupWizard::setBackup(Backup backup) void RestoreBackupWizard::slotShowDiff() { Backup b = backup(); - QListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); + TQListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); IncrementListViewItem *incrementItem = static_cast(item2); - QDateTime date = incrementItem->date(); - QString diff = m_manager->compareAtTime(b,date); - QString message = "

" + i18n("List of modifications since the selected increment:") + "

" + diff + "

"; + TQDateTime date = incrementItem->date(); + TQString diff = m_manager->compareAtTime(b,date); + TQString message = "

" + i18n("List of modifications since the selected increment:") + "

" + diff + "

"; KMessageBox::information(this,message,i18n("Modifications")); } void RestoreBackupWizard::slotShowChanged() { Backup b = backup(); - QListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); + TQListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); IncrementListViewItem *incrementItem = static_cast(item2); - QDateTime date = incrementItem->date(); - QString changed = m_manager->listChangedSince(b,date); + TQDateTime date = incrementItem->date(); + TQString changed = m_manager->listChangedSince(b,date); if ( changed == "" ) changed = i18n("Nothing."); - QString message = "

" + i18n("List of changed files since the selected increment:") + "

" + changed + "

"; + TQString message = "

" + i18n("List of changed files since the selected increment:") + "

" + changed + "

"; KMessageBox::information(this,message,i18n("Changed files")); } void RestoreBackupWizard::slotShowList() { Backup b = backup(); - QListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); + TQListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); IncrementListViewItem *incrementItem = static_cast(item2); - QDateTime date = incrementItem->date(); - QString list = m_manager->listAtTime(b,date); - QString message = "

" + i18n("List of files in the selected increment:") + "

" + list + "

"; + TQDateTime date = incrementItem->date(); + TQString list = m_manager->listAtTime(b,date); + TQString message = "

" + i18n("List of files in the selected increment:") + "

" + list + "

"; KMessageBox::information(this,message,i18n("List of files")); } void RestoreBackupWizard::slotRestoreBackup() { Backup b = backup(); - QListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); + TQListViewItem *item2 = restoreBackupWizard3View->incrementList->selectedItem(); IncrementListViewItem *incrementItem = static_cast(item2); - QDateTime date = incrementItem->date(); + TQDateTime date = incrementItem->date(); m_manager->slotRestoreBackup(b,date); } -void RestoreBackupWizard::slotRestoreError(Backup backup,QString errorMessage) +void RestoreBackupWizard::slotRestoreError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").arg(backup.dest()).arg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").tqarg(backup.dest()).tqarg(errorMessage)); } #include "restorebackupwizard.moc" diff --git a/keep/app/restorebackupwizard.h b/keep/app/restorebackupwizard.h index 85bc937..3038d6a 100644 --- a/keep/app/restorebackupwizard.h +++ b/keep/app/restorebackupwizard.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "restorebackupwizard1view.h" #include "restorebackupwizard2view.h" @@ -32,15 +32,16 @@ class RestoreBackupWizard: public KWizard { Q_OBJECT + TQ_OBJECT public: - RestoreBackupWizard(QWidget *parent, const char *name); + RestoreBackupWizard(TQWidget *tqparent, const char *name); ~RestoreBackupWizard(); Backup backup(); void setBackup(Backup backup); protected slots: - void slotContextMenu(KListView *list,QListViewItem * item,const QPoint &point); + void slotContextMenu(KListView *list,TQListViewItem * item,const TQPoint &point); void slotPage1Changed(); void slotPage2Changed(); void slotPage3Changed(); @@ -52,7 +53,7 @@ protected slots: void slotShowList(); void slotRestoreBackup(); - void slotRestoreError(Backup backup,QString errorMessage); + void slotRestoreError(Backup backup,TQString errorMessage); private: // init GUI @@ -62,7 +63,7 @@ private: void initConnections(); KPopupMenu *m_popup; - QHBox *page1,*page2,*page3; + TQHBox *page1,*page2,*page3; RestoreBackupWizard1View *restoreBackupWizard1View ; RestoreBackupWizard2View *restoreBackupWizard2View; RestoreBackupWizard3View *restoreBackupWizard3View; diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui index 7793e2c..e2ba104 100644 --- a/keep/app/restorebackupwizard1view.ui +++ b/keep/app/restorebackupwizard1view.ui @@ -1,6 +1,6 @@ RestoreBackupWizard1View - + RestoreBackupWizard1View @@ -30,23 +30,23 @@ 0 - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -67,7 +67,7 @@ Expanding - + 20 130 @@ -76,9 +76,9 @@ - + - layout6 + tqlayout6 @@ -152,7 +152,7 @@ LastColumn - + groupBox1 @@ -171,15 +171,15 @@ unnamed - + - layout9 + tqlayout9 unnamed - + btnCustomSource @@ -187,9 +187,9 @@ Use custom backup directory - + - layout8 + tqlayout8 @@ -260,7 +260,7 @@ setEnabled(bool) - + kactivelabel.h klistview.h diff --git a/keep/app/restorebackupwizard2view.ui b/keep/app/restorebackupwizard2view.ui index 9ae588f..a4163c8 100644 --- a/keep/app/restorebackupwizard2view.ui +++ b/keep/app/restorebackupwizard2view.ui @@ -1,6 +1,6 @@ RestoreBackupWizard2View - + RestoreBackupWizard2View @@ -22,23 +22,23 @@ 0 - + - layout50 + tqlayout50 unnamed - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -59,7 +59,7 @@ Expanding - + 20 130 @@ -68,9 +68,9 @@ - + - layout49 + tqlayout49 @@ -92,7 +92,7 @@ Choose a location to restore the selected backup. - + buttonGroup3 @@ -103,15 +103,15 @@ unnamed - + - layout48 + tqlayout48 unnamed - + btnDefaultDest @@ -136,7 +136,7 @@ Horizontal - + btnCustomDest @@ -144,9 +144,9 @@ Use custom directory: - + - layout8 + tqlayout8 @@ -200,7 +200,7 @@ Expanding - + 20 160 @@ -228,7 +228,7 @@ setEnabled(bool) - + kactivelabel.h kactivelabel.h diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui index b4e9522..dee3a23 100644 --- a/keep/app/restorebackupwizard3view.ui +++ b/keep/app/restorebackupwizard3view.ui @@ -1,6 +1,6 @@ RestoreBackupWizard3View - + RestoreBackupWizard3View @@ -25,23 +25,23 @@ 0 - + - layout11 + tqlayout11 unnamed - + - layout6 + tqlayout6 unnamed - + pixmapLabel1 @@ -62,7 +62,7 @@ Expanding - + 20 130 @@ -71,9 +71,9 @@ - + - layout10 + tqlayout10 @@ -95,17 +95,17 @@ Set the date to restore the selected backup. - + - layout9 + tqlayout9 unnamed - + - layout7 + tqlayout7 @@ -145,9 +145,9 @@ - + - layout8 + tqlayout8 @@ -219,7 +219,7 @@ 89504e470d0a1a0a0000000d49484452000000640000015e08060000007374ba2b0000200049444154789ced9d79741cf77dd83fbf39f6dec5028b1b588020085e124589a444ebb00e4bbe645b9263c7711ca7766cf7394ed3ba4dd2a67dcdebcb4b5ff352f78fb4751bc7769c387123cb922dd99668dd1275d012258a146f520449dcf7b538f69e99fe31bb0b2cb00b2c40801850f3790f6fafd9c5ccef33dfefef98dfcc88f14bbb0d6c2c83b4de2b60938f2dc462d8422c86a5854c4752ebbd0a571d65bd57603ea9a4ce8b3f1de0e4e171a626d2ecd85bc6477eab8e508df38a7e373a9de6c8c1516445d0b62b4075836b95d6787511566a650df6c478f46f3a19ee4d2084c030cc55f30715fee57f69231872ace877cfbf3bc9a3ffb7935452cfbdb7ffbe101ffe5c1d0ea7bc2aebbe5a5846c8db2f8df2f4c3bda453062e87ca75adf54cce24b8d0350040659d93affdd9163cbee505f5e9b72778ec3b9de81a48422214f4333c1e01a0bccac1435f0dd3b2c3b7eadbb352d65d486c46e3177fdfcd99236621d584fcec6ca9439625741ddabb87e91a1805a0a9cdc397fe432baaa3b4aaeff8a1711eff7e178601b224b3a3254cc0e7623a1ae342573fb14412805b3e14e2c3bf5587d3b5fed1b2ae42bada6778ec6f3a898ca69024c1752d35846bcbd174d00d035d075d873397fb191c35856ddf13e0f3ff7a13922416fded770e8ef2cb1ff66018a0c832db3785f17b5dc8124812601874f40fd335300640b052e5a1af86d9bcd3bfd69bbd28eb2244d70d5e3f30c44b8f0fa0ebe0f738d9b7b3019fdb896e600a9923259d363875b197b1c969006ebe27c4a7bedc58f4f7df786e98a7ffb90f005551d8d612c6e776220b5386249113333913e7f4c53e6662c9dc6f7fe4b7ea70bad7275aaeba90a989143ffb6e1797ce9885db521fe486b61a84903212160ad17548a575de7daf8be9681c800ffd462d773f58b3e0f75f7b6a88e71feb07405555b63587f1b91df922c4ac1049126018bcd73dcca51e33359685cc6869bdeeea47cb551572e1c4243ffb5e17d1290d5591d8b7b38ec6ea404e849e1351584a3ca571fc7c672ef73ff4d546f6dc19cafdfe4b8f0f70f0178300385495ed9b9a703bd5bc88c87b2e44eeb92cc1c4748ca3e7fa999a4900b0efee0a3efaf9faab1a2d574588963678feb17e7efdcc300095656e6edfdd80dbade649584a886ec04c2cc5f1f73a49a5d348127ce1dfb6b0757780671fe9e3d0d3e6ef3b5507db3635e1722a66610b0a48111929e449310c8333978739d7390a069455a83cf895305b765d9d685973216383091efb4e27bd9763005cbf39c48ddbaa0181a61b0b44649f6b79efe74b999c8e73e24217baa1a33a24b6eef673fa6db3d277399d6c6d0ae374280ba3625eaacafb7c9eb4f1c9186f9ce8279289963d7755f0b1dfaec7b5c6d1b2a6424ebc31ce933fec2111d7713b15eedc534f7da52f57f08b09592c4a741dc622339cbed403ccaebedbe5a22d1cc6e990910a4645e15455589a40370c4eb60f73a27d040c0894ab3cf89546da6e08ac5591ad8d906442e3c08f7a39f6da38008dd55eeededb80cba91428f0954589aec3c0e824ed5d7d20c0e372b3251cc6a14a45f7fab9a92a5bf885a589bc681a8bc438f84e1fe35366b4dcf4c1723efe85065c9ed58f96551732d0650e7f8cf49bc31ffbafafe2c6ad951846b108584194ccf9ac67708cd18969b63436a0a8f2127bfdd2a9aa98343038726698a3e747310c037fb9c283bf1766ebeed58d96551572f885119ef9711f5ada20e055f9f86d8d5495bb4b28f052a264e1325aa68f124bea28b2bcc45e0fb2100bd3578154b5e0f339bf393c11e7b9377b198d98d172e3ede57cfc771a707b57275a564548743acdcf7fd0cdb9a39300b48503dc774b3d4e87b430f5cc2df06242e62ca3e52d9f1f2553d124c74e75e170aaecdc124655a545a42c3f5515922604689ac19ba787397226132d4185077eaf916d3796adbf90cef7a679ec3b5d4c8ea55024c15dfb6ad9d55a9efbdc30e615ea2a4549ef608453e7fbd13303b88a22d8737d135e8f7b5e545c59aa9afbf9fcd19aa1b138cfbdd9c748c4ecaceebead9cfbbf588fdbbbf2a31a2b16a2eb06af3e39c8cb4f0c6218102a7372ffed8d84ca161eb75820a460811b0565cd8f92644ae34cfb205dbd9105ff47550437eea8a12c18442e3555e5e42c9eaacc7aa47039bc797a84b74f8f601806be328507bedcc8f63d2b8b961509991c4bf1d3ef76d2716e0680ebb79473d79e5a54b9f0805f6951b2b490f1489ca3a77a999c4ee6fdbe24cccfb334d579d9de5a87ea504a4e5585c6b9e6a7aac5181a8bf3dce13e4626cc68b9e1d620f77fb161d9870b962de4fcbb119ef87e37d1690da72a73effe3ab686976e696845449412259a0eed9d639c3c3784a62f5c5d5916685afefb2e87c4be1b6a0995972dac13c4e2a92aed6bc570d6e09bfa75c154550c5d37387c7a84b732d1e20d98d1b2636fe9d152b290745ae7b99ff4f3e6732300d456bab9ffb646025eb5a47fb454941413124f68bc7db28feefee9a2bfad2a8254baf066b43507d8b9b51667a6495c2c5509d54db2e23662a17b483beb01085ffa631cbad9973280b87b27c248e18a5f58745b87c7cdba6538132dbb3e10e413bf5b5ab49424647420c1a37fd3497f670c01ecdb59c9adbbaa58ea98c47c168b925959b352fa87a3bc71b49799587ad1df75a812c9945ef4739f47e1b69beaa9acf02e4855ba6f0b89cabb4896df8c8e8acba5e276bb181b9b24dcfb5f51b571a603771009dc4d5aad44d2a668b9fccd25b755d70dde3a33c2e1539968f12b7cee0f9b69d9bef8d1c92585bc7b688ca7feb1976442c7e352f8d8ad0d34d57a975ca142941a259a6670fcfc08c7cf8ea0b802041a77131ded2236d6c5dca1922c2ea7443c515c48965d5bcbb9615b158acb4fbaf2369255779376d601505d5d4e385c43656590eeee414e9fbe8427d94ec2d58a818cdbed4008c1cc748cb68eaf2358faff41b6dfd2c7f0781cd521f1cd6f6d27505e3cab2c1a43ef1d9fe4f1ef7503d05cebe3a3b7d6e3715d41932e53390aa3f8f3683ccd2b6ff5d23f1445f59473fd67bf85abac1621045a7286a9de93447a4f13e93dc5f4d0453074c452356e86be44133edfa7a9d9710f480a2ea7caa6a63a1a1bab71b91c2412492e5feea5b3b31f210471571bd5d51584c3358442659c397389a9a9289ae445d1a74afa9f554117bffd91161e7ee632239138178e4fb2f7ee50d1e58b96ae963678fae13e8410dcbebb9abddb434bb6344a2157f8059e77f74f72f0ad7ee2090dd9e165db27ff1cd557454b4b3d0e87c2d8d814aacb4ff9e60f98b352b42491de53c4874e337cf92493fde731f4fcf4a6ba0334ddf43136ddfc10de501360505d1ba2a9a996caca20002323139c397389a1a1310c03dc6e275bb7866968a8c1e99cdd9b555541d775d292bf642100afbd3b98ebabd46d722fba6c512189b8c6f85002c3009f5b591519503832f4b4c1af8f0d72fcbc797c5b529cb47efccf709687d9b9b385f2f200a9548aad5b9b1042303919656c2cc2e86804d5e9466bde4bc37e81a1a799ec3b47a4e7247a2a4a65f3f5d4eeb813495670b91c6cda544f385c83d3e9201e4f72f1620fdddd8344a3098480da8ca850a8ac60d4a9aa8aa6e9a4a5d267a9bc7274806399ed0ab77aa8dfe45974f9a2423c3e85b61b029c7f7792e70ef7e171292bae3be6323f3226a6123cfd6a2fc363e61e2424994df7fe099eaa2db4b585696aaa4592244e9e6c479264eaeb2b09067d545404686b6b4292045353338c8e4618198930e272130cef420861461182aaaaf25c414f4c4cd3d57591c14173d8c3e371b37d7b338d8df9d150885c8488d2ca61ae8cb290ca67bfd1bce47716ad10eef9740d97ce4c934aea3cf95a37bf79ef26aa2bae7cc65f56c8d9f6095e7ca37f4e9355d070c71fe2adbf814d9bea696d6dcc4c9633b8fefa569e79e60deeb86337d5d515cc56ee8240c04730e867cb9630424844a3318687c71919996064244247475fae5e9024094992a8ac2ca3b5354c7d7d65c9ebed709811922a41c87c195ff94f5b28af5a7aa29ffc1fbf59fbe7c53ef40755ea9add9c3a3c81a6195cec9d624b3880cb7165239ba994ceb3aff7f1c6bb23b9b128809afd5f25d8fa411a1b6bd8b5ab355380e69e2ecb12e5e5015e78e16dc2e11adc6e572ead988f221315e0743a282f0fd0d8584d5b5b132d2df5949707703a5592c9248944929999383d3d43f4f50d3339394d3aada1aa2aaa5a7c1f4da534dadb7bf0a63bf1a72f165d6ea53260092100a15a27652107e78e4e924aeb74f44db3adb90c552932b8b3048323317ef274175dfdd1bcf72b777f8ef26d1fa5b636c44d376d4308292723fbe8f77b8846e31c3d7a9e70b81697cb5950caec6bf351551582411f757555b4b535d1dada484545192e978368344e7fff287d7d235cbcd84d77f72091c834a9541a4591713866d39861189c3bd7812bdd4f307db6e0f65d890c58464ffde02f0679e971735a676d859bcfdcdbbc6c29474e8d72f0ad85c31f65db3e4ee58d9fa7b232c8fefdd7e37028c8b2944b2fd9e7e66c4683279f7c0d80fbefbf8db232df1c69529e40c88e4189798fe455daa9543a97de4647278844a6300c7319b7db492814a4b2b28c60d0cf534fbd4e28758cadb1ffb760fbae54062c732cebc91ff6f0f6cbe6dca54df53e1ef86053d151d0b9c4e2690ebcdac7c5ae85c31fbe4d7752b9efcb04837e6ebd75174ea7035996906579818cece3c0c0282fbf7c8440c0cb473e722b8180274fca7285cc47d334464727191d9d607434c2c4c434baaee75222c908b5d1e77127dec395ec4660ac8a0c58a6105d3778e47f7770ee987920eabacd413ebcbf7ed1ef74f5cdf0e4c15ea6a30b873f5c757b09ddf2fbf8fd1e6ebf7d372e970345919165392365a18cece39b6f9ea2a3a39f60d0c77df7edc7e7732f9002f385b020a595b6dd3ae3e35399a6f62463631174dd4008908c248991d3749c798b8eb71fc31fd4572c034aa843e6228460fb9e322e9f9966723cc5f0781c1d08d72c6c75e8bac1a1a3c33cfd7a7fc1712647e50e2a6efe7d5c6e17fbf75f8fcbe598576fe4a79ff98f7575212e5fee251e4f3238384253536da6422e5ef8cb8992f9dbedf1b80885ca686cac66cb96303535217c3e37b2e22421828436ed23357d9e2ffc816bc53280e59f41a53a247ee78f5a08d59a07a2de3a35ccc90be379cb4ccea4f8f1af3a38746c04a340fc29c116caf67e035955d9b76f070e8723b39c915b3edbdc2df6a8aa0a37dfbc13c330989a8af1ca2b47492412cbdd9c1521842018f4b17973033b77b6a0690633639779e80ba3572403562004cc4ee3bff893cdf8cacc26e24beff473b1c71c4a387b6992ef3fda4ecf40ace077655f1d813dff0a5951d9bb77072e978b6c411b0699c7ec73f33b851e0d031a1b6b686aaacd4889f2faebc7492693057682c5b3b2ae1ba4d31ac9648a6432452a95269dd64a2a8b13272ea0691ae75ffc6b92f12b3f056f59296b2e6eaf4c63ab9763af9915d9a59e293a07544e5e54482567308c85694ab842f8f6fe1b6497973d7b76cc6921490bf27ff6af50ba9afbbca6a682cb97fb310c83544a636c2c42434315b22ccf49490689448a6834c6cc4c8cc9c9192291192626a6989898666626463c9e249dd6729577b6be5a8cc1c1314e9fbec8c88557b87cf811ce1d8b70dd2dc12b9aafb5e2a1db444ce385cc2c730043041999f4212be02d6b263633483a393b00271c01dc37fe01a83eaebb6e0b8180372f22606e9a221725e6fbb38ff3df733a1decd9b3952347ce01061313d31c3a749c5028483a9d26994ca3691aaaaaa0280aaa2a2f7854551997cb89cbe5c0e1509614016645ffce3b67d1d30976184f724e114c4da4f9a7ff716945677a655951ca8acd68fce3b72ed1f99e794c5d962b5094aadce74248787c75b83ce61c5e6437ce5d5f074790eddb37515e1e5820a250ca323f9bfb9e294cd37462b138e3e3530c0e8e610e9fcc0a9e9e8ed1db3bc4d8d824f17822f73fb2b21545c2eff75255554e63630df5f55504833e5c2e47493200ce9deb64727286ba9967a80fc4f9c41d61848091fe040fffcfcb79e7332e87656b9c994af38fdfbac440975947c872258a52517059b72788d3e5215e730f86ab9ad6d6309595c122f5c55c11b30292c934e974924442239d4e934aa548a7f55cf3d74c2d328d8d35b4b77701cc130db22c515111a0bc3c4059992f33ec62aee3729abf59a2d138274e5cc0a90d51137f19804d753e3e7c4b3dcf1deea3eb4294c7bed359d2995ef3599690e9488a7ff8ef1719ee35f73a59ae4251ca172c979ddd2149e0501db8a60ee3a9afa6a6e6a6057bfcec5e6f904c264826539982d748a552b9e10b97cb89d3e9c0e7f3e2742a389d2a0e878aaa3a703a156459c1ed7670ead4456459c6eff7e0f5ba09047c3437d7664672679bbc57c291236749a5d2b4c51f4762b6f2dfb939c8742ccdaf4f0c71eee824077ed4cba7be54fc4caf42942c243296e4877f7589d1415386a25423cbc1bc650485669a832cd2e8ed4f302486a9bdf9f31886423299ca9cfa0c60204902a7d381d3e92410f0e2743a71bb9da8aabc680731db20008396967a42217388439625229169a6a6a20c0e8e515d5d8ecb959d336664d676f90c0c8c72e9520f6a6a98f2f4f9059fdf725d25d3d11427dac779fba55102e52a773db0f04caf629424647c38c93ffcd5452646ccf9508a52832ce74f6d293ae7694eb4c43a0ed117e9a4f6f6afe3ab6c4051141445cef5ce1545ca7b9edd9b176ffe1a39b142906bb9190604837e3c1e17a3a3930c0f4f100a05f078dc08f32cb6cca35172dad27583d75f3f8ea619a8d397a1c891887bf6d5128da769ef99e2c59f0de00faaecb9b3705a9fcf9235d8e840821ffc65fb1c1975793244668e93229b7fb23ce7b9947d2d5064812c8331d5c3d04bff8de9aeb716695de53f9fdf31cc4f77b0b09f31fbdae974505717c2ed76323e3ec5cc4ce1fe51299c3e7d91b1b1083333332452c5250a21f8d86d0dd4579a876b7ff90fddbc777cb2a4ffb1a890a1de383ff8cb7626c7cc0e8fa2d423cbb3a77649122852111152be084536979565908d38e387ff960bcf7d9bee2e73f8a3b08885cddfe24de1f9cde4d9d792246552998fa9a919a6a6f287fe4b21164bf0d65ba7f0785c689a414c5bfc409d224b3c705713150107ba0e3ff93f9d0cf7c597fc3f453b86ba6ef0bdbfb8c0e4781a10284a03b26c1e4b16223f02e439d121e70a5ee4bf2fcd5b460667b29f999ea3bc792e4e7bc728e3e3932412491c0e736ed4fcd1dbc5c6b6f247740bbd368ff8399d4ea2d118e9b486d3a9e67e77295e7df52803036378bd2efafb47f04a136c719f59524a4b839ff7ba268927340c03b6ddb8f82ccfa2a3bd678e4478e4db1d8040551b9024f3e0fcdccaba709d517cd272b1e584e2a4cb790f1d53d5b90274bb9dd4d757515f5f49385c434d4d28d7692b54b9e74b92f204ceed5b64afa1323313c3300c0201ef925206064678f4d11748a534a627a708bbdab9c9f70665cac4a2859be542d724070ef5e00f2afcfbff75dda2cb16add4bb329d3e49f220843b5757149e1b9b152416add40b9d83610a4bd0967a869aca7d547fe06b8c8ecd303030424fcf10972ff7e68632b2721a1b6b08876bf07866c7c1e656ece66bc8b6a4e657dcd9a38ff1788ac9c9999c94421886c18b2fbe8daeeb84f543ecac7a1b8f5c7aca3bd711e1c5b7cd8b18dcf4c1a52bf6a242b6ef0df0eb6787d1f519d2a96e5cae3a64592d324b5c1489827922e645cb7cc1958923a8a723ecbaf34fd9b76f074248442253f4f58dd0df3f4c5fdf086fbc7112214e21c4ec6c92e6e63a9a9a6aa8a8086018624e2bcac8bd9e53c46445b95c661f261a8de3f1b80af6d24f9cb8407fff286dea6176f95e2959445ad339f8ce00a72e9a515456a1f2c14f562ff9bd450f501d7a6688e71ee9cf6c9c8ccf5387d3e15938737c9142ce3b59a6c84930f34f25931d5e82fbbf89bbe9f64c5acace161144a371fafa46e8ed1da2a3a38f48c48ce4ec5edfdc5cc7a64d753437d7515b5b99693e2f7dc02a994c679adcb352e2f104dffdeee388d4381f757f1f55ca3f0da218e393090e1cea6164c2ecb36ddee9e3b3df68c217587a62fa92470c2f9c98e4a77fdb456cc6ec91fa3c95f8bde5e6b045b1732ac43c1105d25c29cbb9db1ec073c357505407d9e3eb9224d0348daeaec15c937668689cbebe617a7a86e8ef1f21994c2384598937379b725a5ab293e4f27bec730f62699a9eab77009e79e60d8e1d3bcfaddea768520b4f6a98cff9ce082fbcd54f2aad2304dcfd500d773d5053f2104a498770c787933cf2ed0efa3bcd36bcdbe9a3aaa276f644cb82694a148882d2eb9cdc2903e55b71dffca7283ef3924d86a1d3d13180dfefa6bebe3a2769b62237a786f6f40cd3db3b444fcf205353d15c655f5717a2a5a5211349b5f8fdbe3c3966735b303030c2dffffd2fa852fab8d7ffc892432e694de795770638994951de80c26f7ea369d957172af9987a2aa973e047bd1c7dd53cfea12a2af5550db85dce792dafc2e7f2e5a7b3522aff39cb39bc28bbff1da2fa163a3b0708067dd4d656327bcc445af4792432cdbbefbec79933978944a673852f84a0bcdc9713d4dc5c979984073ff8c1cfe9eb1be2c3be7fa65c194108e6889b9d818980c8549203af77339c49512d3bbc7cf6f79bf1074b3b77664542b2bc737094a77ed48b96365b2e0dd5b554940532512016dddb4d4105cef75bb05ce13a2712bc17d1f6152a2acb174446f6f5dce7894492d3a72f71ecd839c6c7a7116834aaed6c52df035962345dcba856cfb85e878e9c696e3ba8ae0ed1d33344abe33837795ec99bfeca9ce70268ef89f0f291d91475e7a76ab8e7d3a5a7a82b1602d07739ca8fbfdd4164d4ecc157959713aead367be545d35491ca7f41142dbc28cc5cc1946d2375dd9f227b6be748c88f8aa1a1314e9cb8c0d9b397d13403af14a1593943b3e33c4e3941b6459c2d6803c1a45ec5985ecb9856cfb8d180579ee656d7cf7148c9fc88c80931e8eb1be6576f99679479fc329ffd7af3155fa466c567e146a7d3fcf43b5db49f328f0afa3c6eb66f6ac4e5940b3481459168595ac45c19b9c146c5477afb1f216a3e908b104dd3696fefe2c48976868727009d2aa99366e50c5572efec5e9d295c447eea29f41eccfd8ec8a528190d9f32c93b674778e3bd1495754ebefca7ad8b9e88532a2b3e84ebf1297cf18f5b78f989015ef9e510d3d118673bc7b8aeb5069f532f696f9f5ff917af4bf2ffb7484fa39cfa0bb4c86f3012fa0c67ce7671fe7c07c9641aa788d12cced2209fc32d451106a435f222a2a09002f543fe7b6667d3a92409a8d348c24008735fae09bb5645065ce1757b254970ef67ea98184d71fcd03829cda06fca4d0d49aa7ce9e2957aeefda5eb9c629958004af7e324cebdc1899e8f5266f4b3599ca5924eb3b03448e9f30464f6f2250bbf488a2a7727f13b134808aa9c93a8c29cfc5768aad34a59950b292bca6ca74b9204a35127295d261c4ce40616f39bc04b8b28a54ed474c18c1ee2f3adafd273e9129aa6a3619ec738b7a06723c258244a44d1c8516483da4012a7a2e1940daa9d93a842237b606c895946cb2bcbd5f8118fdffc19494fa10803430866920a97c7253687e238546341542cd6342e05dd808e3107dbc2d30859e06eabe5f4997e8ccc14cf2553d482f78c829113f0405d85862c047e3545c8318584004346080dd0e61c97b9725645486e43d0f0483324840743c8a475998b231e36552608f9b425ea92d9df590add808e5117d1944299c720a94be0f7b0b5ad8653a7070a0a59f05e5e2a5b98b62401f59582aa321048849c51026a020c050c1d848e24a5018d0253d056cc2a09992d49551828528c046e74218310748eb948a453348792b3296c055101a68cce311733290587a451e616243583784aa1a2c24f5b9bc6d97343050a5f141732afce703a04ad61059f0b14a151e38ee2943430e4d92f18b343f696ab4344a64005d99464a012252e3c689897db1b9e5149e812db6ae238e4d99657a951011919e3a60c5982a023819064bcaa408d09529a4c5d6d39b1b84efbc59179516214495b22efbd5050a12dec44910d3c4a922a770c19ccc84007a181210073d012ac28245ba8c2c8eb79fb8812c78d26ccb378671232a7fadcecac4b10f42e2fceb332a249054908fc6a02a7a283644661c00da33366c96e6ea9241a4bd3d93d5142b3d6c8a5a82dcd1ec2b50e300cca5d31ca1d0930245386d04d11860074404748592196ab436677f3ec5e9f15e323461c1769a1220468bac4993e179baa52d4074b9b9cac1bd035ee229654910438640dbf9a349bc5420121f0bb74c66312ba21013ad7eda8251ad3e81f985a3245b95d1237ee2823e89791844e8d278a5b5e98a232df5a90b256936564efe2cc5daff995b522835f89e39692b9c1472489ae3127ed434eb425024537a07bdc452ca5222490248332671c59367f1f218190916419bfcb4c250809212becbda981b23237a93445ff424117b7edab2158e6c2a90a1a0349dcaa00a1987f9232fb7cceebe1498333dde6f1919af0eadd8b64552244cef443344d4312e6a4374998652565d2814f24480071c399db3bc7a32af101892d55715ceac2b03765b889a695dc6ff994242e45cfa519b390cc3d36e0d689c4337bb1a1232b2ab7ed6fe6c5572e31399598d78a12ecda51ced69600183a016792902b8540caf42b0a4786aec3c113110ebc35462a6d5e0cf3960f957e6af552ac4a84346d35cfa08a25931cbfd0493c9158307a2b4902af9cc4afc4f39ab9494de6fc90878958fe147edd809e09534636fd39648d802399d77c36eb1073af5515058fcb8c18840cc8389c0eeeba6333aaaa924a433a6d5e00e0aedb1ad9da5a819024aafd3a955e1d918d0649cefc6ee62ff3ba7f3ccd5f3fdec3cf7f3d4a2a6dd0b2c3cbd7fe731bc1ca2b3b49672eab72114c5d37f8f9df75f3ee21f34c2a49085ac3956caa0b21cb22b73767a3266528cc68eefc013f6150ed4b51e34f62003d1137d19492ebb14b9241952b8a43d6f3a2af75c72dc892596f60e8c4923afd11324d1ff33d0c838948945f3d7f91ea4a371fdcdf80d32150259d1a6f0287ac6596d3e77c67f6b596d678fe483fcfbe3588a61b385d121ffd7c3d7befae58f57a64552f13db7e728ad77f3594bbf341d0ef66f7d67afc1e474e4ab6c24f190ad39acb1c5f9266fb0a3e873906164d2bb9d42609f03b12b9e81073e4b66cbfcd3c0e6e689959733a3de33a49cdc8c9300bd6606a2a8ecfab2030f03a34aa3c4924f44565740d4cf1f07317e91b318f966edd1de0812f3712a8589dc1c4f9acfa85940dc3e0ed974679ee27fd24133ab224d8d1524d6b6395084c030000099e4944415479ae6e913202d286cc54da9de90bcc0efc4973224712a04a1a55aea89939e62dd3bce30e6449ce2bc4a998cef0542642c81723302877a709bad2c545183aa9749aa70f5de6c523e64d613c3e99fbbfd8c00db72e9cedbf9aacd9b5dfc787133cf177ddb90b6556063decdb5987dfe3c84b399a213399f660cceba0cd16bc41953b93aaa4d9cfb234efbc6b5648a660755da77b4c372f5060cc4a91854eb52f8d5b59242a0c9d8b3d633cfcf46986c7333710b8c5bc449f37b0f637b55bd38bf11b86c1e1174679fed13e5249035912dcb8b59ab6a6f24cdd22325714959848b931849457e0920481b9a9aac0707cf375f79a42e615ecd88cce4474b60e71a93a35be34b2c8468c86296ab6fe482493fcf2e5b3bc76b40b30ef0ef7c92f35b26385977c5d0957e5fe21638366b4644f81ab0d79b9f5863a02ded9bac5403091f2a019b3525445a3da155d7488a5f9fa8f20cb32f373bfa669748dea188641995ba7c2ad23281e15672ff5f3c881638c4f9a51b1e74ef3662eab7509f152b96a77d8d17583379f1fe185c7fa49a70c1459e296eb6bd8b1a97c568a104c24dda40d19491854bba338147dd1536b9a777d7c56c8bc821e99d270ab3a5e8751344545a3719e78fe28878f7700e6cdc11efccafadcee08aea2902ca303091eff7e17ddede6fcd8c66a2f77eda9c7ef55331d3d184fba71cb1a01e7d233059b6ff824b29c19f89b1725f3a360fe7bc7cf76f0d881c34c4ec71002f6df57c97dbf59bbae379b5cb7bbb4bdf1ec302ffe6c8074cac0a148dc71532d3b5b8279876d4b69e237ef7e1059519625636a6a86c70e1ce2ddd39701f3a6950f7d354c53db955f31ef4a59d7fb180ef7c579e2efbae9b968464b4bbd8ffb6ea9c3eb2ebd8ddf7cd367cc08c9157cb63fa2cd6961cd56dc6f1f3bcbcf0ebc4e34668e26dc7e7f35f73c5483a2aecaa0c515b3ee77fad47583434f0ff3d2e303686903a72a71cfbe3ab66f2aad65d3bce773b34216495be313117ef2c4f39c39df01406d938b4f7f2d4c5df3e217a5bcdaacbb902c43bd719ef87e57eee661ad0d7e3e74731d5ef7e26dffa63d9f4751d5a229cad0357efde6517ef1ab83c41349644570f78335dcf1896ae422370f584f2c2304cc6879eda9210efe7c104d337039643eb4af96adcdc5a325bcf70ba8aab360540c0f8ff0e3477f49fba54e73d9560f0f7d2d4c55bd356fdd0d16139265b027c6e3dfebcecdb66f0b07f8d0cdb5b89d0ba3a571cfefe070baf37bea5a9a83afbcce81a75f24954aa13a24eefb6c2dfb3f5cb9e239b7570b4b0a01f3b642af3d35c8c15f0ca26be076ca7ce8e63adae6dd1aa361cfefe27479312b739dfebe3e1efef1a374769a9748dfbcd3c7835f69a4bc6ae18d66ac8865856419e88af1f8f7bb18e8324f29ded61ce09ebd75b8327d85fa3d5fc6e5f1a2a5533cffecb33cfbec73689a86d32df1b1dfae67ef5dc5afb36e452c2f04ccebd0bff2e420affe72105d078f4be6be5bead9dce0a776cfef31323ac6c3fff44ff4f5f502b0eda6009ffa52e3aacdb7bd9a6c082159fa3ba3fcec7bdd0cf598d1b2a3a58ceae61b79f59557310c038f5fe6135f6c60d707d676887c2dd95042c0bcd3cfc19f0ff2fa81a1bcab62effa8079cf27af7fed87c8d7920d2724cb705f9c936f4e90886becdc17a479ebfa0f7bac061b56c8b58a3506706c72d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c862dc462d8422c467666b23d9dd42264ceb8b7b10a0ad77e746ca8edb385580c5b88c5b0eb108bf17e88900d852dc462d8422c862dc4625cab4236ec365d8b4236f4f6d8422c86dd0fb118d762846c686c2116c31662316c2116e35a11722d6c03600bb11cd782908dbefe79d8fd108b712d44c835852dc462d8422c862dc4626c64211b75bd1765a30ad988eb5c12b6108b61f7432cc6468d906b165b88c5b085580c5b88b5303692908db29e57842dc4626c14211b611d5705bb1f6231364a84bc6fb08558839c035bc8fa9357feb690f5674309b1f2baad09561662d5f55a536c2116c3ee87580c2b47c8fb125bc8fa50b4cc6d21eb832dc4422c5ade561362a57559176c2116c34a42acb21eeb8add0fb118568a101b6c21578b92cbd8167275b085588c0d2564bdffbfa5586f21b68c79d8422c86dd0fb118eb1d2136f3b085ac1d2b2a575bc8da610bb1102b2ed3f51062ef008b600bb118575b882d6309ec7e88c5b02b758b610b593d56a51c6d21ab872dc4626c2821b6f412b91a426c19cbc06ef65a0cbb0eb118b6902b63d5cbce167265d8422cc49a94db5a0ab145af80b51262cb5821b6108b61f7432c865da95b0c5bc8f259d3f2b2852c8f352f2b5bc8f2d850426cb1ab802dc462ac96105bc62a61f7432c865da95b0c5bc8d25cd5f2b1852c8d2dc4425cf5b2b95221b6cc55e64a84d832d6005b88c5b0fb2116c3aed42d862da430eb5626b69085ac6b79d84216b2a184d8f2d6185b88c5588e105bc655c0ee87580cbb52b718b61013cb94812dc4c43265600bb1d8f69722c4522b7cadb394105bc655c6166231ec7e88c5b02b758bf17e1662c9ed7ebf0ab1ec36db422c462121965dd9f703b6108b315f882d639db1fb2116e3fd5aa95b96f793900db19db6108bf17e11b261b6312b64c3acf0b58eddcab218ef9794b561b085580c5b88c5b8d6856cb86dbb96856cc8edb285580cbbd96b31aee508d990d8422c862dc462d8422cc6b52664c36f8b2dc4625c4b42ae89edb0fb2116e35a8a906b025b88c5b085580c5b88c5b816846cf4f5cf63a30bd9c8eb5e10bbd96b31367a845c73d8422c862dc462d8422cc64615b211d7b92436a2908db6becbc2166231ec7e88c5d88811724d630bb116862dc43a1860478895d8504236c23aae0ab6108bb11184587dfd5615bb1f6231364284bcafb085ac2f0bcade16b2bed8422c44c172b7b210abaed79a625521565ca7ab822dc462d8fd108b61d50879df620bb9fa2c5adeb690abcb92656d0bb9ba6c282156598f75c5166231ac22c40aeb6009ec7e88c5b04a84d864b085ac3dcb2a5f5bc8da630bb110cb2edbf51462ef0805b085580c5b88c5b0fb2116c3aed42d862d646d587199da42569f2b2a4f5bc8eab3a184d8f297c0166231aea6105b4609d8fd108b6157ea16c316b23aac5a19da4256075b888558d5f25b6b21b6ec65620bb118b6108b61f7432c865da95b0c5bc8ca599372b385ac8c352b335bc8cad850426cc157c06a0bb1655c21b6108b61f7432c865da95b0c5b48e95c9572b285948e2dc4425cb5325a0d21b6d055c41662316c2116c3ee87580c6118f60e6e25a4f55e019b7c6c2116c31662316c2116c3166231fe3f815c7042bc8ddc990000000049454e44ae426082 - + kactivelabel.h kactivelabel.h diff --git a/keep/common/backup.cpp b/keep/common/backup.cpp index dc31715..5e05a48 100644 --- a/keep/common/backup.cpp +++ b/keep/common/backup.cpp @@ -25,7 +25,7 @@ Backup::Backup() { } -Backup::Backup( QString source, QString dest, int interval, int deleteAfter, bool neverDelete,bool useCompression, bool excludeSpecialFiles,bool useAdvancedConfig,QStringList optionList,bool useIncludeExclude,QStringList includeExcludeList) +Backup::Backup( TQString source, TQString dest, int interval, int deleteAfter, bool neverDelete,bool useCompression, bool excludeSpecialFiles,bool useAdvancedConfig,TQStringList optionList,bool useIncludeExclude,TQStringList includeExcludeList) { m_source = source; m_dest = dest; @@ -43,22 +43,22 @@ Backup::~Backup() { } -QString Backup::source() +TQString Backup::source() { return m_source; } -void Backup::setSource(QString source) +void Backup::setSource(TQString source) { m_source = source; } -QString Backup::dest() +TQString Backup::dest() { return m_dest; } -void Backup::setDest(QString dest) +void Backup::setDest(TQString dest) { m_dest = dest; } @@ -123,12 +123,12 @@ void Backup::setUseAdvancedConfig(bool useAdvancedConfig) m_useAdvancedConfig = useAdvancedConfig; } -QStringList Backup::optionList() +TQStringList Backup::optionList() { return m_optionList; } -void Backup::setOptionList(QStringList optionList) +void Backup::setOptionList(TQStringList optionList) { m_optionList = optionList; } @@ -143,31 +143,31 @@ void Backup::setUseIncludeExclude(bool useIncludeExclude) m_useIncludeExclude = useIncludeExclude; } -QStringList Backup::includeExcludeList() +TQStringList Backup::includeExcludeList() { return m_includeExcludeList; } -void Backup::setIncludeExcludeList(QStringList includeExcludeList) +void Backup::setIncludeExcludeList(TQStringList includeExcludeList) { m_includeExcludeList = includeExcludeList; } -QString Backup::htmlDesc() +TQString Backup::htmlDesc() { - QString del; - QString compression; + TQString del; + TQString compression; if ( m_neverDelete ) del = i18n("Never delete"); else - del = i18n("%1 days").arg(m_deleteAfter); + del = i18n("%1 days").tqarg(m_deleteAfter); if ( m_useCompression ) compression = i18n("Yes"); else compression = i18n("No"); - QString html = "

" + i18n("Source directory:") + "
" + TQString html = "

" + i18n("Source directory:") + "
" + m_source + "
" + i18n("Destination directory:") + "
" - + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").arg(m_interval) + + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").tqarg(m_interval) + "
" + i18n("Delete after:") + " " + del + "
" + i18n("Use compression:") + " " + compression + "

"; diff --git a/keep/common/backup.h b/keep/common/backup.h index e7727c1..aa49a90 100644 --- a/keep/common/backup.h +++ b/keep/common/backup.h @@ -19,19 +19,19 @@ #ifndef _BACKUP_H_ #define _BACKUP_H_ -#include +#include class Backup { public: - Backup( QString source, QString dest, int m_interval, int m_deleteAfter, bool m_neverDelete,bool useCompression,bool excludeSpecialFiles,bool useAdvancedConfig,QStringList optionList,bool useIncludeExclude,QStringList includeExcludeList); + Backup( TQString source, TQString dest, int m_interval, int m_deleteAfter, bool m_neverDelete,bool useCompression,bool excludeSpecialFiles,bool useAdvancedConfig,TQStringList optionList,bool useIncludeExclude,TQStringList includeExcludeList); Backup(); ~Backup(); - QString source(); - void setSource(QString source); - QString dest(); - void setDest(QString dest); + TQString source(); + void setSource(TQString source); + TQString dest(); + void setDest(TQString dest); int interval(); void setInterval(int interval); int deleteAfter(); @@ -44,27 +44,27 @@ public: void setExcludeSpecialFiles(bool excludeSpecialFiles); bool useAdvancedConfig(); void setUseAdvancedConfig(bool useAdvancedConfig); - QStringList optionList(); - void setOptionList(QStringList optionList); + TQStringList optionList(); + void setOptionList(TQStringList optionList); bool useIncludeExclude(); void setUseIncludeExclude(bool useIncludeExclude); - QStringList includeExcludeList(); - void setIncludeExcludeList(QStringList includeExcludeList); + TQStringList includeExcludeList(); + void setIncludeExcludeList(TQStringList includeExcludeList); - QString htmlDesc(); + TQString htmlDesc(); private: - QString m_source; - QString m_dest; + TQString m_source; + TQString m_dest; int m_interval; int m_deleteAfter; bool m_neverDelete; bool m_useCompression; bool m_excludeSpecialFiles; bool m_useAdvancedConfig; - QStringList m_optionList; + TQStringList m_optionList; bool m_useIncludeExclude; - QStringList m_includeExcludeList; + TQStringList m_includeExcludeList; }; #endif diff --git a/keep/common/backupconfig.cpp b/keep/common/backupconfig.cpp index 75aed97..f029292 100644 --- a/keep/common/backupconfig.cpp +++ b/keep/common/backupconfig.cpp @@ -34,7 +34,7 @@ void BackupConfig::addBackup(Backup backup) { int id = generateId(); - m_config->setGroup( ("Backup_" + QString::number(id)) ); + m_config->setGroup( ("Backup_" + TQString::number(id)) ); m_config->writeEntry( "Source", backup.source()); m_config->writeEntry( "Dest", backup.dest()); m_config->writeEntry( "Interval", backup.interval()); @@ -50,39 +50,39 @@ void BackupConfig::addBackup(Backup backup) m_config->sync(); } -QValueList BackupConfig::backupList() +TQValueList BackupConfig::backupList() { - QValueList backupList; - QStringList groupList = m_config->groupList(); - QStringList backupNameList = groupList.grep("Backup_"); - for ( QStringList::Iterator it = backupNameList.begin(); it != backupNameList.end(); ++it ) { + TQValueList backupList; + TQStringList groupList = m_config->groupList(); + TQStringList backupNameList = groupList.grep("Backup_"); + for ( TQStringList::Iterator it = backupNameList.begin(); it != backupNameList.end(); ++it ) { m_config->setGroup(*it); - QString source = m_config->readEntry("Source"); - QString dest = m_config->readEntry("Dest"); + TQString source = m_config->readEntry("Source"); + TQString dest = m_config->readEntry("Dest"); int interval = m_config->readNumEntry("Interval"); int deleteAfter = m_config->readNumEntry("DeleteAfter"); bool neverDelete = m_config->readBoolEntry("NeverDelete"); bool useCompression = m_config->readBoolEntry("UseCompression"); bool excludeSpecialFiles = m_config->readBoolEntry("ExcludeSpecialFiles"); bool useAdvancedConfig = m_config->readBoolEntry("UseAdvancedConfig"); - QStringList optionList = m_config->readListEntry( "OptionList"); + TQStringList optionList = m_config->readListEntry( "OptionList"); bool useIncludeExclude = m_config->readBoolEntry("UseIncludeExclude"); - QStringList includeExcludeList = m_config->readListEntry("IncludeExcludeList"); + TQStringList includeExcludeList = m_config->readListEntry("IncludeExcludeList"); backupList.append(Backup(source,dest,interval,deleteAfter,neverDelete,useCompression,excludeSpecialFiles,useAdvancedConfig,optionList,useIncludeExclude,includeExcludeList)); } return backupList; } -void BackupConfig::setBackupList(QValueList backups) +void BackupConfig::setBackupList(TQValueList backups) { - QStringList groupList = m_config->groupList(); - QStringList backupNameList = groupList.grep("Backup_"); - for ( QStringList::Iterator it = backupNameList.begin(); it != backupNameList.end(); ++it ) { + TQStringList groupList = m_config->groupList(); + TQStringList backupNameList = groupList.grep("Backup_"); + for ( TQStringList::Iterator it = backupNameList.begin(); it != backupNameList.end(); ++it ) { m_config->deleteGroup(*it); } m_config->sync(); - QValueList::iterator it; + TQValueList::iterator it; for ( it = backups.begin(); it != backups.end(); ++it ) { addBackup(*it); diff --git a/keep/common/backupconfig.h b/keep/common/backupconfig.h index c53f651..32a55ba 100644 --- a/keep/common/backupconfig.h +++ b/keep/common/backupconfig.h @@ -19,21 +19,21 @@ #ifndef _BACKUPCONFIG_H_ #define _BACKUPCONFIG_H_ -#include -#include +#include +#include #include #include "backup.h" -class BackupConfig: public QObject +class BackupConfig: public TQObject { public: BackupConfig(); ~BackupConfig(); void addBackup(Backup backup); - QValueList backupList(); - void setBackupList(QValueList backups); + TQValueList backupList(); + void setBackupList(TQValueList backups); private: KConfig *m_config; diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp index 1ed8ec9..c82ae5a 100644 --- a/keep/common/backuplistviewitem.cpp +++ b/keep/common/backuplistviewitem.cpp @@ -19,10 +19,10 @@ #include "backuplistviewitem.h" #include -#include +#include #include -BackupListViewItem::BackupListViewItem(KListView *parent,Backup &backup): QListViewItem (parent) +BackupListViewItem::BackupListViewItem(KListView *tqparent,Backup &backup): TQListViewItem (tqparent) { setBackup(backup); } @@ -44,14 +44,14 @@ void BackupListViewItem::setBackup(Backup backup) void BackupListViewItem::setBackupText() { - setText(0, QDir(m_backup.source()).dirName() ); - setText(1, QDir(m_backup.dest()).dirName() ); - setText(2, i18n("%1 days").arg(m_backup.interval())); - QString deleteAfter; + setText(0, TQDir(m_backup.source()).dirName() ); + setText(1, TQDir(m_backup.dest()).dirName() ); + setText(2, i18n("%1 days").tqarg(m_backup.interval())); + TQString deleteAfter; if ( m_backup.neverDelete() == true ) deleteAfter = i18n("Never"); else - deleteAfter = i18n("%1 days").arg(m_backup.deleteAfter()); + deleteAfter = i18n("%1 days").tqarg(m_backup.deleteAfter()); setText(3, deleteAfter); } diff --git a/keep/common/backuplistviewitem.h b/keep/common/backuplistviewitem.h index 8cdd6e6..f471714 100644 --- a/keep/common/backuplistviewitem.h +++ b/keep/common/backuplistviewitem.h @@ -23,10 +23,10 @@ #include "backup.h" -class BackupListViewItem : public QListViewItem +class BackupListViewItem : public TQListViewItem { public: - BackupListViewItem(KListView *parent,Backup &backup); + BackupListViewItem(KListView *tqparent,Backup &backup); ~BackupListViewItem(); Backup backup(); diff --git a/keep/common/includeexcludeitem.cpp b/keep/common/includeexcludeitem.cpp index 895a8ae..6712a3b 100644 --- a/keep/common/includeexcludeitem.cpp +++ b/keep/common/includeexcludeitem.cpp @@ -19,15 +19,15 @@ #include "includeexcludeitem.h" #include -#include +#include #include -IncludeExcludeItem::IncludeExcludeItem(KListView *parent,QString includeExclude): QListViewItem (parent) +IncludeExcludeItem::IncludeExcludeItem(KListView *tqparent,TQString includeExclude): TQListViewItem (tqparent) { setIncludeExclude(includeExclude); } -IncludeExcludeItem::IncludeExcludeItem(KListView *parent,IncludeExcludeItem *item,QString includeExclude): QListViewItem (parent,item) +IncludeExcludeItem::IncludeExcludeItem(KListView *tqparent,IncludeExcludeItem *item,TQString includeExclude): TQListViewItem (tqparent,item) { setIncludeExclude(includeExclude); } @@ -37,12 +37,12 @@ IncludeExcludeItem::~IncludeExcludeItem() { } -QString IncludeExcludeItem::includeExclude() +TQString IncludeExcludeItem::includeExclude() { return m_includeExclude; } -void IncludeExcludeItem::setIncludeExclude(QString includeExclude) +void IncludeExcludeItem::setIncludeExclude(TQString includeExclude) { m_includeExclude = includeExclude; setIncludeExcludeText(); @@ -50,8 +50,8 @@ void IncludeExcludeItem::setIncludeExclude(QString includeExclude) void IncludeExcludeItem::setIncludeExcludeText() { - QString type = m_includeExclude.left(1); - QString file = m_includeExclude.right(m_includeExclude.length() - 1); + TQString type = m_includeExclude.left(1); + TQString file = m_includeExclude.right(m_includeExclude.length() - 1); setText(0, file); if ( type == "I" ) setText(1,i18n("Included")); diff --git a/keep/common/includeexcludeitem.h b/keep/common/includeexcludeitem.h index f6c2667..146c520 100644 --- a/keep/common/includeexcludeitem.h +++ b/keep/common/includeexcludeitem.h @@ -23,18 +23,18 @@ #include "backup.h" -class IncludeExcludeItem : public QListViewItem +class IncludeExcludeItem : public TQListViewItem { public: - IncludeExcludeItem(KListView *parent,QString includeExclude); - IncludeExcludeItem(KListView *parent,IncludeExcludeItem *item,QString includeExclude); + IncludeExcludeItem(KListView *tqparent,TQString includeExclude); + IncludeExcludeItem(KListView *tqparent,IncludeExcludeItem *item,TQString includeExclude); ~IncludeExcludeItem(); - QString includeExclude(); - void setIncludeExclude(QString includeExclude); + TQString includeExclude(); + void setIncludeExclude(TQString includeExclude); private: - QString m_includeExclude; + TQString m_includeExclude; void setIncludeExcludeText(); }; diff --git a/keep/common/incrementlistviewitem.cpp b/keep/common/incrementlistviewitem.cpp index c5cc718..f460d3d 100644 --- a/keep/common/incrementlistviewitem.cpp +++ b/keep/common/incrementlistviewitem.cpp @@ -19,15 +19,15 @@ #include "incrementlistviewitem.h" #include -#include +#include #include -IncrementListViewItem::IncrementListViewItem(KListView *parent,QDateTime date): QListViewItem (parent) +IncrementListViewItem::IncrementListViewItem(KListView *tqparent,TQDateTime date): TQListViewItem (tqparent) { setDate(date); } -IncrementListViewItem::IncrementListViewItem(KListView *parent,QListViewItem *item,QDateTime date): QListViewItem (parent,item) +IncrementListViewItem::IncrementListViewItem(KListView *tqparent,TQListViewItem *item,TQDateTime date): TQListViewItem (tqparent,item) { setDate(date); } @@ -37,12 +37,12 @@ IncrementListViewItem::~IncrementListViewItem() { } -QDateTime IncrementListViewItem::date() +TQDateTime IncrementListViewItem::date() { return m_date; } -void IncrementListViewItem::setDate(QDateTime date) +void IncrementListViewItem::setDate(TQDateTime date) { m_date = date; setDateText(); diff --git a/keep/common/incrementlistviewitem.h b/keep/common/incrementlistviewitem.h index 59141d1..c40d2e0 100644 --- a/keep/common/incrementlistviewitem.h +++ b/keep/common/incrementlistviewitem.h @@ -20,21 +20,21 @@ #define _INCREMENTLISTVIEWITEM_H_ #include -#include +#include -class IncrementListViewItem : public QListViewItem +class IncrementListViewItem : public TQListViewItem { public: - IncrementListViewItem(KListView *parent, QDateTime date); - IncrementListViewItem(KListView *parent, QListViewItem *item,QDateTime date); + IncrementListViewItem(KListView *tqparent, TQDateTime date); + IncrementListViewItem(KListView *tqparent, TQListViewItem *item,TQDateTime date); ~IncrementListViewItem(); - QDateTime date(); - void setDate(QDateTime date); + TQDateTime date(); + void setDate(TQDateTime date); private: - QDateTime m_date; + TQDateTime m_date; void setDateText(); }; diff --git a/keep/common/listviewtooltip.h b/keep/common/listviewtooltip.h index c871933..dc35142 100644 --- a/keep/common/listviewtooltip.h +++ b/keep/common/listviewtooltip.h @@ -20,59 +20,59 @@ #ifndef _LISTVIEWTOOLTIP_H_ #define _LISTVIEWTOOLTIP_H_ -#include -#include -#include +#include +#include +#include #include "backuplistviewitem.h" #include "backup.h" -class ListViewToolTip : public QToolTip +class ListViewToolTip : public TQToolTip { public: - ListViewToolTip(QListView* parent); + ListViewToolTip(TQListView* tqparent); protected: - void maybeTip( const QPoint& p ); + void maybeTip( const TQPoint& p ); private: - QListView* listView; + TQListView* listView; }; -inline ListViewToolTip::ListViewToolTip( QListView* parent ): QToolTip( parent->viewport() ), listView( parent ) {} +inline ListViewToolTip::ListViewToolTip( TQListView* tqparent ): TQToolTip( tqparent->viewport() ), listView( tqparent ) {} -inline void ListViewToolTip::maybeTip( const QPoint& p ) { +inline void ListViewToolTip::maybeTip( const TQPoint& p ) { if ( !listView ) return; - QListViewItem* item = listView->itemAt( p ); + TQListViewItem* item = listView->itemAt( p ); if ( !item ) return; - const QRect itemRect = listView->itemRect( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = listView->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const int col = listView->header()->sectionAt( p.x() ); if ( col == -1 ) return; - const QRect headerRect = listView->header()->sectionRect( col ); + const TQRect headerRect = listView->header()->sectionRect( col ); if ( !headerRect.isValid() ) return; - const QRect cellRect( headerRect.left(), itemRect.top(),headerRect.width(), itemRect.height()); + const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width(), tqitemRect.height()); BackupListViewItem* backupItem = static_cast(item); - QString tipStr = backupItem->backup().htmlDesc(); + TQString tipStr = backupItem->backup().htmlDesc(); /* if( col == 0 ) - tipStr = QString( "Contents of this cell: %1" ).arg(item->text( 0 ) ); + tipStr = TQString( "Contents of this cell: %1" ).tqarg(item->text( 0 ) ); else if( col == 1 ) - tipStr = QString( "Contents of that cell: %1" ).arg(item->text( 1 ) ); + tipStr = TQString( "Contents of that cell: %1" ).tqarg(item->text( 1 ) ); else - tipStr = QString( "Something else" ); + tipStr = TQString( "Something else" ); */ tip( cellRect, tipStr ); } diff --git a/keep/common/rdblistener.cpp b/keep/common/rdblistener.cpp index f213bee..7debd67 100644 --- a/keep/common/rdblistener.cpp +++ b/keep/common/rdblistener.cpp @@ -35,17 +35,17 @@ void RDBListener::receivedStdOut(KProcess *proc, char *buffer, int buflen) m_stdOut.append(buffer); } -QString RDBListener::errorMessage() +TQString RDBListener::errorMessage() { return m_stdErr.join("").simplifyWhiteSpace(); } -QStringList RDBListener::stdErr() +TQStringList RDBListener::stdErr() { return m_stdErr; } -QStringList RDBListener::stdOut() +TQStringList RDBListener::stdOut() { return m_stdOut; } diff --git a/keep/common/rdblistener.h b/keep/common/rdblistener.h index e95186d..21616b6 100644 --- a/keep/common/rdblistener.h +++ b/keep/common/rdblistener.h @@ -19,19 +19,20 @@ #ifndef _RDBLISTENER_H_ #define _RDBLISTENER_H_ -#include +#include -#include +#include #include -class RDBListener: public QObject +class RDBListener: public TQObject { Q_OBJECT + TQ_OBJECT public: RDBListener(); - QStringList stdOut(); - QStringList stdErr(); - QString errorMessage(); + TQStringList stdOut(); + TQStringList stdErr(); + TQString errorMessage(); bool isOk(); public slots: @@ -39,8 +40,8 @@ public slots: void receivedStdErr(KProcess *proc, char *buffer, int buflen); private: - QStringList m_stdOut; - QStringList m_stdErr; + TQStringList m_stdOut; + TQStringList m_stdErr; bool m_isOk; }; diff --git a/keep/common/rdbmanager.cpp b/keep/common/rdbmanager.cpp index 4d86a89..221fa3f 100644 --- a/keep/common/rdbmanager.cpp +++ b/keep/common/rdbmanager.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include RDBManager::RDBManager() @@ -33,42 +33,42 @@ RDBManager::~RDBManager() void RDBManager::slotCheckBackup() { - QValueList backups = outdatedBackupList(); - QValueList::iterator it; + TQValueList backups = outdatedBackupList(); + TQValueList::iterator it; for ( it = backups.begin(); it != backups.end(); ++it ) { doBackup(*it); } } -void RDBManager::slotForceBackup(QValueList backupList) +void RDBManager::slotForceBackup(TQValueList backupList) { - QValueList::iterator it; + TQValueList::iterator it; for ( it = backupList.begin(); it != backupList.end(); ++it ) { doBackup(*it); } } -QString RDBManager::compareAtTime(Backup backup, QDateTime date) +TQString RDBManager::compareAtTime(Backup backup, TQDateTime date) { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options *proc << "--compare-at-time"; - *proc << QString::number(date.toTime_t()); // increment date + *proc << TQString::number(date.toTime_t()); // increment date // Adds source and dest - *proc << QFile::encodeName(KProcess::quote(backup.source())); - *proc << QFile::encodeName(KProcess::quote(backup.dest())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.source()))); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); // Adds the listener RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList output = listen->stdOut(); - QStringList::iterator it = output.begin(); + TQStringList output = listen->stdOut(); + TQStringList::iterator it = output.begin(); kdDebug() << "Executed process: " << proc->args() << endl; @@ -78,24 +78,24 @@ QString RDBManager::compareAtTime(Backup backup, QDateTime date) return (*it); } -QString RDBManager::listChangedSince(Backup backup, QDateTime date) +TQString RDBManager::listChangedSince(Backup backup, TQDateTime date) { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options *proc << "--list-changed-since"; - *proc << QString::number(date.toTime_t()); // increment date + *proc << TQString::number(date.toTime_t()); // increment date // Adds the dest - *proc << QFile::encodeName(KProcess::quote(backup.dest())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); // Adds a listener RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList output = listen->stdOut(); - QStringList::iterator it = output.begin(); + TQStringList output = listen->stdOut(); + TQStringList::iterator it = output.begin(); kdDebug() << "Executed process: " << proc->args() << endl; @@ -105,24 +105,24 @@ QString RDBManager::listChangedSince(Backup backup, QDateTime date) return (*it); } -QString RDBManager::listAtTime(Backup backup, QDateTime date) +TQString RDBManager::listAtTime(Backup backup, TQDateTime date) { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options *proc << "--list-at-time"; - *proc << QString::number(date.toTime_t()); // increment date + *proc << TQString::number(date.toTime_t()); // increment date // Adds the dest - *proc << QFile::encodeName(KProcess::quote(backup.dest())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); // Adds a listener RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList output = listen->stdOut(); - QStringList::iterator it = output.begin(); + TQStringList output = listen->stdOut(); + TQStringList::iterator it = output.begin(); kdDebug() << "Executed process: " << proc->args() << endl; @@ -132,7 +132,7 @@ QString RDBManager::listAtTime(Backup backup, QDateTime date) return (*it); } -QValueList RDBManager::incrementList(Backup backup) +TQValueList RDBManager::incrementList(Backup backup) { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); @@ -141,27 +141,27 @@ QValueList RDBManager::incrementList(Backup backup) *proc << "-v2"; *proc << "--parsable-output"; // Adds the dest - *proc << QFile::encodeName(KProcess::quote(backup.dest())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); // Adds a listener RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList output = listen->stdOut(); - QStringList::iterator it = output.begin(); + TQStringList output = listen->stdOut(); + TQStringList::iterator it = output.begin(); - QStringList lines = QStringList::split("\n",*it); - QValueList dateList; + TQStringList lines = TQStringList::split("\n",*it); + TQValueList dateList; - QStringList::iterator it2 = output.begin(); + TQStringList::iterator it2 = output.begin(); for ( it2 = lines.begin(); it2 != lines.end(); ++it2 ) { - QStringList field = QStringList::split(" ",*it2); - QStringList::iterator dateStr = field.begin(); + TQStringList field = TQStringList::split(" ",*it2); + TQStringList::iterator dateStr = field.begin(); long timestamp = (*dateStr).toUInt(); - QDateTime datetime; + TQDateTime datetime; datetime.setTime_t(timestamp); dateList.append(datetime); } @@ -174,24 +174,24 @@ QValueList RDBManager::incrementList(Backup backup) return dateList; } -QDateTime RDBManager::lastIncrement(Backup backup) +TQDateTime RDBManager::lastIncrement(Backup backup) { - QValueList increments = incrementList(backup); - QDateTime last = increments.last(); + TQValueList increments = incrementList(backup); + TQDateTime last = increments.last(); return last; } -QValueList RDBManager::outdatedBackupList() +TQValueList RDBManager::outdatedBackupList() { BackupConfig config; - QValueList backups = config.backupList(); - QValueList outdated; - QValueList::iterator it; + TQValueList backups = config.backupList(); + TQValueList outdated; + TQValueList::iterator it; kdDebug() << "Detecting outdated backup." << endl; for ( it = backups.begin(); it != backups.end(); ++it ) { - QDateTime last = lastIncrement(*it); - QDate today = QDate::currentDate(); + TQDateTime last = lastIncrement(*it); + TQDate today = TQDate::tqcurrentDate(); if ( last.date().daysTo(today) >= (*it).interval() ) { kdDebug() << "Detected outdated backup: " << (*it).source() << endl; @@ -201,21 +201,21 @@ QValueList RDBManager::outdatedBackupList() return outdated; } -void RDBManager::slotRestoreBackup(Backup backup,QDateTime time) +void RDBManager::slotRestoreBackup(Backup backup,TQDateTime time) { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options *proc << "--force"; *proc << "--restore-as-of"; - *proc << QString::number(time.toTime_t()); // Date of the increment to restore + *proc << TQString::number(time.toTime_t()); // Date of the increment to restore // Adds source and dest - *proc << QFile::encodeName(KProcess::quote(backup.dest())); - *proc << QFile::encodeName(KProcess::quote(backup.source())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.source()))); // Adds a listener (for output recording) RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); - connect(proc,SIGNAL(receivedStderr(KProcess *,char *,int)),listen,SLOT(receivedStdErr(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStderr(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdErr(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; @@ -239,13 +239,13 @@ bool RDBManager::isRDB() *proc << "-V"; // Adds a listener (for output recording) RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList outList = listen->stdOut(); - QStringList::iterator out = outList.begin(); + TQStringList outList = listen->stdOut(); + TQStringList::iterator out = outList.begin(); kdDebug() << "Executed process: " << proc->args() << endl; @@ -257,20 +257,20 @@ bool RDBManager::isRDB() return true; } -QString RDBManager::RDBVersion() +TQString RDBManager::RDBVersion() { // Gets the rdiff-backup process KProcess *proc = RDBProcess(); *proc << "-V"; // Adds a listener (for output recording) RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; - QStringList outList = listen->stdOut(); - QStringList::iterator out = outList.begin(); + TQStringList outList = listen->stdOut(); + TQStringList::iterator out = outList.begin(); kdDebug() << "Executed process: " << proc->args() << endl; @@ -287,21 +287,21 @@ void RDBManager::doBackup(Backup backup) // Adds include and exclude if ( backup.useIncludeExclude() ) { - QStringList includeExcludeList = backup.includeExcludeList(); - QStringList::iterator it; + TQStringList includeExcludeList = backup.includeExcludeList(); + TQStringList::iterator it; for ( it = includeExcludeList.begin(); it != includeExcludeList.end(); ++it ) { - QString type = (*it).left(1); - QString file = (*it).right((*it).length() - 1); + TQString type = (*it).left(1); + TQString file = (*it).right((*it).length() - 1); if ( type == "I" ) { *proc << "--include"; - *proc << QFile::encodeName(KProcess::quote(file)); + *proc << TQString(TQFile::encodeName(KProcess::quote(file))); } else if ( type == "E" ) { *proc << "--exclude"; - *proc << QFile::encodeName(KProcess::quote(file)); + *proc << TQString(TQFile::encodeName(KProcess::quote(file))); } } } @@ -318,19 +318,19 @@ void RDBManager::doBackup(Backup backup) // For advanced mode else { - QStringList optionList = backup.optionList(); - for ( QStringList::Iterator it = optionList.begin(); it != optionList.end(); ++it ) + TQStringList optionList = backup.optionList(); + for ( TQStringList::Iterator it = optionList.begin(); it != optionList.end(); ++it ) { *proc << *it; } } // Adds source and dest - *proc << QFile::encodeName(KProcess::quote(backup.source())); - *proc << QFile::encodeName(KProcess::quote(backup.dest())); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.source()))); + *proc << TQString(TQFile::encodeName(KProcess::quote(backup.dest()))); // Adds a listener (for output recording) RDBListener *listen = new RDBListener(); - connect(proc,SIGNAL(receivedStdout(KProcess *,char *,int)),listen,SLOT(receivedStdOut(KProcess *,char *,int))); - connect(proc,SIGNAL(receivedStderr(KProcess *,char *,int)),listen,SLOT(receivedStdErr(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStdout(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(KProcess *,char *,int))); + connect(proc,TQT_SIGNAL(receivedStderr(KProcess *,char *,int)),listen,TQT_SLOT(receivedStdErr(KProcess *,char *,int))); // Starts the process if ( !proc->start(KProcess::Block, KProcess::AllOutput) ) kdDebug() << "Error starting rdiff-backup" << endl; @@ -360,7 +360,7 @@ void RDBManager::removeOldIncrements(Backup backup) // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options - *proc << "--remove-older-than" << QString("%1").arg(backup.deleteAfter()) + "D"; + *proc << "--remove-older-than" << TQString("%1").tqarg(backup.deleteAfter()) + "D"; // Adds dest *proc << backup.dest(); // Starts the process @@ -378,7 +378,7 @@ KProcess *RDBManager::RDBProcess(bool isNice,int niceLevel) proc->setUseShell(true); if ( isNice ) { - *proc << "nice" << "-n" << QString("%1").arg(niceLevel); + *proc << "nice" << "-n" << TQString("%1").tqarg(niceLevel); } *proc << "rdiff-backup"; diff --git a/keep/common/rdbmanager.h b/keep/common/rdbmanager.h index f7115ec..e85dee9 100644 --- a/keep/common/rdbmanager.h +++ b/keep/common/rdbmanager.h @@ -19,38 +19,39 @@ #ifndef _RDBMANAGER_H_ #define _RDBMANAGER_H_ -#include -#include -#include +#include +#include +#include #include "backupconfig.h" #include "rdblistener.h" -class RDBManager: public QObject +class RDBManager: public TQObject { Q_OBJECT + TQ_OBJECT public: RDBManager(); ~RDBManager(); - QValueList incrementList(Backup backup); - QValueList outdatedBackupList(); - QDateTime lastIncrement(Backup backup); + TQValueList incrementList(Backup backup); + TQValueList outdatedBackupList(); + TQDateTime lastIncrement(Backup backup); - QString compareAtTime(Backup backup, QDateTime date); - QString listChangedSince(Backup backup, QDateTime date); - QString listAtTime(Backup backup, QDateTime date); + TQString compareAtTime(Backup backup, TQDateTime date); + TQString listChangedSince(Backup backup, TQDateTime date); + TQString listAtTime(Backup backup, TQDateTime date); bool isRDB(); - QString RDBVersion(); + TQString RDBVersion(); public slots: void slotCheckBackup(); - void slotForceBackup(QValueList backupList); - void slotRestoreBackup(Backup backup,QDateTime time); + void slotForceBackup(TQValueList backupList); + void slotRestoreBackup(Backup backup,TQDateTime time); signals: - void backupError(Backup backup,QString errorMessage); + void backupError(Backup backup,TQString errorMessage); void backupSuccess(Backup backup); private: diff --git a/keep/kded/keepkded.cpp b/keep/kded/keepkded.cpp index 51a315d..add6dc9 100644 --- a/keep/kded/keepkded.cpp +++ b/keep/kded/keepkded.cpp @@ -18,10 +18,10 @@ #include "keepkded.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -32,18 +32,18 @@ #include #include -KeepKded::KeepKded(const QCString &name): KDEDModule(name) +KeepKded::KeepKded(const TQCString &name): KDEDModule(name) { m_logFilePath = locateLocal( "data", "keep/keep.log", true ); m_manager = new RDBManager(); - connect( m_manager, SIGNAL(backupError(Backup,QString)), this, SLOT(slotBackupError(Backup,QString)) ); - connect( m_manager, SIGNAL(backupSuccess(Backup)), this, SLOT(slotBackupSuccess(Backup)) ); + connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotBackupError(Backup,TQString)) ); + connect( m_manager, TQT_SIGNAL(backupSuccess(Backup)), this, TQT_SLOT(slotBackupSuccess(Backup)) ); slotCheckBackup(); - m_timer = new QTimer(this); - connect( m_timer, SIGNAL(timeout()), this, SLOT(slotCheckBackup()) ); + m_timer = new TQTimer(this); + connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckBackup()) ); m_timer->start( 1000 * 60 * 60 ); } @@ -52,11 +52,11 @@ KeepKded::~KeepKded() delete m_manager; } -void KeepKded::slotBackupError(Backup backup,QString errorMessage) +void KeepKded::slotBackupError(Backup backup,TQString errorMessage) { if ( KeepSettings::notifyBackupError() ) { - KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage),16,4); + KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage),16,4); } log("Backup Error",backup.source(),errorMessage); } @@ -65,18 +65,18 @@ void KeepKded::slotBackupSuccess(Backup backup) { if ( KeepSettings::notifyBackupSuccess() ) { - KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").arg(backup.source()).arg(backup.dest()),16,1); + KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").tqarg(backup.source()).tqarg(backup.dest()),16,1); } log("Backup Success",backup.source(),"Successfully backuped to: " + backup.dest() ); } -void KeepKded::log(QString type,QString backup,QString message) +void KeepKded::log(TQString type,TQString backup,TQString message) { - QString logMessage = QDateTime::currentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; - QFile file( m_logFilePath ); + TQString logMessage = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; + TQFile file( m_logFilePath ); if ( file.open(IO_WriteOnly | IO_Append) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << logMessage << "\n"; file.close(); } @@ -90,7 +90,7 @@ void KeepKded::slotCheckBackup() extern "C" { - KDE_EXPORT KDEDModule *create_keep(const QCString &name) + KDE_EXPORT KDEDModule *create_keep(const TQCString &name) { return new KeepKded(name); } diff --git a/keep/kded/keepkded.h b/keep/kded/keepkded.h index 99776ea..1bf85a7 100644 --- a/keep/kded/keepkded.h +++ b/keep/kded/keepkded.h @@ -20,29 +20,30 @@ #define _KEEPKDED_H_ #include -#include +#include #include "rdbmanager.h" class KeepKded: public KDEDModule { Q_OBJECT +// TQ_OBJECT K_DCOP public: - KeepKded( const QCString &name ); + KeepKded( const TQCString &name ); virtual ~KeepKded(); public slots: void slotCheckBackup(); - void slotBackupError(Backup backup, QString ErrorMessage); + void slotBackupError(Backup backup, TQString ErrorMessage); void slotBackupSuccess(Backup backup); private: - QTimer *m_timer; - QString m_logFilePath; + TQTimer *m_timer; + TQString m_logFilePath; RDBManager *m_manager; - void log(QString type,QString backup,QString message); + void log(TQString type,TQString backup,TQString message); }; #endif