kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge bleeding edge. bleeding edge is now again dead

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=558082
This commit is contained in:
Dirk Mueller 2006-07-04 17:09:53 +00:00
parent 91b7578268
commit e6040c725e
63 changed files with 167 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdepasswd/CMakeLists.txt
View file

@ -18,7 +18,7 @@ install(TARGETS kdepasswd DESTINATION bin)
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kdepasswd.desktop )
install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_DIR} )

6
kdepasswd/kcm/CMakeLists.txt
View file

@ -19,13 +19,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_useraccount )
target_link_libraries(kcm_useraccount konq ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDESU_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_useraccount )
install(TARGETS kcm_useraccount DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kcm_useraccount.desktop )
install_files( ${KCFG_INSTALL_DIR} FILES kcm_useraccount.kcfg kcm_useraccount_pass.kcfg )
install( FILES kcm_useraccount.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES kcm_useraccount.kcfg kcm_useraccount_pass.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )

2
kdepasswd/kcm/pics/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kdm/pics/users FILES Apple.png BeachBall.png Blowfish.png Bug.png Butterfly.png Car.png Cow.png Daemon.png Dog.png Elephant.png Flower.png Frog.png Ghost.png Guitar.png Heart.png Konqui.png Lion.png Monkey.png Penguin.png Pig.png Rabbit.png Ring.png Scream.png Shark.png Splash.png Star.png Teddybear.png Turtle.png )
install( FILES Apple.png BeachBall.png Blowfish.png Bug.png Butterfly.png Car.png Cow.png Daemon.png Dog.png Elephant.png Flower.png Frog.png Ghost.png Guitar.png Heart.png Konqui.png Lion.png Monkey.png Penguin.png Pig.png Rabbit.png Ring.png Scream.png Shark.png Splash.png Star.png Teddybear.png Turtle.png DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users )

6
keditbookmarks/CMakeLists.txt
View file

@ -44,15 +44,15 @@ kde4_add_kdeinit_executable( keditbookmarks ${keditbookmarks_KDEINIT_SRCS})
target_link_libraries(kdeinit_keditbookmarks ${KDE4_KDECORE_LIBS} konq )
install_targets(${LIB_INSTALL_DIR} kdeinit_keditbookmarks )
install(TARGETS kdeinit_keditbookmarks DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( keditbookmarks kdeinit_keditbookmarks )
install(TARGETS keditbookmarks DESTINATION bin)
########### install files ###############
install_files( ${KCFG_INSTALL_DIR} FILES keditbookmarks.kcfg )
install_files( ${DATA_INSTALL_DIR}/keditbookmarks FILES keditbookmarksui.rc keditbookmarks-genui.rc )
install( FILES keditbookmarks.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES keditbookmarksui.rc keditbookmarks-genui.rc DESTINATION ${DATA_INSTALL_DIR}/keditbookmarks )
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )

8
kfind/CMakeLists.txt
View file

@ -18,7 +18,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kfindpart )
target_link_libraries(kfindpart ${KDE4_KDE3SUPPORT_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} kfindpart )
install(TARGETS kfindpart DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -36,9 +36,9 @@ install(TARGETS kfind DESTINATION bin)
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES Kfind.desktop )
install_files( ${SERVICETYPES_INSTALL_DIR} FILES findpart.desktop )
install_files( ${SERVICES_INSTALL_DIR} FILES kfindpart.desktop )
install( FILES Kfind.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES findpart.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kfindpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
kde4_install_icons( ${ICON_INSTALL_DIR} hicolor )

2
kfind/pics/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kfindpart/icons FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kfindpart/icons )

24
konqueror/CMakeLists.txt
View file

@ -61,7 +61,7 @@ kde4_add_kdeinit_executable( konqueror ${konqueror_KDEINIT_SRCS})
target_link_libraries(kdeinit_konqueror ${KDE4_KDE3SUPPORT_LIBS} kutils konq )
install_targets(${LIB_INSTALL_DIR} kdeinit_konqueror )
install(TARGETS kdeinit_konqueror DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( konqueror kdeinit_konqueror )
install(TARGETS konqueror DESTINATION bin)
@ -69,18 +69,18 @@ install(TARGETS konqueror DESTINATION bin)
########### install files ###############
install_files( ${APPLNK_INSTALL_DIR}/.hidden FILES konqfilemgr.desktop )
install_files( ${XDG_APPS_DIR} FILES kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop )
install_files( ${KCFG_INSTALL_DIR} FILES konqueror.kcfg )
install_files( ${APPLNK_INSTALL_DIR} FILES konqueror.desktop )
install_files( ${DATA_INSTALL_DIR}/konqueror FILES konqueror.rc konq-simplebrowser.rc )
install( FILES konqfilemgr.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )
install( FILES kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES konqueror.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES konqueror.desktop DESTINATION ${APPLNK_INSTALL_DIR} )
install( FILES konqueror.rc konq-simplebrowser.rc DESTINATION ${DATA_INSTALL_DIR}/konqueror )
install(FILES profile_webbrowsing.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME webbrowsing)
install(FILES profile_filemanagement.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME filemanagement)
install(FILES profile_midnightcommander.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME midnightcommander)
install(FILES profile_tabbedbrowsing.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME tabbedbrowsing)
install(FILES profile_kde_devel.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME kde_devel)
install(FILES profile_simplebrowser.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME simplebrowser)
install(FILES profile_webbrowsing.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME webbrowsing)
install(FILES profile_filemanagement.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME filemanagement)
install(FILES profile_midnightcommander.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME midnightcommander)
install(FILES profile_tabbedbrowsing.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME tabbedbrowsing)
install(FILES profile_kde_devel.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME kde_devel)
install(FILES profile_simplebrowser.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/profiles/ RENAME simplebrowser)

8
konqueror/about/CMakeLists.txt
View file

@ -13,14 +13,14 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_aboutpage )
target_link_libraries(konq_aboutpage ${KDE4_KDECORE_LIBS} khtml kdeui kparts ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} konq_aboutpage )
install(TARGETS konq_aboutpage DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/about FILES box-centre-konqueror.png top-right-konqueror.png lightning.png launch.html intro.html specs.html tips.html plugins.html plugins_rtl.html konq.css )
install_files( ${SERVICETYPES_INSTALL_DIR} FILES konqaboutpage.desktop )
install_files( ${SERVICES_INSTALL_DIR} FILES konq_aboutpage.desktop )
install( FILES box-centre-konqueror.png top-right-konqueror.png lightning.png launch.html intro.html specs.html tips.html plugins.html plugins_rtl.html konq.css DESTINATION ${DATA_INSTALL_DIR}/konqueror/about )
install( FILES konqaboutpage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES konq_aboutpage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

28
konqueror/about/konq_aboutpage.cc
View file

@ -90,7 +90,7 @@ QString KonqAboutPageFactory::launch()
if ( s_launch_html )
return *s_launch_html;
QString res = loadFile( locate( "data", "konqueror/about/launch.html" ));
QString res = loadFile( KStandardDirs::locate( "data", "konqueror/about/launch.html" ));
if ( res.isEmpty() )
return res;
@ -105,9 +105,9 @@ QString KonqAboutPageFactory::launch()
QString home_folder = QDir::homePath();
QString continue_icon_path = QApplication::isRightToLeft()?iconloader->iconPath("1leftarrow", K3Icon::Small ):iconloader->iconPath("1rightarrow", K3Icon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
res = res.arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->layoutDirection() == Qt::RightToLeft )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
res = res.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
else
res = res.arg( "" );
@ -161,7 +161,7 @@ QString KonqAboutPageFactory::intro()
if ( s_intro_html )
return *s_intro_html;
QString res = loadFile( locate( "data", "konqueror/about/intro.html" ));
QString res = loadFile( KStandardDirs::locate( "data", "konqueror/about/intro.html" ));
if ( res.isEmpty() )
return res;
@ -170,9 +170,9 @@ QString KonqAboutPageFactory::intro()
QString gohome_icon_path = iconloader->iconPath("gohome", K3Icon::Small );
QString continue_icon_path = QApplication::isRightToLeft()?iconloader->iconPath("1leftarrow", K3Icon::Small ):iconloader->iconPath("1rightarrow", K3Icon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
res = res.arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->layoutDirection() == Qt::RightToLeft )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
res = res.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
else
res = res.arg( "" );
@ -220,14 +220,14 @@ QString KonqAboutPageFactory::specs()
return *s_specs_html;
KIconLoader *iconloader = KGlobal::iconLoader();
QString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
QString res = loadFile( KStandardDirs::locate( "data", "konqueror/about/specs.html" ));
QString continue_icon_path = QApplication::isRightToLeft()?iconloader->iconPath("1leftarrow", K3Icon::Small ):iconloader->iconPath("1rightarrow", K3Icon::Small );
if ( res.isEmpty() )
return res;
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
res = res.arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->layoutDirection() == Qt::RightToLeft )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
res = res.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
else
res = res.arg( "" );
@ -301,7 +301,7 @@ QString KonqAboutPageFactory::tips()
if ( s_tips_html )
return *s_tips_html;
QString res = loadFile( locate( "data", "konqueror/about/tips.html" ));
QString res = loadFile( KStandardDirs::locate( "data", "konqueror/about/tips.html" ));
if ( res.isEmpty() )
return res;
@ -322,9 +322,9 @@ QString KonqAboutPageFactory::tips()
iconloader->iconPath("view_left_right", K3Icon::Small );
QString continue_icon_path = QApplication::isRightToLeft()?iconloader->iconPath("1leftarrow", K3Icon::Small ):iconloader->iconPath("1rightarrow", K3Icon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
res = res.arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->layoutDirection() == Qt::RightToLeft )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
res = res.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
else
res = res.arg( "" );
@ -387,7 +387,7 @@ QString KonqAboutPageFactory::plugins()
if ( s_plugins_html )
return *s_plugins_html;
QString res = loadFile( locate( "data", kapp->layoutDirection() == Qt::RightToLeft ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
QString res = loadFile( KStandardDirs::locate( "data", kapp->layoutDirection() == Qt::RightToLeft ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
.arg(i18n("Installed Plugins"))
.arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
.arg(i18n("Installed"))
@ -501,7 +501,7 @@ void KonqAboutPage::urlSelected( const QString &url, int button, int state, cons
i18n("Faster Startup?"),i18n("Disable"),i18n("Keep") )
== KMessageBox::Yes )
{
QString profile = locateLocal("data", "konqueror/profiles/webbrowsing");
QString profile = KStandardDirs::locateLocal("data", "konqueror/profiles/webbrowsing");
KSaveFile file( profile );
if ( file.status() == 0 ) {
QByteArray content = "[Profile]\n"

6
konqueror/client/CMakeLists.txt
View file

@ -13,15 +13,15 @@ kde4_add_kdeinit_executable( kfmclient ${kfmclient_KDEINIT_SRCS})
target_link_libraries(kdeinit_kfmclient ${KDE4_KDE3SUPPORT_LIBS} )
install_targets(${LIB_INSTALL_DIR} kdeinit_kfmclient )
install(TARGETS kdeinit_kfmclient DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( kfmclient kdeinit_kfmclient )
install(TARGETS kfmclient DESTINATION bin)
########### install files ###############
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES kfmclient_3_2.upd )
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES kfmclient_3_2_update.sh )
install( FILES kfmclient_3_2.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES kfmclient_3_2_update.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

6
konqueror/dirpart/CMakeLists.txt
View file

@ -20,13 +20,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_part )
target_link_libraries(konq_part ${KDE4_KDECORE_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} konq_part )
install(TARGETS konq_part DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqpart FILES konq_listview.rc konq_iconview.rc )
install_files( ${SERVICES_INSTALL_DIR} FILES konq_listview.desktop konq_iconview4.desktop )
install( FILES konq_listview.rc konq_iconview.rc DESTINATION ${DATA_INSTALL_DIR}/konqpart )
install( FILES konq_listview.desktop konq_iconview4.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

6
konqueror/iconview/CMakeLists.txt
View file

@ -13,13 +13,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_iconview )
target_link_libraries(konq_iconview ${KDE4_KDECORE_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} konq_iconview )
install(TARGETS konq_iconview DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqiconview FILES konq_iconview.rc konq_multicolumnview.rc )
install_files( ${SERVICES_INSTALL_DIR} FILES konq_iconview.desktop konq_multicolumnview.desktop )
install( FILES konq_iconview.rc konq_multicolumnview.rc DESTINATION ${DATA_INSTALL_DIR}/konqiconview )
install( FILES konq_iconview.desktop konq_multicolumnview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

6
konqueror/konq_main.cc
View file

@ -64,7 +64,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log");
KTempFile crashlog_file(KStandardDirs::locateLocal("tmp", "konqueror-crash-"), ".log");
KonqMainWindow::s_crashlog_file = crashlog_file.file();
if ( app.isSessionRestored() )
@ -101,7 +101,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
QString profile = QString::fromLocal8Bit(args->getOption("profile"));
QString profilePath = profile;
if (profile[0] != '/')
profilePath = locate( "data", QLatin1String("konqueror/profiles/")+profile );
profilePath = KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/")+profile );
QString url;
QStringList filesToSelect;
if (args->count() == 1)
@ -153,7 +153,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
// By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager.
QString profile = "webbrowsing";
QString profilePath = locate( "data", QLatin1String("konqueror/profiles/")+profile );
QString profilePath = KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/")+profile );
if ( !profilePath.isEmpty() ) {
KonqMisc::createBrowserWindowFromProfile( profilePath, profile );
} else {

8
konqueror/konq_mainwindow.cc
View file

@ -1184,7 +1184,7 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url, const KParts::URLArgs
}
QString profileName = QLatin1String( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
KSimpleConfig cfg( locate( "data", profileName ), true );
KSimpleConfig cfg( KStandardDirs::locate( "data", profileName ), true );
cfg.setGroup( "Profile" );
if ( windowArgs.x != -1 )
@ -1293,7 +1293,7 @@ void KonqMainWindow::slotNewWindow()
profile = QLatin1String("filemanagement");
}
KonqMisc::createBrowserWindowFromProfile(
locate( "data", QLatin1String("konqueror/profiles/")+profile ),
KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/")+profile ),
profile );
}
@ -1480,7 +1480,7 @@ void KonqMainWindow::slotToolFind()
else
url.setPath( QDir::homePath() );
KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile(
locate( "data", QLatin1String("konqueror/profiles/filemanagement") ),
KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/filemanagement") ),
"filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
mw->m_paFindFiles->setChecked(true);
// Delay it after the openURL call (hacky!)
@ -1860,7 +1860,7 @@ void KonqMainWindow::slotGoSettings()
void KonqMainWindow::slotGoDirTree()
{
KUrl u;
u.setPath( locateLocal( "data", "konqueror/dirtree/" ) );
u.setPath( KStandardDirs::locateLocal( "data", "konqueror/dirtree/" ) );
openURL( 0, u );
}

2
konqueror/konq_misc.cc
View file

@ -108,7 +108,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const KParts::URLAr
KMimeType::findByURL(url)->name() == "text/html")
? "webbrowsing" : "filemanagement";
QString profile = locate( "data", QLatin1String("konqueror/profiles/") + profileName );
QString profile = KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/") + profileName );
return createBrowserWindowFromProfile(profile, profileName,
url, args,
forbidUseHTML, filesToSelect, tempFile, openURL );

6
konqueror/konq_tabs.cc
View file

@ -213,6 +213,12 @@ void KonqFrameTabs::saveConfig( KConfig* config, const QString &prefix, bool sav
void KonqFrameTabs::copyHistory( KonqFrameBase *other )
{
if( !other ) {
kDebug(1202) << "The Frame does not exist" << endl;
return;
}
if( other->frameType() != "Tabs" ) {
kDebug(1202) << "Frame types are not the same" << endl;
return;

2
konqueror/konq_viewmgr.cc
View file

@ -1066,7 +1066,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
void KonqViewManager::saveViewProfile( const QString & fileName, const QString & profileName, bool saveURLs, bool saveWindowSize )
{
QString path = locateLocal( "data", QString::fromLatin1( "konqueror/profiles/" ) +
QString path = KStandardDirs::locateLocal( "data", QString::fromLatin1( "konqueror/profiles/" ) +
fileName, KGlobal::instance() );
if ( QFile::exists( path ) )

4
konqueror/kttsplugin/CMakeLists.txt
View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} khtmlkttsdplugin )
target_link_libraries(khtmlkttsdplugin ${KDE4_KPARTS_LIBS} khtml )
install_targets(${PLUGIN_INSTALL_DIR} khtmlkttsdplugin )
install(TARGETS khtmlkttsdplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/khtml/kpartplugins FILES khtmlkttsd.rc khtmlkttsd.desktop )
install( FILES khtmlkttsd.rc khtmlkttsd.desktop DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins )

8
konqueror/listview/CMakeLists.txt
View file

@ -24,14 +24,14 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_listview )
target_link_libraries(konq_listview ${KDE4_KDECORE_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} konq_listview )
install(TARGETS konq_listview DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${KCFG_INSTALL_DIR} FILES konq_listview.kcfg )
install_files( ${DATA_INSTALL_DIR}/konqlistview FILES konq_treeview.rc konq_detailedlistview.rc konq_textview.rc konq_infolistview.rc )
install_files( ${SERVICES_INSTALL_DIR} FILES konq_treeview.desktop konq_detailedlistview.desktop konq_textview.desktop konq_infolistview.desktop )
install( FILES konq_listview.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES konq_treeview.rc konq_detailedlistview.rc konq_textview.rc konq_infolistview.rc DESTINATION ${DATA_INSTALL_DIR}/konqlistview )
install( FILES konq_treeview.desktop konq_detailedlistview.desktop konq_textview.desktop konq_infolistview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

2
konqueror/pics/actions/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/icons FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/konqueror/icons )

2
konqueror/pics/indicators/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/pics FILES indicator_connect.png indicator_noconnect.png indicator_empty.png indicator_viewactive.png )
install( FILES indicator_connect.png indicator_noconnect.png indicator_empty.png indicator_viewactive.png DESTINATION ${DATA_INSTALL_DIR}/konqueror/pics )

2
konqueror/pics/tiles/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/tiles FILES bluemorning.png canvas.png kde4ever.png kenwimer.png noise.png paper_flieder.png redfiber.png )
install( FILES bluemorning.png canvas.png kde4ever.png kenwimer.png noise.png paper_flieder.png redfiber.png DESTINATION ${DATA_INSTALL_DIR}/konqueror/tiles )

4
konqueror/preloader/CMakeLists.txt
View file

@ -15,13 +15,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kded_konqy_preloader )
target_link_libraries(kded_konqy_preloader ${KDE4_KDEUI_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kded_konqy_preloader )
install(TARGETS kded_konqy_preloader DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( /share/autostart FILES konqy_preload.desktop )
install_files( ${SERVICES_INSTALL_DIR}/kded FILES konqy_preloader.desktop )
install( FILES konqy_preloader.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )

2
konqueror/quickprint/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/servicemenus FILES text-print.desktop text-html-print.desktop text-css-print.desktop text-ada-print.desktop text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-diff-print.desktop text-java-print.desktop text-log-print.desktop text-makefile-print.desktop text-pas-print.desktop text-perl-print.desktop text-python-print.desktop text-tcl-print.desktop text-tex-print.desktop text-xslt-print.desktop text-xml-print.desktop )
install( FILES text-print.desktop text-html-print.desktop text-css-print.desktop text-ada-print.desktop text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-diff-print.desktop text-java-print.desktop text-log-print.desktop text-makefile-print.desktop text-pas-print.desktop text-perl-print.desktop text-python-print.desktop text-tcl-print.desktop text-tex-print.desktop text-xslt-print.desktop text-xml-print.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )

6
konqueror/remoteencodingplugin/CMakeLists.txt
View file

@ -13,13 +13,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_remoteencoding )
target_link_libraries(konq_remoteencoding ${KDE4_KDECORE_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} konq_remoteencoding )
install(TARGETS konq_remoteencoding DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqlistview/kpartplugins FILES kremoteencodingplugin.rc kremoteencodingplugin.desktop )
install_files( ${DATA_INSTALL_DIR}/konqiconview/kpartplugins FILES kremoteencodingplugin.rc kremoteencodingplugin.desktop )
install( FILES kremoteencodingplugin.rc kremoteencodingplugin.desktop DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins )
install( FILES kremoteencodingplugin.rc kremoteencodingplugin.desktop DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins )

6
konqueror/settings/css/CMakeLists.txt
View file

@ -15,13 +15,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_css )
target_link_libraries(kcm_css ${KDE4_KDE3SUPPORT_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_css )
install(TARGETS kcm_css DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kcmcss.desktop )
install_files( ${DATA_INSTALL_DIR}/kcmcss FILES template.css )
install( FILES kcmcss.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES template.css DESTINATION ${DATA_INSTALL_DIR}/kcmcss )

4
konqueror/settings/css/kcmcss.cpp
View file

@ -136,7 +136,7 @@ void CSSConfig::load()
customDialog->blackOnWhite->setChecked(m == "black-on-white");
customDialog->whiteOnBlack->setChecked(m == "white-on-black");
customDialog->customColor->setChecked(m == "custom");
QColor white (Qt::white);
QColor black (Qt::black);
customDialog->backgroundColorButton->setColor(c->readEntry("BackColor", white));
@ -191,7 +191,7 @@ void CSSConfig::save()
delete c;
// generate CSS template
QString templ = locate("data", "kcmcss/template.css");
QString templ = KStandardDirs::locate("data", "kcmcss/template.css");
QString dest;
if (!templ.isEmpty())
{

4
konqueror/settings/ebrowsing/CMakeLists.txt
View file

@ -11,12 +11,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kurifilt )
target_link_libraries(kcm_kurifilt ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kcm_kurifilt )
install(TARGETS kcm_kurifilt DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES ebrowsing.desktop )
install( FILES ebrowsing.desktop DESTINATION ${XDG_APPS_DIR} )

4
konqueror/settings/filetypes/CMakeLists.txt
View file

@ -15,7 +15,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_filetypes )
target_link_libraries(kcm_filetypes ${KDE4_KDE3SUPPORT_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_filetypes )
install(TARGETS kcm_filetypes DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -36,7 +36,7 @@ install(TARGETS keditfiletype DESTINATION bin)
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES filetypes.desktop )
install( FILES filetypes.desktop DESTINATION ${XDG_APPS_DIR} )

4
konqueror/settings/filetypes/filetypesview.cpp
View file

@ -250,7 +250,7 @@ void FileTypesView::addType()
if (m.exec()) {
Q3ListViewItemIterator it(typesLV);
QString loc = m.group() + "/" + m.text() + ".desktop";
loc = locateLocal("mime", loc);
loc = KStandardDirs::locate("mime", loc);
KMimeType::Ptr mimetype(new KMimeType(loc,
m.group() + "/" + m.text(),
QString(), QString(),
@ -364,7 +364,7 @@ bool FileTypesView::sync( QList<TypesListItem *>& itemsModified )
KMimeType::Ptr m_ptr = KMimeType::mimeType(*it);
loc = m_ptr->desktopEntryPath();
loc = locateLocal("mime", loc);
loc = KStandardDirs::locate("mime", loc);
KDesktopFile config(loc, false, "mime");
config.writeEntry("Type", "MimeType");

2
konqueror/settings/filetypes/keditfiletype.cpp
View file

@ -149,7 +149,7 @@ int main(int argc, char ** argv)
int inc = 0;
do {
++inc;
loc = locateLocal( "mime", mimeString.arg( inc ) + ".desktop" );
loc = KStandardDirs::locate( "mime", mimeString.arg( inc ) + ".desktop" );
}
while ( QFile::exists( loc ) );

6
konqueror/settings/filetypes/kservicelistwidget.cpp
View file

@ -49,14 +49,14 @@ KServiceListItem::KServiceListItem( KService::Ptr pService, int kind )
bool isApplication = pService->type() == "Application";
if (!isApplication)
localPath = locateLocal("services", desktopPath);
localPath = KStandardDirs::locateLocal("services", desktopPath);
else
localPath = pService->locateLocal();
}
bool KServiceListItem::isImmutable()
{
return !checkAccess(localPath, W_OK);
return !KStandardDirs::checkAccess(localPath, W_OK);
}
KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *name)
@ -308,7 +308,7 @@ void KServiceListWidget::editService()
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
path = locate("apps", path);
path = KStandardDirs::locate("apps", path);
KUrl serviceURL;
serviceURL.setPath( path );
KFileItem item( serviceURL, "application/x-desktop", KFileItem::Unknown );

10
konqueror/settings/kio/CMakeLists.txt
View file

@ -44,15 +44,15 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kio )
target_link_libraries(kcm_kio ${KDE4_KDE3SUPPORT_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_kio )
install(TARGETS kcm_kio DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES cookies.desktop useragent.desktop cache.desktop lanbrowser.desktop netpref.desktop proxy.desktop )
install_files( ${SERVICETYPES_INSTALL_DIR} FILES uasprovider.desktop )
install_files( ${APPLNK_INSTALL_DIR}/.hidden FILES smb.desktop )
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES socks.upd )
install( FILES cookies.desktop useragent.desktop cache.desktop lanbrowser.desktop netpref.desktop proxy.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES uasprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES smb.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )
install( FILES socks.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
#original Makefile.am contents follow:

2
konqueror/settings/kio/uasproviders/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${SERVICES_INSTALL_DIR}/useragentstrings FILES ie401onwinnt4.desktop ie45onwinnt5.desktop ie501onwinnt5.desktop ie50onppc.desktop ie55onwin98.desktop ie55onwinnt5.desktop ie60onwinnt51.desktop ie60oncurrent.desktop mozonwinxp.desktop mozonwin2000.desktop mozoncurrent16.desktop mozoncurrent12.desktop mozoncurrent.desktop nn301oncurrent.desktop nn475onwin95.desktop nn475oncurrent.desktop nn476onppc.desktop op403onwinnt4.desktop lynxoncurrent.desktop w3moncurrent.desktop wgetoncurrent.desktop ns71oncurrent.desktop ns71onwinnt51.desktop op75oncurrent.desktop op85oncurrent.desktop safari12.desktop safari20.desktop googlebot.desktop firefox10oncurrent.desktop firefox15oncurrent.desktop )
install( FILES ie401onwinnt4.desktop ie45onwinnt5.desktop ie501onwinnt5.desktop ie50onppc.desktop ie55onwin98.desktop ie55onwinnt5.desktop ie60onwinnt51.desktop ie60oncurrent.desktop mozonwinxp.desktop mozonwin2000.desktop mozoncurrent16.desktop mozoncurrent12.desktop mozoncurrent.desktop nn301oncurrent.desktop nn475onwin95.desktop nn475oncurrent.desktop nn476onppc.desktop op403onwinnt4.desktop lynxoncurrent.desktop w3moncurrent.desktop wgetoncurrent.desktop ns71oncurrent.desktop ns71onwinnt51.desktop op75oncurrent.desktop op85oncurrent.desktop safari12.desktop safari20.desktop googlebot.desktop firefox10oncurrent.desktop firefox15oncurrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}/useragentstrings )

8
konqueror/settings/konq/CMakeLists.txt
View file

@ -24,14 +24,14 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_konq )
target_link_libraries(kcm_konq ${KDE4_KDE3SUPPORT_LIBS} kutils )
install_targets(${PLUGIN_INSTALL_DIR} kcm_konq )
install(TARGETS kcm_konq DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop )
install_files( ${APPLNK_INSTALL_DIR}/.hidden FILES filebehavior.desktop fileappearance.desktop filepreviews.desktop )
install_files( ${DATA_INSTALL_DIR}/kcontrol/pics FILES overlapping.png onlyone.png )
install( FILES desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES filebehavior.desktop fileappearance.desktop filepreviews.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )
install( FILES overlapping.png onlyone.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics )

6
konqueror/settings/konq/behaviour.cpp
View file

@ -63,7 +63,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, KInstance *
winPixmap = new QLabel(hbox);
winPixmap->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
winPixmap->setPixmap(QPixmap(locate("data",
winPixmap->setPixmap(QPixmap(KStandardDirs::locate("data",
"kcontrol/pics/onlyone.png")));
winPixmap->setFixedSize( winPixmap->sizeHint() );
@ -291,10 +291,10 @@ void KBehaviourOptions::save()
void KBehaviourOptions::updateWinPixmap(bool b)
{
if (b)
winPixmap->setPixmap(QPixmap(locate("data",
winPixmap->setPixmap(QPixmap(KStandardDirs::locate("data",
"kcontrol/pics/overlapping.png")));
else
winPixmap->setPixmap(QPixmap(locate("data",
winPixmap->setPixmap(QPixmap(KStandardDirs::locate("data",
"kcontrol/pics/onlyone.png")));
}

4
konqueror/settings/konqhtml/CMakeLists.txt
View file

@ -29,12 +29,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_konqhtml )
target_link_libraries(kcm_konqhtml ${KDE4_KDE3SUPPORT_LIBS} khtml)
install_targets(${PLUGIN_INSTALL_DIR} kcm_konqhtml )
install(TARGETS kcm_konqhtml DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop )
install( FILES khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop DESTINATION ${XDG_APPS_DIR} )

2
konqueror/settings/konqhtml/pluginopts.cpp
View file

@ -556,7 +556,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
QRegExp version(";version=[^:]*:");
// open the cache file
QFile cachef( locate("data", "nsplugins/cache") );
QFile cachef( KStandardDirs::locate("data", "nsplugins/cache") );
if ( !cachef.exists() || !cachef.open(QIODevice::ReadOnly) ) {
kDebug() << "Could not load plugin cache file!" << endl;
return;

6
konqueror/settings/performance/CMakeLists.txt
View file

@ -15,13 +15,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_performance )
target_link_libraries(kcm_performance ${KDE4_KDE3SUPPORT_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_performance )
install(TARGETS kcm_performance DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kcmperformance.desktop )
install_files( ${APPLNK_INSTALL_DIR}/.hidden FILES kcmkonqyperformance.desktop )
install( FILES kcmperformance.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES kcmkonqyperformance.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )

6
konqueror/shellcmdplugin/CMakeLists.txt
View file

@ -13,13 +13,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_shellcmdplugin )
target_link_libraries(konq_shellcmdplugin ${KDE4_KDECORE_LIBS} konq ${KDE4_KDESU_LIBS})
install_targets(${PLUGIN_INSTALL_DIR} konq_shellcmdplugin )
install(TARGETS konq_shellcmdplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqlistview/kpartplugins FILES kshellcmdplugin.rc kshellcmdplugin.desktop )
install_files( ${DATA_INSTALL_DIR}/konqiconview/kpartplugins FILES kshellcmdplugin.rc kshellcmdplugin.desktop )
install( FILES kshellcmdplugin.rc kshellcmdplugin.desktop DESTINATION ${DATA_INSTALL_DIR}/konqlistview/kpartplugins )
install( FILES kshellcmdplugin.rc kshellcmdplugin.desktop DESTINATION ${DATA_INSTALL_DIR}/konqiconview/kpartplugins )

12
konqueror/sidebar/CMakeLists.txt
View file

@ -16,7 +16,7 @@ kde4_add_library(konqsidebarplugin SHARED ${konqsidebarplugin_LIB_SRCS})
target_link_libraries(konqsidebarplugin ${KDE4_KDECORE_LIBS} kparts )
set_target_properties(konqsidebarplugin PROPERTIES VERSION 1.2.0 SOVERSION 1 )
install_targets(${LIB_INSTALL_DIR} konqsidebarplugin )
install(TARGETS konqsidebarplugin DESTINATION ${LIB_INSTALL_DIR} )
########### next target ###############
@ -31,16 +31,16 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_sidebar )
target_link_libraries(konq_sidebar ${KDE4_KDECORE_LIBS} kparts kio konq konqsidebarplugin kutils )
install_targets(${PLUGIN_INSTALL_DIR} konq_sidebar )
install(TARGETS konq_sidebar DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${SERVICES_INSTALL_DIR} FILES konq_sidebartng.desktop )
install_files( ${CONFIG_INSTALL_DIR} FILES konqsidebartng.rc )
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/entries/ FILES .version )
install( FILES konq_sidebartng.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES konqsidebartng.rc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES .version DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries/ )
install_files( /include FILES konqsidebarplugin.h )
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES konqsidebartng.upd move_konqsidebartng_entries.sh )
install( FILES konqsidebartng.upd move_konqsidebartng_entries.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

6
konqueror/sidebar/sidebar_widget.cpp
View file

@ -135,12 +135,12 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p
tmp.prepend("/konqsidebartng/" + profile + "/entries/");
}
filename = tmp.arg("");
myFile = locateLocal("data", filename);
myFile = KStandardDirs::locateLocal("data", filename);
if (QFile::exists(myFile)) {
for (ulong l = 0; l < ULONG_MAX; l++) {
filename = tmp.arg(l);
myFile = locateLocal("data", filename);
myFile = KStandardDirs::locateLocal("data", filename);
if (!QFile::exists(myFile)) {
break;
} else {
@ -317,7 +317,7 @@ void Sidebar_Widget::addWebSideBar(const KUrl& url, const QString& /*name*/) {
KStandardDirs *dirs = KGlobal::dirs();
QString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);
list = KStandardDirs::locateLocal("data", m_relPath);
// Go through list to see which ones exist. Check them for the URL
QStringList files = QDir(list).entryList("websidebarplugin*.desktop");

4
konqueror/sidebar/test/CMakeLists.txt
View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_sidebartest )
target_link_libraries(konq_sidebartest ${KDE4_KDECORE_LIBS} kparts kio konqsidebarplugin )
install_targets(${PLUGIN_INSTALL_DIR} konq_sidebartest )
install(TARGETS konq_sidebartest DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/entries FILES test.desktop )
install( FILES test.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )

2
konqueror/sidebar/trees/CMakeLists.txt
View file

@ -26,7 +26,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konqsidebar_tree )
target_link_libraries(konqsidebar_tree ${KDE4_KDECORE_LIBS} konq konqsidebarplugin )
install_targets(${PLUGIN_INSTALL_DIR} konqsidebar_tree )
install(TARGETS konqsidebar_tree DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############

2
konqueror/sidebar/trees/bookmark_module/CMakeLists.txt
View file

@ -17,7 +17,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_sidebartree_bookmarks )
target_link_libraries(konq_sidebartree_bookmarks ${KDE4_KDEUI_LIBS} konqsidebarplugin konq)
install_targets(${PLUGIN_INSTALL_DIR} konq_sidebartree_bookmarks )
install(TARGETS konq_sidebartree_bookmarks DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############

2
konqueror/sidebar/trees/dirtree_module/CMakeLists.txt
View file

@ -17,7 +17,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_sidebartree_dirtree )
target_link_libraries(konq_sidebartree_dirtree ${KDE4_KDE3SUPPORT_LIBS} konq konqsidebarplugin )
install_targets(${PLUGIN_INSTALL_DIR} konq_sidebartree_dirtree )
install(TARGETS konq_sidebartree_dirtree DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############

6
konqueror/sidebar/trees/history_module/CMakeLists.txt
View file

@ -18,7 +18,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konq_sidebartree_history )
target_link_libraries(konq_sidebartree_history ${KDE4_KDEUI_LIBS} konqsidebarplugin konq )
install_targets(${PLUGIN_INSTALL_DIR} konq_sidebartree_history )
install(TARGETS konq_sidebartree_history DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -36,12 +36,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_history )
target_link_libraries(kcm_history ${KDE4_KDEUI_LIBS} konq )
install_targets(${PLUGIN_INSTALL_DIR} kcm_history )
install(TARGETS kcm_history DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kcmhistory.desktop )
install( FILES kcmhistory.desktop DESTINATION ${XDG_APPS_DIR} )

8
konqueror/sidebar/trees/init/CMakeLists.txt
View file

@ -6,10 +6,10 @@ add_subdirectory( services )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop )
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/dirtree FILES history_module.desktop dirtree_module.desktop bookmarks_module.desktop )
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/add FILES virtualfolderadd.desktop )
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/entries FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop system.desktop )
install( FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries )
install( FILES history_module.desktop dirtree_module.desktop bookmarks_module.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/dirtree )
install( FILES virtualfolderadd.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add )
install( FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop system.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )

2
konqueror/sidebar/trees/init/remote/CMakeLists.txt
View file

@ -6,7 +6,7 @@ add_subdirectory( web )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote FILES .directory )
install( FILES .directory DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote )

2
konqueror/sidebar/trees/init/remote/ftp/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/ftp FILES .directory kde_ftp.desktop )
install( FILES .directory kde_ftp.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/ftp )

2
konqueror/sidebar/trees/init/remote/web/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/web FILES .directory apps_web.desktop dot_web.desktop kde_web.desktop look_web.desktop )
install( FILES .directory apps_web.desktop dot_web.desktop kde_web.desktop look_web.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/remote/web )

2
konqueror/sidebar/trees/init/services/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services FILES .directory audiocd.desktop printsystem.desktop media.desktop settings.desktop applications.desktop )
install( FILES .directory audiocd.desktop printsystem.desktop media.desktop settings.desktop applications.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )

6
konqueror/sidebar/web_module/CMakeLists.txt
View file

@ -13,13 +13,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konqsidebar_web )
target_link_libraries(konqsidebar_web ${KDE4_KDECORE_LIBS} kparts khtml konqsidebarplugin konq )
install_targets(${PLUGIN_INSTALL_DIR} konqsidebar_web )
install(TARGETS konqsidebar_web DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/websidebar FILES websidebar.html )
install_files( ${DATA_INSTALL_DIR}/konqsidebartng/add FILES webmodule_add.desktop )
install( FILES websidebar.html DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/websidebar )
install( FILES webmodule_add.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add )

6
kwrite/CMakeLists.txt
View file

@ -11,15 +11,15 @@ kde4_add_kdeinit_executable( kwrite ${kwrite_KDEINIT_SRCS})
target_link_libraries(kdeinit_kwrite ${KDE4_KDECORE_LIBS} ktexteditor kparts ${QT_QT3SUPPORT_LIBRARY} kdeui ${QT_QTGUI_LIBRARY} kio)
install_targets(${LIB_INSTALL_DIR} kdeinit_kwrite )
install(TARGETS kdeinit_kwrite DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( kwrite kdeinit_kwrite )
install(TARGETS kwrite DESTINATION bin)
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kwrite.desktop )
install_files( ${DATA_INSTALL_DIR}/kwrite FILES kwriteui.rc )
install( FILES kwrite.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )

6
lib/konq/CMakeLists.txt
View file

@ -41,12 +41,12 @@ kde4_add_library(konq SHARED ${konq_LIB_SRCS})
target_link_libraries(konq ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} kdefx ${KDE4_KDESU_LIBS})
set_target_properties(konq PROPERTIES VERSION 5.0.0 SOVERSION 5 )
install_targets(${LIB_INSTALL_DIR} konq )
install(TARGETS konq DESTINATION ${LIB_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kbookmark FILES directory_bookmarkbar.desktop )
install( FILES directory_bookmarkbar.desktop DESTINATION ${DATA_INSTALL_DIR}/kbookmark )
install_files( /include FILES
konq_popupmenu.h
knewmenu.h
@ -71,7 +71,7 @@ install_files( /include FILES
konq_filetip.h
konqmimedata.h
)
install_files( ${SERVICETYPES_INSTALL_DIR} FILES konqpopupmenuplugin.desktop )
install( FILES konqpopupmenuplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )

4
lib/konq/Templates/CMakeLists.txt
View file

@ -3,8 +3,8 @@
########### install files ###############
install_files( ${TEMPLATES_INSTALL_DIR} FILES linkProgram.desktop linkURL.desktop linkFloppy.desktop linkHD.desktop linkCDROM.desktop Directory.desktop TextFile.desktop HTMLFile.desktop linkZIP.desktop linkDVDROM.desktop linkCAMERA.desktop linkNFS.desktop linkCDWRITER.desktop linkMO.desktop )
install_files( ${TEMPLATES_INSTALL_DIR}/.source FILES Program.desktop URL.desktop Floppy.desktop HD.desktop CDROM-Device.desktop TextFile.txt HTMLFile.html ZIP-Device.desktop DVDROM-Device.desktop CAMERA-Device.desktop NFS.desktop CDWRITER-Device.desktop MO-Device.desktop )
install( FILES linkProgram.desktop linkURL.desktop linkFloppy.desktop linkHD.desktop linkCDROM.desktop Directory.desktop TextFile.desktop HTMLFile.desktop linkZIP.desktop linkDVDROM.desktop linkCAMERA.desktop linkNFS.desktop linkCDWRITER.desktop linkMO.desktop DESTINATION ${TEMPLATES_INSTALL_DIR} )
install( FILES Program.desktop URL.desktop Floppy.desktop HD.desktop CDROM-Device.desktop TextFile.txt HTMLFile.html ZIP-Device.desktop DVDROM-Device.desktop CAMERA-Device.desktop NFS.desktop CDWRITER-Device.desktop MO-Device.desktop DESTINATION ${TEMPLATES_INSTALL_DIR}/.source )

6
lib/konq/favicons/CMakeLists.txt
View file

@ -8,10 +8,10 @@ target_link_libraries( kded_favicons ${KDE4_KIO_LIBS} )
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kded_favicons )
install_targets(${PLUGIN_INSTALL_DIR} kded_favicons )
install(TARGETS kded_favicons DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${SERVICES_INSTALL_DIR}/kded FILES favicons.desktop )
install( FILES favicons.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES favicons.upd move_favicons.sh )
install( FILES favicons.upd move_favicons.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

2
lib/konq/konq_bgnddlg.cc
View file

@ -181,7 +181,7 @@ void KonqBgndDialog::slotPictureChanged()
if ( file.isEmpty() )
file = KStandardDirs::locate("wallpaper", m_pixmapFile); // add fallback for compatibility
if ( file.isEmpty() ) {
kWarning(1203) << "Couldn't KStandardDirs::locate wallpaper " << m_pixmapFile << endl;
kWarning(1203) << "Couldn't locate wallpaper " << m_pixmapFile << endl;
m_preview->setPalette(QPalette());
m_pixmap = QPixmap();
m_pixmapFile = "";

2
lib/konq/konq_propsview.cc
View file

@ -58,7 +58,7 @@ static QPixmap wallpaperPixmap( const QString & _wallpaper )
else
QPixmapCache::insert( key, pix );
return pix;
} else kWarning(1203) << "Couldn't KStandardDirs::locate wallpaper " << _wallpaper << endl;
} else kWarning(1203) << "Couldn't locate wallpaper " << _wallpaper << endl;
return QPixmap();
}

2
lib/konq/pics/CMakeLists.txt
View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/konqueror/pics FILES thumbnailfont_7x4.png arrow_topleft.png arrow_topright.png arrow_bottomleft.png arrow_bottomright.png )
install( FILES thumbnailfont_7x4.png arrow_topleft.png arrow_topright.png arrow_bottomleft.png arrow_bottomright.png DESTINATION ${DATA_INSTALL_DIR}/konqueror/pics )

8
nsplugins/CMakeLists.txt
View file

@ -25,7 +25,7 @@ if (X11_Xt_LIB)
target_link_libraries(nsplugin ${KDE4_KIO_LIBS} kparts ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} )
install_targets(${PLUGIN_INSTALL_DIR} nsplugin )
install(TARGETS nsplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -40,7 +40,7 @@ if (X11_Xt_LIB)
target_link_libraries(kcm_nsplugins ${KDE4_KDECORE_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_nsplugins )
install(TARGETS kcm_nsplugins DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -57,8 +57,8 @@ if (X11_Xt_LIB)
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES khtml_plugins.desktop )
install_files( ${DATA_INSTALL_DIR}/plugin FILES nspluginpart.rc )
install( FILES khtml_plugins.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES nspluginpart.rc DESTINATION ${DATA_INSTALL_DIR}/plugin )
else (X11_Xt_LIB)

2
nsplugins/nspluginloader.cpp
View file

@ -189,7 +189,7 @@ void NSPluginLoader::scanPlugins()
QRegExp version(";version=[^:]*:");
// open the cache file
QFile cachef(locate("data", "nsplugins/cache"));
QFile cachef(KStandardDirs::locate("data", "nsplugins/cache"));
if (!cachef.open(QIODevice::ReadOnly)) {
kDebug() << "Could not load plugin cache file!" << endl;
return;

2
nsplugins/wrapper/CMakeLists.txt
View file

@ -12,7 +12,7 @@ kde4_add_library(nswrapper SHARED ${nswrapper_LIB_SRCS})
target_link_libraries(nswrapper ${KDE4_KDECORE_LIBS} )
set_target_properties(nswrapper PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install_targets(${LIB_INSTALL_DIR} nswrapper )
install(TARGETS nswrapper DESTINATION ${LIB_INSTALL_DIR} )
########### install files ###############