Compare commits

...

122 Commits

Author SHA1 Message Date
TDE Gitea a14a938bf9 Reset submodule main/core/tdepim/admin to latest HEAD
1 year ago
Slávek Banko f83650cc20
Raise the minimum required version of CMake to 3.1.
1 year ago
Slávek Banko 146329630e
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
2 years ago
TDE Gitea 9634cf3acd Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea be4172779b Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea 338666666f Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea 438d4e0409 Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea ddaa78b4bd Reset submodule main/core/tdepim/admin to latest HEAD
2 years ago
TDE Gitea b51f5868e5 Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea 485c82f06a Reset submodule main/core/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea c4f3e879cc Reset submodule main/core/tdepim/admin to latest HEAD
2 years ago
TDE Gitea a5986e0d44 Reset submodule main/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea c951676841 Reset submodule main/tdepim/admin to latest HEAD
2 years ago
TDE Gitea ca56f84e3d Reset submodule main/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea 53850c5135 Reset submodule main/tdepim/admin to latest HEAD
2 years ago
TDE Gitea 3fd5014b32 Reset submodule main/tdepim/cmake to latest HEAD
2 years ago
TDE Gitea f54451b6d1 Reset submodule main/tdepim/admin to latest HEAD
2 years ago
TDE Gitea c5947ecdc9 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea df33596221 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 45e2e46f99 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea a24b44d221 Reset submodule main/tdepim/admin to latest HEAD
3 years ago
TDE Gitea 5b728b5111 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea dc01aea4e2 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 0faafbc377 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 6cc170dd78 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 152e91611c Reset submodule main/tdepim/admin to latest HEAD
3 years ago
TDE Gitea ce0ee05587 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 7c4925fc0a Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea cfb3f038a4 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea e1a4fdd4d4 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 3bde248449 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea d8c666124f Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 142ae2acf3 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 7463366c7a Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
TDE Gitea 7defd5a171 Reset submodule main/tdepim/cmake to latest HEAD
3 years ago
Slávek Banko 0fbf6e65a4
Switch all submodules to https.
3 years ago
TDE Gitea 04adf69f04 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 370b3b369b Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 1dedc518b2 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 34c9c9328f Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 0d0c96783c Reset submodule main/tdepim/admin to latest HEAD
4 years ago
TDE Gitea d884bb3af2 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 4de35013a3 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 6d81a99204 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea ebececed28 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 587194d4a7 Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea b8e4e30c4e Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea e645c5d59d Reset submodule main/tdepim/admin to latest HEAD
4 years ago
TDE Gitea 5f09dc115c Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 616ef6128e Reset submodule main/tdepim/cmake to latest HEAD
4 years ago
TDE Gitea 50cbd0c367 Reset submodule main/tdepim/admin to latest HEAD
4 years ago
Slávek Banko 654aae58be Reset submodule main/tdepim/admin to latest HEAD
5 years ago
Slávek Banko 1059a482de Reset submodule main/tdepim/admin to latest HEAD
5 years ago
Slávek Banko 64c1ed395d Reset submodule main/tdepim/admin to latest HEAD
5 years ago
Slávek Banko 2dafd92ace Reset submodule main/tdepim/cmake to latest HEAD
6 years ago
Slávek Banko c4e9485fab Reset submodule main/tdepim/admin to latest HEAD
7 years ago
Slávek Banko d89a476ae4 Reset submodule main/tdepim/cmake to latest HEAD
7 years ago
Slávek Banko 7f51d84e7b Reset submodule main/tdepim/admin to latest HEAD
7 years ago
Slávek Banko 84caa32d49 Fix IMAP parsing mistakes due to internal memory errors
10 years ago
Slávek Banko 6c74b8921a Reset submodule main/tdepim/admin to latest HEAD
10 years ago
Darrell Anderson 683112f000 Cleanup output clutter.
10 years ago
Darrell Anderson 3edbad576c Fix typos.
10 years ago
Timothy Pearson 5b94ddbf72 Fix retriggering of GPGMe socket notifiers in nested event loops
10 years ago
Slávek Banko 0cd5714096 Fix memory leak in karm idle detector
10 years ago
Slávek Banko ce92ecdbbd Reset submodule main/tdepim/admin to latest HEAD
10 years ago
Slávek Banko 1134502d2b Add CMake option to build karm with xscreensaver support
10 years ago
Timothy Pearson 1ab2350d42 Add Email file service menu to kmail
10 years ago
Slávek Banko 4529460680 Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Slávek Banko e545fc638b Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Slávek Banko 4308b0345d Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Slávek Banko dad4e183c4 Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Slávek Banko be31ca13ed Reset submodule main/tdepim/admin to latest HEAD
10 years ago
Darrell Anderson d42076f187 Fix references to user profile directory.
10 years ago
Darrell Anderson 99522ebebf Fix inadvertent tq changes.
10 years ago
Darrell Anderson 76ce676201 Fix inadvertent tq changes.
10 years ago
Darrell Anderson 4d87ac726e Remove unnecessary language.
10 years ago
Darrell Anderson 9a6b614070 Fix inadvertent tqt changes.
10 years ago
Darrell Anderson 9701dcae66 Fix inadvertent tq changes.
10 years ago
Slávek Banko 052f2735cd Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Darrell Anderson a34b0b48eb Change ${INCLUDE_INSTALL_DIR}/tde -> ${INCLUDE_INSTALL_DIR}.
10 years ago
Slávek Banko 50f01165ea Reset submodule main/tdepim/cmake to latest HEAD
10 years ago
Slávek Banko 9b7b86f1d8 Reset submodule main/tdepim/admin to latest HEAD
10 years ago
Slávek Banko 1a0e1c584f Fix another endless loop in imapparser
11 years ago
Slávek Banko 9dc91538a9 Fix more SEGV in imapparser
11 years ago
Slávek Banko e3cb7a61df Fix the addquotes/removequots functions in libkmime
11 years ago
Slávek Banko 4af20ec805 Update final HTML install path so all modules are consistent.
11 years ago
Slávek Banko 3e4a2e8ec1 Removed knotes window resizing for RichText toolbar
11 years ago
Slávek Banko be2f7aa795 Updated holiday_sk and added to the installation
11 years ago
Darrell Anderson 0a258d54c4 Add image files from commit f1ec987d.
11 years ago
Darrell Anderson f4b90f9a08 Add missing kandy icons. This resolves bug report 1013.
11 years ago
Timothy Pearson ac7c9c459a Fix disconnected signals introduced in KDE SVN commit 641050
11 years ago
Slávek Banko a1ca48332c Added DCOP interface to the kmail composer window
11 years ago
Timothy Pearson 97ec1bacd1 Disable unneccesary fsync() in cached IMAP handler
11 years ago
Timothy Pearson ab5822e18c Fix FTBFS
11 years ago
Slávek Banko 98ca007c6f Fix knotes repeated reduction in RichText mode
11 years ago
Darrell Anderson 8959375f43 Update kalarmd icon reference, which does not exist, to kalarm.
11 years ago
Slávek Banko 3d99c1cbba Fix segfault in IMAP folder parsing
11 years ago
Slávek Banko ead8cb696e Fix long response time on large IMAP folders
11 years ago
Timothy Pearson b60e74f6ad Fix IMAP hang on auth failure
11 years ago
Slávek Banko 70ab4a6893 Fix KMail counting of unread messages in the system tray icon
11 years ago
Slávek Banko bfc5ca6c3f Fix knotes to not close notes during saving session.
11 years ago
Darrell Anderson 097fc893cb Fix knotes not appearing on the desktop when a session is restored.
11 years ago
Darrell Anderson 52eefd582e Further organize KDE Menu.
11 years ago
Darrell Anderson df73372c29 Remove "More Applications" from KDE menu. Add Office category to KOrn.
11 years ago
Darrell Anderson f5790dac65 Reverse patch from GIT hash 33e649c9.
11 years ago
Darrell Anderson a5965a5571 GCC 4.7 fix.
11 years ago
Darrell Anderson 9c066e9107 GCC 4.7 fix.
11 years ago
Darrell Anderson 7a135f8461 Fix inadvertent "TQ" changes.
11 years ago
Timothy Pearson 7a3c5f4774 Terminate kdDebug calls with newlines
11 years ago
Timothy Pearson f4b37d7631 Fix linear alphabet string errors
11 years ago
Timothy Pearson 1c7ec66396 Fix FTBFS
11 years ago
Timothy Pearson c34a46b466 Fix a number of build warnings
11 years ago
Timothy Pearson 6d45b35a4a Fix reference to temporary in libemailfunctions
11 years ago
Timothy Pearson 987ff38c02 Fix inadvertent TQt changes
11 years ago
Timothy Pearson ebf706e3c9 Fix FTBFS
11 years ago
Timothy Pearson 33032a31b3 Fix FTBFS
11 years ago
Timothy Pearson 1d7f2552fa Rename a few stragglers
11 years ago
Timothy Pearson c4b3c076ff Rename obsolete tq methods to standard names
11 years ago
Timothy Pearson 04b89c2dbd Fix a few strings that contain Status
11 years ago
Timothy Pearson ad4317e2e0 Remove additional unneeded tq method conversions
11 years ago
Timothy Pearson e3649f7442 Rename old tq methods that no longer need a unique name
11 years ago
Slávek Banko 4b4a3f32d8 Add common directories
11 years ago

3
.gitmodules vendored

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

@ -9,7 +9,7 @@
#
#################################################
cmake_minimum_required( VERSION 2.8 )
cmake_minimum_required( VERSION 3.1 )
##### general package setup #####################
@ -71,6 +71,7 @@ option( WITH_SCALIX "Enable scalix support" OFF )
option( WITH_CALDAV "Enable caldav support" OFF )
option( WITH_CARDDAV "Enable carddav support" OFF )
option( WITH_INDEXLIB "Enable indexlib support (in kmail)" OFF )
option( WITH_XSCREENSAVER "Enable xscreensaver support (idle detection in karm)" OFF )
if( NOT WITH_ARTS )
set( WITHOUT_ARTS 1 )

@ -135,8 +135,95 @@ if( BUILD_LIBKDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
if( NOT HAVE_GPGME_0_4_BRANCH )
message( STATUS " found 'gpgme', version ${GPGME_VERSION}" )
endif( )
# check for various GPGME features
tde_save( CMAKE_CXX_FLAGS )
tde_save( CMAKE_REQUIRED_LIBRARIES )
string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
# See FIXME above regarding -D_FILE_OFFSET_BITS=64
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GPGME_INCLUDE_DIRS} -D_FILE_OFFSET_BITS=64")
set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}")
# check for GPGME_KEYLIST_MODE_VALIDATE
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
gpgme_keylist_mode_t mode = GPGME_KEYLIST_MODE_VALIDATE;
};"
HAVE_GPGME_KEYLIST_MODE_VALIDATE )
# check for gpgme_cancel
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
gpgme_ctx_t ctx = 0;
gpgme_error_t e = gpgme_cancel( ctx );
};"
HAVE_GPGME_CANCEL )
# check for gpgme_key_t->keylist_mode
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
gpgme_key_t key = 0;
key->keylist_mode = 0;
};"
HAVE_GPGME_KEY_T_KEYLIST_MODE )
# check for gpgme_decrypt_result_t->wrong_key_usage
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
gpgme_decrypt_result_t res;
unsigned int wku = res->wrong_key_usage;
};"
HAVE_GPGME_WRONG_KEY_USAGE )
# check for GPGME_INCLUDE_CERTS_DEFAULT
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
int i = GPGME_INCLUDE_CERTS_DEFAULT;
};"
HAVE_GPGME_INCLUDE_CERTS_DEFAULT )
# check for gpgme_op_getauditlog
check_cxx_source_compiles("
#include <gpgme.h>
int main() {
gpgme_ctx_t ctx = 0;
gpgme_data_t data = 0;
unsigned int flags = 0;
gpgme_error_t e = gpgme_op_getauditlog( ctx, data, flags );
};"
HAVE_GPGME_OP_GETAUDITLOG )
# done checking for GPGME features
tde_restore( CMAKE_CXX_FLAGS )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
endif( )
if( BUILD_KARM AND WITH_XSCREENSAVER )
check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xscrnsaver )
else( )
check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xext )
endif( )
endif( )
check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
set( HAVE_LIBXSS 1 )
else( )
tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
endif( )
endif( )
# required stuff
find_package( TQt )
find_package( TDE )

@ -66,7 +66,7 @@ Problems addressed
------------------
* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
@ -551,7 +551,7 @@ Problems addressed
* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
*Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
* Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------
* Prevent crash after changing the tqlayout and replying then. (778728)
* Prevent crash after changing the layout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@ -1960,7 +1960,7 @@ Bugfixes
deleted without ever having been initialised. Also init some other vars ASAP. (700035)
- kolab/issue1712 Update revision when adding new attendees.(663228)
- kolab/issue1672 Make sure to open the folder when saving a single message as well.(664661)
- Fix lack of double-quotes around folder name, making GEQUOTAROOT fail on folders with a space in the
- Fix lack of double-quotes around folder name, making GETQUOTAROOT fail on folders with a space in the
name.(665276)
- Port the ability to add and remove subfolders from korganizer's resource view from proko2. (665274)
- kolab/issue1721 Don't exit when the popup menu is canceled.(665679)
@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
- proko35 W1-9 icon tqalignment was improved.
- proko35 W1-9 icon alignment was improved.
Additional Fixes
================

@ -0,0 +1 @@
Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

@ -39,7 +39,7 @@ link_directories(
install( FILES
plugin.h articleinterceptor.h akregator_export.h storage.h
feedstorage.h storagefactory.h storagefactoryregistry.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kde/akregator )
DESTINATION ${INCLUDE_INSTALL_DIR}/akregator )
##### other data ################################

@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
feedURL.prepend("http://");
f->setXmlUrl(feedURL);
widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
connect( feed, TQT_SIGNAL(fetched(Feed* )),
this, TQT_SLOT(fetchCompleted(Feed *)) );
@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
void AddFeedDialog::fetchError(Feed *)
{
KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
KDialogBase::slotCancel();
}

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@ -75,7 +75,7 @@
<property name="name">
<cstring>urlEdit</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
<string>tqStatus</string>
<string>Status</string>
</property>
</widget>
<spacer>
@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>

@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TQStringList storageParams;
storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
if (factory != 0)
{
@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
{
m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
}
Filters::ArticleFilterList list;
@ -194,7 +194,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
m_extension = new BrowserExtension(this, "ak_extension");
connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&)));
connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
initFonts();
RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
}
void Part::loadPlugins()
@ -428,11 +428,11 @@ bool Part::openFile()
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
}
if (!doc.setContent(listBackup))
@ -444,10 +444,10 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") );
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
}
m_view->loadFeeds(createDefaultFeedList());
}
@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
if (file.open(IO_WriteOnly) == false)
{
//FIXME: allow to save the feedlist into different location -tpr 20041118
KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
return;
}
@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
{
// this is a dirty fix to get the main window used for the tray icon
TQWidgetList *l = kapp->tqtopLevelWidgets();
TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;
@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
if (doc.setContent(TQByteArray(file.readAll())))
m_view->importFeeds(doc);
else
KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
}
else
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
if (isRemote)
KIO::NetAccess::removeTempFile(filename);
@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
if ( file.exists() &&
KMessageBox::questionYesNo(m_view,
i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
i18n("Export"),
i18n("Overwrite"),
KStdGuiItem::cancel()) == KMessageBox::No )
@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
if ( !file.open(IO_WriteOnly) )
{
KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
return;
}
@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
"can cause the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.tqarg( programName, programName, backendName );
.arg( programName, programName, backendName );
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
// even think about changing the above to .tqarg( programName ).
// even think about changing the above to .arg( programName ).
else
msg = i18n("<qt>%1 seems to be running on another display on this "
"machine. <b>Running %1 and %2 at the same "
@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
"the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.tqarg( oldProgramName, programName, backendName );
.arg( oldProgramName, programName, backendName );
}
else
{
@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that it is "
"not already running on %2.</qt>")
.tqarg( programName, oldHostName, backendName );
.arg( programName, oldHostName, backendName );
else
msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
"same time is not supported by the %4 backend and can cause "
@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %1 is "
"not running on %3.</qt>")
.tqarg( oldProgramName, programName, oldHostName, backendName );
.arg( oldProgramName, programName, oldHostName, backendName );
}
KCursorSaver idle( KBusyPtr::idle() );

@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
virtual bool visitTagNode(TagNode* node)
{
TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
{
Tag tag = node->tag();
@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
else
msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
else
msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSetqStatus(Settings::statusFilter());
m_searchBar->slotSetStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}
@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon)
void View::connectFrame(Frame *f)
{
connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&)));
connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
@ -465,10 +465,10 @@ void View::connectFrame(Frame *f)
connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
}
void View::sloStatusText(const TQString &c)
void View::slotStatusText(const TQString &c)
{
if (sender() == m_currentFrame)
emit seStatusBarText(c);
emit setStatusBarText(c);
}
void View::slotCaptionChanged(const TQString &c)
@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f)
emit setWindowCaption(f->caption());
emit setProgress(f->progress());
emit seStatusBarText(f->statusText());
emit setStatusBarText(f->statusText());
if (f->part() == m_part)
m_part->mergePart(m_articleViewer);
@ -884,7 +884,7 @@ void View::slotFeedAdd()
}
TreeNode* lastChild = group->tqchildren().last();
TreeNode* lastChild = group->children().last();
addFeed(TQString(), lastChild, group, false);
}
@ -1070,14 +1070,14 @@ void View::slotFetchingStarted()
{
m_mainFrame->setState(Frame::Started);
m_actionManager->action("feed_stop")->setEnabled(true);
m_mainFrame->seStatusText(i18n("Fetching Feeds..."));
m_mainFrame->setStatusText(i18n("Fetching Feeds..."));
}
void View::slotFetchingStopped()
{
m_mainFrame->setState(Frame::Completed);
m_actionManager->action("feed_stop")->setEnabled(false);
m_mainFrame->seStatusText(TQString());
m_mainFrame->setStatusText(TQString());
}
void View::slotFeedFetched(Feed *feed)
@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
a.setqStatus(Article::Read);
a.setStatus(Article::Read);
}
}
@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
case 0:
return;
case 1:
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::Read);
(*it).setStatus(Article::Read);
}
void View::slotTextToSpeechRequest()
@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::Unread);
(*it).setStatus(Article::Unread);
}
void View::slotSetSelectedArticleNew()
@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::New);
(*it).setStatus(Article::New);
}
void View::slotSetCurrentArticleReadDelayed()
@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
if (article.isNull())
return;
article.setqStatus(Article::Read);
article.setStatus(Article::Read);
}
void View::slotMouseOverInfo(const KFileItem *kifi)
@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
if (kifi)
{
KFileItem *k=(KFileItem*)kifi;
m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo());
m_mainFrame->setStatusText(k->url().prettyURL());//geStatusBarInfo());
}
else
{
m_mainFrame->seStatusText(TQString());
m_mainFrame->setStatusText(TQString());
}
}
@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
m_searchBar->slotSetText(config->readEntry("searchLine"));
int statusfilter = config->readNumEntry("searchCombo", -1);
if (statusfilter != -1)
m_searchBar->slotSetqStatus(statusfilter);
m_searchBar->slotSetStatus(statusfilter);
}
int selectedID = config->readNumEntry("selectedNodeID", -1);

@ -134,7 +134,7 @@ namespace Akregator {
void signalUnreadCountChanged(int);
void setWindowCaption(const TQString&);
void seStatusBarText(const TQString&);
void setStatusBarText(const TQString&);
void setProgress(int);
void signalStarted(KIO::Job*);
void signalCompleted();
@ -196,7 +196,7 @@ namespace Akregator {
void slotMouseOverInfo(const KFileItem *kifi);
/** sets the status bar text to a given string */
void sloStatusText(const TQString &);
void slotStatusText(const TQString &);
void slotStarted();
void slotCanceled(const TQString &);

@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/
enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
TQString guid;
Backend::FeedStorage* archive;
@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
if (article.meta("deleted") == "true")
{ // if article is in deleted state, we just add the status and omit the rest
d->status = Private::Read | Private::Deleted;
d->archive->setqStatus(d->guid, d->status);
d->archive->setStatus(d->guid, d->status);
}
else
{ // article is not deleted, let's add it to the archive
@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
d->archive->setCommentsLink(d->guid, article.commentsLink().url());
d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
d->archive->setAuthor(d->guid, article.author());
@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
int statusInt = status.toInt();
if (statusInt == New)
statusInt = Unread;
setqStatus(statusInt);
setStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
setqStatus(Read);
setStatus(Read);
d->status = Private::Deleted | Private::Read;
d->archive->setqStatus(d->guid, d->status);
d->archive->setStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);
if (d->feed)
@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}
void Article::setqStatus(int stat)
void Article::setStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
int oldtqStatus = status();
int oldStatus = status();
if (oldtqStatus != stat)
if (oldStatus != stat)
{
switch (stat)
{
@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
d->archive->setqStatus(d->guid, d->status);
d->archive->setStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this, oldtqStatus);
d->feed->setArticleChanged(*this, oldStatus);
}
}
@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
void Article::setKeep(bool keep)
{
d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
d->archive->setqStatus(d->guid, d->status);
d->archive->setStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}